DIST xpaint-2.10.2.tar.bz2 1891925 BLAKE2B 056ef057357a2441c8a286adf326a98650e5e0905ee07c5ef24b0689dbb57247711c44b63211494e4ca9e44429d6237c017f53e2690f99790fa6100e4ce4d118 SHA512 a25aa940931c686e86cbc2bd8d6fd3c80d2c793a20d7a2dd90fb5cba1cd360b5e1c8433bf0d639e2b86cb2a74040be373f732c4617909aaf8c5ada2624ab5614
-DIST xpaint-2.9.10.2.tar.bz2 1245813 BLAKE2B 9ff1a94bdbaf996f7ca41fd8df86ccfc58d7f51b24b20311f082beb30620dc48a6e9ae0e28ccf2cf41a7cd7901cf303fda1d45a7b48ff4ec356a3ac1f2ccd642 SHA512 8aa388d4b82b5867817eca2188f50734140c395efe663c290a78b4f24314754fb29257165a64c9b8a03634dede03d919d9a3a54c1d32049cc34216a1f3d4e499
-DIST xpaint-2.9.10.3.tar.bz2 1283725 BLAKE2B 46e1798830ddff6cc7d6d827fad0cad6d42a61dd6e6740ae6d3bca70ae7012a7c63d1d3ea5b6ebb21e0b2889c96c3f0e57969ec02bb8e742f945027e0e22e3b8 SHA512 d5d365e0308e50166e5ac70859e388436d8f0cb870b2dea0155fbc9a65a8377a861bea2217df2b5c016f8751c9ff1f74509eaff310acfaacd7b29c51cf726ac5
+++ /dev/null
-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
-
+++ /dev/null
-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 */
+++ /dev/null
-From 69a76e5f4a72d83635cd413b7460df4776b2605f Mon Sep 17 00:00:00 2001
-From: hasufell <hasufell@gentoo.org>
-Date: Sun, 16 Aug 2015 16:51:26 +0200
-Subject: [PATCH] Fix build with clang
-
----
- rw/readWriteTGA.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/rw/readWriteTGA.c b/rw/readWriteTGA.c
-index 306a751..9046ee3 100644
---- a/rw/readWriteTGA.c
-+++ b/rw/readWriteTGA.c
-@@ -607,7 +607,7 @@ int WriteTGA(char *file_name, Image * image)
- int tga_defdir = 1;
- int transparency = -1;
-
-- if (!image) return;
-+ if (!image) return -1;
- w = image->width;
- h = image->height;
- bpp = image->scale;
---
-2.5.0
-
+++ /dev/null
-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
-
+++ /dev/null
-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
-
+++ /dev/null
-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
-
+++ /dev/null
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils
-
-DESCRIPTION="Image editor with tiff, jpeg and png support"
-HOMEPAGE="http://sf-xpaint.sourceforge.net/"
-SRC_URI="mirror://sourceforge/sf-xpaint/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="jpeg2k pgf tiff"
-
-RDEPEND="
- media-libs/fontconfig
- media-libs/freetype
- media-libs/libpng:0
- x11-libs/libICE
- x11-libs/libX11
- >=x11-libs/libXaw3dXft-1.6.2c
- x11-libs/libXext
- x11-libs/libXft
- x11-libs/libXmu
- x11-libs/libXpm
- x11-libs/libXt
- sys-libs/zlib
- virtual/jpeg:0
- jpeg2k? ( media-libs/openjpeg:0 )
- pgf? ( media-libs/libpgf )
- tiff? (
- media-libs/jbigkit:0
- media-libs/tiff:0
- )"
-DEPEND="${RDEPEND}
- sys-devel/flex
- sys-devel/bison
- virtual/pkgconfig"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-2.9.9.4-{QA1,submake,parallel-make}.patch \
- "${FILESDIR}"/${PN}-2.9.10.2-{QA2,tiff}.patch
- eautoreconf
-}
-
-src_configure() {
- econf \
- $(use_enable tiff) \
- $(use_enable jpeg2k libopenjpeg)
-}
-
-src_compile() {
- # clean up
- emake clean
- emake -C util clean
-
- # parallel make still fails sometimes
- emake substads
- emake xpaint.1
-
- default
- emake \
- WITH_PGF="$(usex pgf "yes" "no")" \
- CC="$(tc-getCC)" \
- CXX="$(tc-getCXX)" \
- -C util
-}
-
-src_install() {
- default
- emake \
- WITH_PGF="$(usex pgf "yes" "no")" \
- DESTDIR="${ED}" \
- -C util install
-}
-
-pkg_postinst() {
- elog "optional dependencies:"
- elog " app-text/gv (external viewer for PostScript output)"
- elog " media-gfx/imagemagick (external viewer for pixel graphics)"
- elog " net-print/cups (printing)"
-}
+++ /dev/null
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils
-
-DESCRIPTION="Image editor with tiff, jpeg and png support"
-HOMEPAGE="http://sf-xpaint.sourceforge.net/"
-SRC_URI="mirror://sourceforge/sf-xpaint/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="jpeg2k pgf tiff"
-
-RDEPEND="
- media-libs/fontconfig
- media-libs/freetype
- media-libs/libpng:0
- x11-libs/libICE
- x11-libs/libX11
- >=x11-libs/libXaw3dXft-1.6.2c
- x11-libs/libXext
- x11-libs/libXft
- x11-libs/libXmu
- x11-libs/libXpm
- x11-libs/libXt
- sys-libs/zlib
- virtual/jpeg:0
- jpeg2k? ( media-libs/openjpeg:0 )
- pgf? ( media-libs/libpgf )
- tiff? (
- media-libs/jbigkit:0
- media-libs/tiff:0
- )"
-DEPEND="${RDEPEND}
- sys-devel/flex
- sys-devel/bison
- virtual/pkgconfig"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-2.9.9.4-{QA1,submake,parallel-make}.patch \
- "${FILESDIR}"/${PN}-2.9.10.2-{QA2,tiff}.patch \
- "${FILESDIR}"/${PN}-2.9.10.3-Fix-build-with-clang.patch
- eautoreconf
-}
-
-src_configure() {
- econf \
- $(use_enable tiff) \
- $(use_enable jpeg2k libopenjpeg)
-}
-
-src_compile() {
- # clean up
- emake clean
- emake -C util clean
-
- # parallel make still fails sometimes
- emake substads
- emake xpaint.1
-
- default
- emake \
- WITH_PGF="$(usex pgf "yes" "no")" \
- CC="$(tc-getCC)" \
- CXX="$(tc-getCXX)" \
- -C util
-}
-
-src_install() {
- default
- emake \
- WITH_PGF="$(usex pgf "yes" "no")" \
- DESTDIR="${ED}" \
- -C util install
-}
-
-pkg_postinst() {
- elog "optional dependencies:"
- elog " app-text/gv (external viewer for PostScript output)"
- elog " media-gfx/imagemagick (external viewer for pixel graphics)"
- elog " net-print/cups (printing)"
-}
projects / gentoo.git / commitdiff