diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-02-06 21:14:02 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-02-06 21:14:02 +0000 |
| commit | 0a27827ed43045f4b7edc42496ecf50b294f3b4b (patch) | |
| tree | 4e70e539c7f353943ff338aaa6bf45c84ffd9e8a /x11-misc | |
| parent | Version bump. (diff) | |
| download | historical-0a27827ed43045f4b7edc42496ecf50b294f3b4b.tar.gz historical-0a27827ed43045f4b7edc42496ecf50b294f3b4b.tar.bz2 historical-0a27827ed43045f4b7edc42496ecf50b294f3b4b.zip | |
Fix building with -Wl,--as-needed wrt #248586 by Kacper Kowalik.
Package-Manager: portage-2.2_rc62/cvs/Linux x86_64
Diffstat (limited to 'x11-misc')
| -rw-r--r-- | x11-misc/xrmap/ChangeLog | 8 | ||||
| -rw-r--r-- | x11-misc/xrmap/Manifest | 5 | ||||
| -rw-r--r-- | x11-misc/xrmap/files/xrmap-2.32-asneeded.patch | 11 | ||||
| -rw-r--r-- | x11-misc/xrmap/xrmap-2.32.ebuild | 7 |
4 files changed, 24 insertions, 7 deletions
diff --git a/x11-misc/xrmap/ChangeLog b/x11-misc/xrmap/ChangeLog index a26cc8216559..cfb84b1b74cb 100644 --- a/x11-misc/xrmap/ChangeLog +++ b/x11-misc/xrmap/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-misc/xrmap -# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/xrmap/ChangeLog,v 1.15 2007/03/09 07:57:25 drac Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xrmap/ChangeLog,v 1.16 2010/02/06 21:14:02 ssuominen Exp $ + + 06 Feb 2010; Samuli Suominen <ssuominen@gentoo.org> xrmap-2.32.ebuild, + +files/xrmap-2.32-asneeded.patch: + Fix building with -Wl,--as-needed wrt #248586 by Kacper Kowalik. 09 Mar 2007; Samuli Suominen <drac@gentoo.org> xrmap-2.29.ebuild, xrmap-2.32.ebuild: diff --git a/x11-misc/xrmap/Manifest b/x11-misc/xrmap/Manifest index 8f2f98bbbd88..6be32e7c4b67 100644 --- a/x11-misc/xrmap/Manifest +++ b/x11-misc/xrmap/Manifest @@ -1,9 +1,10 @@ AUX xrmap-2.32-Makefile.kit.patch 750 RMD160 520dd023635430506d8c4c4c01a5fa366cf134aa SHA1 4200764cd4db2ae821997fda913c855c2a767064 SHA256 139784b2180e404e9265352fecad131ae535288dddb91b6fe7487095e6d41328 +AUX xrmap-2.32-asneeded.patch 371 RMD160 228f5c1b16dc01ac43afbf14fd7435082e2f32f7 SHA1 39cc0e9e8fdaa795573e3d4f0739f8918a9671a0 SHA256 aa11918d5303efb0492c93ad8e8b8520a3e06a211a17a2a717bfd853b617e736 DIST CIA_WDB2.jpd.gz 7391060 RMD160 80fe751ba61405d7b7b7ecdfaf3a9d8e7b9e06b8 SHA1 5d5695c21059dce13ede1f7d5c2a4dfe19b52dd2 SHA256 6bd5c4dc9b31814fdd724563ad27a5a08484d2e8b4f410f8a3a6941491dc13e1 DIST xrmap-2.10.tgz 3944521 RMD160 dd398b2e4b24c23b1fbf9edfa37ddf7d1f4eaf65 SHA1 234a3272e5433865ce7e41c0ed663e17c0fa0f6d SHA256 dcc7383064ca03f4bbc097863cc0e54572c7b0c586461f222cfa7a14848acd6c DIST xrmap-2.29.tar.bz2 1072241 RMD160 f8cacc343643a66c8236743c76c80d3c33c44c5c SHA1 af2efc47b7ef76840a72a96e67174b0fd5dd8973 SHA256 2c790904c5077940b8e4b23d848b0e6a02757cde18a3256c47f34da7d7ae31d0 DIST xrmap-2.32.tar.bz2 1133345 RMD160 5f981cd7e05046d97833bdbf48cf983d3a87d0fe SHA1 30838b29801f8dbf018cf02831e29fd4054ef109 SHA256 842364b5fbe73a4c4573a828a5bc6f492bb9809694ad1dcc16cb29fb8dc2c184 EBUILD xrmap-2.29.ebuild 2112 RMD160 1b9f33e54013a4c7ed06c1a0550b9c716f815549 SHA1 fc79529380a944b5585c1655be573511a4cca5df SHA256 bd641e18421edc15bd9f3e439cd97f83c38eef3b1d285ebac970bdff29be6d32 -EBUILD xrmap-2.32.ebuild 2174 RMD160 e3192f83373758c8ffaea36e1419c7834dbca38b SHA1 fedc908b33a97ff27e8f39b12386998c71f2a7bf SHA256 0ada2891e65115614bd3c30327cfdd0a704a8ff7b0314c5b8cb1be42f980bf85 -MISC ChangeLog 1912 RMD160 8e8f489337449887c80d22deb4566c84ac675a3e SHA1 b430433cea5f768b838291c92d0720e946f74fa9 SHA256 3300e25e0955808f1aa9fc291fb4268c5bd37d68847a105c7e37b89b7df7bc65 +EBUILD xrmap-2.32.ebuild 2212 RMD160 a5f763b09db009d16b16a7aec37818f5b2b41889 SHA1 14111437745786eb48b72c48a5c02d663a643fa3 SHA256 1db50a05d9b08a2bd68c7fb1d784ea623e7029bab3f49a4d4841a4a6adb00367 +MISC ChangeLog 2094 RMD160 bb8317c753629437b799a17386028661c87b0440 SHA1 738489924ac22442b9c72f3615cea19e5aec946b SHA256 8ed0e33483372348c86d9bd66a6f043125caa14c2260c6688f6bd0d5207b0c62 MISC metadata.xml 166 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 SHA1 e6c6436c304a65b4a012a5b7be7ee264b228a645 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826 diff --git a/x11-misc/xrmap/files/xrmap-2.32-asneeded.patch b/x11-misc/xrmap/files/xrmap-2.32-asneeded.patch new file mode 100644 index 000000000000..6675be293d16 --- /dev/null +++ b/x11-misc/xrmap/files/xrmap-2.32-asneeded.patch @@ -0,0 +1,11 @@ +--- Makefile.noimake ++++ Makefile.noimake +@@ -19,7 +19,7 @@ + ## LDOPTIONS=-O6 -g -Wall libxpm/libXpm.a -lX11 -lz -lm -L/usr/X11R6/lib + + all: explorer.o xrmap.o +- gcc $(LDOPTIONS) -o xrmap explorer.o xrmap.o ++ gcc -o xrmap explorer.o xrmap.o $(LDOPTIONS) + cd editkit ; make -f Makefile.kit DESTDIR=$(DESTDIR) + cd earthview ; make DESTDIR=$(DESTDIR) + @cat EXTRADATA diff --git a/x11-misc/xrmap/xrmap-2.32.ebuild b/x11-misc/xrmap/xrmap-2.32.ebuild index ba2e0f57823c..c92720aaace0 100644 --- a/x11-misc/xrmap/xrmap-2.32.ebuild +++ b/x11-misc/xrmap/xrmap-2.32.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/xrmap/xrmap-2.32.ebuild,v 1.5 2009/05/05 18:04:11 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xrmap/xrmap-2.32.ebuild,v 1.6 2010/02/06 21:14:02 ssuominen Exp $ inherit eutils @@ -32,7 +32,8 @@ src_unpack() { rm -rf "${S}" mv "${WORKDIR}"/${PN}-${FULL_DIST} "${S}" unpack ${A} - epatch "${FILESDIR}/${P}-Makefile.kit.patch" + epatch "${FILESDIR}"/${P}-Makefile.kit.patch \ + "${FILESDIR}"/${P}-asneeded.patch cd "${S}"/editkit && xmkmf || die } |