From 46eedbedafdb0040c37884982d4c775ce277fb7b Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Wed, 20 Oct 2021 10:22:14 +0100
Subject: gentoo resync : 20.10.2021

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

(limited to 'media-gfx/xpaint')

diff --git a/media-gfx/xpaint/Manifest b/media-gfx/xpaint/Manifest
index 1b82b83765b2..9d4aa910353d 100644
--- a/media-gfx/xpaint/Manifest
+++ b/media-gfx/xpaint/Manifest
@@ -1,6 +1,9 @@
 AUX xpaint-3.1.3-gentoo-prefix.patch 3605 BLAKE2B c513a72991ec83b99fc12d90c112c743a0fec456ae09ad77ecee887e67d2891efd200d8d08bad594472060515b56b02b9097951c5ad285ddfebd3d46acc4265a SHA512 d231237fa1512637c5448b1c8c7a1dcffa1383a0dd24f6606215643ce51932ef58e994bfbc3f24d3376acdd9cc06d713d453c643d4d00e9d00af0e011e55762d
 AUX xpaint-3.1.3-gentoo-qa.patch 1480 BLAKE2B 43b80854e8d0bb68566f86116444507852bf61807846ec97238a90fefc8a86f9be3978858c12af3278b787b14f805edb628327ae411b8b6fbdcd7530ee72cbd5 SHA512 cfa7057625f3086b573f9109a89f29e1cf17c15d253a0c903bd0f315e4aac3d8111df899ef98d0a3416486d81305f0a041f061985d31d435ccbd24b0fc5a57b3
 AUX xpaint-3.1.3-libtool-clang.patch 1434 BLAKE2B d89978f8c925a64fa62ff2a0788ed81ca5faee6a71afda069930a7381e2bb095bbad3c1236c3594532afc5441ef789bf6ea0571b4bb25065e2cbef7fdc52ebe3 SHA512 f4027619c4eda686953fc33c62518a7ef12db09e6160f5e038179aa06f64629d2ad28b373ec332fe3266fd7e15af77577b6a60cfdffb165afe1358519201c399
+AUX xpaint-3.1.4-gentoo-shared-lib.patch 503 BLAKE2B 12bae42eb3a119c8acb3c5a6436191bf65c9697f6d743531633f0d64f5cdb26270f659eb0725a26efcc780cc06f91cf7f4e4f5032cf72f21614f3f7e48615b25 SHA512 971fb77386f2a896605d05346c4cf65fd68bdcc7b2f82e1319059f1c4ac37b0d76585c8ff0ce6d5841639bd94b420ac29b2e5275fe9309b31549cc540f2a9833
 DIST xpaint-3.1.3.tar.bz2 1656489 BLAKE2B c6f5ed4a6c990dccacc572c834fabf68a16cacfde477915e5c3598a96335a899344d4375a48e6bf06fb601e9b260a11cc2b43afb404a83b9fb7b3044288ce1fa SHA512 8ef15d6af4b65d9da18d3e5eb9eacc0b42e718d069e20de91f2e0352b642d0a4b7626a2008fdd6217c0668ed1ecdc7a09c4a993a6074c77b7899b4613c1c4bda
+DIST xpaint-3.1.4.tar.bz2 1630009 BLAKE2B 6090156f0c27742487edfd24e803e814d7f2801c3847a5435a896e575ee3bf0b17f498e8ba8f4b7a87536780dd7c15ec7e0c0e0acb28b225d95ed0c835abfa97 SHA512 ea81f0f0eaad2072fe487efba933b6f0a4f2a4d8ae7548169b8e765cf1232c9944149a822173350af91309535d8f3625b8e58814811a5f4491fa3e2fcdf92e1d
 EBUILD xpaint-3.1.3.ebuild 1941 BLAKE2B 5e739c74c5341e48c973cb0786b96f56724ea602cf463855d2e587ce67a5437620585bfa84b8b6de2707c882453c43e3f1181e3f76fae69ad6ca73725d60caf4 SHA512 3b073c54cc13783430d34d6777eab200953dff07d01c529fc6ba1a5ff21de390a98758b588388fcc217c06783f335033f2de71275961b5563d68aa231fdc7dbf
+EBUILD xpaint-3.1.4.ebuild 1833 BLAKE2B e0059015e593960e104a5270bc7122d51c4b0589cdc0d6bb3c617b3b0845de5b7a0a92c09d12fff5abe813646622307edfa5e67f1c87da6c0a9e2d152c131963 SHA512 afb301b6c6e0c93cb1157acfbdf91f7240d786e36a06319a41cba49c438597832dff70bc66380903a155fc77f33bf5d08fcceb7665ab4c434c0adf6dfa303a3d
 MISC metadata.xml 1440 BLAKE2B 54c11ed5ec99921d5ff28f23ee6be2df1fb2d21b3a994c92a94f0edfb2b69116620767bb51811c095736c1f1a7fb4205d6f1971997d81ca9f3c17c6c394d3068 SHA512 34c889965c22aa055b0205d0f93b45f51572958bf0ac992a781a3a5c679303081c368e4af35fa4c4699e8ac4724e125b4048b2d2856c408092cd4c7859728880
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 000000000000..b05500ea6f75
--- /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 000000000000..64e86898d496
--- /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
+}
-- 
cgit v1.2.3