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
1 jer 13/05/31 14:05:23
2
3 Modified: libecwj2-3.3-nolcms.patch
4 Log:
5 Fix relative paths in patch (bug #471852 by Milos Popovic).
6
7 (Portage version: 2.2.0_alpha177/cvs/Linux x86_64, signed Manifest commit with key A792A613)
8
9 Revision Changes Path
10 1.2 sci-libs/libecwj2/files/libecwj2-3.3-nolcms.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/libecwj2/files/libecwj2-3.3-nolcms.patch?rev=1.2&view=markup
13 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
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/libecwj2/files/libecwj2-3.3-nolcms.patch?r1=1.1&r2=1.2
15
16 Index: libecwj2-3.3-nolcms.patch
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/sci-libs/libecwj2/files/libecwj2-3.3-nolcms.patch,v
19 retrieving revision 1.1
20 retrieving revision 1.2
21 diff -u -r1.1 -r1.2
22 --- libecwj2-3.3-nolcms.patch 2 Jan 2010 02:58:46 -0000 1.1
23 +++ libecwj2-3.3-nolcms.patch 31 May 2013 14:05:23 -0000 1.2
24 @@ -1,6 +1,5 @@
25 -diff -Naur ../libecwj2-3.3/Makefile.am ./Makefile.am
26 ---- ../libecwj2-3.3/Makefile.am 2006-07-02 20:14:18.000000000 -0500
27 -+++ ./Makefile.am 2009-03-16 14:04:13.000000000 -0500
28 +--- a/Makefile.am 2006-07-02 20:14:18.000000000 -0500
29 ++++ b/Makefile.am 2009-03-16 14:04:13.000000000 -0500
30 @@ -1,3 +1,5 @@
31 +AUTOMAKE_OPTIONS = foreign
32 +
33 @@ -15,9 +14,8 @@
34 - Source/C/NCSEcw/lcms/include/icc34.h \
35 Source/NCSBuildGnu/NCSGnuConfig.h
36
37 -diff -Naur ../libecwj2-3.3/Source/NCSBuildGnu/Makefile.am ./Source/NCSBuildGnu/Makefile.am
38 ---- ../libecwj2-3.3/Source/NCSBuildGnu/Makefile.am 2006-07-02 20:14:18.000000000 -0500
39 -+++ ./Source/NCSBuildGnu/Makefile.am 2009-03-16 14:00:50.000000000 -0500
40 +--- a/Source/NCSBuildGnu/Makefile.am 2006-07-02 20:14:18.000000000 -0500
41 ++++ b/Source/NCSBuildGnu/Makefile.am 2009-03-16 14:00:50.000000000 -0500
42 @@ -113,22 +113,6 @@
43 ../C/NCSEcw/shared_src/qmf_util.c \
44 ../C/NCSEcw/shared_src/quantize.c \
45 @@ -41,9 +39,8 @@
46 ../C/NCSGDT2/NCSGDTEpsg.cpp \
47 ../C/NCSGDT2/NCSGDTEPSGKey.cpp \
48 ../C/NCSGDT2/NCSGDTLocation.cpp
49 -diff -Naur ../libecwj2-3.3/Source/include/NCSJPCDefs.h ./Source/include/NCSJPCDefs.h
50 ---- ../libecwj2-3.3/Source/include/NCSJPCDefs.h 2006-07-02 20:15:24.000000000 -0500
51 -+++ ./Source/include/NCSJPCDefs.h 2009-03-16 14:00:27.000000000 -0500
52 +--- a/Source/include/NCSJPCDefs.h 2006-07-02 20:15:24.000000000 -0500
53 ++++ b/Source/include/NCSJPCDefs.h 2009-03-16 14:00:27.000000000 -0500
54 @@ -59,7 +59,7 @@
55 // Use LCMS for ICC->RGB conversions, supports both
56 // restricted and full ICC profiles.
57 @@ -53,9 +50,8 @@
58
59 //
60 // Use TinyXML for XML DOM Parsing
61 -diff -Naur ../libecwj2-3.3/configure.in ./configure.in
62 ---- ../libecwj2-3.3/configure.in 2006-07-02 20:13:30.000000000 -0500
63 -+++ ./configure.in 2009-03-16 14:00:14.000000000 -0500
64 +--- a/configure.in 2006-07-02 20:13:30.000000000 -0500
65 ++++ b/configure.in 2009-03-16 14:00:14.000000000 -0500
66 @@ -32,17 +32,6 @@
67 # Build some standard absolute include paths for the build