Gentoo Archives: gentoo-commits

From: "Jeroen Roovers (jer)" <jer@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sci-libs/libecwj2/files: libecwj2-3.3-nolcms.patch
Date: Fri, 31 May 2013 14:05:29
Message-Id: 20130531140523.E1D072171D@flycatcher.gentoo.org
jer         13/05/31 14:05:23

  Modified:             libecwj2-3.3-nolcms.patch
  Log:
  Fix relative paths in patch (bug #471852 by Milos Popovic).
  
  (Portage version: 2.2.0_alpha177/cvs/Linux x86_64, signed Manifest commit with key A792A613)

Revision  Changes    Path
1.2                  sci-libs/libecwj2/files/libecwj2-3.3-nolcms.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/libecwj2/files/libecwj2-3.3-nolcms.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/libecwj2/files/libecwj2-3.3-nolcms.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/libecwj2/files/libecwj2-3.3-nolcms.patch?r1=1.1&r2=1.2

Index: libecwj2-3.3-nolcms.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/libecwj2/files/libecwj2-3.3-nolcms.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libecwj2-3.3-nolcms.patch	2 Jan 2010 02:58:46 -0000	1.1
+++ libecwj2-3.3-nolcms.patch	31 May 2013 14:05:23 -0000	1.2
@@ -1,6 +1,5 @@
-diff -Naur ../libecwj2-3.3/Makefile.am ./Makefile.am
---- ../libecwj2-3.3/Makefile.am	2006-07-02 20:14:18.000000000 -0500
-+++ ./Makefile.am	2009-03-16 14:04:13.000000000 -0500
+--- a/Makefile.am	2006-07-02 20:14:18.000000000 -0500
++++ b/Makefile.am	2009-03-16 14:04:13.000000000 -0500
 @@ -1,3 +1,5 @@
 +AUTOMAKE_OPTIONS = foreign
 +
@@ -15,9 +14,8 @@
 -	Source/C/NCSEcw/lcms/include/icc34.h \
  	Source/NCSBuildGnu/NCSGnuConfig.h 
  
-diff -Naur ../libecwj2-3.3/Source/NCSBuildGnu/Makefile.am ./Source/NCSBuildGnu/Makefile.am
---- ../libecwj2-3.3/Source/NCSBuildGnu/Makefile.am	2006-07-02 20:14:18.000000000 -0500
-+++ ./Source/NCSBuildGnu/Makefile.am	2009-03-16 14:00:50.000000000 -0500
+--- a/Source/NCSBuildGnu/Makefile.am	2006-07-02 20:14:18.000000000 -0500
++++ b/Source/NCSBuildGnu/Makefile.am	2009-03-16 14:00:50.000000000 -0500
 @@ -113,22 +113,6 @@
  	../C/NCSEcw/shared_src/qmf_util.c \
  	../C/NCSEcw/shared_src/quantize.c \
@@ -41,9 +39,8 @@
  	../C/NCSGDT2/NCSGDTEpsg.cpp \
  	../C/NCSGDT2/NCSGDTEPSGKey.cpp \
  	../C/NCSGDT2/NCSGDTLocation.cpp
-diff -Naur ../libecwj2-3.3/Source/include/NCSJPCDefs.h ./Source/include/NCSJPCDefs.h
---- ../libecwj2-3.3/Source/include/NCSJPCDefs.h	2006-07-02 20:15:24.000000000 -0500
-+++ ./Source/include/NCSJPCDefs.h	2009-03-16 14:00:27.000000000 -0500
+--- a/Source/include/NCSJPCDefs.h	2006-07-02 20:15:24.000000000 -0500
++++ b/Source/include/NCSJPCDefs.h	2009-03-16 14:00:27.000000000 -0500
 @@ -59,7 +59,7 @@
  // Use LCMS for ICC->RGB conversions, supports both
  // restricted and full ICC profiles.
@@ -53,9 +50,8 @@
  
  //
  // Use TinyXML for XML DOM Parsing
-diff -Naur ../libecwj2-3.3/configure.in ./configure.in
---- ../libecwj2-3.3/configure.in	2006-07-02 20:13:30.000000000 -0500
-+++ ./configure.in	2009-03-16 14:00:14.000000000 -0500
+--- a/configure.in	2006-07-02 20:13:30.000000000 -0500
++++ b/configure.in	2009-03-16 14:00:14.000000000 -0500
 @@ -32,17 +32,6 @@
  # Build some standard absolute include paths for the build