Also commit the patch...

Package-Manager: portage-2.2.0_alpha55/cvs/Linux x86_64

diff --git a/net-misc/nx/ChangeLog b/net-misc/nx/ChangeLog
index 8bff76cb145bb4f1e9b7a73f256fea2bbb11b48c..c5e600166d9d55a3165047809a8462528a465641 100644 (file)
--- a/net-misc/nx/ChangeLog
+++ b/net-misc/nx/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/nx
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nx/ChangeLog,v 1.59 2011/09/14 12:44:37 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nx/ChangeLog,v 1.60 2011/09/14 12:55:34 voyageur Exp $
+
+  14 Sep 2011; Bernard Cafarelli <voyageur@gentoo.org>
+  +files/nx-3.5.0-libpng15.patch:
+  Also commit the patch...
 
 *nx-3.5.0-r1 (14 Sep 2011)
 

diff --git a/net-misc/nx/Manifest b/net-misc/nx/Manifest
index cd33e595536d035fe7aa1480035ae7d00c4e84e3..1c36a3390f068204f1b37745e6018ec9a8f43698 100644 (file)
--- a/net-misc/nx/Manifest
+++ b/net-misc/nx/Manifest
@@ -9,6 +9,7 @@ AUX nx-3.1.0-gcc-4.3.patch 373 RMD160 3a8585a19fae38b7814e85c68a475df18765fbc6 S
 AUX nx-3.2.0-nxproxy_read_from_stdin.patch 1382 RMD160 1d71a4b9b1e1499b032bf8e32523881554eb278e SHA1 5e5417d4a2fd5f0e3d5c447876f3c8e912c78a34 SHA256 7674e887e1be1134110e2219a96b413efa2b32d9be50de77d15b9dcbad8a4d76
 AUX nx-3.3.0-cflags.patch 1322 RMD160 04228677d9e948843d7ad44c9663dbb96159bdac SHA1 41c873be0ce50ddb4fc6d965213c7bbd61647328 SHA256 88e9506a5809e1357c29b4f0ec1777b69335e35e90a22ab14f98fd616d67fc6e
 AUX nx-3.3.0-nxcomp-glibc2.10.patch 455 RMD160 dbb8ff05d042ec8a565f55dae51ddc51d8ed0854 SHA1 3c5522c749764fc42e549c87930790cac60fd01e SHA256 3d9938912d565962e7f00b4dfc1549b6a71de5335c97206658d4088a7122508d
+AUX nx-3.5.0-libpng15.patch 835 RMD160 7c6685ee2e2ad4d5ac69052123bc1403d149388f SHA1 e72fccc7b55d0bd16d155e7c225b21034aa604ab SHA256 04333308521101d7ed751d98c45ed4e34ca6e1f940a2e5914ad1c10b9d7a83db
 DIST nx-X11-3.4.0-3.tar.gz 20245244 RMD160 98f0a39ce7dd0ba2ddfe6f1e7db0c8a2384b78e4 SHA1 74dbc9cfea6d93361e362298421cdac82f5d910d SHA256 7819ffb49859277ae5003574b683410c6ff03e80dfb523da7c32dbf70774a903
 DIST nx-X11-3.5.0-1.tar.gz 20219290 RMD160 36075707cc2599f62e236f00951eaf345090578d SHA1 41391a796cf7ceaa5874eec7d7b1d08a473f04b6 SHA256 a81672d918c72d425a4eb2a98b454586b3f396e46f108c2b4945ff5e41e9fc4d
 DIST nx-X11-3.5.0-2.tar.gz 20345475 RMD160 85ca4499c46fce1bebbf7b96101dd764d1ba7f35 SHA1 cf85890dad11cb9edc382d7e540fdc866fe82e04 SHA256 11a48ea553c31da9f04a1dfa0a190efa7eed3b6bd4280a22ddbd602a754cbe22
@@ -29,12 +30,12 @@ DIST nxproxy-3.5.0-1.tar.gz 80194 RMD160 82d0e132c94ff259485ac166fa4ac380bb9371f
 EBUILD nx-3.4.0-r3.ebuild 3987 RMD160 371bdab9488958b8488f269e363b6902a8b5d7e5 SHA1 8ed054dd58008714d96e8cadb9c519a1f0b91976 SHA256 dc6542b6be153bed0d45a1ef0d58fe96c813d74f9192d9088e334ba8b69e6f21
 EBUILD nx-3.5.0-r1.ebuild 3374 RMD160 9a8f1b3a45df48c7b03174f6a4dd3cf564cbca60 SHA1 cafa03f40b348865f9b5d17d0cb654dfdd4efd1f SHA256 d21ccbbe7ab932008b9076c352952f61529ee430c62f4eddb181935543014481
 EBUILD nx-3.5.0.ebuild 3802 RMD160 07edcdc1b5309b4db7af8894524fdfdc8c95d8b7 SHA1 4872f65b32e96eda67799cd403dd15161b7ae15c SHA256 7ad6552ab8a3d0b4609ce9556833eb895f7883c0568be5378b13ac432976bfcc
-MISC ChangeLog 8902 RMD160 1b9ab05c59d43a9de74e3928b10de821aa2dd9da SHA1 06873390b42f467f2b3f00c0f41e0b9c6eda92d4 SHA256 e583dc6545ff117228907cb2d669508b83042eb05b085717692b61b2590b7b85
+MISC ChangeLog 9019 RMD160 405d33c83eea1bbf8836f675b1089d1790f3948e SHA1 bbf89e68f9d4eb75575c9e79a2cbb43e9c3dc9ab SHA256 34d7bf21ef600a0aee2a37f158b6bf12e15feef64636afb8cbeba025a6bbcc30
 MISC metadata.xml 254 RMD160 b79639a7a5027cb4342c18c2c5f0999bdd56f81f SHA1 d4bc63a27b50efd4593005361dc2e6032a34b1a8 SHA256 2952f5071f21b100d9704142bb38a3e126a2ed3f41b4232e213ce607f7780033
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk5wocEACgkQFYEBGcdFJfLa6QD+KtAHmV3OlWSBYxcGjeKI4cQ0
-y31L09HhN1ueLsVeDGAA/Ro0hsF+eY2Sl15d9SztoOhsDcXRN9mc3csfhNpfT3TH
-=dLES
+iF4EAREIAAYFAk5wpFEACgkQFYEBGcdFJfLXnAD8CcHNbB2g5pNUnFiNjGVQb2Wm
+NqsLXtx/nHD342Hs/BcA/1XfukKspZ+4HL5yzJoUIpWf8oAtE+BJkfs6f1bV5NZZ
+=tSwB
 -----END PGP SIGNATURE-----

diff --git a/net-misc/nx/files/nx-3.5.0-libpng15.patch b/net-misc/nx/files/nx-3.5.0-libpng15.patch
new file mode 100644 (file)
index 0000000..c8f2a95
--- /dev/null
+++ b/net-misc/nx/files/nx-3.5.0-libpng15.patch
@@ -0,0 +1,30 @@
+diff -ur nxcomp.orig/Pgn.cpp nxcomp/Pgn.cpp
+--- nxcomp.orig/Pgn.cpp        2010-03-01 19:18:59.000000000 +0200
++++ nxcomp/Pgn.cpp     2011-09-13 16:35:12.000000000 +0300
+@@ -414,7 +414,7 @@
+ 
+   png_read_info(pngPtr, infoPtr);
+ 
+-  if (infoPtr -> color_type == PNG_COLOR_TYPE_PALETTE)
++  if (png_get_color_type(pngPtr, infoPtr) == PNG_COLOR_TYPE_PALETTE)
+   {
+     png_set_expand(pngPtr);
+   }
+@@ -565,7 +565,7 @@
+ 
+   png_read_info( pngPtr, infoPtr ) ;
+ 
+-  if (infoPtr -> color_type == PNG_COLOR_TYPE_PALETTE)
++  if (png_get_color_type(pngPtr, infoPtr) == PNG_COLOR_TYPE_PALETTE)
+   {
+     png_set_expand(pngPtr);
+   }
+@@ -709,7 +709,7 @@
+   png_read_info(pngPtr, infoPtr) ;
+ 
+ 
+-  if (infoPtr -> color_type == PNG_COLOR_TYPE_PALETTE)
++  if (png_get_color_type(pngPtr, infoPtr) == PNG_COLOR_TYPE_PALETTE)
+   {
+     png_set_expand(pngPtr);
+   }