[gentoo-commits] repo/gentoo:master commit in: media-gfx/xpaint/files/, media-gfx/xpaint/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/xpaint/files/, media-gfx/xpaint/
@ 2015-08-16 14:56 Julian Ospald
  0 siblings, 0 replies; 5+ messages in thread
From: Julian Ospald @ 2015-08-16 14:56 UTC (permalink / raw
  To: gentoo-commits

commit:     3d9971c0cba1f4a167a86fb195d31ec659b1b251
Author:     Julian Ospald <hasufell <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 16 14:55:30 2015 +0000
Commit:     Julian Ospald <hasufell <AT> gentoo <DOT> org>
CommitDate: Sun Aug 16 14:55:59 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d9971c0

media-gfx/xpaint: version bump to 2.9.10.3

 media-gfx/xpaint/Manifest                          |  1 +
 .../xpaint-2.9.10.3-Fix-build-with-clang.patch     | 25 +++++++
 media-gfx/xpaint/xpaint-2.9.10.3.ebuild            | 86 ++++++++++++++++++++++
 3 files changed, 112 insertions(+)

diff --git a/media-gfx/xpaint/Manifest b/media-gfx/xpaint/Manifest
index 4523305..a3ac931 100644
--- a/media-gfx/xpaint/Manifest
+++ b/media-gfx/xpaint/Manifest
@@ -1 +1,2 @@
 DIST xpaint-2.9.10.2.tar.bz2 1245813 SHA256 7f1554c8390bc68da2bcc0449407b8cc69616ce5d2170f97d1b30aee9fcbdcf6 SHA512 8aa388d4b82b5867817eca2188f50734140c395efe663c290a78b4f24314754fb29257165a64c9b8a03634dede03d919d9a3a54c1d32049cc34216a1f3d4e499 WHIRLPOOL 5ffe99ba979590c1ad675f7cbd57e4dba92aa7c24a9600784224c913069cad1fa88a676180d60fc2cc60c6f7185056385ccb59f2725c9799781335ed38d8934a
+DIST xpaint-2.9.10.3.tar.bz2 1283725 SHA256 9de0cb99557ea8329391b5d45ad59be080972924258aeb1b3c0c748bab9586c7 SHA512 d5d365e0308e50166e5ac70859e388436d8f0cb870b2dea0155fbc9a65a8377a861bea2217df2b5c016f8751c9ff1f74509eaff310acfaacd7b29c51cf726ac5 WHIRLPOOL 4d0ec766168fe329cba88506ff98f560f8fc4067245d1062ae9649db5bc3f380181e98eae0b443deb13f4f3de38c8239cc1d608499f61941cc18c18c70849d61

diff --git a/media-gfx/xpaint/files/xpaint-2.9.10.3-Fix-build-with-clang.patch b/media-gfx/xpaint/files/xpaint-2.9.10.3-Fix-build-with-clang.patch
new file mode 100644
index 0000000..a5a2621
--- /dev/null
+++ b/media-gfx/xpaint/files/xpaint-2.9.10.3-Fix-build-with-clang.patch
@@ -0,0 +1,25 @@
+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
+

diff --git a/media-gfx/xpaint/xpaint-2.9.10.3.ebuild b/media-gfx/xpaint/xpaint-2.9.10.3.ebuild
new file mode 100644
index 0000000..06434b7
--- /dev/null
+++ b/media-gfx/xpaint/xpaint-2.9.10.3.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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:62
+	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)"
+}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/xpaint/files/, media-gfx/xpaint/
@ 2021-03-27 17:01 Sam James
  0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2021-03-27 17:01 UTC (permalink / raw
  To: gentoo-commits

commit:     bcaa18be3312e4871f31b3b20656027fdb9b5c54
Author:     Viorel Munteanu <ceamac.paragon <AT> gmail <DOT> com>
AuthorDate: Sat Mar 27 13:03:28 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Mar 27 16:42:36 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bcaa18be

media-gfx/xpaint: fix compiling in gentoo prefix

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Viorel Munteanu <ceamac.paragon <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/20036
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../xpaint/files/xpaint-3.1.3-gentoo-prefix.patch  | 103 +++++++++++++++++++++
 ...gs-strip.patch => xpaint-3.1.3-gentoo-qa.patch} |   8 +-
 .../xpaint/files/xpaint-3.1.3-libtool-clang.patch  |  26 ++++++
 media-gfx/xpaint/xpaint-3.1.3.ebuild               |  16 +++-
 4 files changed, 147 insertions(+), 6 deletions(-)

diff --git a/media-gfx/xpaint/files/xpaint-3.1.3-gentoo-prefix.patch b/media-gfx/xpaint/files/xpaint-3.1.3-gentoo-prefix.patch
new file mode 100644
index 00000000000..cf02a14725f
--- /dev/null
+++ b/media-gfx/xpaint/files/xpaint-3.1.3-gentoo-prefix.patch
@@ -0,0 +1,103 @@
+This patch fixes compiling xpaint inside a gentoo prefix.
+There are multiple issues:
+	search paths hardcoded to /usr/include,
+	install paths outside prefix,
+	X resources in app-defaults with path hardcoded to /usr/share/xpaint
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -3,7 +3,7 @@
+ ## Local Configuration arguments
+ BINDIR = $(prefix)/bin
+ SHAREDIR = $(prefix)/share/xpaint
+-XAPPLOADDIR = /etc/X11/app-defaults
++XAPPLOADDIR = $(sysconfdir)/X11/app-defaults
+ 
+ ## Enable/disable PRINTCAP (for older BSD style printing configuration)
+ ## PRINTCAP = -DPRINTCAP
+@@ -85,7 +85,7 @@
+ .PHONY:
+ 
+ version.h:
+-	rm -f xaw_incdir ; ln -s /usr/include/X11/Xaw3dxft xaw_incdir
++	rm -f xaw_incdir ; ln -s @includedir@/X11/Xaw3dxft xaw_incdir
+ 	echo "#define XPAINT_VERSION \"$(PACKAGE_VERSION)\"" > version.h
+ 
+ substads: substads.c
+@@ -149,8 +149,7 @@
+ 	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 install
+-	cd vxp2ps ; make install
++	cd vxp2ps ; make BINDIR=$(BINDIR) install
+ 
+ clean-local:
+ 	rm -f xaw_incdir
+--- a/util/Makefile
++++ b/util/Makefile
+@@ -17,9 +17,9 @@
+ 
+ ifneq ($(WITH_PGF),no)
+ pgf2pnm: main.cpp pnm.cpp
+-	@if [ -x /usr/include/libpgf ] ; then \
+-	$(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 ; \
++	@if [ -x $(includedir)/libpgf ] ; then \
++	$(CXX) $(CXXFLAGS) -fpermissive -c main.cpp -o main.o -I$(includedir)/libpgf ; \
++	$(CXX) $(CXXFLAGS) -fpermissive -c pnm.cpp -o pnm.o -I$(includedir)/libpgf ; \
+ 	$(CXX) $(CXXFLAGS) -fpermissive -o pgf2pnm main.o pnm.o $(LDFLAGS) -lpgf ; \
+ 	else \
+ 	echo "libpgf not installed !!" ; \
+--- a/configure.ac
++++ b/configure.ac
+@@ -32,7 +32,7 @@
+ AC_TYPE_UINT32_T
+ AC_TYPE_UINT64_T
+ 
+-CFLAGS="$CFLAGS -I/usr/include -I/usr/include/X11 -I/usr/include/X11/Xaw3dxft"
++CFLAGS="$CFLAGS -I${prefix}/include -I${prefix}/include/X11 -I${prefix}/include/X11/Xaw3dxft"
+ LIBS="$LIBS -lm"
+ echo "VERSION = $VERSION" > .version
+ 
+@@ -40,7 +40,7 @@
+ AC_CHECK_LIB([X11], [XOpenDisplay], have_x11="yes")
+ if test x"$have_x11" = xyes; then
+   AC_SUBST([X_LIBS], ["-lXmu -lXt -lSM -lICE -lXext -lX11 -lXpm -ldl -rdynamic"])
+-  AC_SUBST([X_CFLAGS], ["-I/usr/include/X11"])
++  AC_SUBST([X_CFLAGS], ["-I${prefix}/include/X11"])
+ else
+   echo "X11 libraries not installed !"
+   exit 1
+@@ -291,7 +291,7 @@
+ fi
+ 
+ if test x$enable_libopenjp2 = xyes; then
+-  CFLAGS="$CFLAGS -I/usr/include/openjpeg-2.3"
++  CFLAGS="$CFLAGS -I${prefix}/include/openjpeg-2.3"
+   LIBS="$LIBS -lopenjp2"
+   AC_SUBST(LIBOPENJP2_LIBS)
+   AC_DEFINE(HAVE_OPENJP2)
+@@ -323,9 +323,9 @@
+   [AC_LANG_PROGRAM([[#include <freetype2/config/ftheader.h>]])],
+   [AC_MSG_RESULT([already in path])],
+   [AC_PREPROC_IFELSE(
+-    [AC_LANG_PROGRAM([[#include </usr/include/freetype2/freetype/config/ftheader.h>]])],
+-    [AC_MSG_RESULT([/usr/include/freetype2])
+-     AC_SUBST([SPECIAL_CFLAGS], ["-I/usr/include/freetype2"])],
++    [AC_LANG_PROGRAM([[#include <${prefix}/include/freetype2/freetype/config/ftheader.h>]])],
++    [AC_MSG_RESULT([${prefix}/include/freetype2])
++     AC_SUBST([SPECIAL_CFLAGS], ["-I${prefix}/include/freetype2"])],
+     [AC_MSG_ERROR([cannot find freetype2 headers; try setting CFLAGS.])]
+   )]
+ )
+--- a/xpaintrw/Makefile.am
++++ b/xpaintrw/Makefile.am
+@@ -13,7 +13,7 @@
+ ARCH_DEFINES = -fPIC
+ 
+ ## PBM_DEFINES = -DNETPBM10
+-PBM_DEFINES = -I/usr/include/netpbm -DNETPBM11
++PBM_DEFINES = -I@includedir@/netpbm -DNETPBM11
+ 
+ ## 
+ ## Specific xpaint options

diff --git a/media-gfx/xpaint/files/xpaint-3.1.3-cflags-ldflags-strip.patch b/media-gfx/xpaint/files/xpaint-3.1.3-gentoo-qa.patch
similarity index 84%
rename from media-gfx/xpaint/files/xpaint-3.1.3-cflags-ldflags-strip.patch
rename to media-gfx/xpaint/files/xpaint-3.1.3-gentoo-qa.patch
index f0677c0d713..cc7d70de6f3 100644
--- a/media-gfx/xpaint/files/xpaint-3.1.3-cflags-ldflags-strip.patch
+++ b/media-gfx/xpaint/files/xpaint-3.1.3-gentoo-qa.patch
@@ -1,6 +1,6 @@
-The original Makefiles did not pass CFLAGS and LDFLAGS, causing QA warnings
-See also bug https://bugs.gentoo.org/727632
-Also remove -O3 and stripping, leave portage control that
+The original Makefile did not pass CFLAGS and LDFLAGS
+See bug https://bugs.gentoo.org/727632
+Also remove -O3 and stripping
 --- a/vxp2ps/Makefile
 +++ b/vxp2ps/Makefile
 @@ -3,16 +3,16 @@
@@ -20,7 +20,7 @@ Also remove -O3 and stripping, leave portage control that
  
  install: all
 -	install -c -s vxp2ps vxp2tex vxp2dkw "$(DESTDIR)"/usr/bin
-+	install -c vxp2ps vxp2tex vxp2dkw "$(DESTDIR)"/usr/bin
++	install -c vxp2ps vxp2tex vxp2dkw "$(DESTDIR)$(BINDIR)"
  
  clean:
  	rm -f core *~ vxp2ps vxp2tex vxp2dkw

diff --git a/media-gfx/xpaint/files/xpaint-3.1.3-libtool-clang.patch b/media-gfx/xpaint/files/xpaint-3.1.3-libtool-clang.patch
new file mode 100644
index 00000000000..92ccb899ce1
--- /dev/null
+++ b/media-gfx/xpaint/files/xpaint-3.1.3-libtool-clang.patch
@@ -0,0 +1,26 @@
+libtool doesn't work if compiling with clang.  Need to add --tag=CC
+Also don't hardcode /usr/bin/tool in gentoo prefix
+See bug https://bugs.gentoo.org/731010
+--- a/configure.ac
++++ b/configure.ac
+@@ -17,6 +17,9 @@
+ AC_LANG_C
+ AM_PROG_AR
+ 
++dnl search libtool
++AC_PATH_PROG([PROGLIBTOOL], [libtool])
++
+ ## basic types
+ 
+ AC_TYPE_INT8_T
+--- a/xpaintrw/Makefile.am
++++ b/xpaintrw/Makefile.am
+@@ -28,7 +28,7 @@
+ 
+ xpaint_DEFINES = $(ARCH_DEFINES) $(EXTRA_DEFINES) $(XAWLIB_DEFINES)
+ 
+-LIBTOOL = /usr/bin/libtool
++LIBTOOL = @PROGLIBTOOL@ --tag=CC
+ AM_CFLAGS   = @X_CFLAGS@ @SPECIAL_CFLAGS@ $(xpaint_DEFINES)
+ AM_YFLAGS     = -d
+ CLEANFILES    = 

diff --git a/media-gfx/xpaint/xpaint-3.1.3.ebuild b/media-gfx/xpaint/xpaint-3.1.3.ebuild
index a853557cf49..131d8059027 100644
--- a/media-gfx/xpaint/xpaint-3.1.3.ebuild
+++ b/media-gfx/xpaint/xpaint-3.1.3.ebuild
@@ -42,11 +42,13 @@ BDEPEND="
 	sys-devel/flex
 	sys-devel/libtool
 	virtual/pkgconfig
+	x11-misc/imake
 "
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-2.10.2-libtool-clang.patch
-	"${FILESDIR}"/${P}-cflags-ldflags-strip.patch
+	"${FILESDIR}"/${P}-libtool-clang.patch
+	"${FILESDIR}"/${P}-gentoo-qa.patch
+	"${FILESDIR}"/${P}-gentoo-prefix.patch
 )
 
 src_prepare() {
@@ -55,6 +57,12 @@ src_prepare() {
 }
 
 src_configure() {
+	# regenerate resources in app-defaults
+	# Local.xawdefs is missing and imake was complaining about it, so use it to redefine SHAREDIR
+	echo "SHAREDIR = \"${EPREFIX}\"/usr/share/xpaint" > Local.xawdefs || die
+	xmkmf || die
+	mv Makefile Makefile.resources || die
+
 	econf \
 		$(use_enable tiff) \
 		--disable-libdvipgm \
@@ -75,7 +83,11 @@ src_compile() {
 		WITH_PGF="$(usex pgf "yes" "no")" \
 		CC="$(tc-getCC)" \
 		CXX="$(tc-getCXX)" \
+		includedir="${EPREFIX}"/usr/include \
 		-C util
+
+	# regenerate resources in app-defaults
+	(rm XPaint.ad && emake -f Makefile.resources XPaint.ad) || die
 }
 
 src_install() {


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/xpaint/files/, media-gfx/xpaint/
@ 2021-05-31  8:20 Sam James
  0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2021-05-31  8:20 UTC (permalink / raw
  To: gentoo-commits

commit:     2b77f2a046e97787bb11bf25defb2e8533164c19
Author:     Viorel Munteanu <ceamac.paragon <AT> gmail <DOT> com>
AuthorDate: Mon May 24 16:58:41 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon May 31 08:16:41 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b77f2a0

media-gfx/xpaint: drop 2.10.2

3.1.3 is stable
Bug: https://bugs.gentoo.org/791388
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Viorel Munteanu <ceamac.paragon <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/20969
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/xpaint/Manifest                          |  1 -
 .../xpaint/files/xpaint-2.10.2-libtool-clang.patch | 13 ----
 .../files/xpaint-2.10.2-respect-ldflags.patch      | 18 -----
 media-gfx/xpaint/xpaint-2.10.2-r1.ebuild           | 88 ----------------------
 4 files changed, 120 deletions(-)

diff --git a/media-gfx/xpaint/Manifest b/media-gfx/xpaint/Manifest
index c9cb55e12c3..1b59012a7db 100644
--- a/media-gfx/xpaint/Manifest
+++ b/media-gfx/xpaint/Manifest
@@ -1,2 +1 @@
-DIST xpaint-2.10.2.tar.bz2 1891925 BLAKE2B 056ef057357a2441c8a286adf326a98650e5e0905ee07c5ef24b0689dbb57247711c44b63211494e4ca9e44429d6237c017f53e2690f99790fa6100e4ce4d118 SHA512 a25aa940931c686e86cbc2bd8d6fd3c80d2c793a20d7a2dd90fb5cba1cd360b5e1c8433bf0d639e2b86cb2a74040be373f732c4617909aaf8c5ada2624ab5614
 DIST xpaint-3.1.3.tar.bz2 1656489 BLAKE2B c6f5ed4a6c990dccacc572c834fabf68a16cacfde477915e5c3598a96335a899344d4375a48e6bf06fb601e9b260a11cc2b43afb404a83b9fb7b3044288ce1fa SHA512 8ef15d6af4b65d9da18d3e5eb9eacc0b42e718d069e20de91f2e0352b642d0a4b7626a2008fdd6217c0668ed1ecdc7a09c4a993a6074c77b7899b4613c1c4bda

diff --git a/media-gfx/xpaint/files/xpaint-2.10.2-libtool-clang.patch b/media-gfx/xpaint/files/xpaint-2.10.2-libtool-clang.patch
deleted file mode 100644
index d6a3dab0783..00000000000
--- a/media-gfx/xpaint/files/xpaint-2.10.2-libtool-clang.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-libtool doesn't work if compiling with clang.  Need to add --tag=CC
-See bug https://bugs.gentoo.org/731010
---- a/xpaintrw/Makefile.am
-+++ b/xpaintrw/Makefile.am
-@@ -25,7 +25,7 @@
- 
- xpaint_DEFINES = $(ARCH_DEFINES) $(EXTRA_DEFINES) $(XAWLIB_DEFINES)
- 
--LIBTOOL = /usr/bin/libtool
-+LIBTOOL = /usr/bin/libtool --tag=CC
- AM_CFLAGS   = @X_CFLAGS@ @SPECIAL_CFLAGS@ $(xpaint_DEFINES)
- AM_YFLAGS     = -d
- CLEANFILES    = 

diff --git a/media-gfx/xpaint/files/xpaint-2.10.2-respect-ldflags.patch b/media-gfx/xpaint/files/xpaint-2.10.2-respect-ldflags.patch
deleted file mode 100644
index 11a0b0e9a84..00000000000
--- a/media-gfx/xpaint/files/xpaint-2.10.2-respect-ldflags.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-The original Makefile did not pass CFLAGS and LDFLAGS
-See bug https://bugs.gentoo.org/727632
-Also remove -O3 and stripping, leave portage control that
---- a/util/Makefile
-+++ b/util/Makefile
-@@ -10,10 +10,10 @@
- endif
- 
- pdfconcat:
--	$(CC) $(CFLAGS) -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) $(CPPFLAGS) $(LDFLAGS) -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
- 
- ppmtops:
--	$(CC) $(CFLAGS) ppmtops.c -o ppmtops
-+	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) ppmtops.c -o ppmtops
- 
- ifneq ($(WITH_PGF),no)
- pgf2pnm: main.cpp pnm.cpp

diff --git a/media-gfx/xpaint/xpaint-2.10.2-r1.ebuild b/media-gfx/xpaint/xpaint-2.10.2-r1.ebuild
deleted file mode 100644
index 425586764ea..00000000000
--- a/media-gfx/xpaint/xpaint-2.10.2-r1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools desktop toolchain-funcs
-
-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="pgf tiff"
-# jpeg2k disabled for blocking media-libs/openjpeg:0 security cleanup, bug 735592
-
-RDEPEND="
-	media-libs/fontconfig
-	media-libs/freetype:2
-	media-libs/libjpeg-turbo:=
-	media-libs/libpng:0=
-	x11-libs/libICE
-	x11-libs/libX11
-	>=x11-libs/libXaw3dXft-1.6.2c[unicode]
-	x11-libs/libXext
-	x11-libs/libXft
-	x11-libs/libXmu
-	x11-libs/libXpm
-	x11-libs/libXt
-	sys-libs/zlib
-	pgf? ( media-libs/libpgf )
-	tiff? (
-		media-libs/jbigkit:0=
-		media-libs/tiff:0
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	sys-devel/bison
-	sys-devel/flex
-	sys-devel/libtool
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-libtool-clang.patch
-	"${FILESDIR}"/${P}-respect-ldflags.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable tiff) \
-		--disable-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
-	doicon icons/xpaint.svg
-	make_desktop_entry "${PN}"
-	find "${ED}" \( -name '*.la' -o -name '*.a' \) -type f -delete || die
-}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/xpaint/files/, media-gfx/xpaint/
@ 2021-10-20  1:51 Sam James
  0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2021-10-20  1:51 UTC (permalink / raw
  To: gentoo-commits

commit:     345630239813968d48dc235350372a750005c071
Author:     Viorel Munteanu <ceamac.paragon <AT> gmail <DOT> com>
AuthorDate: Sun Oct 10 07:15:53 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Oct 20 01:46:05 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34563023

media-gfx/xpaint: add v3.1.4

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Viorel Munteanu <ceamac.paragon <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/22538
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/xpaint/Manifest                          |  1 +
 .../files/xpaint-3.1.4-gentoo-shared-lib.patch     | 15 ++++
 media-gfx/xpaint/xpaint-3.1.4.ebuild               | 96 ++++++++++++++++++++++
 3 files changed, 112 insertions(+)

diff --git a/media-gfx/xpaint/Manifest b/media-gfx/xpaint/Manifest
index 1b59012a7db..7ed4b083c4e 100644
--- a/media-gfx/xpaint/Manifest
+++ b/media-gfx/xpaint/Manifest
@@ -1 +1,2 @@
 DIST xpaint-3.1.3.tar.bz2 1656489 BLAKE2B c6f5ed4a6c990dccacc572c834fabf68a16cacfde477915e5c3598a96335a899344d4375a48e6bf06fb601e9b260a11cc2b43afb404a83b9fb7b3044288ce1fa SHA512 8ef15d6af4b65d9da18d3e5eb9eacc0b42e718d069e20de91f2e0352b642d0a4b7626a2008fdd6217c0668ed1ecdc7a09c4a993a6074c77b7899b4613c1c4bda
+DIST xpaint-3.1.4.tar.bz2 1630009 BLAKE2B 6090156f0c27742487edfd24e803e814d7f2801c3847a5435a896e575ee3bf0b17f498e8ba8f4b7a87536780dd7c15ec7e0c0e0acb28b225d95ed0c835abfa97 SHA512 ea81f0f0eaad2072fe487efba933b6f0a4f2a4d8ae7548169b8e765cf1232c9944149a822173350af91309535d8f3625b8e58814811a5f4491fa3e2fcdf92e1d

diff --git a/media-gfx/xpaint/files/xpaint-3.1.4-gentoo-shared-lib.patch b/media-gfx/xpaint/files/xpaint-3.1.4-gentoo-shared-lib.patch
new file mode 100644
index 00000000000..b05500ea6f7
--- /dev/null
+++ b/media-gfx/xpaint/files/xpaint-3.1.4-gentoo-shared-lib.patch
@@ -0,0 +1,15 @@
+xpaint was compiling and installing a shared library but it was not using it, linking with the static one instead
+This patch attempts to link with libxpaintrw.so instead
+So we can pass --disable-static to configure
+
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -79,7 +79,7 @@
+ 
+ xpaint_SOURCES = $(BASE_HDRS) $(BASE_SRCS)
+ 
+-xpaint_LDADD = xpaintrw/.libs/libxpaintrw.a @X_LIBS@ @X_LIBS_EXTRA@
++xpaint_LDADD = -Lxpaintrw/.libs -lxpaintrw @X_LIBS@ @X_LIBS_EXTRA@
+ 
+ docs: INSTALL README TODO ChangeLog
+ .PHONY:

diff --git a/media-gfx/xpaint/xpaint-3.1.4.ebuild b/media-gfx/xpaint/xpaint-3.1.4.ebuild
new file mode 100644
index 00000000000..64e86898d49
--- /dev/null
+++ b/media-gfx/xpaint/xpaint-3.1.4.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools desktop toolchain-funcs xdg-utils
+
+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="pgf tiff"
+# jpeg2k disabled for blocking media-libs/openjpeg:0 security cleanup, bug 735592
+
+RDEPEND="
+	media-libs/fontconfig
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:0=
+	media-libs/netpbm
+	x11-libs/libX11
+	>=x11-libs/libXaw3dXft-1.6.2h[unicode]
+	x11-libs/libXext
+	x11-libs/libXft
+	x11-libs/libXmu
+	x11-libs/libXpm
+	x11-libs/libXt
+	pgf? ( media-libs/libpgf )
+	tiff? ( media-libs/tiff:0 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.1.3-libtool-clang.patch
+	"${FILESDIR}"/${PN}-3.1.3-gentoo-qa.patch
+	"${FILESDIR}"/${PN}-3.1.3-gentoo-prefix.patch
+	"${FILESDIR}"/${P}-gentoo-shared-lib.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable tiff) \
+		--disable-libdvipgm \
+		--disable-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)" \
+		includedir="${EPREFIX}"/usr/include \
+		-C util
+}
+
+src_install() {
+	default
+	emake \
+		WITH_PGF="$(usex pgf "yes" "no")" \
+		DESTDIR="${ED}" \
+		-C util install
+	doicon icons/xpaint.svg
+	make_desktop_entry "${PN}"
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/xpaint/files/, media-gfx/xpaint/
@ 2022-08-10 13:27 Joonas Niilola
  0 siblings, 0 replies; 5+ messages in thread
From: Joonas Niilola @ 2022-08-10 13:27 UTC (permalink / raw
  To: gentoo-commits

commit:     1c1339a568ac96ddddca18fc8c46de1882cc3d74
Author:     Viorel Munteanu <ceamac.paragon <AT> gmail <DOT> com>
AuthorDate: Thu Jul 28 19:40:03 2022 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed Aug 10 13:27:54 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c1339a5

media-gfx/xpaint: fix compilation with lto

Closes: https://bugs.gentoo.org/859820
Signed-off-by: Viorel Munteanu <ceamac.paragon <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/26638
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 .../xpaint/files/xpaint-3.1.4-gentoo-lto.patch     | 27 +++++++
 media-gfx/xpaint/xpaint-3.1.4-r1.ebuild            | 87 ++++++++++++++++++++++
 2 files changed, 114 insertions(+)

diff --git a/media-gfx/xpaint/files/xpaint-3.1.4-gentoo-lto.patch b/media-gfx/xpaint/files/xpaint-3.1.4-gentoo-lto.patch
new file mode 100644
index 000000000000..abdb51967fbc
--- /dev/null
+++ b/media-gfx/xpaint/files/xpaint-3.1.4-gentoo-lto.patch
@@ -0,0 +1,27 @@
+https://bugs.gentoo.org/859820
+
+dynFinish is declared as double, but always used as int (actually Boolean).
+
+--- a/dynPenOp.c
++++ b/dynPenOp.c
+@@ -35,7 +35,8 @@
+ 
+ #define XTIMEOUT 20
+ 
+-double dynWidth = 10, dynMass = 600, dynDrag = 15, dynFinish = 0;
++double dynWidth = 10, dynMass = 600, dynDrag = 15;
++Boolean dynFinish = 0;
+ 
+ typedef struct {
+ 	double	startx, starty;
+--- a/ops.h
++++ b/ops.h
+@@ -26,7 +26,7 @@
+ extern double tickSize, tickAngle;
+ extern double brushOpacity;
+ extern double dynWidth, dynMass, dynDrag;
+-extern int dynFinish;
++extern Boolean dynFinish;
+ extern int sprayRadius, sprayDensity, sprayRate;
+ extern int boxSize;
+ extern double boxRatio;

diff --git a/media-gfx/xpaint/xpaint-3.1.4-r1.ebuild b/media-gfx/xpaint/xpaint-3.1.4-r1.ebuild
new file mode 100644
index 000000000000..65557236f490
--- /dev/null
+++ b/media-gfx/xpaint/xpaint-3.1.4-r1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools desktop toolchain-funcs xdg
+
+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="pgf tiff"
+# jpeg2k disabled for blocking media-libs/openjpeg:0 security cleanup, bug 735592
+
+RDEPEND="
+	media-libs/fontconfig
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:0=
+	media-libs/netpbm
+	x11-libs/libX11
+	>=x11-libs/libXaw3dXft-1.6.2h[unicode]
+	x11-libs/libXext
+	x11-libs/libXft
+	x11-libs/libXmu
+	x11-libs/libXpm
+	x11-libs/libXt
+	pgf? ( media-libs/libpgf )
+	tiff? ( media-libs/tiff:0 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.1.3-libtool-clang.patch
+	"${FILESDIR}"/${PN}-3.1.3-gentoo-qa.patch
+	"${FILESDIR}"/${PN}-3.1.3-gentoo-prefix.patch
+	"${FILESDIR}"/${P}-gentoo-shared-lib.patch
+	"${FILESDIR}"/${P}-gentoo-lto.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable tiff) \
+		--disable-libdvipgm \
+		--disable-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)" \
+		includedir="${EPREFIX}"/usr/include \
+		-C util
+}
+
+src_install() {
+	default
+	emake \
+		WITH_PGF="$(usex pgf "yes" "no")" \
+		DESTDIR="${ED}" \
+		-C util install
+	doicon icons/xpaint.svg
+	make_desktop_entry "${PN}"
+	find "${ED}" -name '*.la' -delete || die
+}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2022-08-10 13:28 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-05-31  8:20 [gentoo-commits] repo/gentoo:master commit in: media-gfx/xpaint/files/, media-gfx/xpaint/ Sam James
  -- strict thread matches above, loose matches on Subject: below --
2022-08-10 13:27 Joonas Niilola
2021-10-20  1:51 Sam James
2021-03-27 17:01 Sam James
2015-08-16 14:56 Julian Ospald

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox