[patch] patch to use _Z_OF() instead of OF()

gngb-zlibfix.patch (text/plain), 4.78 KB, created by Michael on 2014-07-30 14:19:03 UTC

diff -ruN gngb.old/Manifest gngb/Manifest
--- gngb.old/Manifest	2014-07-30 15:56:10.292553446 +0200
+++ gngb/Manifest	2014-07-30 16:01:06.948913782 +0200
@@ -1,22 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX gngb-20060309-ovflfix.patch 473 SHA256 4d6bcf84fcb5663ef40a320851d928fc17b194ad807af59c7a343592b16b7c63 SHA512 b0d6630aaf693b8cc3f0384641e05125dd8c6cd6c26fd7a3856ff2c23d462c4eed1986108acf1bf9c269e7a008f9367f86eabf148b53064ebe7a4f39f3cdbc74 WHIRLPOOL d2e9a9bf01df21f5e7f2488c48b3b89bb5f3957b1fa508386c895c8a8b4173ffa7870bf2c250d1898a16b974ecd971d9af9b014ac6b4376b90a281b344d8f872
+AUX gngb-20060309-zlibfix.patch 602 SHA256 5bebf587f69b64befc884b245f914efd312ea935a84adae6ef1f6af21ddfeacc SHA512 5695eee43c7fad1aba9eb8f59184d60165253354c4889c78e31932f7a1ac8223ca721b21fcab69b8b7dd9e766240b24541b478ca17cc007fe89705b283c84693 WHIRLPOOL 04109c85007c6d43662cb2df48cb9149edce186a832f230e0f754b25cf20eac4fa0cea594293941bcd716aaec8cb36947ca6f95b65b54afba44fc49d1111beb2
 DIST gngb-20060309.tar.gz 168911 SHA256 49c565002a6e9025c33b13aa0ffcdc456b6bd6360fb966460815a3b4007b4bc8 SHA512 169fdb94eac439240ff15fc2337908cb40e06259338d03c0193a0cb04acb9ee688832fc3157ec56e4e541a8889c4b1a4e7d0efb035b5829ffb856192b60d259f WHIRLPOOL 98c4338825dbf7a2bfa4679041c0aad6fc95ab2f72b293afddbc0ece8c539c3629691150443d18582d767036c1a8d48dff3d04978f94a387894e2290f1f2b090
-EBUILD gngb-20060309.ebuild 833 SHA256 51433b64e15f6a099d2c26bb4ccd05c2993540aacfc57736586a8a4ce4a25236 SHA512 6acca1801565a7b6a9351731de0d2187c6c361e3c202f5ef333dc28da444471aff1e57bcb0439ace31fb4400fcf2d07a16a55b27cf3ae15a14b27fa25fe9c1e6 WHIRLPOOL 8043b04b96e210ac0c7624630aa358f3d3ef9fb4dc6040a3e809a49f0f2ef0c025b59afff3e69deb2128d0d31727d11d64ded1285d16671ab68c6f5cf504d4de
+EBUILD gngb-20060309.ebuild 871 SHA256 fe50d3ca179c61aa0f7ef69bd107c7d8e89fc3042775c2fc4c1c9d67b986e868 SHA512 21b55484b1010ebb41ecea015a0549a3aa7e978a011005bab6078dd27396e8ed90c0ce54fc78eb6b016a187e8ecf2b4abb51a3dc569de68573b475bf18f4f848 WHIRLPOOL 8204606de178b451258121930ff3d52bedc568004487918d157ecc7bfdbbe0a03b44e3d8d6ee531b786062f720203b98cfaae69b8472421762a3a423f96658cd
 MISC ChangeLog 2987 SHA256 d07bda8d8562e7d9fd772cee8a48e34e4e6e0c6f436455828b3797f8006e22fb SHA512 12dee0303227ef2c6a4f3705d762aca08d37e60cf74d311f0e306e7871f5cb5f23bcc6ab971f633337241faffef6e1e725cf3b3fdfc0e13dd4e304dc4b0295f5 WHIRLPOOL 7deb8ed45d4ab2b6fd0f0028a27f1c2864996d21b71e7e75f51d461a63d92db58f84a491a3c0b13362d0ef91ccfe78f1aeb8eb1250d8ec5be16cd4631c649a98
 MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iQGcBAEBCAAGBQJTdO0uAAoJEJQzkH1pP7W4f7UMAIMZbmNAW2xCqQ6QuPTMALU6
-hez2hVCdTyuw5z7qOLoCLNaiAAucq4SjhhCcgKZgHUlj5lWM5wjRQE3QDWDglpOj
-XZo3f0AGrxFkjokfuN9JfggaMfCWWhXRoz9ejHx40q3ni0hefrW7i+PYvbXftrCG
-VfJLiE26wDntaj2OUfjghmj64V1ZGn15ro4lu7mTLcpKSVZUBkMMwbmzt1Yqw7BE
-G8kCL2rRtKTslyH1B2+vOne+DWOXjwy2ORVHZnC6O13gbctb8yvFOhCaoI+6YXKy
-J519WLUn9XKPrxHMPC9N3dztcOBCwXIdqoLF+ZxCKhcukrq4z9Xv9yhsiF88Raes
-brPZ3kpjKhhS6jBfZfoOTjoVBBbJas0pwbHUuCjBJOoZFGaduBq3naW317Lf1cS1
-hUvarUCqWyrtUXMS8YZqyRzKc1BhqSO05h7mXzAg1GL9/DLzNeiSf/7FbGCl/AvL
-zzw2ykcMymFBjRzIu2HiiSbTRSXzv9m0S7ma6mTu4w==
-=7Iuc
------END PGP SIGNATURE-----
diff -ruN gngb.old/files/gngb-20060309-zlibfix.patch gngb/files/gngb-20060309-zlibfix.patch
--- gngb.old/files/gngb-20060309-zlibfix.patch	1970-01-01 01:00:00.000000000 +0100
+++ gngb/files/gngb-20060309-zlibfix.patch	2014-07-30 15:59:08.680365283 +0200
@@ -0,0 +1,18 @@
+--- src/unzip.h.old	2014-07-30 15:29:20.321284383 +0200
++++ src/unzip.h	2014-07-30 15:28:40.494774712 +0200
+@@ -49,6 +49,15 @@
+ #include "zlib.h"
+ #endif
+ 
++/* gentoo changed zlib API macros ON() and OF() to _Z_ON() and _Z_OF()
++ * to avoid collisions with other packages:
++ * https://bugs.gentoo.org/show_bug.cgi?id=383179
++ * http://code.google.com/p/fritzing/issues/detail?id=1854 */
++#ifdef _Z_OF
++#undef OF
++#define OF _Z_OF
++#endif
++
+ #if defined(STRICTUNZIP) || defined(STRICTZIPUNZIP)
+ /* like the STRICT of WIN32, we define a pointer that cannot be converted
+     from (void*) without cast */
diff -ruN gngb.old/gngb-20060309.ebuild gngb/gngb-20060309.ebuild
--- gngb.old/gngb-20060309.ebuild	2014-07-30 15:56:10.292553446 +0200
+++ gngb/gngb-20060309.ebuild	2014-07-30 15:58:23.999914883 +0200
@@ -19,7 +19,8 @@
 	app-arch/bzip2
 	opengl? ( virtual/opengl )"
 
-PATCHES=( "${FILESDIR}"/${P}-ovflfix.patch )
+PATCHES=( "${FILESDIR}"/${P}-ovflfix.patch \
+		  "${FILESDIR}"/${P}-zlibfix.patch)
 
 src_configure() {
 	egamesconf $(use_with opengl gl)