diff options
| author |   Christian Birchinger <joker@gentoo.org> | 2010-01-14 06:41:30 +0000 |
|---|---|---|
| committer | Christian Birchinger <joker@gentoo.org> | 2010-01-14 06:41:30 +0000 |
| commit | cabca1297e22f8be0a7a47d18269c94616f14082 (patch) | |
| tree | 666f0a244c1c81f2095de37f6ca0964835281812 /media-libs/dumb | |
| parent | Added an as-needed patch from bug #300515. (diff) | |
| download | historical-cabca1297e22f8be0a7a47d18269c94616f14082.tar.gz historical-cabca1297e22f8be0a7a47d18269c94616f14082.tar.bz2 historical-cabca1297e22f8be0a7a47d18269c94616f14082.zip | |
Unified PIC and as-needed patches to make maintenance easier.
Package-Manager: portage-2.1.6.13/cvs/Linux x86_64
Diffstat (limited to 'media-libs/dumb')
| -rw-r--r-- | media-libs/dumb/ChangeLog | 7 | ||||
| -rw-r--r-- | media-libs/dumb/Manifest | 7 | ||||
| -rw-r--r-- | media-libs/dumb/dumb-0.9.3-r1.ebuild | 5 | ||||
| -rw-r--r-- | media-libs/dumb/files/dumb-0.9.3-PIC-as-needed.patch (renamed from media-libs/dumb/files/dumb-0.9.2-PIC.patch) | 4 | ||||
| -rw-r--r-- | media-libs/dumb/files/dumb-0.9.3-as-needed.patch | 12 |
5 files changed, 13 insertions, 22 deletions
diff --git a/media-libs/dumb/ChangeLog b/media-libs/dumb/ChangeLog index bddbcb186c8f..298c01605efa 100644 --- a/media-libs/dumb/ChangeLog +++ b/media-libs/dumb/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-libs/dumb # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/dumb/ChangeLog,v 1.36 2010/01/14 05:48:08 joker Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/dumb/ChangeLog,v 1.37 2010/01/14 06:41:30 joker Exp $ + + 14 Jan 2010; Christian Birchinger <joker@gentoo.org> + -files/dumb-0.9.2-PIC.patch, dumb-0.9.3-r1.ebuild, + +files/dumb-0.9.3-PIC-as-needed.patch, -files/dumb-0.9.3-as-needed.patch: + Unified PIC and as-needed patches to make maintenance easier. 14 Jan 2010; Christian Birchinger <joker@gentoo.org> dumb-0.9.3-r1.ebuild, +files/dumb-0.9.3-as-needed.patch: diff --git a/media-libs/dumb/Manifest b/media-libs/dumb/Manifest index 56194d87a79e..50109ab7172a 100644 --- a/media-libs/dumb/Manifest +++ b/media-libs/dumb/Manifest @@ -1,7 +1,6 @@ -AUX dumb-0.9.2-PIC.patch 2705 RMD160 265e64e064fa18478d21795ae2d0a45ba2a5cd34 SHA1 c0bd60ccba112ea2575d608b2ffdc3aabe0b8c5a SHA256 04c201b599559ad67061b5c0fe5515def053e2e025ad8dc5d0b8c022abc32b1d -AUX dumb-0.9.3-as-needed.patch 591 RMD160 3498664fdaf782d7d529c3380239122b0894ed95 SHA1 9e4d9eddaa8cf0dfac9a1a94ac27eb979cdf1693 SHA256 7503c877dfe664765ce6546947989cf00ede7e082ebaa5b5773036cbd6aa5cff +AUX dumb-0.9.3-PIC-as-needed.patch 2708 RMD160 7babd044efa9dd73153e125d9b850f8aa7740f5f SHA1 e28f2a30664955611fc0f4c94a87f3014dddb5e7 SHA256 b8a950ddfe55d09ad69796d3720c7423b566ffa07a415f46bc7274dc2e77694d AUX dumb-0.9.3_CVE-2006-3668.patch 637 RMD160 09c8de5a1ca5f2f45b7e1a8b245006f4f8b85dc8 SHA1 facf6c974bc436369de73367670943a23877d29a SHA256 9f6785435757db725bc73b1c4874b91e80b9277c6fdd2b56e47dae1cfbc968e6 DIST dumb-0.9.3.tar.gz 167379 RMD160 53c7931fec71dd4e67e19c4acf38c0f9202e5698 SHA1 4764bd59f5895eb5035a5139454cef7a53a76bb8 SHA256 8d44fbc9e57f3bac9f761c3b12ce102d47d717f0dd846657fb988e0bb5d1ea33 -EBUILD dumb-0.9.3-r1.ebuild 2130 RMD160 3cab5d573a4aad09c413d83648cfdcf7ebeaba29 SHA1 d09046b0d5ac299fa6cf9563bb57b59df4d00afa SHA256 74009499cf85a96d85d37a4365029564f29df90af56e5d6d19c7d7a40d082271 -MISC ChangeLog 4909 RMD160 1bec205541a4f04b4949e3890e908080f686c31e SHA1 2eb0a7dd118726a959e5def87aa0289aee1acf08 SHA256 d104a5cd165d6b407b13699af01721f1c38d990d73bdfc1c85d295ec56c47417 +EBUILD dumb-0.9.3-r1.ebuild 2090 RMD160 b8e8c319e3355cf87ee89bdbc7af446187834cdd SHA1 bd88cf66d3dbf1485b18f96ce278d11f185d05ed SHA256 7d5546f0cd90b9d64a682259945b7e60788ce02d8430d5e920ea80f6206ef726 +MISC ChangeLog 5158 RMD160 b35d30ed8122ec51747e57ad0b7d5c764404f54b SHA1 422f287b92f6a68b102884cadeb01307b1736690 SHA256 b5ba60cd261d9ab065bc18a58a7c3a40fe6d55e768c0e1faa83bd892055a6574 MISC metadata.xml 251 RMD160 57bef9027e07a80633e99023903f4de9332f52d4 SHA1 da26e36e44561eb0d30b22bf6787705ae5c3d4b3 SHA256 c6bc54aeb1244159055765e01a1d89c4bf47fa956a3e065de5f4d4b7b24a6753 diff --git a/media-libs/dumb/dumb-0.9.3-r1.ebuild b/media-libs/dumb/dumb-0.9.3-r1.ebuild index 8aa7c71d4841..e038c034a27d 100644 --- a/media-libs/dumb/dumb-0.9.3-r1.ebuild +++ b/media-libs/dumb/dumb-0.9.3-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/dumb/dumb-0.9.3-r1.ebuild,v 1.11 2010/01/14 05:48:08 joker Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/dumb/dumb-0.9.3-r1.ebuild,v 1.12 2010/01/14 06:41:30 joker Exp $ EAPI=2 inherit eutils @@ -24,9 +24,8 @@ ALL_TARGETS := core core-examples core-headers PREFIX := /usr EOF - epatch "${FILESDIR}"/${PN}-0.9.2-PIC.patch + epatch "${FILESDIR}"/${P}-PIC-as-needed.patch epatch "${FILESDIR}"/${P}_CVE-2006-3668.patch - epatch "${FILESDIR}"/${P}-as-needed.patch sed -i '/= -s/d' Makefile || die "sed failed" cp -f Makefile Makefile.rdy } diff --git a/media-libs/dumb/files/dumb-0.9.2-PIC.patch b/media-libs/dumb/files/dumb-0.9.3-PIC-as-needed.patch index dc3009310b77..f44e8fb6c526 100644 --- a/media-libs/dumb/files/dumb-0.9.2-PIC.patch +++ b/media-libs/dumb/files/dumb-0.9.3-PIC-as-needed.patch @@ -65,8 +65,8 @@ diff -Naur dumb.orig/make/Makefile.inc dumb/make/Makefile.inc $(CORE_LIB_FILE): $(CORE_OBJECTS) - $(AR) rs $@ $^ -+ $(CC) -shared -o $@ -Wl,-shared,-soname,$(shell basename $@) -lm $^ ++ $(CC) -shared -o $@ -Wl,-shared,-soname,$(shell basename $@) $^ -lm $(ALLEGRO_LIB_FILE): $(ALLEGRO_OBJECTS) - $(AR) rs $@ $^ -+ $(CC) -shared -o $@ -Wl,-shared,-soname,$(shell basename $@) -lm $^ ++ $(CC) -shared -o $@ -Wl,-shared,-soname,$(shell basename $@) $^ -ldumb diff --git a/media-libs/dumb/files/dumb-0.9.3-as-needed.patch b/media-libs/dumb/files/dumb-0.9.3-as-needed.patch deleted file mode 100644 index 6426544e60f6..000000000000 --- a/media-libs/dumb/files/dumb-0.9.3-as-needed.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- dumb-0.9.3.orig/make/Makefile.inc 2010-01-11 13:47:27.426643138 +0100 -+++ dumb-0.9.3/make/Makefile.inc 2010-01-11 13:50:42.488400053 +0100 -@@ -33,7 +33,7 @@ - $(CC) $(CFLAGS) $(WFLAGS_ALLEGRO) -c -o $@ $< - - $(CORE_LIB_FILE): $(CORE_OBJECTS) -- $(CC) -shared -o $@ -Wl,-shared,-soname,$(shell basename $@) -lm $^ -+ $(CC) -shared -o $@ $(LDFLAGS) -Wl,-shared,-soname,$(shell basename $@) $^ -lm - - $(ALLEGRO_LIB_FILE): $(ALLEGRO_OBJECTS) -- $(CC) -shared -o $@ -Wl,-shared,-soname,$(shell basename $@) -lm $^ -+ $(CC) -shared -o $@ $(LDFLAGS) -Wl,-shared,-soname,$(shell basename $@) $^ -lm |