diff options
| author |   Tom Wijsman <tomwij@gentoo.org> | 2013-08-10 17:24:20 +0000 |
|---|---|---|
| committer | Tom Wijsman <tomwij@gentoo.org> | 2013-08-10 17:24:20 +0000 |
| commit | a2ebabf19f74210fec32ae8ed83d8c337185ba7c (patch) | |
| tree | c81c8c55d75b3ab461094faa674c5986c0b858ef /app-text/pdftk/files | |
| parent | Add blockers on emul-libs so that it is stacked for baselibs r10 (diff) | |
| download | gentoo-2-a2ebabf19f74210fec32ae8ed83d8c337185ba7c.tar.gz gentoo-2-a2ebabf19f74210fec32ae8ed83d8c337185ba7c.tar.bz2 gentoo-2-a2ebabf19f74210fec32ae8ed83d8c337185ba7c.zip | |
Version bump to 2.02. Fixes bug #450080, reported by Adam Randall, 7v5w7go9ub0o and Jeroen Roovers; applied patch by Ondrej Grover with small fixes to make it work with 2.02 instead of 2.01 as well as to not turn warnings into errors to avoid breakage without purpose.
(Portage version: 2.1.13.7/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D)
Diffstat (limited to 'app-text/pdftk/files')
| -rw-r--r-- | app-text/pdftk/files/pdftk-2.02-flags.patch | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/app-text/pdftk/files/pdftk-2.02-flags.patch b/app-text/pdftk/files/pdftk-2.02-flags.patch new file mode 100644 index 000000000000..5b20c9701cc0 --- /dev/null +++ b/app-text/pdftk/files/pdftk-2.02-flags.patch @@ -0,0 +1,43 @@ +Based on Debian patch, see http://patch-tracker.debian.org/patch/series/view/pdftk/2.01-1/customise_build_parameters + +diff -ruN pdftk-2.01-dist/pdftk/Makefile.Base pdftk-2.01-dist/pdftk/Makefile.Base +--- pdftk-2.01-dist/pdftk/Makefile.Base 2012-12-06 19:57:36.000000000 +0100 ++++ pdftk-2.01-dist/pdftk/Makefile.Base 2013-03-24 18:32:52.669492230 +0100 +@@ -43,7 +43,7 @@ + $(CXX) $(CPPFLAGS) $(CXXFLAGS) -I$(JAVALIBPATH) pdftk.cc -c + + pdftk : pdftk.o attachments.o report.o passwords.o $(JAVALIB) $(LIBGCJ_SUPPLEMENT_FULL_O) +- $(CXX) $(CXXFLAGS) attachments.o report.o passwords.o pdftk.o $(JAVALIB) $(LIBGCJ_SUPPLEMENT_FULL_O) $(LDLIBS) -o pdftk ++ $(CXX) $(LDFLAGS) $(CXXFLAGS) attachments.o report.o passwords.o pdftk.o $(JAVALIB) $(LIBGCJ_SUPPLEMENT_FULL_O) $(LDLIBS) -o pdftk + + install: + /usr/bin/install pdftk /usr/local/bin +diff -ruN pdftk-2.01-dist/pdftk/Makefile.Debian pdftk-2.01-dist/pdftk/Makefile.Debian +--- pdftk-2.01-dist/pdftk/Makefile.Debian 2012-12-06 19:58:44.000000000 +0100 ++++ pdftk-2.01-dist/pdftk/Makefile.Debian 2013-03-24 18:34:39.034540850 +0100 +@@ -21,7 +21,7 @@ + # tools + # need direct path to libgcj for gcjh (starting in gcj 4.1.2 per Aurélien GÉRÔME) + TOOLPATH= +-export VERSUFF=-4.6 ++export VERSUFF= + export CPP= $(TOOLPATH)cpp$(VERSUFF) + export CXX= $(TOOLPATH)g++$(VERSUFF) + export GCJ= $(TOOLPATH)gcj$(VERSUFF) +@@ -64,13 +64,12 @@ + # only effects libraries following option on the command line + # + # +-export CPPFLAGS= -DPATH_DELIM=0x2f -DASK_ABOUT_WARNINGS=false -DUNBLOCK_SIGNALS -fdollars-in-identifiers +-export CXXFLAGS= -Wall -Wextra -Weffc++ -O2 +-export GCJFLAGS= -fsource=1.3 -O2 +-export GCJHFLAGS= -force ++export CPPFLAGS+= -DPATH_DELIM=0x2f -DASK_ABOUT_WARNINGS=false -DUNBLOCK_SIGNALS -fdollars-in-identifiers ++export GCJFLAGS+= -fsource=1.3 ++export GCJHFLAGS+= -force + export LDLIBS= -lgcj + + include Makefile.Base + + # required packages (xubuntu 12.04) + # gcj-jdk, g++ |