summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2013-05-31 14:05:23 +0000
committerJeroen Roovers <jer@gentoo.org>2013-05-31 14:05:23 +0000
commit3bc4cbab1a754dfdccb49eff43c931751483db41 (patch)
treed8a9bc5160ae113707f2887d514a8f68fa27fe6f /sci-libs
parentRun enewgroup before src_install() too (bug #471874 by thetuber). (diff)
downloadgentoo-2-3bc4cbab1a754dfdccb49eff43c931751483db41.tar.gz
gentoo-2-3bc4cbab1a754dfdccb49eff43c931751483db41.tar.bz2
gentoo-2-3bc4cbab1a754dfdccb49eff43c931751483db41.zip
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)
Diffstat (limited to 'sci-libs')
-rw-r--r--sci-libs/libecwj2/ChangeLog7
-rw-r--r--sci-libs/libecwj2/files/libecwj2-3.3-nolcms.patch20
2 files changed, 13 insertions, 14 deletions
diff --git a/sci-libs/libecwj2/ChangeLog b/sci-libs/libecwj2/ChangeLog
index bf57790ec774..2963cb146841 100644
--- a/sci-libs/libecwj2/ChangeLog
+++ b/sci-libs/libecwj2/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sci-libs/libecwj2
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/libecwj2/ChangeLog,v 1.10 2012/08/03 19:42:46 bicatali Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/libecwj2/ChangeLog,v 1.11 2013/05/31 14:05:23 jer Exp $
+
+ 31 May 2013; Jeroen Roovers <jer@gentoo.org> files/libecwj2-3.3-nolcms.patch:
+ Fix relative paths in patch (bug #471852 by Milos Popovic).
03 Aug 2012; Sébastien Fabbro <bicatali@gentoo.org> libecwj2-3.3-r1.ebuild:
Added static-libs, keyword amd64-linux x86-linux
diff --git a/sci-libs/libecwj2/files/libecwj2-3.3-nolcms.patch b/sci-libs/libecwj2/files/libecwj2-3.3-nolcms.patch
index 3be4142de4f5..92c5abdc09fa 100644
--- a/sci-libs/libecwj2/files/libecwj2-3.3-nolcms.patch
+++ b/sci-libs/libecwj2/files/libecwj2-3.3-nolcms.patch
@@ -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 @@ diff -Naur ../libecwj2-3.3/Makefile.am ./Makefile.am
- 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 @@ diff -Naur ../libecwj2-3.3/Source/NCSBuildGnu/Makefile.am ./Source/NCSBuildGnu/M
../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 @@ diff -Naur ../libecwj2-3.3/Source/include/NCSJPCDefs.h ./Source/include/NCSJPCDe
//
// 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