summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2004-06-19 07:12:30 +0000
committerMike Frysinger <vapier@gentoo.org>2004-06-19 07:12:30 +0000
commit7f9d1c205614f8c73dfe84e2b0dd713728e30eb1 (patch)
tree18a7fa4172bc16db3e8cb19ab59714b0a4455d52 /media-libs
parentVersion bumped. Added dispatch-conf(1) and g-cpan.pl(1) (diff)
downloadhistorical-7f9d1c205614f8c73dfe84e2b0dd713728e30eb1.tar.gz
historical-7f9d1c205614f8c73dfe84e2b0dd713728e30eb1.tar.bz2
historical-7f9d1c205614f8c73dfe84e2b0dd713728e30eb1.zip
fix include bug #54198
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/svgalib/ChangeLog8
-rw-r--r--media-libs/svgalib/Manifest12
-rw-r--r--media-libs/svgalib/files/svgalib-1.9.18-lrmi-gentoo-cflags.patch9
-rw-r--r--media-libs/svgalib/files/svgalib-1.9.18-utils-include.patch11
-rw-r--r--media-libs/svgalib/svgalib-1.9.18-r1.ebuild8
5 files changed, 41 insertions, 7 deletions
diff --git a/media-libs/svgalib/ChangeLog b/media-libs/svgalib/ChangeLog
index 3b456526b1a5..3968bf542b16 100644
--- a/media-libs/svgalib/ChangeLog
+++ b/media-libs/svgalib/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for media-libs/svgalib
# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/ChangeLog,v 1.38 2004/06/07 23:01:38 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/ChangeLog,v 1.39 2004/06/19 07:12:30 vapier Exp $
+
+ 19 Jun 2004; Mike Frysinger <vapier@gentoo.org>
+ +files/svgalib-1.9.18-lrmi-gentoo-cflags.patch,
+ +files/svgalib-1.9.18-utils-include.patch, svgalib-1.9.18-r1.ebuild:
+ Make sure the gcc always runs with $CFLAGS to fix #54198 by Simon Strandman
+ and add a small patch so lrmi uses our $CFLAGS instead of -g.
07 Jun 2004; Aron Griffis <agriffis@gentoo.org> svgalib-1.9.17-r3.ebuild:
Fix use invocation
diff --git a/media-libs/svgalib/Manifest b/media-libs/svgalib/Manifest
index abce0e5d8b28..add7eb1045d2 100644
--- a/media-libs/svgalib/Manifest
+++ b/media-libs/svgalib/Manifest
@@ -1,11 +1,11 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
-MD5 e1cf0488207ec53e64300a04364290a1 ChangeLog 6337
+MD5 3fa3395f274efa280662434b2e4f3855 ChangeLog 6649
MD5 a7952dad5afc0717ba17be89c06af59b svgalib-1.9.18.ebuild 3331
MD5 7ba8eaf0cdcf0f73a2efad41d746af03 svgalib-1.9.17-r3.ebuild 3051
MD5 f83aa01b1049450c03bb86b4ad7b246c svgalib-1.4.3-r4.ebuild 2406
-MD5 809f47918d5eee1f37f861c60991945f svgalib-1.9.18-r1.ebuild 4385
+MD5 72386db4c5e3fcfd84fac69622cc4b5f svgalib-1.9.18-r1.ebuild 4546
MD5 ae00198d9110c4de5bc6dd4d6424ab26 files/digest-svgalib-1.4.3-r4 132
MD5 0d7d045fc55ccf3f4a26bc54286a3b8a files/digest-svgalib-1.9.18 66
MD5 e4ead3e3192f5a945ff177331122d7ae files/digest-svgalib-1.9.17-r3 66
@@ -22,10 +22,12 @@ MD5 84638d1958dd8a0851602dc50dad3998 files/svgalib-1.9.18-linux2.6.patch 7981
MD5 0d7d045fc55ccf3f4a26bc54286a3b8a files/digest-svgalib-1.9.18-r1 66
MD5 c6ccf439f748f710447c61fe41801a3c files/svgalib-1.9.18-linux2.6-v2.patch 7842
MD5 e6a7509b89c4014c625cf1eaefd994ff files/svgalib-1.9.18-gcc34.patch 322
+MD5 627fcf9d82cd93cddcdef96a00248260 files/svgalib-1.9.18-utils-include.patch 413
+MD5 0877788ea40d3673a0c50d82d4560e0a files/svgalib-1.9.18-lrmi-gentoo-cflags.patch 269
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.9.8 (GNU/Linux)
-iD8DBQFA0wunHTu7gpaalycRApE2AJ4h83FaB0n/Nld2VOjNcaBLM4ecjACgoham
-gfHNA6I0+c8IUYCwO/d9mQo=
-=DcsL
+iD8DBQFA0+drHTu7gpaalycRAqDwAJoCQmkm3S421CsyVx+shJUSGulktwCglpZq
+TcEOd90VpuNj1dmlPmSjI9g=
+=OEin
-----END PGP SIGNATURE-----
diff --git a/media-libs/svgalib/files/svgalib-1.9.18-lrmi-gentoo-cflags.patch b/media-libs/svgalib/files/svgalib-1.9.18-lrmi-gentoo-cflags.patch
new file mode 100644
index 000000000000..2bddb4a1b7ce
--- /dev/null
+++ b/media-libs/svgalib/files/svgalib-1.9.18-lrmi-gentoo-cflags.patch
@@ -0,0 +1,9 @@
+--- svgalib-1.9.18/lrmi-0.6m/Makefile.orig 2004-06-19 02:48:08.112742704 -0400
++++ svgalib-1.9.18/lrmi-0.6m/Makefile 2004-06-19 02:48:23.471407832 -0400
+@@ -1,4 +1,5 @@
+-CFLAGS = -g -Wall
++OPTIMIZE = -g -Wall
++CFLAGS = $(OPTIMIZE)
+
+ sources = lrmi.c
+ objects = lrmi.o
diff --git a/media-libs/svgalib/files/svgalib-1.9.18-utils-include.patch b/media-libs/svgalib/files/svgalib-1.9.18-utils-include.patch
new file mode 100644
index 000000000000..954d3f33d538
--- /dev/null
+++ b/media-libs/svgalib/files/svgalib-1.9.18-utils-include.patch
@@ -0,0 +1,11 @@
+--- svgalib-1.9.18/utils/Makefile.orig 2004-06-19 02:41:48.628433088 -0400
++++ svgalib-1.9.18/utils/Makefile 2004-06-19 02:42:00.532623376 -0400
+@@ -56,7 +56,7 @@
+ $(INSTALLPROG) $(UTILPROGS) $(UTILINSTALLDIR)
+
+ .depend:
+- gcc -MM $(patsubst %.o,$(srcdir)/utils/%.c,$(OBJECTS)) >.depend
++ gcc -MM $(CFLAGS) $(patsubst %.o,$(srcdir)/utils/%.c,$(OBJECTS)) >.depend
+
+ #
+ # include a dependency file if one exists
diff --git a/media-libs/svgalib/svgalib-1.9.18-r1.ebuild b/media-libs/svgalib/svgalib-1.9.18-r1.ebuild
index 2571580d69cb..815364e3e8a9 100644
--- a/media-libs/svgalib/svgalib-1.9.18-r1.ebuild
+++ b/media-libs/svgalib/svgalib-1.9.18-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/svgalib-1.9.18-r1.ebuild,v 1.6 2004/06/18 15:33:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/svgalib-1.9.18-r1.ebuild,v 1.7 2004/06/19 07:12:30 vapier Exp $
inherit eutils flag-o-matic
@@ -38,6 +38,12 @@ src_unpack() {
# Get it to work with kernel 2.6
epatch ${FILESDIR}/${P}-linux2.6-v2.patch
+ # Fix include bug #54198
+ epatch ${FILESDIR}/${P}-utils-include.patch
+
+ # Have lrmi compile with our $CFLAGS
+ epatch ${FILESDIR}/${P}-lrmi-gentoo-cflags.patch
+
# Disable kernel module support while building stages #38403
#use build &&
sed -i 's:installmodule ::' Makefile