[gentoo-commits] gentoo-x86 commit in dev-perl/perl-tk/files: perl-tk-804.31.0-fix-libpng-option.patch

[Vladimir Smirnov (civil)]

civil       14/01/21 14:45:13

  Modified:             perl-tk-804.31.0-fix-libpng-option.patch
  Log:
  Improve patch for libpng issue. Just add one missing call to pkg-config.
  
  (Portage version: 2.2.8/cvs/Linux x86_64, signed Manifest commit with key 0xA832680F)

Revision  Changes    Path
1.2                  dev-perl/perl-tk/files/perl-tk-804.31.0-fix-libpng-option.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-perl/perl-tk/files/perl-tk-804.31.0-fix-libpng-option.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-perl/perl-tk/files/perl-tk-804.31.0-fix-libpng-option.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-perl/perl-tk/files/perl-tk-804.31.0-fix-libpng-option.patch?r1=1.1&r2=1.2

Index: perl-tk-804.31.0-fix-libpng-option.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-perl/perl-tk/files/perl-tk-804.31.0-fix-libpng-option.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-tk-804.31.0-fix-libpng-option.patch	21 Jan 2014 13:40:35 -0000	1.1
+++ perl-tk-804.31.0-fix-libpng-option.patch	21 Jan 2014 14:45:13 -0000	1.2
@@ -1,16 +1,12 @@
 --- Tk-804.031/PNG/Makefile.PL.old	2014-01-21 17:04:09.961441121 +0400
 +++ Tk-804.031/PNG/Makefile.PL	2014-01-21 17:08:15.582448981 +0400
-@@ -17,10 +17,10 @@
- 
- my $libpng_cflags;
+@@ -17,10 +17,11 @@
  my $libpng_libs;
--system('pkg-config --exists libpng');
-+system('pkg-config --exists png');
+ system('pkg-config --exists libpng');
  if ($? == 0) {
--    chomp($libpng_cflags = `pkg-config --cflags libpng`);
--    chomp($libpng_libs   = `pkg-config --libs libpng`);
-+    chomp($libpng_cflags = `pkg-config --cflags png`);
-+    chomp($libpng_libs   = `pkg-config --libs png`);
+     chomp($libpng_cflags = `pkg-config --cflags libpng`);
+     chomp($libpng_libs   = `pkg-config --libs libpng`);
++    chomp($libpng_libs  .= `pkg-config --libs zlib`);
  } else {
      warn "'pkg-config libpng' failed, continue with fallback values for cflags and libs...\n";
      $libpng_cflags = '-I/usr/local/include';