diff options
Diffstat (limited to 'media-gfx/xpaint/files')
| -rw-r--r-- | media-gfx/xpaint/files/xpaint-2.9.10.2-QA2.patch | 67 | ||||
| -rw-r--r-- | media-gfx/xpaint/files/xpaint-2.9.10.2-tiff.patch | 37 | ||||
| -rw-r--r-- | media-gfx/xpaint/files/xpaint-2.9.9.4-QA1.patch | 91 | ||||
| -rw-r--r-- | media-gfx/xpaint/files/xpaint-2.9.9.4-QA2.patch | 67 | ||||
| -rw-r--r-- | media-gfx/xpaint/files/xpaint-2.9.9.4-autoreconf.patch | 24 | ||||
| -rw-r--r-- | media-gfx/xpaint/files/xpaint-2.9.9.4-parallel-make.patch | 25 | ||||
| -rw-r--r-- | media-gfx/xpaint/files/xpaint-2.9.9.4-submake.patch | 29 |
7 files changed, 340 insertions, 0 deletions
diff --git a/media-gfx/xpaint/files/xpaint-2.9.10.2-QA2.patch b/media-gfx/xpaint/files/xpaint-2.9.10.2-QA2.patch new file mode 100644 index 000000000000..9179585974c2 --- /dev/null +++ b/media-gfx/xpaint/files/xpaint-2.9.10.2-QA2.patch @@ -0,0 +1,67 @@ +From 08bdf5f5d0c64384b2be16bd8ac68244675388d5 Mon Sep 17 00:00:00 2001 +From: hasufell <hasufell@gentoo.org> +Date: Sun, 6 Oct 2013 21:13:51 +0200 +Subject: [PATCH] respect CFLAGS + +--- + Makefile.am | 2 +- + configure.ac | 2 +- + rw/Makefile.am | 2 +- + rw/configure.ac | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 4cf1753..414597f 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -26,7 +26,7 @@ EXTERN_VIEWER = display + ## -D_BSD_SOURCE -D_SVID_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 \ + ## -DFUNCPROTO=15 -DNARROWPROTO + +-ARCH_DEFINES = -g -O2 -fno-strict-aliasing -fPIC ++ARCH_DEFINES = -fno-strict-aliasing -fPIC + + ## + ## Specific xpaint options +diff --git a/configure.ac b/configure.ac +index e058529..3979075 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -29,7 +29,7 @@ AC_TYPE_UINT16_T + AC_TYPE_UINT32_T + AC_TYPE_UINT64_T + +-CFLAGS="-I/usr/include -I/usr/include/X11 -I/usr/include/X11/Xaw3dxft" ++CFLAGS="$CFLAGS -I/usr/include -I/usr/include/X11 -I/usr/include/X11/Xaw3dxft" + LIBS="$LIBS -lm" + echo "VERSION = $VERSION" > .version + +diff --git a/rw/Makefile.am b/rw/Makefile.am +index d91d5d5..2f50253 100644 +--- a/rw/Makefile.am ++++ b/rw/Makefile.am +@@ -10,7 +10,7 @@ SHAREDIR = $(prefix)/share/xpaint + ## -D_BSD_SOURCE -D_SVID_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 \ + ## -DFUNCPROTO=15 -DNARROWPROTO + +-ARCH_DEFINES = -g -O2 -fno-strict-aliasing -fPIC ++ARCH_DEFINES = -fno-strict-aliasing -fPIC + + ## + ## Specific xpaint options +diff --git a/rw/configure.ac b/rw/configure.ac +index fb4f3d4..d9c7601 100644 +--- a/rw/configure.ac ++++ b/rw/configure.ac +@@ -29,7 +29,7 @@ AC_TYPE_UINT16_T + AC_TYPE_UINT32_T + AC_TYPE_UINT64_T + +-CFLAGS="-D_POSIX_C_SOURCE=199309L -D_POSIX_SOURCE -D_XOPEN_SOURCE -D_BSD_SOURCE -D_SVID_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -DFUNCPROTO=15 -DNARROWPROTO -I/usr/include -I/usr/include/X11 -I/usr/include/X11/Xaw3dxft" ++CFLAGS="$CFLAGS -D_POSIX_C_SOURCE=199309L -D_POSIX_SOURCE -D_XOPEN_SOURCE -D_BSD_SOURCE -D_SVID_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -DFUNCPROTO=15 -DNARROWPROTO -I/usr/include -I/usr/include/X11 -I/usr/include/X11/Xaw3dxft" + LIBS="$LIBS -lm" + + dnl check X11 +-- +1.8.3.2 + diff --git a/media-gfx/xpaint/files/xpaint-2.9.10.2-tiff.patch b/media-gfx/xpaint/files/xpaint-2.9.10.2-tiff.patch new file mode 100644 index 000000000000..20e59872b84d --- /dev/null +++ b/media-gfx/xpaint/files/xpaint-2.9.10.2-tiff.patch @@ -0,0 +1,37 @@ +From: Julian Ospald <hasufell@gentoo.org> +Date: Fri Jun 20 13:52:42 UTC 2014 +Subject: fix tiff build switch + +--- xpaint-2.9.10.2/configure.ac ++++ xpaint-2.9.10.2/configure.ac +@@ -125,9 +125,11 @@ + with_libtiff="yes" + tiff_header_found="no" + # +-AC_ARG_ENABLE(tiff, ++AC_ARG_ENABLE([tiff], + [ --enable-tiff[=[yes|no]] Build with TIFF support [ [default=yes] ]], +-test "$enable_tiff" = "no" && with_libtiff="no") ++ [with_libtiff=$enableval], ++ [with_libtiff=yes] ++) + # + if test "x$with_libtiff" = xyes ; then + #TIFF compiled with JPEG and JBIG support? +--- xpaint-2.9.10.2/rw/readWriteTIFF.c ++++ xpaint-2.9.10.2/rw/readWriteTIFF.c +@@ -14,6 +14,8 @@ + + /* $Id$ */ + ++#ifdef HAVE_TIFF ++ + #include <stdio.h> + #include <stdlib.h> + #include "tiffio.h" +@@ -527,3 +529,5 @@ int WriteTIFF(char *file, Image * image) + + return 0; + } ++ ++#endif /* HAVE_TIFF */ diff --git a/media-gfx/xpaint/files/xpaint-2.9.9.4-QA1.patch b/media-gfx/xpaint/files/xpaint-2.9.9.4-QA1.patch new file mode 100644 index 000000000000..31e3a38ba005 --- /dev/null +++ b/media-gfx/xpaint/files/xpaint-2.9.9.4-QA1.patch @@ -0,0 +1,91 @@ +From 2987bfa203a8467a697efffa211b90b12858b40b Mon Sep 17 00:00:00 2001 +From: hasufell <hasufell@gentoo.org> +Date: Sun, 6 Oct 2013 20:37:28 +0200 +Subject: [PATCH] respect flags, add WITH_PGF option, fix echo + +--- + util/Makefile | 56 +++++++++++++++++++++++++++++++++++--------------------- + 1 file changed, 35 insertions(+), 21 deletions(-) + +diff --git a/util/Makefile b/util/Makefile +index e6af415..21a0d17 100644 +--- a/util/Makefile ++++ b/util/Makefile +@@ -1,39 +1,53 @@ +-GCC = gcc +-CPP = g++ -fpermissive ++# set to anything but "no" to enable ++WITH_PGF=no + ++ifneq ($(WITH_PGF),no) + all: pdfconcat ppmtops pgf2pnm ++else ++all: pdfconcat ppmtops ++endif + + pdfconcat: +- $(GCC) -O3 -s -DNDEBUG=1 -DNO_CONFIG=1 -ansi -pedantic -Wunused -Wall -W -Wstrict-prototypes -Wtraditional -Wnested-externs -Winline -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wmissing-prototypes -Wmissing-declarations pdfconcat.c -o pdfconcat ++ $(CC) $(CFLAGS) -DNDEBUG=1 -DNO_CONFIG=1 -ansi -pedantic -Wunused -Wall -W -Wstrict-prototypes -Wtraditional -Wnested-externs -Winline -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wmissing-prototypes -Wmissing-declarations pdfconcat.c -o pdfconcat $(LDFLAGS) + + ppmtops: +- $(GCC) ppmtops.c -o ppmtops ++ $(CC) $(CFLAGS) ppmtops.c -o ppmtops $(LDFLAGS) + ++ifneq ($(WITH_PGF),no) + pgf2pnm: main.cpp pnm.cpp + @if [ -x /usr/include/libpgf ] ; then \ +- $(CPP) -c main.cpp -o main.o -I/usr/include/libpgf ; \ +- $(CPP) -c pnm.cpp -o pnm.o -I/usr/include/libpgf ; \ +- $(CPP) -o pgf2pnm main.o pnm.o -lpgf ; \ ++ $(CXX) $(CXXFLAGS) -fpermissive -c main.cpp -o main.o -I/usr/include/libpgf ; \ ++ $(CXX) $(CXXFLAGS) -fpermissive -c pnm.cpp -o pnm.o -I/usr/include/libpgf ; \ ++ $(CXX) $(CXXFLAGS) -fpermissive -o pgf2pnm main.o pnm.o $(LDFLAGS) -lpgf ; \ + else \ +- @echo "libpgf not installed !!" ; \ ++ echo "libpgf not installed !!" ; \ + fi ++endif + +-install: ++install-common: + @if [ -x pdfconcat ] ; then \ +- mkdir -p $(DESTDIR)/usr/bin ; \ +- install -c pdfconcat $(DESTDIR)/usr/bin ; \ +- echo "install -c pdfconcat $(DESTDIR)/usr/bin" ; \ +- mkdir -p $(DESTDIR)/usr/share/man/man1 ; \ +- install -c -m 644 pdfconcat.1 $(DESTDIR)/usr/share/man/man1 ; \ +- echo "install -c pdfconcat.1 $(DESTDIR)/usr/share/man/man1" ; fi ++ mkdir -p "$(DESTDIR)"/usr/bin ; \ ++ install -c pdfconcat "$(DESTDIR)"/usr/bin ; \ ++ echo "install -c pdfconcat "$(DESTDIR)"/usr/bin" ; \ ++ mkdir -p "$(DESTDIR)"/usr/share/man/man1 ; \ ++ install -c -m 644 pdfconcat.1 "$(DESTDIR)"/usr/share/man/man1 ; \ ++ echo "install -c pdfconcat.1 "$(DESTDIR)"/usr/share/man/man1" ; fi + @if [ -x ppmtops ] ; then \ +- mkdir -p $(DESTDIR)/usr/bin ; \ +- install -c ppmtops $(DESTDIR)/usr/bin ; \ +- echo "install -c ppmtops $(DESTDIR)/usr/bin" ; fi ++ mkdir -p "$(DESTDIR)"/usr/bin ; \ ++ install -c ppmtops "$(DESTDIR)"/usr/bin ; \ ++ echo "install -c ppmtops "$(DESTDIR)"/usr/bin" ; fi ++ ++install-pgf: + @if [ -x pgf2pnm ] ; then \ +- mkdir -p $(DESTDIR)/usr/bin ; \ +- install -c pgf2pnm $(DESTDIR)/usr/bin ; \ +- echo "install -c pgf2pnm $(DESTDIR)/usr/bin" ; fi ++ mkdir -p "$(DESTDIR)"/usr/bin ; \ ++ install -c pgf2pnm "$(DESTDIR)"/usr/bin ; \ ++ echo "install -c pgf2pnm "$(DESTDIR)"/usr/bin" ; fi ++ ++ifneq ($(WITH_PGF),no) ++install: install-common install-pgf ++else ++install: install-common ++endif + + clean: + rm -f core *~ *.o pdfconcat ppmtops pgf2pnm +-- +1.8.3.2 + diff --git a/media-gfx/xpaint/files/xpaint-2.9.9.4-QA2.patch b/media-gfx/xpaint/files/xpaint-2.9.9.4-QA2.patch new file mode 100644 index 000000000000..03b35f81f37b --- /dev/null +++ b/media-gfx/xpaint/files/xpaint-2.9.9.4-QA2.patch @@ -0,0 +1,67 @@ +From 08bdf5f5d0c64384b2be16bd8ac68244675388d5 Mon Sep 17 00:00:00 2001 +From: hasufell <hasufell@gentoo.org> +Date: Sun, 6 Oct 2013 21:13:51 +0200 +Subject: [PATCH] respect CFLAGS + +--- + Makefile.am | 2 +- + configure.ac | 2 +- + rw/Makefile.am | 2 +- + rw/configure.ac | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 4cf1753..414597f 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -26,7 +26,7 @@ EXTERN_VIEWER = display + ## -D_BSD_SOURCE -D_SVID_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 \ + ## -DFUNCPROTO=15 -DNARROWPROTO + +-ARCH_DEFINES = -g -O2 -fno-strict-aliasing -fPIC ++ARCH_DEFINES = -fno-strict-aliasing -fPIC + + ## + ## Specific xpaint options +diff --git a/configure.ac b/configure.ac +index e058529..3979075 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -29,7 +29,7 @@ AC_TYPE_UINT16_T + AC_TYPE_UINT32_T + AC_TYPE_UINT64_T + +-CFLAGS="-I/usr/include -I/usr/include/X11 -I/usr/include/X11/Xaw3dxft" ++CFLAGS="$CFLAGS -I/usr/include -I/usr/include/X11 -I/usr/include/X11/Xaw3dxft" + LIBS="$LIBS -lm" + echo "VERSION = $VERSION" > .version + +diff --git a/rw/Makefile.am b/rw/Makefile.am +index d91d5d5..2f50253 100644 +--- a/rw/Makefile.am ++++ b/rw/Makefile.am +@@ -10,7 +10,7 @@ SHAREDIR = $(prefix)/share/xpaint + ## -D_BSD_SOURCE -D_SVID_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 \ + ## -DFUNCPROTO=15 -DNARROWPROTO + +-ARCH_DEFINES = -g -O2 -fno-strict-aliasing -fPIC ++ARCH_DEFINES = -fno-strict-aliasing -fPIC + + ## + ## Specific xpaint options +diff --git a/rw/configure.ac b/rw/configure.ac +index fb4f3d4..d9c7601 100644 +--- a/rw/configure.ac ++++ b/rw/configure.ac +@@ -29,7 +29,7 @@ AC_TYPE_UINT16_T + AC_TYPE_UINT32_T + AC_TYPE_UINT64_T + +-CFLAGS="-I/usr/include -I/usr/include/X11 -I/usr/include/X11/Xaw3dxft" ++CFLAGS="$CFLAGS -I/usr/include -I/usr/include/X11 -I/usr/include/X11/Xaw3dxft" + LIBS="$LIBS -lm" + + dnl check X11 +-- +1.8.3.2 + diff --git a/media-gfx/xpaint/files/xpaint-2.9.9.4-autoreconf.patch b/media-gfx/xpaint/files/xpaint-2.9.9.4-autoreconf.patch new file mode 100644 index 000000000000..4342d4f4fa78 --- /dev/null +++ b/media-gfx/xpaint/files/xpaint-2.9.9.4-autoreconf.patch @@ -0,0 +1,24 @@ +From e22a3c15aea7d734f433370130458d97d6490d8a Mon Sep 17 00:00:00 2001 +From: hasufell <hasufell@gentoo.org> +Date: Sun, 6 Oct 2013 20:27:49 +0200 +Subject: [PATCH] add missing macros + +--- + configure.ac | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/configure.ac b/configure.ac +index 169419e..e058529 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -15,6 +15,7 @@ AC_CONFIG_MACRO_DIR([m4]) + AM_INIT_AUTOMAKE([-Wall -Werror]) + + AC_LANG_C ++AM_PROG_AR + + ## basic types + +-- +1.8.3.2 + diff --git a/media-gfx/xpaint/files/xpaint-2.9.9.4-parallel-make.patch b/media-gfx/xpaint/files/xpaint-2.9.9.4-parallel-make.patch new file mode 100644 index 000000000000..250f634f9973 --- /dev/null +++ b/media-gfx/xpaint/files/xpaint-2.9.9.4-parallel-make.patch @@ -0,0 +1,25 @@ +From ae11f5cb975749bd8d6ffda48301eb4aadfee35d Mon Sep 17 00:00:00 2001 +From: hasufell <hasufell@gentoo.org> +Date: Sun, 6 Oct 2013 21:02:12 +0200 +Subject: [PATCH] fix parallel make + +--- + Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index b2285a0..4cf1753 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -112,7 +112,7 @@ XPaint.ad: app-defaults + XPaint.ad.h: substads XPaint.ad + ./substads -ad2c XPaint.ad $@ + +-xpaint.1: xpaint.1.in version.h ++xpaint.1: substads xpaint.1.in version.h + ./substads -single xpaint.1.in xpaint.1 XPAINT_VERSION $(PACKAGE_VERSION) + + install-exec-hook: +-- +1.8.3.2 + diff --git a/media-gfx/xpaint/files/xpaint-2.9.9.4-submake.patch b/media-gfx/xpaint/files/xpaint-2.9.9.4-submake.patch new file mode 100644 index 000000000000..e218eb4c75e9 --- /dev/null +++ b/media-gfx/xpaint/files/xpaint-2.9.9.4-submake.patch @@ -0,0 +1,29 @@ +From 11b369b69c4637431b139960391bded531a9f652 Mon Sep 17 00:00:00 2001 +From: hasufell <hasufell@gentoo.org> +Date: Sun, 6 Oct 2013 20:25:14 +0200 +Subject: [PATCH] don't run submake + +--- + Makefile.am | 5 ----- + 1 file changed, 5 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 5b2caec..b2285a0 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -139,11 +139,6 @@ install-exec-hook: + mkdir -p $(DESTDIR)$(SHAREDIR)/messages + cd share/messages ; $(RM) -f *~ ; cp -f Messages* $(DESTDIR)$(SHAREDIR)/messages + chmod -R a+r $(DESTDIR)$(SHAREDIR)/ +- cd util ; make ; make install DESTDIR=$(DESTDIR)$ + + clean-local: + rm -f xaw_incdir +- cd util ; make clean +- +-distclean-local: +- cd util ; make distclean +\ No newline at end of file +-- +1.8.3.2 + |