Clean up after myself, the patch I grabbed from the-random-location is not perfect...

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/dev-scheme/plt-scheme/Manifest b/dev-scheme/plt-scheme/Manifest
index bf46b77a5eb4c557c7bfed70177edc2f31c58c0c..b311c81a5a1e4194bc8763e787f5c16b0c6fb680 100644 (file)
--- a/dev-scheme/plt-scheme/Manifest
+++ b/dev-scheme/plt-scheme/Manifest
@@ -1,4 +1,4 @@
-AUX plt-scheme-4.2.2-libpng14.patch 603 RMD160 99fa0e5046041d1fcdda6f09732bde60bc5bea21 SHA1 86c3d7ca198cfc3e8aade8cad2ca9a268b8b074d SHA256 73e1851756b2a91fee72161b88bc103ac5f125215b279979cf8e3226cf0c1d52
+AUX plt-scheme-4.2.2-libpng14.patch 396 RMD160 528d3c74a98170a093949d4aef579197a58ec01a SHA1 26ec3164050362b79473530445e51f9fe3a984c7 SHA256 b63564ba154cd1d70dcba070ca99a63bf58c08a8c157441ea6986ad097f203fb
 DIST plt-4.2.2-src-unix.tgz 15169687 RMD160 a2d6a3d2400ac0710c2c1e336f7d0f73bd329ab2 SHA1 171bf156d4fa7de5d3035629db427791e79d3115 SHA256 4fb874e9dee67b337369d8b7747239f8caa8eeaddf1bc3fe983916d28b3f06f4
 EBUILD plt-scheme-4.2.2.ebuild 2412 RMD160 ccd0aafd1cb0136d27cc6edef312977eec6b8670 SHA1 192a9b2ed9964439e410dea6e017ed796b690cee SHA256 9f82b2f0f8a0ba674a171d1212d8f37be15e1e476abb37be82f3a2d8283bcee4
 MISC ChangeLog 19576 RMD160 72f16a9a5ec8ae5283c34745252dc511cde9c4c2 SHA1 75fdd07e8458b756b4f58e1ce469f34e072177ce SHA256 f62fe3c88f036d517a8eab80eb871fc755e669c768b184b86ce158662d34c3b3

diff --git a/dev-scheme/plt-scheme/files/plt-scheme-4.2.2-libpng14.patch b/dev-scheme/plt-scheme/files/plt-scheme-4.2.2-libpng14.patch
index da20e0878c16ba38ef20d025d38a8b6e5c1dd72c..0995176ce929bc2416cfa3a24144e30cfba43ff6 100644 (file)
--- a/dev-scheme/plt-scheme/files/plt-scheme-4.2.2-libpng14.patch
+++ b/dev-scheme/plt-scheme/files/plt-scheme-4.2.2-libpng14.patch
@@ -1,15 +1,13 @@
-diff -ur plt-4.2.2.orig/src/wxcommon/wxJPEG.cxx plt-4.2.2/src/wxcommon/wxJPEG.cxx
---- plt-4.2.2.orig/src/wxcommon/wxJPEG.cxx     2009-09-17 06:08:52.000000000 +0300
-+++ plt-4.2.2/src/wxcommon/wxJPEG.cxx  2010-05-11 13:17:28.000000000 +0300
-@@ -726,7 +726,11 @@
+http://bugs.gentoo.org/319253
+
+--- src/wxcommon/wxJPEG.cxx
++++ src/wxcommon/wxJPEG.cxx
+@@ -726,7 +726,7 @@
         png_set_strip_16(png_ptr);
  
       /* Expand grayscale images to the full 8 bits from 1, 2, or 4 bits/pixel */
-+     #if PNG_LIBPNG_VER < 10400
-      png_set_gray_1_2_4_to_8(png_ptr);
-+     #else
+-     png_set_gray_1_2_4_to_8(png_ptr);
 +     png_set_expand_gray_1_2_4_to_8(png_ptr);
-+     #endif
     }
  
     /* Set the background color to draw transparent and alpha images over.