* [gentoo-commits] repo/gentoo:master commit in: media-gfx/xpaint/, media-gfx/xpaint/files/
@ 2021-03-27 17:01 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2021-03-27 17:01 UTC (permalink / raw
To: gentoo-commits
commit: 0d5589a76eeb41356df572265dcf8379826269fd
Author: Viorel Munteanu <ceamac.paragon <AT> gmail <DOT> com>
AuthorDate: Mon Mar 22 16:37:36 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Mar 27 16:42:29 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d5589a7
media-gfx/xpaint: fix passing LDFLAGS
Closes: https://bugs.gentoo.org/727632
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Viorel Munteanu <ceamac.paragon <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../xpaint/files/xpaint-2.10.2-respect-ldflags.patch | 18 ++++++++++++++++++
media-gfx/xpaint/xpaint-2.10.2-r1.ebuild | 8 ++------
2 files changed, 20 insertions(+), 6 deletions(-)
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
new file mode 100644
index 00000000000..11a0b0e9a84
--- /dev/null
+++ b/media-gfx/xpaint/files/xpaint-2.10.2-respect-ldflags.patch
@@ -0,0 +1,18 @@
+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
index 86563f5c2ab..53779ba99c7 100644
--- a/media-gfx/xpaint/xpaint-2.10.2-r1.ebuild
+++ b/media-gfx/xpaint/xpaint-2.10.2-r1.ebuild
@@ -45,13 +45,9 @@ BDEPEND="
PATCHES=(
"${FILESDIR}"/${P}-libtool-clang.patch
+ "${FILESDIR}"/${P}-respect-ldflags.patch
)
-src_prepare() {
- default
- sed -i -e 's/-O3 -s//g' util/Makefile || die
-}
-
src_configure() {
econf \
$(use_enable tiff) \
@@ -83,5 +79,5 @@ src_install() {
-C util install
doicon icons/xpaint.svg
make_desktop_entry "${PN}"
- find "${D}" \( -name '*.la' -o -name '*.a' \) -type f -delete || die
+ find "${ED}" \( -name '*.la' -o -name '*.a' \) -type f -delete || die
}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/xpaint/, media-gfx/xpaint/files/
@ 2021-03-27 17:01 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2021-03-27 17:01 UTC (permalink / raw
To: gentoo-commits
commit: 4866112462debfdde734c6b9f5841108be8dbfbf
Author: Viorel Munteanu <ceamac.paragon <AT> gmail <DOT> com>
AuthorDate: Sun Mar 21 08:47:43 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Mar 27 16:42:31 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48661124
media-gfx/xpaint: new version 3.1.3
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Viorel Munteanu <ceamac.paragon <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-gfx/xpaint/Manifest | 1 +
.../files/xpaint-3.1.3-cflags-ldflags-strip.patch | 41 +++++++++
media-gfx/xpaint/xpaint-3.1.3.ebuild | 98 ++++++++++++++++++++++
3 files changed, 140 insertions(+)
diff --git a/media-gfx/xpaint/Manifest b/media-gfx/xpaint/Manifest
index 5c6f7235ace..c9cb55e12c3 100644
--- a/media-gfx/xpaint/Manifest
+++ b/media-gfx/xpaint/Manifest
@@ -1 +1,2 @@
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-3.1.3-cflags-ldflags-strip.patch b/media-gfx/xpaint/files/xpaint-3.1.3-cflags-ldflags-strip.patch
new file mode 100644
index 00000000000..f0677c0d713
--- /dev/null
+++ b/media-gfx/xpaint/files/xpaint-3.1.3-cflags-ldflags-strip.patch
@@ -0,0 +1,41 @@
+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
+--- a/vxp2ps/Makefile
++++ b/vxp2ps/Makefile
+@@ -3,16 +3,16 @@
+ all: vxp2ps vxp2tex vxp2dkw
+
+ vxp2ps: vxp2ps.c
+- gcc vxp2ps.c -o vxp2ps -lm $(CFLAGSEXTRA)
++ $(CC) vxp2ps.c -o vxp2ps -lm $(CFLAGS) $(CPPFLAGS) $(LDFLAGS)
+
+ vxp2tex: vxp2tex.c
+- gcc vxp2tex.c -o vxp2tex -lm
++ $(CC) vxp2tex.c -o vxp2tex -lm $(CFLAGS) $(CPPFLAGS) $(LDFLAGS)
+
+ vxp2dkw: vxp2dkw.c
+- gcc vxp2dkw.c -o vxp2dkw -lm
++ $(CC) vxp2dkw.c -o vxp2dkw -lm $(CFLAGS) $(CPPFLAGS) $(LDFLAGS)
+
+ install: all
+- install -c -s vxp2ps vxp2tex vxp2dkw "$(DESTDIR)"/usr/bin
++ install -c vxp2ps vxp2tex vxp2dkw "$(DESTDIR)"/usr/bin
+
+ clean:
+ rm -f core *~ vxp2ps vxp2tex vxp2dkw
+--- 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 -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 -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-3.1.3.ebuild b/media-gfx/xpaint/xpaint-3.1.3.ebuild
new file mode 100644
index 00000000000..a853557cf49
--- /dev/null
+++ b/media-gfx/xpaint/xpaint-3.1.3.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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/freetype:2
+ media-libs/libjpeg-turbo:=
+ media-libs/libpng:0=
+ media-libs/netpbm:=
+ x11-libs/libICE
+ 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
+ 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}"/${PN}-2.10.2-libtool-clang.patch
+ "${FILESDIR}"/${P}-cflags-ldflags-strip.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)" \
+ -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
+}
+
+pkg_postinst() {
+ xdg_desktop_database_update
+}
+
+pkg_postrm() {
+ xdg_desktop_database_update
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/xpaint/, media-gfx/xpaint/files/
@ 2021-03-27 17:01 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2021-03-27 17:01 UTC (permalink / raw
To: gentoo-commits
commit: ed46e83d672d110adada7533f90878ed9c25e195
Author: Viorel Munteanu <ceamac.paragon <AT> gmail <DOT> com>
AuthorDate: Mon Mar 22 16:33:19 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Mar 27 16:42:28 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed46e83d
media-gfx/xpaint: fix compilation with clang
Closes: https://bugs.gentoo.org/731010
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Viorel Munteanu <ceamac.paragon <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-gfx/xpaint/files/xpaint-2.10.2-libtool-clang.patch | 13 +++++++++++++
media-gfx/xpaint/xpaint-2.10.2-r1.ebuild | 10 +++++++---
2 files changed, 20 insertions(+), 3 deletions(-)
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
new file mode 100644
index 00000000000..d6a3dab0783
--- /dev/null
+++ b/media-gfx/xpaint/files/xpaint-2.10.2-libtool-clang.patch
@@ -0,0 +1,13 @@
+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/xpaint-2.10.2-r1.ebuild b/media-gfx/xpaint/xpaint-2.10.2-r1.ebuild
index dc92f046b92..86563f5c2ab 100644
--- a/media-gfx/xpaint/xpaint-2.10.2-r1.ebuild
+++ b/media-gfx/xpaint/xpaint-2.10.2-r1.ebuild
@@ -18,6 +18,7 @@ IUSE="pgf tiff"
RDEPEND="
media-libs/fontconfig
media-libs/freetype:2
+ media-libs/libjpeg-turbo:=
media-libs/libpng:0=
x11-libs/libICE
x11-libs/libX11
@@ -28,7 +29,6 @@ RDEPEND="
x11-libs/libXpm
x11-libs/libXt
sys-libs/zlib
- media-libs/libjpeg-turbo:=
pgf? ( media-libs/libpgf )
tiff? (
media-libs/jbigkit:0=
@@ -39,9 +39,14 @@ DEPEND="${RDEPEND}"
BDEPEND="
sys-devel/bison
sys-devel/flex
+ sys-devel/libtool
virtual/pkgconfig
"
+PATCHES=(
+ "${FILESDIR}"/${P}-libtool-clang.patch
+)
+
src_prepare() {
default
sed -i -e 's/-O3 -s//g' util/Makefile || die
@@ -78,6 +83,5 @@ src_install() {
-C util install
doicon icons/xpaint.svg
make_desktop_entry "${PN}"
- find "${D}" -name '*.la' -type f -delete || die
- find "${D}" -name '*.a' -type f -delete || die
+ find "${D}" \( -name '*.la' -o -name '*.a' \) -type f -delete || die
}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/xpaint/, media-gfx/xpaint/files/
@ 2021-04-10 8:31 Joonas Niilola
0 siblings, 0 replies; 4+ messages in thread
From: Joonas Niilola @ 2021-04-10 8:31 UTC (permalink / raw
To: gentoo-commits
commit: 4db13a86d16973ebc6ff65e41c6c220d901b2841
Author: Viorel Munteanu <ceamac.paragon <AT> gmail <DOT> com>
AuthorDate: Sun Mar 28 11:50:11 2021 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Apr 10 08:31:31 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4db13a86
media-gfx/xpaint: fix emerging with `rdlibtool`
`rdlibtool` is part of `sys-devel/slibtool`
Closes: https://bugs.gentoo.org/778791
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Viorel Munteanu <ceamac.paragon <AT> gmail.com>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
.../xpaint/files/xpaint-3.1.3-libtool-clang.patch | 37 ++++++++++++++++++----
media-gfx/xpaint/xpaint-3.1.3.ebuild | 1 -
2 files changed, 31 insertions(+), 7 deletions(-)
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
index 92ccb899ce1..9aef70c8a9a 100644
--- a/media-gfx/xpaint/files/xpaint-3.1.3-libtool-clang.patch
+++ b/media-gfx/xpaint/files/xpaint-3.1.3-libtool-clang.patch
@@ -1,26 +1,51 @@
libtool doesn't work if compiling with clang. Need to add --tag=CC
-Also don't hardcode /usr/bin/tool in gentoo prefix
+Don't hardcode /usr/bin/libtool in gentoo prefix
See bug https://bugs.gentoo.org/731010
+
+rdlibtool needs to find system libtool in current directory
+See bug https://bugs.gentoo.org/778791
--- a/configure.ac
+++ b/configure.ac
-@@ -17,6 +17,9 @@
+@@ -17,6 +17,10 @@
AC_LANG_C
AM_PROG_AR
-+dnl search libtool
-+AC_PATH_PROG([PROGLIBTOOL], [libtool])
++dnl libtool
++LT_INIT
++AC_SUBST([LIBTOOL_DEPS])
+
## basic types
AC_TYPE_INT8_T
--- a/xpaintrw/Makefile.am
+++ b/xpaintrw/Makefile.am
-@@ -28,7 +28,7 @@
+@@ -28,7 +28,8 @@
xpaint_DEFINES = $(ARCH_DEFINES) $(EXTRA_DEFINES) $(XAWLIB_DEFINES)
-LIBTOOL = /usr/bin/libtool
-+LIBTOOL = @PROGLIBTOOL@ --tag=CC
++LIBTOOL = ../libtool
++AM_LIBTOOLFLAGS = --tag=CC
AM_CFLAGS = @X_CFLAGS@ @SPECIAL_CFLAGS@ $(xpaint_DEFINES)
AM_YFLAGS = -d
CLEANFILES =
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -53,12 +53,16 @@
+ dist_man_MANS = xpaint.1 imgmerge.1
+ AM_CFLAGS = @X_CFLAGS@ @SPECIAL_CFLAGS@ $(xpaint_DEFINES)
+ ACLOCAL_AMFLAGS = -I m4
+-BUILT_SOURCES = version.h DefaultRC.txt.h messages.h XPaint.ad.h xpaint.1
++BUILT_SOURCES = version.h DefaultRC.txt.h messages.h XPaint.ad.h xpaint.1 libtool
+ AM_YFLAGS = -d
+ CLEANFILES = preproc substads \
+ version.h DefaultRC.txt.h messages.h XPaint.ad.h xpaint.1
+ EXTRA_DIST =
+
++LIBTOOL_DEPS = @LIBTOOL_DEPS@
++libtool:
++ $(SHELL) ./config.status libtool
++
+ BASE_HDRS = bitmap.h color.h crc32.h \
+ Colormap.h ColormapP.h graphic.h hash.h image.h \
+ menu.h messages.h misc.h operation.h ops.h \
diff --git a/media-gfx/xpaint/xpaint-3.1.3.ebuild b/media-gfx/xpaint/xpaint-3.1.3.ebuild
index 131d8059027..df08e4c0d85 100644
--- a/media-gfx/xpaint/xpaint-3.1.3.ebuild
+++ b/media-gfx/xpaint/xpaint-3.1.3.ebuild
@@ -40,7 +40,6 @@ DEPEND="${RDEPEND}"
BDEPEND="
sys-devel/bison
sys-devel/flex
- sys-devel/libtool
virtual/pkgconfig
x11-misc/imake
"
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-04-10 8:31 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-03-27 17:01 [gentoo-commits] repo/gentoo:master commit in: media-gfx/xpaint/, media-gfx/xpaint/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2021-03-27 17:01 Sam James
2021-03-27 17:01 Sam James
2021-04-10 8:31 Joonas Niilola
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox