diff options
author | Justin Lecher <jlec@gentoo.org> | 2010-06-25 10:07:03 +0000 |
---|---|---|
committer | Justin Lecher <jlec@gentoo.org> | 2010-06-25 10:07:03 +0000 |
commit | be877cdd753c83dbbdf00af0706db8f58fd5e5ce (patch) | |
tree | eacb5b942c656060a7e2f22290570838abc7ae46 /media-libs/ming | |
parent | stable x86, bug 325451 (diff) | |
download | historical-be877cdd753c83dbbdf00af0706db8f58fd5e5ce.tar.gz historical-be877cdd753c83dbbdf00af0706db8f58fd5e5ce.tar.bz2 historical-be877cdd753c83dbbdf00af0706db8f58fd5e5ce.zip |
Cleaned uneeded patches
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
Diffstat (limited to 'media-libs/ming')
-rw-r--r-- | media-libs/ming/ChangeLog | 7 | ||||
-rw-r--r-- | media-libs/ming/Manifest | 11 | ||||
-rw-r--r-- | media-libs/ming/files/ming-0.2a-linking.patch | 30 | ||||
-rw-r--r-- | media-libs/ming/files/ming-0.2a-make.patch | 82 | ||||
-rw-r--r-- | media-libs/ming/files/ming-0.4.x-libpng14.patch | 20 |
5 files changed, 10 insertions, 140 deletions
diff --git a/media-libs/ming/ChangeLog b/media-libs/ming/ChangeLog index 3b0a2a13a597..ee7aa9eb75ef 100644 --- a/media-libs/ming/ChangeLog +++ b/media-libs/ming/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-libs/ming # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/ming/ChangeLog,v 1.71 2010/06/25 10:00:12 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/ming/ChangeLog,v 1.72 2010/06/25 10:07:03 jlec Exp $ + + 25 Jun 2010; Justin Lecher <jlec@gentoo.org> + -files/ming-0.2a-linking.patch, -files/ming-0.2a-make.patch, + -files/ming-0.4.x-libpng14.patch: + Cleaned uneeded patches 25 Jun 2010; Justin Lecher <jlec@gentoo.org> -ming-0.4.0_rc2.ebuild: Cleaned uneeded version diff --git a/media-libs/ming/Manifest b/media-libs/ming/Manifest index febbfa30b497..a117c52a0bf4 100644 --- a/media-libs/ming/Manifest +++ b/media-libs/ming/Manifest @@ -3,10 +3,7 @@ Hash: SHA1 AUX ming-0.2a-fpic.patch 1814 RMD160 b033493ac9c522774acaa81b2ddd68a46b995a9e SHA1 7c3144646a27c5b4474bce6c8efd26f8e86b3636 SHA256 54b7a3492a9136eb91b09dd36b07049db38adb110d08a2f734c752bfda2d815b AUX ming-0.2a-gentoo.diff 369 RMD160 9db5b5e84dd46c794e6502f51c67e5b146c35e51 SHA1 46e25c3614a9b45c1df9111fd548917be6173029 SHA256 0c78843c402ec5e6df5e97a2cef8e9ab72961749e059b95dbf565e770b24a666 -AUX ming-0.2a-linking.patch 1115 RMD160 4857939ffbb2fd852f866e5135ac762d9d8a383a SHA1 70d6a3dbb81600a82b0f59f34b7fca9a4afddaf3 SHA256 1d81fd16680d1dbdbb797cd88874efd4f4bd76f0d159496c83a2d307244efdf4 -AUX ming-0.2a-make.patch 2243 RMD160 658072052ecc9c33f693f191419b2ecf90ad6815 SHA1 34059195be138931509a44d0a3166c97b3bc40ed SHA256 ac6c74ca729e4678e5dc7cee245bef0d33568e8cb063fdc65d81399a1fb62d84 AUX ming-0.3.0--as-needed.patch 7840 RMD160 6104616ba1ab6cecf824d3167e4455bad7d633a8 SHA1 dfb11d85fba618779d2c8e5e50565edb96d50e0c SHA256 336c3ceeb7a5e9de4e5a97ac544af1d65376ca8007fddbed4d77f6f715a9a068 -AUX ming-0.4.x-libpng14.patch 539 RMD160 2bf1b3204ec8cfae1a084c846b3179b84f2670d9 SHA1 63ec02405840056876f25961d6f69a3f289b3e35 SHA256 bd8b84ca82228e57832aaae6cb4058e0c52981bbf12912fd9093bd64c6ebe727 DIST ming-0.2a.tgz 316447 RMD160 2dc888ca8ffda1e219002081973de8855b3faf61 SHA1 9f8b4d9afcee51351b326e6f072352cc8ac013f5 SHA256 b986908e72228574efcc7d4a196ae4edf9a276399a1ada6aaf66aafe6142e744 DIST ming-0.4.3.tar.bz2 14098671 RMD160 38a495250c7f4ff3335ebd08df2984719a2f046b SHA1 e51a1c9de7efcd6b20f727a824cfbf323b6f5e6f SHA256 61480ef0bd911639ac0538bf59d4d5052a1380192d145e922720c33c40693bf0 DIST ming_0.3.0-13.diff.gz 44050 RMD160 391c3ebeae85e93523c32d93cd99913cd405335d SHA1 61cf3e77b3589e27dc981cb5f1ce9b7e0a908127 SHA256 b510902798378a05d63eff457cad2a17cfb03aad878136354175fcc3b633f594 @@ -14,12 +11,12 @@ DIST ming_0.3.0.orig.tar.gz 369259 RMD160 d1484c8ed5442f82d3311fe6164beb5dc9ce2a EBUILD ming-0.2a.ebuild 1288 RMD160 823834b394a63615e8d22ed5a1ae80b3db5df499 SHA1 832c4813037b7bacb51f8dc00ca71355cbd306ef SHA256 2f2cd302e264a742f1494efeffc574647cc27052ae77f2e694542e790396c12e EBUILD ming-0.3.0-r1.ebuild 2813 RMD160 625f9b56540ee29a8cbfb0bd8fd4951154c28def SHA1 704dfbbecd39472ae7318b910cfcc61af917e013 SHA256 aa4470534b70fafede5c81267276dcd27b1b38d32af784f1e0086bada3ff8b14 EBUILD ming-0.4.3.ebuild 2299 RMD160 d4af8606cb97759f3f29ed8b783237af0a7a802e SHA1 4579571923650fb4ac691a094e0ee13a44ad7412 SHA256 2641fdcfbe4a7ed2f2f24eb74daecda3c0704237501b2f7aad2c49140557bf39 -MISC ChangeLog 9066 RMD160 48164c12ba0f53c41e10073dc23eb355cd9a9abb SHA1 0dd98a7f5722521c1f73271e53871167b70daab8 SHA256 9a78ee45586fc5ad17c63ef9ce1f698e59d877276cf9e658b485bc93b9077f00 +MISC ChangeLog 9239 RMD160 525aa5549b5f9bd48bab94e2cbbc66c9880e4713 SHA1 e4f1dea62660943abf07565c247532a34d487dc5 SHA256 d0cb0d83617b4e8c4147cdef7ec4f22b3788a033e1b6d8ebd5e9c4b57880a400 MISC metadata.xml 236 RMD160 92f49f8275e75caf57b88a3172d5204eaa4e33ae SHA1 dd1a8550a514e55ab0ed6190ab4794bb090994f8 SHA256 56075995f83836ae824c7cb01931b98d6745f6d5a7764299c8262e801486b829 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.15 (GNU/Linux) -iEYEARECAAYFAkwkfjEACgkQgAnW8HDreRagmgCfZlaHAUebDeEip5OwuBeqnVGB -IccAnjNZGtXKnnexxsKPATyu/sAhf+SR -=Ipy3 +iEYEARECAAYFAkwkf80ACgkQgAnW8HDreRb5jgCfXOxqabyn56AfYxUvXTMqOx/D +Q7sAnizF8Vlgfgu8920P2Eizbt732yFt +=uZjF -----END PGP SIGNATURE----- diff --git a/media-libs/ming/files/ming-0.2a-linking.patch b/media-libs/ming/files/ming-0.2a-linking.patch deleted file mode 100644 index 7cfe815e2ac0..000000000000 --- a/media-libs/ming/files/ming-0.2a-linking.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -Nuar --exclude '*~' ming-0.2a.orig/py_ext/Makefile ming-0.2a/py_ext/Makefile ---- ming-0.2a.orig/py_ext/Makefile 2006-06-11 03:55:18.102054000 -0700 -+++ ming-0.2a/py_ext/Makefile 2006-06-11 03:59:15.500918176 -0700 -@@ -7,7 +7,7 @@ - all: - - mingcmodule.so: ming_wrap.o -- $(CC) $(CFLAGS) -shared -o mingcmodule.so ming_wrap.o -lming -+ $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -L.. -lming - - mingc.pyd: ming_wrap.o - dllwrap --dllname mingc.pyd --driver-name gcc --def mingc.def \ -diff -Nuar --exclude '*~' ming-0.2a.orig/src/Makefile ming-0.2a/src/Makefile ---- ming-0.2a.orig/src/Makefile 2006-06-11 03:55:18.076055000 -0700 -+++ ming-0.2a/src/Makefile 2006-06-11 04:04:20.289175057 -0700 -@@ -24,7 +24,7 @@ - dynamic: ${OFILES} - cd blocks && make - cd actioncompiler && make -- ${CC} ${CFLAGS} ${OFILES} ${COMPILEROFILES} blocks/*.o -shared \ -+ ${CC} ${CFLAGS} ${LDFLAGS} ${OFILES} ${COMPILEROFILES} blocks/*.o -shared \ - -o libming.so - cp libming.so .. - -@@ -45,4 +45,4 @@ - # ${CC} ${FLAGS} -c $< - - test: static test.o -- ${CC} -o test test.o libming.a -lm -+ ${CC} ${LDFLAGS} -o test test.o libming.a -lm diff --git a/media-libs/ming/files/ming-0.2a-make.patch b/media-libs/ming/files/ming-0.2a-make.patch deleted file mode 100644 index 67d644f1d9e1..000000000000 --- a/media-libs/ming/files/ming-0.2a-make.patch +++ /dev/null @@ -1,82 +0,0 @@ -diff -ur ming-0.2a.orig/Makefile ming-0.2a/Makefile ---- ming-0.2a.orig/Makefile 2006-12-09 00:15:45 +0100 -+++ ming-0.2a/Makefile 2006-12-09 00:18:27 +0100 -@@ -25,16 +25,16 @@ - install libming.a ${LIBDIR}/libming.a - - dynamic: -- cd src && make dynamic -+ cd src && ${MAKE} dynamic - - static: -- cd src && make static -+ cd src && ${MAKE} static - - clean: -- cd src && make clean -- cd util && make clean -- cd py_ext && make clean -- cd php_ext && make clean -+ cd src && ${MAKE} clean -+ cd util && ${MAKE} clean -+ cd py_ext && ${MAKE} clean -+ cd php_ext && ${MAKE} clean - rm -f test.o test test.exe *.core - rm -f libming.a libming.so - -diff -ur ming-0.2a.orig/php_ext/Makefile ming-0.2a/php_ext/Makefile ---- ming-0.2a.orig/php_ext/Makefile 2006-12-09 00:15:44 +0100 -+++ ming-0.2a/php_ext/Makefile 2006-12-09 00:18:30 +0100 -@@ -13,7 +13,7 @@ - ${CC} ${DEFINES} -c ming.c -I. -I.. `php-config --includes` - - ../libming.a: -- cd ..; make static -+ cd ..; ${MAKE} static - - clean: - rm -f php_ming.so -diff -ur ming-0.2a.orig/py_ext/Makefile ming-0.2a/py_ext/Makefile ---- ming-0.2a.orig/py_ext/Makefile 2006-12-09 00:15:44 +0100 -+++ ming-0.2a/py_ext/Makefile 2006-12-09 00:18:30 +0100 -@@ -18,7 +18,7 @@ - gcc -g -Wall -I .. -I ${PYINCDIR} -fpic -c ming_wrap.c - - ../libming.a: -- cd ..; make static -+ cd ..; ${MAKE} static - - swig: - swig -I.. -python ming.i -diff -ur ming-0.2a.orig/src/Makefile ming-0.2a/src/Makefile ---- ming-0.2a.orig/src/Makefile 2006-12-09 00:15:44 +0100 -+++ ming-0.2a/src/Makefile 2006-12-09 00:18:30 +0100 -@@ -19,22 +19,22 @@ - all: dynamic - - dynamic: ${OFILES} -- cd blocks && make -- cd actioncompiler && make -+ cd blocks && ${MAKE} -+ cd actioncompiler && ${MAKE} - ${CC} ${CFLAGS} ${LDFLAGS} ${OFILES} ${COMPILEROFILES} blocks/*.o -shared \ - -o libming.so - cp libming.so .. - - static: ${OFILES} -- cd blocks && make -- cd actioncompiler && make -+ cd blocks && ${MAKE} -+ cd actioncompiler && ${MAKE} - ar r libming.a blocks/*.o ${OFILES} ${COMPILEROFILES} - ranlib libming.a # bsd requires this? - cp libming.a .. - - clean: -- cd blocks && make clean -- cd actioncompiler && make clean -+ cd blocks && ${MAKE} clean -+ cd actioncompiler && ${MAKE} clean - rm -f *.o libming.a libming.so test test.exe core *.core - - # breaks on bsd: diff --git a/media-libs/ming/files/ming-0.4.x-libpng14.patch b/media-libs/ming/files/ming-0.4.x-libpng14.patch deleted file mode 100644 index ce43fdec1d91..000000000000 --- a/media-libs/ming/files/ming-0.4.x-libpng14.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- src/blocks/pngdbl.c -+++ src/blocks/pngdbl.c -@@ -49,7 +49,7 @@ - - if(fread(header, 1, 8, fp) != 8) - return NULL; -- if(!png_check_sig(header, 8)) -+ if(png_sig_cmp(header, 0, 8)) - return NULL; - result = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); - if(!result) -@@ -69,7 +69,7 @@ - - if(SWFInput_read(input, header, 8) != 8) - return NULL; -- if(!png_check_sig(header, 8)) -+ if(png_sig_cmp(header, 0, 8)) - return NULL; - result = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); - if(!result) |