* [gentoo-commits] repo/gentoo:master commit in: media-gfx/graphicsmagick/files/, media-gfx/graphicsmagick/
@ 2020-12-27 0:19 Sam James
0 siblings, 0 replies; 10+ messages in thread
From: Sam James @ 2020-12-27 0:19 UTC (permalink / raw
To: gentoo-commits
commit: f14e7958e3403bb6c5785ad7e69bccc466c1c7e0
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 27 00:19:17 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Dec 27 00:19:22 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f14e7958
media-gfx/graphicsmagick: bump to 1.3.36
Package-Manager: Portage-3.0.12-prefix, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-gfx/graphicsmagick/Manifest | 1 +
.../files/graphicsmagick-1.3.36-flags.patch | 59 ++++++++++++++++++++++
...ck-9999.ebuild => graphicsmagick-1.3.36.ebuild} | 13 +++--
.../graphicsmagick/graphicsmagick-9999.ebuild | 11 ++--
4 files changed, 71 insertions(+), 13 deletions(-)
diff --git a/media-gfx/graphicsmagick/Manifest b/media-gfx/graphicsmagick/Manifest
index 5c6174e3fae..f43ed697a40 100644
--- a/media-gfx/graphicsmagick/Manifest
+++ b/media-gfx/graphicsmagick/Manifest
@@ -1 +1,2 @@
DIST GraphicsMagick-1.3.35.tar.xz 5543224 BLAKE2B 8a284d85341c10939fdece5c565d5b881276afb9b4c5dfb2221b780a01b99f78ee62761722c372baf9155c63f7ef176b67310aeedcab0368f4f26f5b0150bcce SHA512 baae92089d52147ef961f93495abc8a9d8b1a963af61d87a650c1ab105d46816aa38c83f654edcb5a0e1b7f07ccc06eaeaa443b9bde3a63a0b9bfb45f3ae144c
+DIST GraphicsMagick-1.3.36.tar.xz 5600712 BLAKE2B 069ab4f9bb5beea3321860bf8e43c8a1b51ab102054e92486375209a86fd3c1c1fb44d4b2c43a65c78f36e9f37e09316fe77b4f261bfb0af3b2c2a86ff8b5aa5 SHA512 27ed5fcbfb0303436bdcb0f11d18257a967d471251b51e633e2c655b0a7e5ed01f61a61f9702cc7d4c02714e005ac18ca9ba0f690c0580e41d07947a03c5cbb4
diff --git a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.36-flags.patch b/media-gfx/graphicsmagick/files/graphicsmagick-1.3.36-flags.patch
new file mode 100644
index 00000000000..311cd782925
--- /dev/null
+++ b/media-gfx/graphicsmagick/files/graphicsmagick-1.3.36-flags.patch
@@ -0,0 +1,59 @@
+diff --git a/Magick++/bin/GraphicsMagick++-config.in b/Magick++/bin/GraphicsMagick++-config.in
+index 9733be2..4c49362 100755
+--- a/Magick++/bin/GraphicsMagick++-config.in
++++ b/Magick++/bin/GraphicsMagick++-config.in
+@@ -33,7 +33,7 @@ while test $# -gt 0; do
+ echo '@MAGICK_API_CPPFLAGS@'
+ ;;
+ --cxxflags)
+- echo '@CXXFLAGS@'
++ echo '@MAGICK_API_CXXFLAGS@'
+ ;;
+ --ldflags)
+ echo '@MAGICK_API_LDFLAGS@'
+diff --git a/configure.ac b/configure.ac
+index d6a30f6..2f5ff6c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -335,6 +335,7 @@ fi
+
+ AC_OPENMP([C])
+ CFLAGS="$OPENMP_CFLAGS $CFLAGS"
++MAGICK_API_CFLAGS="$MAGICK_API_CFLAGS $OPENMP_CFLAGS"
+ #CXXFLAGS="$OPENMP_CXXFLAGS $CXXFLAGS"
+ #LDFLAGS="$LDFLAGS $OPENMP_CFLAGS"
+ AC_SUBST([OPENMP_CFLAGS])
+@@ -3689,9 +3690,10 @@ MAGICK_DEP_LIBS=`echo $MAGICK_DEP_LIBS | sed -e 's/ */ /g'`
+ MAGICK_EXTRA_DEP_LIBS=`echo $MAGICK_EXTRA_DEP_LIBS | sed -e 's/ */ /g'`
+ #LIBS=`echo $LIBS | sed -e 's/ */ /g'`
+
+-MAGICK_API_CFLAGS=$CFLAGS
++MAGICK_API_CFLAGS=`echo $MAGICK_API_CFLAGS | sed -e 's/ */ /g'`
+ MAGICK_API_CPPFLAGS=`echo $MAGICK_API_CPPFLAGS | sed -e 's/ */ /g'`
+-MAGICK_API_LDFLAGS="-L$LIB_DIR $LDFLAGS"
++MAGICK_API_CXXFLAGS=""
++MAGICK_API_LDFLAGS="-L$LIB_DIR"
+ MAGICK_API_DEP_LIBS="$MAGICK_DEP_LIBS"
+ MAGICK_API_LIBS="-lGraphicsMagick $MAGICK_API_DEP_LIBS $MAGICK_EXTRA_DEP_LIBS"
+
+@@ -3721,6 +3723,7 @@ AC_SUBST([X_CFLAGS])
+
+ AC_SUBST([MAGICK_API_CFLAGS])
+ AC_SUBST([MAGICK_API_CPPFLAGS])
++AC_SUBST(MAGICK_API_CXXFLAGS)
+ AC_SUBST([MAGICK_API_PC_CPPFLAGS])
+ AC_SUBST([MAGICK_API_LDFLAGS])
+ AC_SUBST([MAGICK_API_LIBS])
+diff --git a/magick/GraphicsMagick-config.in b/magick/GraphicsMagick-config.in
+index 8b2f016..3f66ae3 100644
+--- a/magick/GraphicsMagick-config.in
++++ b/magick/GraphicsMagick-config.in
+@@ -30,7 +30,7 @@ while test $# -gt 0; do
+ echo @PACKAGE_VERSION@
+ ;;
+ --cflags)
+- echo '@CFLAGS@'
++ echo '@MAGICK_API_CFLAGS@'
+ ;;
+ --cppflags)
+ echo '@MAGICK_API_CPPFLAGS@'
diff --git a/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.36.ebuild
similarity index 94%
copy from media-gfx/graphicsmagick/graphicsmagick-9999.ebuild
copy to media-gfx/graphicsmagick/graphicsmagick-1.3.36.ebuild
index 5cde9ca8939..84918ccd05d 100644
--- a/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild
+++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.36.ebuild
@@ -2,10 +2,10 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
+
inherit autotools toolchain-funcs
MY_P=${P/graphicsm/GraphicsM}
-
DESCRIPTION="Collection of tools and libraries for many image formats"
HOMEPAGE="http://www.graphicsmagick.org/"
LICENSE="MIT"
@@ -16,7 +16,8 @@ if [[ ${PV} == "9999" ]] ; then
EHG_REPO_URI="http://hg.code.sf.net/p/${PN}/code"
else
SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
- KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+ S="${WORKDIR}/${MY_P}"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
fi
IUSE="bzip2 +cxx debug dynamic-loading fpx imagemagick jbig jpeg lcms lzma
@@ -39,20 +40,18 @@ RDEPEND="dev-libs/libltdl:0
truetype? (
media-fonts/urw-fonts
>=media-libs/freetype-2
- )
+ )
webp? ( media-libs/libwebp:= )
wmf? ( media-libs/libwmf )
X? (
x11-libs/libSM
x11-libs/libXext
- )
+ )
zlib? ( sys-libs/zlib )"
DEPEND="${RDEPEND}"
-S=${WORKDIR}/${MY_P}
-
PATCHES=(
- "${FILESDIR}"/${PN}-1.3.19-flags.patch
+ "${FILESDIR}"/${PN}-1.3.36-flags.patch
"${FILESDIR}"/${PN}-1.3.19-perl.patch
)
diff --git a/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild b/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild
index 5cde9ca8939..bef7b3a9feb 100644
--- a/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild
+++ b/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild
@@ -2,10 +2,10 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
+
inherit autotools toolchain-funcs
MY_P=${P/graphicsm/GraphicsM}
-
DESCRIPTION="Collection of tools and libraries for many image formats"
HOMEPAGE="http://www.graphicsmagick.org/"
LICENSE="MIT"
@@ -16,6 +16,7 @@ if [[ ${PV} == "9999" ]] ; then
EHG_REPO_URI="http://hg.code.sf.net/p/${PN}/code"
else
SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
+ S="${WORKDIR}/${MY_P}"
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
fi
@@ -39,20 +40,18 @@ RDEPEND="dev-libs/libltdl:0
truetype? (
media-fonts/urw-fonts
>=media-libs/freetype-2
- )
+ )
webp? ( media-libs/libwebp:= )
wmf? ( media-libs/libwmf )
X? (
x11-libs/libSM
x11-libs/libXext
- )
+ )
zlib? ( sys-libs/zlib )"
DEPEND="${RDEPEND}"
-S=${WORKDIR}/${MY_P}
-
PATCHES=(
- "${FILESDIR}"/${PN}-1.3.19-flags.patch
+ "${FILESDIR}"/${PN}-1.3.36-flags.patch
"${FILESDIR}"/${PN}-1.3.19-perl.patch
)
^ permalink raw reply related [flat|nested] 10+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/graphicsmagick/files/, media-gfx/graphicsmagick/
@ 2023-12-27 22:48 Sam James
0 siblings, 0 replies; 10+ messages in thread
From: Sam James @ 2023-12-27 22:48 UTC (permalink / raw
To: gentoo-commits
commit: 53ad9b81118ada34df80b4a85208e4ec2d04a0bb
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 27 22:48:18 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Dec 27 22:48:18 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53ad9b81
media-gfx/graphicsmagick: fix perl build w/ autoconf-2.72
Closes: https://bugs.gentoo.org/920788
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../graphicsmagick-1.3.42-autoconf-2.72-perl-lfs.patch | 13 +++++++++++++
media-gfx/graphicsmagick/graphicsmagick-1.3.42.ebuild | 1 +
2 files changed, 14 insertions(+)
diff --git a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.42-autoconf-2.72-perl-lfs.patch b/media-gfx/graphicsmagick/files/graphicsmagick-1.3.42-autoconf-2.72-perl-lfs.patch
new file mode 100644
index 000000000000..4092a7303dc9
--- /dev/null
+++ b/media-gfx/graphicsmagick/files/graphicsmagick-1.3.42-autoconf-2.72-perl-lfs.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/920788
+https://github.com/ImageMagick/ImageMagick/pull/6978
+--- a/configure.ac
++++ b/configure.ac
+@@ -386,7 +386,7 @@ AC_FUNC_FSEEKO
+ LFS_CPPFLAGS=''
+ if test "$enable_largefile" != no
+ then
+- if test "$ac_cv_sys_file_offset_bits" != 'no'
++ if test "$ac_cv_sys_file_offset_bits" != 'no' && test -n "$ac_cv_sys_file_offset_bits"
+ then
+ LFS_CPPFLAGS="$LFS_CPPFLAGS -D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits"
+ fi
diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.42.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.42.ebuild
index e06b4db947e2..e95dedd071e0 100644
--- a/media-gfx/graphicsmagick/graphicsmagick-1.3.42.ebuild
+++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.42.ebuild
@@ -68,6 +68,7 @@ BDEPEND+=" virtual/pkgconfig"
PATCHES=(
"${FILESDIR}"/${PN}-1.3.41-flags.patch
"${FILESDIR}"/${PN}-1.3.41-perl.patch
+ "${FILESDIR}"/${PN}-1.3.42-autoconf-2.72-perl-lfs.patch
)
pkg_pretend() {
^ permalink raw reply related [flat|nested] 10+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/graphicsmagick/files/, media-gfx/graphicsmagick/
@ 2023-03-09 6:41 Sam James
0 siblings, 0 replies; 10+ messages in thread
From: Sam James @ 2023-03-09 6:41 UTC (permalink / raw
To: gentoo-commits
commit: a80a21a605475095d050ea14833d354338fc9e86
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 9 06:41:18 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Mar 9 06:41:18 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a80a21a6
media-gfx/graphicsmagick: drop 1.3.38-r5, 1.3.39
Bug: https://bugs.gentoo.org/888545
Bug: https://bugs.gentoo.org/890851
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-gfx/graphicsmagick/Manifest | 4 -
.../graphicsmagick-1.3.38-configure-bashism.patch | 34 -----
.../graphicsmagick/graphicsmagick-1.3.38-r5.ebuild | 161 ---------------------
.../graphicsmagick/graphicsmagick-1.3.39.ebuild | 160 --------------------
4 files changed, 359 deletions(-)
diff --git a/media-gfx/graphicsmagick/Manifest b/media-gfx/graphicsmagick/Manifest
index 5f73be7e7b81..b9635f463150 100644
--- a/media-gfx/graphicsmagick/Manifest
+++ b/media-gfx/graphicsmagick/Manifest
@@ -1,6 +1,2 @@
-DIST GraphicsMagick-1.3.38.tar.xz 5958352 BLAKE2B 132c8b2303690dbe84b0e9ab33db0c0861845ef0260915e33197912dbcae02ae70c27bce634cfe0ab6b739ef6f3e828cbea9043fc90be993fb2c4a5e33e20ee9 SHA512 478f9e2907d4cb1099b0cbd1a73e4ab58aef94edf6cb1636ce48a378084ec1671599fd4f369455e5af898e94d1386f7149f6933b7c668027a6f6952bc763ec3a
-DIST GraphicsMagick-1.3.38.tar.xz.sig 119 BLAKE2B 166b7bb6de30af22d1f2317812f76dee43dd69c5557613deea35de3767624466c07001fe029ec9d33d0c61ed2fe5ca3f48bf435853374c722963a1293bfaa7a1 SHA512 c6dfee7e4b63b646460f9045ca5c8f3105d1a761ec3cd3471b53293178ed9a963884539c8026d934ce1915654d517a9b30232d7260a13f6d7dbeb5a592485b09
-DIST GraphicsMagick-1.3.39.tar.xz 5509028 BLAKE2B 774717df5c10664d7f60305bbc0b780bd896c27cf5999fae3835a3b3275068bde626a8efb073f7eb9151671e0c170579b5fa7a36b9773e1a0d96c5cd7d0b73c8 SHA512 4820587a8fbc18864134a243eca68359389d92f2b716c657088e06b6fcf76831d9b3b4644478195ee6c5fb3a4ebdce06c79997f5a5778a28c63f5c8a319419a4
-DIST GraphicsMagick-1.3.39.tar.xz.asc 228 BLAKE2B ea9f9d607a4699e148beab6f43f04897c808db5a19c9b0d62d65218127506549931d9cae002ebed2abc8022fb9707612a298139fd051da6c5a6f2f9d5ac3d2a0 SHA512 f9d83d39e1bda804c1c128f18c9a6539906b21abacfb64501fb65c67a56b46b8591ba32a890ecf49917791ebdf394307136229b5820e16909159f5c42270f7ba
DIST GraphicsMagick-1.3.40.tar.xz 5507792 BLAKE2B 2052eb34931f07c902a9c68192ebe4d36137cd23219b1598bae2fa78c5c8bfd1efadf9fd430ed4fee8dc903e50ffabe5a9c76bf55966b85b6f303b2decdca6ee SHA512 e64902aa2a8702d03d188350bd4252a2263e431611f9a70f38cd8beede8a38cc91bb4de3603fedf15420ebbba488f609f218e9b45e356b9f8dc8e4a75f380ee5
DIST GraphicsMagick-1.3.40.tar.xz.asc 228 BLAKE2B 70eaaa0cd30cfe23ac6dc5e8edc026c57eea7b1a608e83da3408f6fa9fc2cceeb8190e4e9015f321ee688f2a32689d244d69bc61764a99ab0f99ada72143a575 SHA512 82c628e4a260a690c7b1941321881a97d54b4c9580dcbfd8ae786a1774dc43c46e8542488ca875346446858e7475847c440cfca572315a5fe123315b187a240a
diff --git a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.38-configure-bashism.patch b/media-gfx/graphicsmagick/files/graphicsmagick-1.3.38-configure-bashism.patch
deleted file mode 100644
index 69d5fd50a1bf..000000000000
--- a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.38-configure-bashism.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-# HG changeset patch
-# User Sam James <sam@gentoo.org>
-# Date 1659168362 -3600
-# Sat Jul 30 09:06:02 2022 +0100
-# Node ID aa77bc8461ee15501a0298dafd53c97447aa30d0
-# Parent 0a06f497d58839e4100b3be46bbdcd14d8147d75
-configure: fix bashism
-
-configure scripts need to be runnable with a POSIX-compliant /bin/sh.
-
-On many (but not all!) systems, /bin/sh is provided by Bash, so errors
-like this aren't spotted. Notably Debian defaults to /bin/sh provided
-by dash which doesn't tolerate such bashisms as '=='.
-
-This retains compatibility with bash.
-
-Fixes configure warnings/errors like:
-```
-checking for gs... /usr/sbin/gs
-./configure: 31719: test: #: unexpected operator
-checking for Windows fonts directory (location of arial.ttf)... /usr/share/fonts/corefonts/
-```
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -3148,7 +3148,7 @@ have_ralcgm='no' ; if test "$CGMDecodeD
- AM_CONDITIONAL([HasPSDelegate],[test "$have_gs" = 'yes'])
-
- # Tests for programs only used while in maintainer mode
--if test "$MAINT" == '' ; then
-+if test "$MAINT" = '' ; then
- # Test for optional rst2html.py utility and define automake conditional HasRST2HTML if found.
- AC_CHECK_PROGS([RST2HTML],[rst2html.py rst2html])
-
diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.38-r5.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.38-r5.ebuild
deleted file mode 100644
index 18c3f3286591..000000000000
--- a/media-gfx/graphicsmagick/graphicsmagick-1.3.38-r5.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools toolchain-funcs
-
-MY_P=${P/graphicsm/GraphicsM}
-DESCRIPTION="Collection of tools and libraries for many image formats"
-HOMEPAGE="http://www.graphicsmagick.org/ https://hg.osdn.net/view/graphicsmagick/GM"
-
-if [[ ${PV} == 9999 ]] ; then
- inherit mercurial
- EHG_REPO_URI="http://hg.code.sf.net/p/${PN}/code"
-else
- VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/bobfriesenhahn.asc
- inherit verify-sig
- SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
- SRC_URI+=" verify-sig? ( mirror://sourceforge/${PN}/${MY_P}.tar.xz.sig )"
- S="${WORKDIR}/${MY_P}"
-
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
- BDEPEND="verify-sig? ( sec-keys/openpgp-keys-bobfriesenhahn )"
-fi
-
-LICENSE="MIT"
-SLOT="0/${PV%.*}"
-
-IUSE="bzip2 +cxx debug dynamic-loading fpx heif imagemagick jbig jpeg jpegxl lcms lzma"
-IUSE+=" openmp perl png postscript q16 q32 static-libs svg tcmalloc tiff truetype"
-IUSE+=" webp wmf X zlib zstd"
-
-RDEPEND="
- dev-libs/libltdl
- bzip2? ( app-arch/bzip2 )
- fpx? ( media-libs/libfpx )
- heif? ( media-libs/libheif:= )
- imagemagick? ( !media-gfx/imagemagick )
- jbig? ( media-libs/jbigkit )
- jpeg? ( media-libs/libjpeg-turbo:= )
- jpegxl? ( media-libs/libjxl:= )
- lcms? ( media-libs/lcms:2 )
- lzma? ( app-arch/xz-utils )
- perl? ( dev-lang/perl:= )
- png? ( media-libs/libpng:= )
- postscript? ( app-text/ghostscript-gpl )
- svg? ( dev-libs/libxml2 )
- tcmalloc? ( dev-util/google-perftools:= )
- tiff? ( media-libs/tiff:= )
- truetype? (
- media-fonts/urw-fonts
- >=media-libs/freetype-2
- )
- webp? ( media-libs/libwebp:= )
- wmf? ( media-libs/libwmf )
- X? (
- x11-libs/libSM
- x11-libs/libX11
- x11-libs/libXext
- )
- zlib? ( sys-libs/zlib )
- zstd? ( app-arch/zstd:= )
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.3.36-flags.patch
- "${FILESDIR}"/${PN}-1.3.19-perl.patch
- "${FILESDIR}"/${P}-configure-bashism.patch
-)
-
-pkg_pretend() {
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-src_prepare() {
- default
-
- eautoreconf
-}
-
-src_configure() {
- local depth=8
-
- use q16 && depth=16
- use q32 && depth=32
-
- local myeconfargs=(
- --enable-largefile
- --enable-shared
- $(use_enable static-libs static)
- $(use_enable debug prof)
- $(use_enable debug gcov)
- $(use_enable imagemagick magick-compat)
- $(use_enable openmp)
- --with-threads
- $(use_with dynamic-loading modules)
- --with-quantum-depth=${depth}
- --without-frozenpaths
- $(use_with cxx magick-plus-plus)
- $(use_with heif)
- $(use_with jpegxl jxl)
- $(use_with perl)
- --with-perl-options=INSTALLDIRS=vendor
- $(use_with bzip2 bzlib)
- $(use_with postscript dps)
- $(use_with fpx)
- $(use_with jbig)
- $(use_with webp)
- $(use_with jpeg)
- # Needs last-rited/unpackaged jasper
- --without-jp2
- $(use_with lcms lcms2)
- $(use_with lzma)
- $(use_with png)
- $(use_with tcmalloc)
- $(use_with tiff)
- --without-trio
- $(use_with truetype ttf)
- $(use_with wmf)
- --with-fontpath="${EPREFIX}"/usr/share/fonts
- --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
- --with-windows-font-dir="${EPREFIX}"/usr/share/fonts/corefonts
- $(use_with svg xml)
- $(use_with zlib)
- $(use_with zstd)
- $(use_with X x)
- )
-
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- default
-
- use perl && emake perl-build
-}
-
-src_test() {
- unset DISPLAY # some perl tests fail when DISPLAY is set
-
- default
-}
-
-src_install() {
- default
-
- if use perl ; then
- emake -C PerlMagick DESTDIR="${D}" install
-
- find "${ED}" -type f -name perllocal.pod -exec rm -f {} + || die
- find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} + || die
- fi
-
- find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + || die
-}
diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.39.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.39.ebuild
deleted file mode 100644
index 8171180c0101..000000000000
--- a/media-gfx/graphicsmagick/graphicsmagick-1.3.39.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools toolchain-funcs
-
-MY_P=${P/graphicsm/GraphicsM}
-DESCRIPTION="Collection of tools and libraries for many image formats"
-HOMEPAGE="http://www.graphicsmagick.org/ https://hg.osdn.net/view/graphicsmagick/GM"
-
-if [[ ${PV} == 9999 ]] ; then
- inherit mercurial
- EHG_REPO_URI="http://hg.code.sf.net/p/${PN}/code"
-else
- VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/bobfriesenhahn.asc
- inherit verify-sig
- SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
- SRC_URI+=" verify-sig? ( mirror://sourceforge/${PN}/${MY_P}.tar.xz.asc )"
- S="${WORKDIR}/${MY_P}"
-
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
- BDEPEND="verify-sig? ( sec-keys/openpgp-keys-bobfriesenhahn )"
-fi
-
-LICENSE="MIT"
-SLOT="0/${PV%.*}"
-
-IUSE="bzip2 +cxx debug dynamic-loading fpx heif imagemagick jbig jpeg jpegxl lcms lzma"
-IUSE+=" openmp perl png postscript q16 q32 static-libs svg tcmalloc tiff truetype"
-IUSE+=" webp wmf X zlib zstd"
-
-RDEPEND="
- dev-libs/libltdl
- bzip2? ( app-arch/bzip2 )
- fpx? ( media-libs/libfpx )
- heif? ( media-libs/libheif:= )
- imagemagick? ( !media-gfx/imagemagick )
- jbig? ( media-libs/jbigkit )
- jpeg? ( media-libs/libjpeg-turbo:= )
- jpegxl? ( media-libs/libjxl:= )
- lcms? ( media-libs/lcms:2 )
- lzma? ( app-arch/xz-utils )
- perl? ( dev-lang/perl:= )
- png? ( media-libs/libpng:= )
- postscript? ( app-text/ghostscript-gpl )
- svg? ( dev-libs/libxml2 )
- tcmalloc? ( dev-util/google-perftools:= )
- tiff? ( media-libs/tiff:= )
- truetype? (
- media-fonts/urw-fonts
- >=media-libs/freetype-2
- )
- webp? ( media-libs/libwebp:= )
- wmf? ( media-libs/libwmf )
- X? (
- x11-libs/libSM
- x11-libs/libX11
- x11-libs/libXext
- )
- zlib? ( sys-libs/zlib )
- zstd? ( app-arch/zstd:= )
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.3.36-flags.patch
- "${FILESDIR}"/${PN}-1.3.19-perl.patch
-)
-
-pkg_pretend() {
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-src_prepare() {
- default
-
- eautoreconf
-}
-
-src_configure() {
- local depth=8
-
- use q16 && depth=16
- use q32 && depth=32
-
- local myeconfargs=(
- --enable-largefile
- --enable-shared
- $(use_enable static-libs static)
- $(use_enable debug prof)
- $(use_enable debug gcov)
- $(use_enable imagemagick magick-compat)
- $(use_enable openmp)
- --with-threads
- $(use_with dynamic-loading modules)
- --with-quantum-depth=${depth}
- --without-frozenpaths
- $(use_with cxx magick-plus-plus)
- $(use_with heif)
- $(use_with jpegxl jxl)
- $(use_with perl)
- --with-perl-options=INSTALLDIRS=vendor
- $(use_with bzip2 bzlib)
- $(use_with postscript dps)
- $(use_with fpx)
- $(use_with jbig)
- $(use_with webp)
- $(use_with jpeg)
- # Needs last-rited/unpackaged jasper
- --without-jp2
- $(use_with lcms lcms2)
- $(use_with lzma)
- $(use_with png)
- $(use_with tcmalloc)
- $(use_with tiff)
- --without-trio
- $(use_with truetype ttf)
- $(use_with wmf)
- --with-fontpath="${EPREFIX}"/usr/share/fonts
- --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
- --with-windows-font-dir="${EPREFIX}"/usr/share/fonts/corefonts
- $(use_with svg xml)
- $(use_with zlib)
- $(use_with zstd)
- $(use_with X x)
- )
-
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- default
-
- use perl && emake perl-build
-}
-
-src_test() {
- unset DISPLAY # some perl tests fail when DISPLAY is set
-
- default
-}
-
-src_install() {
- default
-
- if use perl ; then
- emake -C PerlMagick DESTDIR="${D}" install
-
- find "${ED}" -type f -name perllocal.pod -exec rm -f {} + || die
- find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} + || die
- fi
-
- find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + || die
-}
^ permalink raw reply related [flat|nested] 10+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/graphicsmagick/files/, media-gfx/graphicsmagick/
@ 2022-02-20 5:51 Sam James
0 siblings, 0 replies; 10+ messages in thread
From: Sam James @ 2022-02-20 5:51 UTC (permalink / raw
To: gentoo-commits
commit: 32fe5498447350c6a92de7bfa04a743bbfb6e5e8
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 20 05:40:18 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Feb 20 05:40:18 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32fe5498
media-gfx/graphicsmagick: drop 1.3.36
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-gfx/graphicsmagick/Manifest | 1 -
.../files/graphicsmagick-1.3.36-bzip-no-zlib.patch | 24 ----
.../graphicsmagick/graphicsmagick-1.3.36.ebuild | 133 ---------------------
3 files changed, 158 deletions(-)
diff --git a/media-gfx/graphicsmagick/Manifest b/media-gfx/graphicsmagick/Manifest
index 559dac8e96a3..4a582fed0167 100644
--- a/media-gfx/graphicsmagick/Manifest
+++ b/media-gfx/graphicsmagick/Manifest
@@ -1,2 +1 @@
-DIST GraphicsMagick-1.3.36.tar.xz 5600712 BLAKE2B 069ab4f9bb5beea3321860bf8e43c8a1b51ab102054e92486375209a86fd3c1c1fb44d4b2c43a65c78f36e9f37e09316fe77b4f261bfb0af3b2c2a86ff8b5aa5 SHA512 27ed5fcbfb0303436bdcb0f11d18257a967d471251b51e633e2c655b0a7e5ed01f61a61f9702cc7d4c02714e005ac18ca9ba0f690c0580e41d07947a03c5cbb4
DIST GraphicsMagick-1.3.37.tar.xz 5623688 BLAKE2B d6d5c8a07ec2aa2e60399887fa788751104c6917af295bb5a7bb1281d4a547462dd76cdde98f09cc00322bc3d7c89258dcd9d50506cfcec47a606efd90163b2a SHA512 971e05480a65eb99ff3c0d874675bcbffc24eafec1cacd03f5ef410ae014f82329f3590393100927f753feb183be1105fe0cfc5b0f775a30b0e6dc0c6b8a77af
diff --git a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.36-bzip-no-zlib.patch b/media-gfx/graphicsmagick/files/graphicsmagick-1.3.36-bzip-no-zlib.patch
deleted file mode 100644
index 5a78527b2286..000000000000
--- a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.36-bzip-no-zlib.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-http://hg.code.sf.net/p/graphicsmagick/code//rev/d9ec69e25e9e
-
-Sent upstream.
-
-# User Sam James <sam@gentoo.org>
-# Date 1631846586 -3600
-# Fri Sep 17 03:43:06 2021 +0100
-magick/blob.c: Fix build with bzip2 enabled and zlib disabled
-
-Seems to be a typo.
-
-Bug: https://bugs.gentoo.org/641164
-
---- a/magick/blob.c
-+++ b/magick/blob.c
-@@ -5040,7 +5040,7 @@ MagickExport size_t WriteBlob(Image *ima
- else
- amount=(int) remaining;
-
-- bz_count=BZ2_bzwrite(blob->handle.gz,
-+ bz_count=BZ2_bzwrite(blob->handle.bz,
- (void *) ((unsigned char *) data+i),amount);
- if (bz_count <= 0)
- break;
diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.36.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.36.ebuild
deleted file mode 100644
index 45f73976f1ad..000000000000
--- a/media-gfx/graphicsmagick/graphicsmagick-1.3.36.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools toolchain-funcs
-
-MY_P=${P/graphicsm/GraphicsM}
-DESCRIPTION="Collection of tools and libraries for many image formats"
-HOMEPAGE="http://www.graphicsmagick.org/ http://hg.code.sf.net/p/graphicsmagick/code/"
-LICENSE="MIT"
-SLOT="0/${PV%.*}"
-
-if [[ ${PV} == "9999" ]] ; then
- inherit mercurial
- EHG_REPO_URI="http://hg.code.sf.net/p/${PN}/code"
-else
- SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
- S="${WORKDIR}/${MY_P}"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-fi
-
-IUSE="bzip2 +cxx debug dynamic-loading fpx imagemagick jbig jpeg lcms lzma
- openmp perl png postscript q16 q32 static-libs svg threads tiff truetype
- webp wmf X zlib"
-
-RDEPEND="
- dev-libs/libltdl:0
- bzip2? ( app-arch/bzip2 )
- fpx? ( media-libs/libfpx )
- imagemagick? ( !media-gfx/imagemagick )
- jbig? ( media-libs/jbigkit )
- jpeg? ( virtual/jpeg:0 )
- lcms? ( media-libs/lcms:2 )
- lzma? ( app-arch/xz-utils )
- perl? ( dev-lang/perl:= )
- png? ( media-libs/libpng:0= )
- postscript? ( app-text/ghostscript-gpl )
- svg? ( dev-libs/libxml2 )
- tiff? ( media-libs/tiff:0 )
- truetype? (
- media-fonts/urw-fonts
- >=media-libs/freetype-2
- )
- webp? ( media-libs/libwebp:= )
- wmf? ( media-libs/libwmf )
- X? (
- x11-libs/libSM
- x11-libs/libXext
- )
- zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.3.36-flags.patch
- "${FILESDIR}"/${PN}-1.3.19-perl.patch
- "${FILESDIR}"/${PN}-1.3.36-bzip-no-zlib.patch
-)
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- local depth=8
- use q16 && depth=16
- use q32 && depth=32
-
- local openmp=disable
- if use openmp && tc-has-openmp ; then
- openmp=enable
- fi
-
- local myeconfargs=(
- --${openmp}-openmp
- --enable-largefile
- --enable-shared
- $(use_enable static-libs static)
- $(use_enable debug prof)
- $(use_enable debug gcov)
- $(use_enable imagemagick magick-compat)
- $(use_with threads)
- $(use_with dynamic-loading modules)
- --with-quantum-depth=${depth}
- --without-frozenpaths
- $(use_with cxx magick-plus-plus)
- $(use_with perl)
- --with-perl-options=INSTALLDIRS=vendor
- $(use_with bzip2 bzlib)
- $(use_with postscript dps)
- $(use_with fpx)
- $(use_with jbig)
- $(use_with webp)
- $(use_with jpeg)
- --without-jp2
- $(use_with lcms lcms2)
- $(use_with lzma)
- $(use_with png)
- $(use_with tiff)
- $(use_with truetype ttf)
- $(use_with wmf)
- --with-fontpath="${EPREFIX}"/usr/share/fonts
- --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
- --with-windows-font-dir="${EPREFIX}"/usr/share/fonts/corefonts
- $(use_with svg xml)
- $(use_with zlib)
- $(use_with X x)
- )
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- default
- use perl && emake perl-build
-}
-
-src_test() {
- unset DISPLAY # some perl tests fail when DISPLAY is set
- default
-}
-
-src_install() {
- default
-
- if use perl ; then
- emake -C PerlMagick DESTDIR="${D}" install
- find "${ED}" -type f -name perllocal.pod -exec rm -f {} + || die
- find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} + || die
- fi
-
- find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + || die
-}
^ permalink raw reply related [flat|nested] 10+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/graphicsmagick/files/, media-gfx/graphicsmagick/
@ 2021-09-17 2:53 Sam James
0 siblings, 0 replies; 10+ messages in thread
From: Sam James @ 2021-09-17 2:53 UTC (permalink / raw
To: gentoo-commits
commit: 6db838d02c636a09a735bd787e4616fa9f496620
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 17 02:52:46 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Sep 17 02:52:46 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6db838d0
media-gfx/graphicsmagick: fix build with bzip2 enabled, zlib disabled
Submitted upstream.
Bug: https://bugs.gentoo.org/641164
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/graphicsmagick-1.3.36-bzip-no-zlib.patch | 22 ++++++++++++++++++++++
.../graphicsmagick/graphicsmagick-1.3.36.ebuild | 1 +
2 files changed, 23 insertions(+)
diff --git a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.36-bzip-no-zlib.patch b/media-gfx/graphicsmagick/files/graphicsmagick-1.3.36-bzip-no-zlib.patch
new file mode 100644
index 00000000000..142b4c0b013
--- /dev/null
+++ b/media-gfx/graphicsmagick/files/graphicsmagick-1.3.36-bzip-no-zlib.patch
@@ -0,0 +1,22 @@
+Sent upstream.
+
+# User Sam James <sam@gentoo.org>
+# Date 1631846586 -3600
+# Fri Sep 17 03:43:06 2021 +0100
+magick/blob.c: Fix build with bzip2 enabled and zlib disabled
+
+Seems to be a typo.
+
+Bug: https://bugs.gentoo.org/641164
+
+--- a/magick/blob.c
++++ b/magick/blob.c
+@@ -5040,7 +5040,7 @@ MagickExport size_t WriteBlob(Image *ima
+ else
+ amount=(int) remaining;
+
+- bz_count=BZ2_bzwrite(blob->handle.gz,
++ bz_count=BZ2_bzwrite(blob->handle.bz,
+ (void *) ((unsigned char *) data+i),amount);
+ if (bz_count <= 0)
+ break;
diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.36.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.36.ebuild
index 877d4026435..45f73976f1a 100644
--- a/media-gfx/graphicsmagick/graphicsmagick-1.3.36.ebuild
+++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.36.ebuild
@@ -54,6 +54,7 @@ DEPEND="${RDEPEND}"
PATCHES=(
"${FILESDIR}"/${PN}-1.3.36-flags.patch
"${FILESDIR}"/${PN}-1.3.19-perl.patch
+ "${FILESDIR}"/${PN}-1.3.36-bzip-no-zlib.patch
)
src_prepare() {
^ permalink raw reply related [flat|nested] 10+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/graphicsmagick/files/, media-gfx/graphicsmagick/
@ 2021-02-02 23:51 Sam James
0 siblings, 0 replies; 10+ messages in thread
From: Sam James @ 2021-02-02 23:51 UTC (permalink / raw
To: gentoo-commits
commit: 09861a1041e363349a46bc4572f984024dff755d
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 2 23:49:21 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Feb 2 23:49:21 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09861a10
media-gfx/graphicsmagick: cleanup old
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-gfx/graphicsmagick/Manifest | 1 -
.../files/graphicsmagick-1.3.19-flags.patch | 56 ---------
.../graphicsmagick-1.3.35-CVE-2020-12672.patch | 67 ----------
...smagick-1.3.35-oss-fuzz-20045-20318-21956.patch | 38 ------
.../graphicsmagick-1.3.35-oss-fuzz-23042.patch | 42 -------
.../graphicsmagick/graphicsmagick-1.3.35-r1.ebuild | 135 ---------------------
6 files changed, 339 deletions(-)
diff --git a/media-gfx/graphicsmagick/Manifest b/media-gfx/graphicsmagick/Manifest
index f43ed697a40..097ae8445d3 100644
--- a/media-gfx/graphicsmagick/Manifest
+++ b/media-gfx/graphicsmagick/Manifest
@@ -1,2 +1 @@
-DIST GraphicsMagick-1.3.35.tar.xz 5543224 BLAKE2B 8a284d85341c10939fdece5c565d5b881276afb9b4c5dfb2221b780a01b99f78ee62761722c372baf9155c63f7ef176b67310aeedcab0368f4f26f5b0150bcce SHA512 baae92089d52147ef961f93495abc8a9d8b1a963af61d87a650c1ab105d46816aa38c83f654edcb5a0e1b7f07ccc06eaeaa443b9bde3a63a0b9bfb45f3ae144c
DIST GraphicsMagick-1.3.36.tar.xz 5600712 BLAKE2B 069ab4f9bb5beea3321860bf8e43c8a1b51ab102054e92486375209a86fd3c1c1fb44d4b2c43a65c78f36e9f37e09316fe77b4f261bfb0af3b2c2a86ff8b5aa5 SHA512 27ed5fcbfb0303436bdcb0f11d18257a967d471251b51e633e2c655b0a7e5ed01f61a61f9702cc7d4c02714e005ac18ca9ba0f690c0580e41d07947a03c5cbb4
diff --git a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.19-flags.patch b/media-gfx/graphicsmagick/files/graphicsmagick-1.3.19-flags.patch
deleted file mode 100644
index 1ebef540033..00000000000
--- a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.19-flags.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-Fix various preprocessor, compiler, and linker flags added to config wrappers.
-Previously they would add build time flags to the files which is incorrect.
-
---- GraphicsMagick-1.3.19/configure.ac
-+++ GraphicsMagick-1.3.19/configure.ac
-@@ -346,6 +346,7 @@
-
- AC_OPENMP([C])
- CFLAGS="$OPENMP_CFLAGS $CFLAGS"
-+MAGICK_API_CFLAGS="$MAGICK_API_CFLAGS $OPENMP_CFLAGS"
- #CXXFLAGS="$OPENMP_CXXFLAGS $CXXFLAGS"
- #LDFLAGS="$LDFLAGS $OPENMP_CFLAGS"
- AC_SUBST(OPENMP_CFLAGS)
-@@ -3407,9 +3408,10 @@
- MAGICK_DEP_LIBS=`echo $MAGICK_DEP_LIBS | sed -e 's/ */ /g'`
- #LIBS=`echo $LIBS | sed -e 's/ */ /g'`
-
--MAGICK_API_CFLAGS=$CFLAGS
-+MAGICK_API_CFLAGS=`echo $MAGICK_API_CFLAGS | sed -e 's/ */ /g'`
- MAGICK_API_CPPFLAGS=`echo $MAGICK_API_CPPFLAGS | sed -e 's/ */ /g'`
--MAGICK_API_LDFLAGS="-L$LIB_DIR $LDFLAGS"
-+MAGICK_API_CXXFLAGS=""
-+MAGICK_API_LDFLAGS="-L$LIB_DIR"
- MAGICK_API_DEP_LIBS="$MAGICK_DEP_LIBS"
- MAGICK_API_LIBS="-lGraphicsMagick $MAGICK_API_DEP_LIBS"
-
-@@ -3440,6 +3442,7 @@
-
- AC_SUBST(MAGICK_API_CFLAGS)
- AC_SUBST(MAGICK_API_CPPFLAGS)
-+AC_SUBST(MAGICK_API_CXXFLAGS)
- AC_SUBST(MAGICK_API_PC_CPPFLAGS)
- AC_SUBST(MAGICK_API_LDFLAGS)
- AC_SUBST(MAGICK_API_LIBS)
---- GraphicsMagick-1.3.19/magick/GraphicsMagick-config.in
-+++ GraphicsMagick-1.3.19/magick/GraphicsMagick-config.in
-@@ -30,7 +30,7 @@
- echo @PACKAGE_VERSION@
- ;;
- --cflags)
-- echo '@CFLAGS@'
-+ echo '@MAGICK_API_CFLAGS@'
- ;;
- --cppflags)
- echo '@MAGICK_API_CPPFLAGS@'
---- GraphicsMagick-1.3.19/Magick++/bin/GraphicsMagick++-config.in
-+++ GraphicsMagick-1.3.19/Magick++/bin/GraphicsMagick++-config.in
-@@ -33,7 +33,7 @@
- echo '@MAGICK_API_CPPFLAGS@'
- ;;
- --cxxflags)
-- echo '@CXXFLAGS@'
-+ echo '@MAGICK_API_CXXFLAGS@'
- ;;
- --ldflags)
- echo '@MAGICK_API_LDFLAGS@'
diff --git a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.35-CVE-2020-12672.patch b/media-gfx/graphicsmagick/files/graphicsmagick-1.3.35-CVE-2020-12672.patch
deleted file mode 100644
index b314ea288e4..00000000000
--- a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.35-CVE-2020-12672.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-diff -r 4917a4242fc0 -r 50395430a371 coders/png.c
---- a/coders/png.c Fri May 01 13:49:13 2020 -0500
-+++ b/coders/png.c Sat May 30 10:18:16 2020 -0500
-@@ -5304,7 +5304,7 @@
- if (logging)
- (void) LogMagickEvent(CoderEvent,GetMagickModule(),
- "MAGN chunk (%lu bytes): "
-- "First_magnified_object_id=%u, Last_magnified_object_id=%u, "
-+ "First_magnified_object_id=%u, Las t_magnified_object_id=%u, "
- "MB=%u, ML=%u, MR=%u, MT=%u, MX=%u, MY=%u, "
- "X_method=%u, Y_method=%u",
- length,
-@@ -5679,6 +5679,8 @@
- /*
- If magnifying and a supported method is requested then
- magnify the image.
-+
-+ http://www.libpng.org/pub/mng/spec/mng-1.0-20010209-pdg.html#mng-MAGN
- */
- if (((mng_info->magn_methx > 0) && (mng_info->magn_methx <= 5)) &&
- ((mng_info->magn_methy > 0) && (mng_info->magn_methy <= 5)))
-@@ -5689,7 +5691,28 @@
-
- if (logging)
- (void) LogMagickEvent(CoderEvent,GetMagickModule(),
-- " Processing MNG MAGN chunk");
-+ " Processing MNG MAGN chunk: MB=%u, ML=%u,"
-+ " MR=%u, MT=%u, MX=%u, MY=%u,"
-+ " X_method=%u, Y_method=%u",
-+ mng_info->magn_mb,mng_info->magn_ml,
-+ mng_info->magn_mr,mng_info->magn_mt,
-+ mng_info->magn_mx,mng_info->magn_my,
-+ mng_info->magn_methx,
-+ mng_info->magn_methy);
-+
-+ /*
-+ If the image width is 1, then X magnification is done
-+ by simple pixel replication.
-+ */
-+ if (image->columns == 1)
-+ mng_info->magn_methx = 1;
-+
-+ /*
-+ If the image height is 1, then Y magnification is done
-+ by simple pixel replication.
-+ */
-+ if (image->rows == 1)
-+ mng_info->magn_methy = 1;
-
- if (mng_info->magn_methx == 1)
- {
-@@ -5734,12 +5757,10 @@
- Image
- *large_image;
-
-- int
-- yy;
--
- long
- m,
-- y;
-+ y,
-+ yy;
-
- register long
- x;
-
diff --git a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.35-oss-fuzz-20045-20318-21956.patch b/media-gfx/graphicsmagick/files/graphicsmagick-1.3.35-oss-fuzz-20045-20318-21956.patch
deleted file mode 100644
index c7921dd2e69..00000000000
--- a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.35-oss-fuzz-20045-20318-21956.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -r 50395430a371 -r 83b4d2b4b873 coders/wpg.c
---- a/coders/wpg.c Sat May 30 10:18:16 2020 -0500
-+++ b/coders/wpg.c Sat May 30 17:33:51 2020 -0500
-@@ -403,7 +403,7 @@
- x++; \
- if((long) x>=ldblk) \
- { \
-- if(InsertRow(BImgBuff,y,image,bpp)==MagickFail) RetVal=-6; \
-+ if(InsertRow(BImgBuff,y,image,bpp)==MagickFail) { RetVal=-6; goto unpack_wpg_raser_error; } \
- x=0; \
- y++; \
- if(y>=image->rows) break; \
-@@ -537,6 +537,7 @@
- }
- }
- }
-+unpack_wpg_raser_error:;
- MagickFreeMemory(BImgBuff);
- return(RetVal);
- }
-@@ -552,7 +553,7 @@
- x++; \
- if((long) x >= ldblk) \
- { \
-- if(InsertRow(BImgBuff,(long) y,image,bpp)==MagickFail) RetVal=-6; \
-+ if(InsertRow(BImgBuff,(long) y,image,bpp)==MagickFail) { RetVal=-6; goto unpack_wpg2_error; } \
- x=0; \
- y++; \
- XorMe = 0; \
-@@ -729,6 +730,7 @@
- }
- }
- }
-+unpack_wpg2_error:;
- FreeUnpackWPG2RasterAllocs(BImgBuff,UpImgBuff);
- return(RetVal);
- }
-
diff --git a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.35-oss-fuzz-23042.patch b/media-gfx/graphicsmagick/files/graphicsmagick-1.3.35-oss-fuzz-23042.patch
deleted file mode 100644
index 197a230a340..00000000000
--- a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.35-oss-fuzz-23042.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -r 24ed4812e580 -r b0aa53a5f970 coders/wpg.c
---- a/coders/wpg.c Tue Jun 02 07:45:45 2020 -0500
-+++ b/coders/wpg.c Sat Jun 06 14:12:18 2020 -0500
-@@ -413,9 +413,12 @@
-
- /** Call this function to ensure that all data matrix is filled with something. This function
- * is used only to error recovery. */
--static void ZeroFillMissingData(unsigned char *BImgBuff,unsigned long x, unsigned long y, Image *image,
-- int bpp, long ldblk)
-+static MagickPassFail ZeroFillMissingData(unsigned char *BImgBuff,unsigned long x, unsigned long y, Image *image,
-+ int bpp, long ldblk)
- {
-+ MagickPassFail
-+ status = MagickPass;
-+
- while(y<image->rows && image->exception.severity!=UndefinedException)
- {
- if((long) x<ldblk)
-@@ -427,9 +430,13 @@
- x = 0; /* Next pass will need to clear whole row */
- }
- if(InsertRow(BImgBuff,y,image,bpp) == MagickFail)
-- break;
-+ {
-+ status = MagickFail;
-+ break;
-+ }
- y++;
- }
-+ return status;
- }
-
-
-@@ -528,7 +535,6 @@
- }
- if(InsertRow(BImgBuff,y,image,bpp)==MagickFail)
- {
-- ZeroFillMissingData(BImgBuff,x,y,image,bpp,ldblk);
- MagickFreeMemory(BImgBuff);
- return(-6);
- }
-
diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.35-r1.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.35-r1.ebuild
deleted file mode 100644
index 2533e3b977e..00000000000
--- a/media-gfx/graphicsmagick/graphicsmagick-1.3.35-r1.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools toolchain-funcs
-
-MY_P=${P/graphicsm/GraphicsM}
-
-DESCRIPTION="Collection of tools and libraries for many image formats"
-HOMEPAGE="http://www.graphicsmagick.org/"
-LICENSE="MIT"
-SLOT="0/${PV%.*}"
-
-if [[ ${PV} == "9999" ]] ; then
- inherit mercurial
- EHG_REPO_URI="http://hg.code.sf.net/p/${PN}/code"
-else
- SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
- KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-fi
-
-IUSE="bzip2 +cxx debug dynamic-loading fpx imagemagick jbig jpeg lcms lzma
- openmp perl png postscript q16 q32 static-libs svg threads tiff truetype
- webp wmf X zlib"
-
-RDEPEND="dev-libs/libltdl:0
- bzip2? ( app-arch/bzip2 )
- fpx? ( media-libs/libfpx )
- imagemagick? ( !media-gfx/imagemagick )
- jbig? ( media-libs/jbigkit )
- jpeg? ( virtual/jpeg:0 )
- lcms? ( media-libs/lcms:2 )
- lzma? ( app-arch/xz-utils )
- perl? ( dev-lang/perl:= )
- png? ( media-libs/libpng:0= )
- postscript? ( app-text/ghostscript-gpl )
- svg? ( dev-libs/libxml2 )
- tiff? ( media-libs/tiff:0 )
- truetype? (
- media-fonts/urw-fonts
- >=media-libs/freetype-2
- )
- webp? ( media-libs/libwebp:= )
- wmf? ( media-libs/libwmf )
- X? (
- x11-libs/libSM
- x11-libs/libXext
- )
- zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.3.19-flags.patch
- "${FILESDIR}"/${PN}-1.3.19-perl.patch
- "${FILESDIR}"/${P}-CVE-2020-12672.patch
- "${FILESDIR}"/${P}-oss-fuzz-20045-20318-21956.patch
- "${FILESDIR}"/${P}-oss-fuzz-23042.patch
-)
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- local depth=8
- use q16 && depth=16
- use q32 && depth=32
-
- local openmp=disable
- if use openmp && tc-has-openmp; then
- openmp=enable
- fi
-
- local myeconfargs=(
- --${openmp}-openmp
- --enable-largefile
- --enable-shared
- $(use_enable static-libs static)
- $(use_enable debug prof)
- $(use_enable debug gcov)
- $(use_enable imagemagick magick-compat)
- $(use_with threads)
- $(use_with dynamic-loading modules)
- --with-quantum-depth=${depth}
- --without-frozenpaths
- $(use_with cxx magick-plus-plus)
- $(use_with perl)
- --with-perl-options=INSTALLDIRS=vendor
- $(use_with bzip2 bzlib)
- $(use_with postscript dps)
- $(use_with fpx)
- $(use_with jbig)
- $(use_with webp)
- $(use_with jpeg)
- --without-jp2
- $(use_with lcms lcms2)
- $(use_with lzma)
- $(use_with png)
- $(use_with tiff)
- $(use_with truetype ttf)
- $(use_with wmf)
- --with-fontpath="${EPREFIX}"/usr/share/fonts
- --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
- --with-windows-font-dir="${EPREFIX}"/usr/share/fonts/corefonts
- $(use_with svg xml)
- $(use_with zlib)
- $(use_with X x)
- )
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- default
- use perl && emake perl-build
-}
-
-src_test() {
- unset DISPLAY # some perl tests fail when DISPLAY is set
- default
-}
-
-src_install() {
- default
-
- if use perl; then
- emake -C PerlMagick DESTDIR="${D}" install
- find "${ED}" -type f -name perllocal.pod -exec rm -f {} + || die
- find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} + || die
- fi
-
- find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + || die
-}
^ permalink raw reply related [flat|nested] 10+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/graphicsmagick/files/, media-gfx/graphicsmagick/
@ 2020-06-17 1:29 Thomas Deutschmann
0 siblings, 0 replies; 10+ messages in thread
From: Thomas Deutschmann @ 2020-06-17 1:29 UTC (permalink / raw
To: gentoo-commits
commit: ba6698e39be1eeb5fb0c06a89e8dcf239b5a19f2
Author: Sam James (sam_c) <sam <AT> cmpct <DOT> info>
AuthorDate: Mon Jun 8 07:40:04 2020 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Jun 17 01:26:26 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba6698e3
media-gfx/graphicsmagick: Security bump
Patches the following:
- CVE-2020-12672
* oss-fuzz
** 20045
** 20318
** 21956
** 23042
Bug: https://bugs.gentoo.org/721328
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Sam James (sam_c) <sam <AT> cmpct.info>
Closes: https://github.com/gentoo/gentoo/pull/16126
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
.../graphicsmagick-1.3.35-CVE-2020-12672.patch | 67 ++++++++++
...smagick-1.3.35-oss-fuzz-20045-20318-21956.patch | 38 ++++++
.../graphicsmagick-1.3.35-oss-fuzz-23042.patch | 42 +++++++
.../graphicsmagick/graphicsmagick-1.3.35-r1.ebuild | 135 +++++++++++++++++++++
4 files changed, 282 insertions(+)
diff --git a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.35-CVE-2020-12672.patch b/media-gfx/graphicsmagick/files/graphicsmagick-1.3.35-CVE-2020-12672.patch
new file mode 100644
index 00000000000..b314ea288e4
--- /dev/null
+++ b/media-gfx/graphicsmagick/files/graphicsmagick-1.3.35-CVE-2020-12672.patch
@@ -0,0 +1,67 @@
+diff -r 4917a4242fc0 -r 50395430a371 coders/png.c
+--- a/coders/png.c Fri May 01 13:49:13 2020 -0500
++++ b/coders/png.c Sat May 30 10:18:16 2020 -0500
+@@ -5304,7 +5304,7 @@
+ if (logging)
+ (void) LogMagickEvent(CoderEvent,GetMagickModule(),
+ "MAGN chunk (%lu bytes): "
+- "First_magnified_object_id=%u, Last_magnified_object_id=%u, "
++ "First_magnified_object_id=%u, Las t_magnified_object_id=%u, "
+ "MB=%u, ML=%u, MR=%u, MT=%u, MX=%u, MY=%u, "
+ "X_method=%u, Y_method=%u",
+ length,
+@@ -5679,6 +5679,8 @@
+ /*
+ If magnifying and a supported method is requested then
+ magnify the image.
++
++ http://www.libpng.org/pub/mng/spec/mng-1.0-20010209-pdg.html#mng-MAGN
+ */
+ if (((mng_info->magn_methx > 0) && (mng_info->magn_methx <= 5)) &&
+ ((mng_info->magn_methy > 0) && (mng_info->magn_methy <= 5)))
+@@ -5689,7 +5691,28 @@
+
+ if (logging)
+ (void) LogMagickEvent(CoderEvent,GetMagickModule(),
+- " Processing MNG MAGN chunk");
++ " Processing MNG MAGN chunk: MB=%u, ML=%u,"
++ " MR=%u, MT=%u, MX=%u, MY=%u,"
++ " X_method=%u, Y_method=%u",
++ mng_info->magn_mb,mng_info->magn_ml,
++ mng_info->magn_mr,mng_info->magn_mt,
++ mng_info->magn_mx,mng_info->magn_my,
++ mng_info->magn_methx,
++ mng_info->magn_methy);
++
++ /*
++ If the image width is 1, then X magnification is done
++ by simple pixel replication.
++ */
++ if (image->columns == 1)
++ mng_info->magn_methx = 1;
++
++ /*
++ If the image height is 1, then Y magnification is done
++ by simple pixel replication.
++ */
++ if (image->rows == 1)
++ mng_info->magn_methy = 1;
+
+ if (mng_info->magn_methx == 1)
+ {
+@@ -5734,12 +5757,10 @@
+ Image
+ *large_image;
+
+- int
+- yy;
+-
+ long
+ m,
+- y;
++ y,
++ yy;
+
+ register long
+ x;
+
diff --git a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.35-oss-fuzz-20045-20318-21956.patch b/media-gfx/graphicsmagick/files/graphicsmagick-1.3.35-oss-fuzz-20045-20318-21956.patch
new file mode 100644
index 00000000000..c7921dd2e69
--- /dev/null
+++ b/media-gfx/graphicsmagick/files/graphicsmagick-1.3.35-oss-fuzz-20045-20318-21956.patch
@@ -0,0 +1,38 @@
+diff -r 50395430a371 -r 83b4d2b4b873 coders/wpg.c
+--- a/coders/wpg.c Sat May 30 10:18:16 2020 -0500
++++ b/coders/wpg.c Sat May 30 17:33:51 2020 -0500
+@@ -403,7 +403,7 @@
+ x++; \
+ if((long) x>=ldblk) \
+ { \
+- if(InsertRow(BImgBuff,y,image,bpp)==MagickFail) RetVal=-6; \
++ if(InsertRow(BImgBuff,y,image,bpp)==MagickFail) { RetVal=-6; goto unpack_wpg_raser_error; } \
+ x=0; \
+ y++; \
+ if(y>=image->rows) break; \
+@@ -537,6 +537,7 @@
+ }
+ }
+ }
++unpack_wpg_raser_error:;
+ MagickFreeMemory(BImgBuff);
+ return(RetVal);
+ }
+@@ -552,7 +553,7 @@
+ x++; \
+ if((long) x >= ldblk) \
+ { \
+- if(InsertRow(BImgBuff,(long) y,image,bpp)==MagickFail) RetVal=-6; \
++ if(InsertRow(BImgBuff,(long) y,image,bpp)==MagickFail) { RetVal=-6; goto unpack_wpg2_error; } \
+ x=0; \
+ y++; \
+ XorMe = 0; \
+@@ -729,6 +730,7 @@
+ }
+ }
+ }
++unpack_wpg2_error:;
+ FreeUnpackWPG2RasterAllocs(BImgBuff,UpImgBuff);
+ return(RetVal);
+ }
+
diff --git a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.35-oss-fuzz-23042.patch b/media-gfx/graphicsmagick/files/graphicsmagick-1.3.35-oss-fuzz-23042.patch
new file mode 100644
index 00000000000..197a230a340
--- /dev/null
+++ b/media-gfx/graphicsmagick/files/graphicsmagick-1.3.35-oss-fuzz-23042.patch
@@ -0,0 +1,42 @@
+diff -r 24ed4812e580 -r b0aa53a5f970 coders/wpg.c
+--- a/coders/wpg.c Tue Jun 02 07:45:45 2020 -0500
++++ b/coders/wpg.c Sat Jun 06 14:12:18 2020 -0500
+@@ -413,9 +413,12 @@
+
+ /** Call this function to ensure that all data matrix is filled with something. This function
+ * is used only to error recovery. */
+-static void ZeroFillMissingData(unsigned char *BImgBuff,unsigned long x, unsigned long y, Image *image,
+- int bpp, long ldblk)
++static MagickPassFail ZeroFillMissingData(unsigned char *BImgBuff,unsigned long x, unsigned long y, Image *image,
++ int bpp, long ldblk)
+ {
++ MagickPassFail
++ status = MagickPass;
++
+ while(y<image->rows && image->exception.severity!=UndefinedException)
+ {
+ if((long) x<ldblk)
+@@ -427,9 +430,13 @@
+ x = 0; /* Next pass will need to clear whole row */
+ }
+ if(InsertRow(BImgBuff,y,image,bpp) == MagickFail)
+- break;
++ {
++ status = MagickFail;
++ break;
++ }
+ y++;
+ }
++ return status;
+ }
+
+
+@@ -528,7 +535,6 @@
+ }
+ if(InsertRow(BImgBuff,y,image,bpp)==MagickFail)
+ {
+- ZeroFillMissingData(BImgBuff,x,y,image,bpp,ldblk);
+ MagickFreeMemory(BImgBuff);
+ return(-6);
+ }
+
diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.35-r1.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.35-r1.ebuild
new file mode 100644
index 00000000000..46738d53d25
--- /dev/null
+++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.35-r1.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools toolchain-funcs
+
+MY_P=${P/graphicsm/GraphicsM}
+
+DESCRIPTION="Collection of tools and libraries for many image formats"
+HOMEPAGE="http://www.graphicsmagick.org/"
+LICENSE="MIT"
+SLOT="0/${PV%.*}"
+
+if [[ ${PV} == "9999" ]] ; then
+ inherit mercurial
+ EHG_REPO_URI="http://hg.code.sf.net/p/${PN}/code"
+else
+ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+fi
+
+IUSE="bzip2 +cxx debug fpx imagemagick jbig jpeg lcms lzma modules openmp
+ perl png postscript q16 q32 static-libs svg threads tiff truetype
+ webp wmf X zlib"
+
+RDEPEND="dev-libs/libltdl:0
+ bzip2? ( app-arch/bzip2 )
+ fpx? ( media-libs/libfpx )
+ imagemagick? ( !media-gfx/imagemagick )
+ jbig? ( media-libs/jbigkit )
+ jpeg? ( virtual/jpeg:0 )
+ lcms? ( media-libs/lcms:2 )
+ lzma? ( app-arch/xz-utils )
+ perl? ( dev-lang/perl:= )
+ png? ( media-libs/libpng:0= )
+ postscript? ( app-text/ghostscript-gpl )
+ svg? ( dev-libs/libxml2 )
+ tiff? ( media-libs/tiff:0 )
+ truetype? (
+ media-fonts/urw-fonts
+ >=media-libs/freetype-2
+ )
+ webp? ( media-libs/libwebp:= )
+ wmf? ( media-libs/libwmf )
+ X? (
+ x11-libs/libSM
+ x11-libs/libXext
+ )
+ zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.3.19-flags.patch
+ "${FILESDIR}"/${PN}-1.3.19-perl.patch
+ "${FILESDIR}"/${P}-CVE-2020-12672.patch
+ "${FILESDIR}"/${P}-oss-fuzz-20045-20318-21956.patch
+ "${FILESDIR}"/${P}-oss-fuzz-23042.patch
+)
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ local depth=8
+ use q16 && depth=16
+ use q32 && depth=32
+
+ local openmp=disable
+ if use openmp && tc-has-openmp; then
+ openmp=enable
+ fi
+
+ local myeconfargs=(
+ --${openmp}-openmp
+ --enable-largefile
+ --enable-shared
+ $(use_enable static-libs static)
+ $(use_enable debug prof)
+ $(use_enable debug gcov)
+ $(use_enable imagemagick magick-compat)
+ $(use_with threads)
+ $(use_with modules)
+ --with-quantum-depth=${depth}
+ --without-frozenpaths
+ $(use_with cxx magick-plus-plus)
+ $(use_with perl)
+ --with-perl-options=INSTALLDIRS=vendor
+ $(use_with bzip2 bzlib)
+ $(use_with postscript dps)
+ $(use_with fpx)
+ $(use_with jbig)
+ $(use_with webp)
+ $(use_with jpeg)
+ --without-jp2
+ $(use_with lcms lcms2)
+ $(use_with lzma)
+ $(use_with png)
+ $(use_with tiff)
+ $(use_with truetype ttf)
+ $(use_with wmf)
+ --with-fontpath="${EPREFIX}"/usr/share/fonts
+ --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
+ --with-windows-font-dir="${EPREFIX}"/usr/share/fonts/corefonts
+ $(use_with svg xml)
+ $(use_with zlib)
+ $(use_with X x)
+ )
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ default
+ use perl && emake perl-build
+}
+
+src_test() {
+ unset DISPLAY # some perl tests fail when DISPLAY is set
+ default
+}
+
+src_install() {
+ default
+
+ if use perl; then
+ emake -C PerlMagick DESTDIR="${D}" install
+ find "${ED}" -type f -name perllocal.pod -exec rm -f {} + || die
+ find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} + || die
+ fi
+
+ find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + || die
+}
^ permalink raw reply related [flat|nested] 10+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/graphicsmagick/files/, media-gfx/graphicsmagick/
@ 2018-12-22 22:43 Andreas K. Hüttel
0 siblings, 0 replies; 10+ messages in thread
From: Andreas K. Hüttel @ 2018-12-22 22:43 UTC (permalink / raw
To: gentoo-commits
commit: 2dc1aecf0b3f1b664a8dd376cd8cfe8778a912f0
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 22 22:42:30 2018 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Dec 22 22:42:51 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2dc1aecf
media-gfx/graphicsmagick: Drop old versions
Drop old versions which make trouble with Perl 5.26 and later
Closes: https://bugs.gentoo.org/629256
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
media-gfx/graphicsmagick/Manifest | 2 -
.../graphicsmagick-1.3.27-version.sh-fix.patch | 11 --
.../graphicsmagick/graphicsmagick-1.3.27.ebuild | 135 --------------------
.../graphicsmagick/graphicsmagick-1.3.28.ebuild | 136 ---------------------
4 files changed, 284 deletions(-)
diff --git a/media-gfx/graphicsmagick/Manifest b/media-gfx/graphicsmagick/Manifest
index 7bb7147cb4d..d438b766308 100644
--- a/media-gfx/graphicsmagick/Manifest
+++ b/media-gfx/graphicsmagick/Manifest
@@ -1,3 +1 @@
-DIST GraphicsMagick-1.3.27.tar.xz 5412544 BLAKE2B 130ce964f3745f4a9f3b54180529fb45afb4ecc63ecb88f626fa4dd2c6fb54675ff9b5b79527dc89d375cad5c4f1136063e612d91cc9d69b0c330c32c786fd96 SHA512 27c2fccebe1ae079040986979405f9840ad39f773e2e0399712695146ec1b0f92a53533e6052df124f5db38aacc95bbd4b2e8692e81c92dade4e169ddfcc9b8c
-DIST GraphicsMagick-1.3.28.tar.xz 5416660 BLAKE2B 874e1e2669db46c458b0e7aa68b24efa07249145b4dd3e1ff2802ec07ad7ea70e4484d0ffcc255454adf4b2be72d6e19f4352db65e22def6e12dfde4cf5987f8 SHA512 c372212e54e6403a44a973113764bf1fee6dde5df08a6ee015ae03c32823f96316018cafd34a355ff8a35ad3581aa7d455d30d664b9d68d3ea2ad277d7cf45e6
DIST GraphicsMagick-1.3.30.tar.xz 5496116 BLAKE2B 408f68334b290ae30d06e4b0efa6e11e89ffa9c00781e2f0ceb25cd6fc308f1be86b5ed9bd52f594e1abd3351f1b7dbfb12e87117ba85f4b4c01d07d7480772a SHA512 4f04245b8abef85de96a1527ad4adc1fadea144a1917db3ea21632a9fe732bdaa7021ffdbbeb7c2ead814ca7b6a14e81bb68a962bbfb64fa6809a235f1b0be5c
diff --git a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.27-version.sh-fix.patch b/media-gfx/graphicsmagick/files/graphicsmagick-1.3.27-version.sh-fix.patch
deleted file mode 100644
index e21b8e7de7e..00000000000
--- a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.27-version.sh-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/version.sh
-+++ b/version.sh
-@@ -27,7 +27,7 @@ PACKAGE_STRING="$PACKAGE_NAME $PACKAGE_VERSION"
- #
- # Formal Package release date
- # Set to string "unreleased" if package is not a formal release.
--PACKAGE_RELEASE_DATE="2017-12-09
-+PACKAGE_RELEASE_DATE="2017-12-09"
- #PACKAGE_RELEASE_DATE="unreleased"
-
- #
diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.27.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.27.ebuild
deleted file mode 100644
index ea52ca5e1e5..00000000000
--- a/media-gfx/graphicsmagick/graphicsmagick-1.3.27.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools toolchain-funcs
-
-MY_P=${P/graphicsm/GraphicsM}
-
-DESCRIPTION="Collection of tools and libraries for many image formats"
-HOMEPAGE="http://www.graphicsmagick.org/"
-LICENSE="MIT"
-SLOT="0/${PV%.*}"
-
-if [[ ${PV} == "9999" ]] ; then
- inherit mercurial
- EHG_REPO_URI="http://hg.code.sf.net/p/${PN}/code"
-else
- SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
- KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
-fi
-
-IUSE="bzip2 cxx debug fpx imagemagick jbig jpeg jpeg2k lcms lzma modules openmp
- perl png postscript q16 q32 static-libs svg test threads tiff truetype
- webp wmf X zlib"
-
-RDEPEND="dev-libs/libltdl:0
- bzip2? ( app-arch/bzip2 )
- fpx? ( media-libs/libfpx )
- imagemagick? ( !media-gfx/imagemagick )
- jbig? ( media-libs/jbigkit )
- jpeg? ( virtual/jpeg:0 )
- jpeg2k? ( media-libs/jasper:= )
- lcms? ( media-libs/lcms:2 )
- lzma? ( app-arch/xz-utils )
- perl? ( dev-lang/perl )
- png? ( media-libs/libpng:0 )
- postscript? ( app-text/ghostscript-gpl )
- svg? ( dev-libs/libxml2 )
- tiff? ( media-libs/tiff:0 )
- truetype? (
- media-fonts/urw-fonts
- >=media-libs/freetype-2
- )
- webp? ( media-libs/libwebp:= )
- wmf? ( media-libs/libwmf )
- X? (
- x11-libs/libSM
- x11-libs/libXext
- )
- zlib? ( sys-libs/zlib )"
-# corefonts are required because needed arial font (bug #588398).
-DEPEND="${RDEPEND}
- test? ( media-fonts/corefonts )"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.3.19-flags.patch
- "${FILESDIR}"/${PN}-1.3.19-perl.patch
- "${FILESDIR}"/${PN}-1.3.27-version.sh-fix.patch
-)
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- local depth=8
- use q16 && depth=16
- use q32 && depth=32
-
- local openmp=disable
- if use openmp && tc-has-openmp; then
- openmp=enable
- fi
-
- econf \
- --${openmp}-openmp \
- --enable-largefile \
- --enable-shared \
- $(use_enable static-libs static) \
- $(use_enable debug prof) \
- $(use_enable debug gcov) \
- $(use_enable imagemagick magick-compat) \
- $(use_with threads) \
- $(use_with modules) \
- --with-quantum-depth=${depth} \
- --without-frozenpaths \
- $(use_with cxx magick-plus-plus) \
- $(use_with perl) \
- --with-perl-options=INSTALLDIRS=vendor \
- $(use_with bzip2 bzlib) \
- $(use_with postscript dps) \
- $(use_with fpx) \
- --without-gslib \
- $(use_with jbig) \
- $(use_with webp) \
- $(use_with jpeg) \
- $(use_with jpeg2k jp2) \
- $(use_with lcms lcms2) \
- $(use_with lzma) \
- $(use_with png) \
- $(use_with tiff) \
- $(use_with truetype ttf) \
- $(use_with wmf) \
- --with-fontpath="${EPREFIX}"/usr/share/fonts \
- --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts \
- --with-windows-font-dir="${EPREFIX}"/usr/share/fonts/corefonts \
- $(use_with svg xml) \
- $(use_with zlib) \
- $(use_with X x)
-}
-
-src_compile() {
- default
- use perl && emake perl-build
-}
-
-src_test() {
- unset DISPLAY # some perl tests fail when DISPLAY is set
- default
-}
-
-src_install() {
- default
-
- if use perl; then
- emake -C PerlMagick DESTDIR="${D}" install
- find "${ED}" -type f -name perllocal.pod -exec rm -f {} + || die
- find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} + || die
- fi
-
- find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + || die
-}
diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.28.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.28.ebuild
deleted file mode 100644
index c5f11fb693d..00000000000
--- a/media-gfx/graphicsmagick/graphicsmagick-1.3.28.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools toolchain-funcs
-
-MY_P=${P/graphicsm/GraphicsM}
-
-DESCRIPTION="Collection of tools and libraries for many image formats"
-HOMEPAGE="http://www.graphicsmagick.org/"
-LICENSE="MIT"
-SLOT="0/${PV%.*}"
-
-if [[ ${PV} == "9999" ]] ; then
- inherit mercurial
- EHG_REPO_URI="http://hg.code.sf.net/p/${PN}/code"
-else
- SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
- KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
-fi
-
-IUSE="bzip2 cxx debug fpx imagemagick jbig jpeg jpeg2k lcms lzma modules openmp
- perl png postscript q16 q32 static-libs svg test threads tiff truetype
- webp wmf X zlib"
-
-RDEPEND="dev-libs/libltdl:0
- bzip2? ( app-arch/bzip2 )
- fpx? ( media-libs/libfpx )
- imagemagick? ( !media-gfx/imagemagick )
- jbig? ( media-libs/jbigkit )
- jpeg? ( virtual/jpeg:0 )
- jpeg2k? ( media-libs/jasper:= )
- lcms? ( media-libs/lcms:2 )
- lzma? ( app-arch/xz-utils )
- perl? ( dev-lang/perl )
- png? ( media-libs/libpng:0 )
- postscript? ( app-text/ghostscript-gpl )
- svg? ( dev-libs/libxml2 )
- tiff? ( media-libs/tiff:0 )
- truetype? (
- media-fonts/urw-fonts
- >=media-libs/freetype-2
- )
- webp? ( media-libs/libwebp:= )
- wmf? ( media-libs/libwmf )
- X? (
- x11-libs/libSM
- x11-libs/libXext
- )
- zlib? ( sys-libs/zlib )"
-# corefonts are required because needed arial font (bug #588398).
-DEPEND="${RDEPEND}
- test? ( media-fonts/corefonts )"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.3.19-flags.patch
- "${FILESDIR}"/${PN}-1.3.19-perl.patch
-)
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- local depth=8
- use q16 && depth=16
- use q32 && depth=32
-
- local openmp=disable
- if use openmp && tc-has-openmp; then
- openmp=enable
- fi
-
- local myeconfargs=(
- --${openmp}-openmp
- --enable-largefile
- --enable-shared
- $(use_enable static-libs static)
- $(use_enable debug prof)
- $(use_enable debug gcov)
- $(use_enable imagemagick magick-compat)
- $(use_with threads)
- $(use_with modules)
- --with-quantum-depth=${depth}
- --without-frozenpaths
- $(use_with cxx magick-plus-plus)
- $(use_with perl)
- --with-perl-options=INSTALLDIRS=vendor
- $(use_with bzip2 bzlib)
- $(use_with postscript dps)
- $(use_with fpx)
- --without-gslib
- $(use_with jbig)
- $(use_with webp)
- $(use_with jpeg)
- $(use_with jpeg2k jp2)
- $(use_with lcms lcms2)
- $(use_with lzma)
- $(use_with png)
- $(use_with tiff)
- $(use_with truetype ttf)
- $(use_with wmf)
- --with-fontpath="${EPREFIX}"/usr/share/fonts
- --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
- --with-windows-font-dir="${EPREFIX}"/usr/share/fonts/corefonts
- $(use_with svg xml)
- $(use_with zlib)
- $(use_with X x)
- )
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- default
- use perl && emake perl-build
-}
-
-src_test() {
- unset DISPLAY # some perl tests fail when DISPLAY is set
- default
-}
-
-src_install() {
- default
-
- if use perl; then
- emake -C PerlMagick DESTDIR="${D}" install
- find "${ED}" -type f -name perllocal.pod -exec rm -f {} + || die
- find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} + || die
- fi
-
- find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + || die
-}
^ permalink raw reply related [flat|nested] 10+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/graphicsmagick/files/, media-gfx/graphicsmagick/
@ 2017-12-11 13:09 Thomas Deutschmann
0 siblings, 0 replies; 10+ messages in thread
From: Thomas Deutschmann @ 2017-12-11 13:09 UTC (permalink / raw
To: gentoo-commits
commit: c28283a0a2606ea8cae074dac39c473a1fa5e994
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 11 13:08:25 2017 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Dec 11 13:09:07 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c28283a0
media-gfx/graphicsmagick: Bump v1.3.27
Package-Manager: Portage-2.3.16, Repoman-2.3.6
media-gfx/graphicsmagick/Manifest | 1 +
.../graphicsmagick-1.3.27-version.sh-fix.patch | 11 ++
.../graphicsmagick/graphicsmagick-1.3.27.ebuild | 135 +++++++++++++++++++++
3 files changed, 147 insertions(+)
diff --git a/media-gfx/graphicsmagick/Manifest b/media-gfx/graphicsmagick/Manifest
index ae9afd1ef7c..1e7131300e9 100644
--- a/media-gfx/graphicsmagick/Manifest
+++ b/media-gfx/graphicsmagick/Manifest
@@ -1,2 +1,3 @@
DIST GraphicsMagick-1.3.25.tar.xz 5387880 BLAKE2B dbde32a869bde374cd453569fbc4b7b2bf54fdb8dc07fa40e83b92b788771797f7b4a529fc8b7ae439482e4e456ac9f947c8f47ac83000bdaf4d4079f4ea5e83 SHA512 d62d6aee96d7b8444f1aa206b0c5cbbed9511612cb71d667af072ea52b68dcd11088699debc58faacbb014ad83fb8c2b3e474220f506069f7b5d22f0340f8ef8
DIST GraphicsMagick-1.3.26.tar.xz 5400564 BLAKE2B bd7c5286f4ff0abe8fafee680f9bea5e96c23d1787b5dc5b1a33580b5b8fd2dc8c5932606e0c8f2d783c377104232e8efb6be83ea10e0105c83e9d1925314e0b SHA512 b33ca0f1c858428693aee27a9089acff9e63d1110f85fa036894cfefe6274e7b2422758ea39852f94fdb4823c9c3f3c44b0d8906627503301f5928096f739f22
+DIST GraphicsMagick-1.3.27.tar.xz 5412544 BLAKE2B 130ce964f3745f4a9f3b54180529fb45afb4ecc63ecb88f626fa4dd2c6fb54675ff9b5b79527dc89d375cad5c4f1136063e612d91cc9d69b0c330c32c786fd96 SHA512 27c2fccebe1ae079040986979405f9840ad39f773e2e0399712695146ec1b0f92a53533e6052df124f5db38aacc95bbd4b2e8692e81c92dade4e169ddfcc9b8c
diff --git a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.27-version.sh-fix.patch b/media-gfx/graphicsmagick/files/graphicsmagick-1.3.27-version.sh-fix.patch
new file mode 100644
index 00000000000..e21b8e7de7e
--- /dev/null
+++ b/media-gfx/graphicsmagick/files/graphicsmagick-1.3.27-version.sh-fix.patch
@@ -0,0 +1,11 @@
+--- a/version.sh
++++ b/version.sh
+@@ -27,7 +27,7 @@ PACKAGE_STRING="$PACKAGE_NAME $PACKAGE_VERSION"
+ #
+ # Formal Package release date
+ # Set to string "unreleased" if package is not a formal release.
+-PACKAGE_RELEASE_DATE="2017-12-09
++PACKAGE_RELEASE_DATE="2017-12-09"
+ #PACKAGE_RELEASE_DATE="unreleased"
+
+ #
diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.27.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.27.ebuild
new file mode 100644
index 00000000000..1c2940db9ea
--- /dev/null
+++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.27.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools toolchain-funcs
+
+MY_P=${P/graphicsm/GraphicsM}
+
+DESCRIPTION="Collection of tools and libraries for many image formats"
+HOMEPAGE="http://www.graphicsmagick.org/"
+LICENSE="MIT"
+SLOT="0/${PV%.*}"
+
+if [[ ${PV} == "9999" ]] ; then
+ inherit mercurial
+ EHG_REPO_URI="http://hg.code.sf.net/p/${PN}/code"
+else
+ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
+ KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+fi
+
+IUSE="bzip2 cxx debug fpx imagemagick jbig jpeg jpeg2k lcms lzma modules openmp
+ perl png postscript q16 q32 static-libs svg test threads tiff truetype
+ webp wmf X zlib"
+
+RDEPEND="dev-libs/libltdl:0
+ bzip2? ( app-arch/bzip2 )
+ fpx? ( media-libs/libfpx )
+ imagemagick? ( !media-gfx/imagemagick )
+ jbig? ( media-libs/jbigkit )
+ jpeg? ( virtual/jpeg:0 )
+ jpeg2k? ( media-libs/jasper:= )
+ lcms? ( media-libs/lcms:2 )
+ lzma? ( app-arch/xz-utils )
+ perl? ( dev-lang/perl )
+ png? ( media-libs/libpng:0 )
+ postscript? ( app-text/ghostscript-gpl )
+ svg? ( dev-libs/libxml2 )
+ tiff? ( media-libs/tiff:0 )
+ truetype? (
+ media-fonts/urw-fonts
+ >=media-libs/freetype-2
+ )
+ webp? ( media-libs/libwebp:= )
+ wmf? ( media-libs/libwmf )
+ X? (
+ x11-libs/libSM
+ x11-libs/libXext
+ )
+ zlib? ( sys-libs/zlib )"
+# corefonts are required because needed arial font (bug #588398).
+DEPEND="${RDEPEND}
+ test? ( media-fonts/corefonts )"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.3.19-flags.patch
+ "${FILESDIR}"/${PN}-1.3.19-perl.patch
+ "${FILESDIR}"/${PN}-1.3.27-version.sh-fix.patch
+)
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ local depth=8
+ use q16 && depth=16
+ use q32 && depth=32
+
+ local openmp=disable
+ if use openmp && tc-has-openmp; then
+ openmp=enable
+ fi
+
+ econf \
+ --${openmp}-openmp \
+ --enable-largefile \
+ --enable-shared \
+ $(use_enable static-libs static) \
+ $(use_enable debug prof) \
+ $(use_enable debug gcov) \
+ $(use_enable imagemagick magick-compat) \
+ $(use_with threads) \
+ $(use_with modules) \
+ --with-quantum-depth=${depth} \
+ --without-frozenpaths \
+ $(use_with cxx magick-plus-plus) \
+ $(use_with perl) \
+ --with-perl-options=INSTALLDIRS=vendor \
+ $(use_with bzip2 bzlib) \
+ $(use_with postscript dps) \
+ $(use_with fpx) \
+ --without-gslib \
+ $(use_with jbig) \
+ $(use_with webp) \
+ $(use_with jpeg) \
+ $(use_with jpeg2k jp2) \
+ $(use_with lcms lcms2) \
+ $(use_with lzma) \
+ $(use_with png) \
+ $(use_with tiff) \
+ $(use_with truetype ttf) \
+ $(use_with wmf) \
+ --with-fontpath="${EPREFIX}"/usr/share/fonts \
+ --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts \
+ --with-windows-font-dir="${EPREFIX}"/usr/share/fonts/corefonts \
+ $(use_with svg xml) \
+ $(use_with zlib) \
+ $(use_with X x)
+}
+
+src_compile() {
+ default
+ use perl && emake perl-build
+}
+
+src_test() {
+ unset DISPLAY # some perl tests fail when DISPLAY is set
+ default
+}
+
+src_install() {
+ default
+
+ if use perl; then
+ emake -C PerlMagick DESTDIR="${D}" install
+ find "${ED}" -type f -name perllocal.pod -exec rm -f {} + || die
+ find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} + || die
+ fi
+
+ find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + || die
+}
^ permalink raw reply related [flat|nested] 10+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/graphicsmagick/files/, media-gfx/graphicsmagick/
@ 2016-06-02 6:18 Lars Wendler
0 siblings, 0 replies; 10+ messages in thread
From: Lars Wendler @ 2016-06-02 6:18 UTC (permalink / raw
To: gentoo-commits
commit: d076df7ea3d181e92e29b76af78cf84b25f2921b
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 2 06:16:40 2016 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Jun 2 06:18:50 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d076df7e
media-gfx/graphicsmagick: Removed old.
Package-Manager: portage-2.2.28
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
media-gfx/graphicsmagick/Manifest | 2 -
.../files/graphicsmagick-1.3.16-libpng14.patch | 65 -----------
.../files/graphicsmagick-1.3.17-freetype.patch | 32 -----
.../files/graphicsmagick-1.3.19-freetype.patch | 15 ---
.../graphicsmagick/graphicsmagick-1.3.19.ebuild | 130 ---------------------
.../graphicsmagick/graphicsmagick-1.3.20-r1.ebuild | 130 ---------------------
6 files changed, 374 deletions(-)
diff --git a/media-gfx/graphicsmagick/Manifest b/media-gfx/graphicsmagick/Manifest
index ab41d97..e78aef7 100644
--- a/media-gfx/graphicsmagick/Manifest
+++ b/media-gfx/graphicsmagick/Manifest
@@ -1,5 +1,3 @@
DIST GraphicsMagick-1.3.18.tar.xz 5124436 SHA256 fd48eebe200793e6f62a2b7d96413c94a8967ab56295605513898e2c8524b0ab SHA512 c04dbca467d2ac94d9c47818c7087954ceb54a736fdd062be6d499319037f4bbca3a779542d8acad262b59cb599521f895177574a21975f496ba57061b64b960 WHIRLPOOL d3b396d1cf3691f4aec1387066a55e4105e220cba22ef690234cb8724e955cc5dd4e39c269fddf610d61249850499facaaa54d2150660ed8f5126554a27c11dc
-DIST GraphicsMagick-1.3.19.tar.xz 5153772 SHA256 de64372bb7bbff18cf14afd35c8239d9588592f053fd51a82f7239ad42174a54 SHA512 cdfbdc75356ade5037eab836739e7e59156d8b3555112d350f25e47072142e19d47ea9da718d93e40fd864c5bb88810737c078d6fbee9950b964f49519881f6e WHIRLPOOL d4cc6eba8472a5e25cbc9e6b49ec5e1449f1b44e2962936b35227c654d3712d65b4201938127e758be2a6f1818a099de04be4761fd115d3806749965f5c42282
-DIST GraphicsMagick-1.3.20.tar.xz 5206616 SHA256 35fa21da4c1479e08da8351c5b1e363adaca803a0064cfc83084363adce387c9 SHA512 59f5eece3a38a98aea43bfc2aefd9c2df458c7f836c8ac05e908c29ea1de295e3f26b63f8daeadac4f40094e5d50aa860472c48e7a52e9f694471d0dcc5bbe37 WHIRLPOOL 13bc6154fbb2224eefdb6f437179a279f8959b4ccff9dc8eb6ef2cec205774a2a7cac4093ac81d36ba22a9879edaca15576ecc56e91da0318b7fffe029a6aecc
DIST GraphicsMagick-1.3.23.tar.xz 5355200 SHA256 fd2535a529528ec6f0bd493fed4395e08082faf940d51d7c18c25586a0a0e60d SHA512 40f0a2d96ea568cc6e52ae0003c2ad393b2cffc6eabb85db78cb22af00eafec3fa1e64ebb26eed4a271f7a54c35c3b985e99a3d0b404fd025f4dba156856c99a WHIRLPOOL a1745035437981205543652e472f1f8a24402555657f79357d87402635f4e10026051ca7850ff6d655ab6321360702f2be80bf5443ca3e83cc471a84382f0107
DIST GraphicsMagick-1.3.24.tar.xz 5372048 SHA256 52bfbacef4be3fbae756dbfd342e4843d2a446bef96450bfbe2c23ca60e180e0 SHA512 d55f8b7d96bc746e2b501ec6315f174f2ab5f6b31a1d138196bf17b506e6d0c2b91ee19f5dd0a2877cd47910aebdcf11158303e90b1b267c6082d462f8548684 WHIRLPOOL 5d666812748389b723dd939cf4f9f4dd5d0ec6a99510db7b0db49ab12e38fa844c8e4da60053566974f0f9174226dd21bd697a718d6f97d163346617701176fb
diff --git a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.16-libpng14.patch b/media-gfx/graphicsmagick/files/graphicsmagick-1.3.16-libpng14.patch
deleted file mode 100644
index bacf70e..0000000
--- a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.16-libpng14.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-
-# HG changeset patch
-# User Glenn Randers-Pehrson <glennrp@simple...>
-# Date 1343491548 18000
-# Node ID d6e469d02cd260b6531e86a8a6c8a5a2b9ff51cb
-# Parent fe9e2eb655ce8b85abfd9b88d20a8a1648ad71e7
-coders/png.c: Some typecasts were inconsistent with libpng-1.4 and later.
-
-diff -r fe9e2eb655ce -r d6e469d02cd2 coders/png.c
---- a/coders/png.c Thu Jul 26 20:24:26 2012 -0500
-+++ b/coders/png.c Sat Jul 28 11:05:48 2012 -0500
-@@ -1360,7 +1360,11 @@
- }
-
- #ifdef PNG_USER_MEM_SUPPORTED
--static png_voidp png_IM_malloc(png_structp png_ptr,png_uint_32 size)
-+#if PNG_LIBPNG_VER >= 14000
-+static png_voidp png_IM_malloc(png_structp png_ptr,png_alloc_size_t size)
-+#else
-+static png_voidp png_IM_malloc(png_structp png_ptr,png_size_t size)
-+#endif
- {
- (void) png_ptr;
- return MagickAllocateMemory(png_voidp,(size_t) size);
-@@ -6169,12 +6173,22 @@
- (void) printf("writing raw profile: type=%.1024s, length=%lu\n",
- profile_type, (unsigned long)length);
- }
-- text=(png_textp) png_malloc(ping,(png_uint_32) sizeof(png_text));
-+#if PNG_LIBPNG_VER >= 14000
-+ text=(png_textp) png_malloc(ping,(png_alloc_size_t) sizeof(png_text));
-+#else
-+ text=(png_textp) png_malloc(ping,(png_size_t) sizeof(png_text));
-+#endif
- description_length=strlen((const char *) profile_description);
- allocated_length=(png_uint_32) (length*2 + (length >> 5) + 20
- + description_length);
-- text[0].text=(png_charp) png_malloc(ping,allocated_length);
-- text[0].key=(png_charp) png_malloc(ping, (png_uint_32) 80);
-+#if PNG_LIBPNG_VER >= 14000
-+ text[0].text=(png_charp) png_malloc(ping,
-+ (png_alloc_size_t) allocated_length);
-+ text[0].key=(png_charp) png_malloc(ping, (png_alloc_size_t) 80);
-+#else
-+ text[0].text=(png_charp) png_malloc(ping, (png_size_t) allocated_length);
-+ text[0].key=(png_charp) png_malloc(ping, (png_size_t) 80);
-+#endif
- text[0].key[0]='\0';
- (void) strcat(text[0].key, "Raw profile type ");
- (void) strncat(text[0].key, (const char *) profile_type, 61);
-@@ -7620,7 +7634,12 @@
-
- if (*attribute->key == '[')
- continue;
-- text=(png_textp) png_malloc(ping,(png_uint_32) sizeof(png_text));
-+#if PNG_LIBPNG_VER >= 14000
-+ text=(png_textp) png_malloc(ping,
-+ (png_alloc_size_t) sizeof(png_text));
-+#else
-+ text=(png_textp) png_malloc(ping,(png_size_t) sizeof(png_text));
-+#endif
- text[0].key=attribute->key;
- text[0].text=attribute->value;
- text[0].text_length=strlen(attribute->value);
-
diff --git a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.17-freetype.patch b/media-gfx/graphicsmagick/files/graphicsmagick-1.3.17-freetype.patch
deleted file mode 100644
index 3ae4ad4..0000000
--- a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.17-freetype.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-https://sourceforge.net/tracker/?func=detail&aid=3601612&group_id=73485&atid=537940
-
---- a/configure
-+++ b/configure
-@@ -26488,7 +26488,6 @@
- # directory as GraphicsMagick installation prefix.
- #LDFLAGS="$LDFLAGS -L$LIB_DIR"
- #CPPFLAGS="$CPPFLAGS -I$INCLUDE_DIR"
--MAGICK_API_CPPFLAGS="-I$INCLUDE_DIR/GraphicsMagick $MAGICK_API_CPPFLAGS"
-
- #
- # Find the X11 RGB database
-@@ -29490,8 +29490,8 @@
- then
- freetype_prefix=`${freetype_config} --prefix`
- freetype_exec_prefix=`${freetype_config} --exec-prefix`
-- LDFLAGS="$LDFLAGS -L${freetype_exec_prefix}/lib"
-- CPPFLAGS="$CPPFLAGS -I${freetype_prefix}/include/freetype2"
-+ LDFLAGS="$LDFLAGS `${PKG_CONFIG:-pkg-config} freetype2 --libs`"
-+ CPPFLAGS="$CPPFLAGS `${PKG_CONFIG:-pkg-config} freetype2 --cflags`"
- fi
-
- dnl First see if there is a library
-@@ -35767,7 +35767,7 @@
-
- MAGICK_API_CFLAGS=$CFLAGS
- MAGICK_API_CPPFLAGS=`echo $MAGICK_API_CPPFLAGS | sed -e 's/ */ /g'`
--MAGICK_API_LDFLAGS="-L$LIB_DIR $LDFLAGS"
-+MAGICK_API_LDFLAGS="$LDFLAGS"
- MAGICK_API_DEP_LIBS="$MAGICK_DEP_LIBS $MAGICK_API_LIBLTDL"
- MAGICK_API_LIBS="-lGraphicsMagick $MAGICK_API_DEP_LIBS"
-
diff --git a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.19-freetype.patch b/media-gfx/graphicsmagick/files/graphicsmagick-1.3.19-freetype.patch
deleted file mode 100644
index 4ef1fb9..0000000
--- a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.19-freetype.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-https://sourceforge.net/tracker/?func=detail&aid=3601612&group_id=73485&atid=537940
-
---- GraphicsMagick-1.3.19/configure.ac
-+++ GraphicsMagick-1.3.19/configure.ac
-@@ -2283,8 +2284,8 @@
- then
- freetype_prefix=`${freetype_config} --prefix`
- freetype_exec_prefix=`${freetype_config} --exec-prefix`
-- LDFLAGS="$LDFLAGS -L${freetype_exec_prefix}/lib"
-- CPPFLAGS="$CPPFLAGS -I${freetype_prefix}/include/freetype2"
-+ LDFLAGS="$LDFLAGS `${PKG_CONFIG:-pkg-config} freetype2 --libs`"
-+ CPPFLAGS="$CPPFLAGS `${PKG_CONFIG:-pkg-config} freetype2 --cflags`"
- fi
-
- dnl First see if there is a library
diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.19.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.19.ebuild
deleted file mode 100644
index 3f5d217..0000000
--- a/media-gfx/graphicsmagick/graphicsmagick-1.3.19.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools eutils toolchain-funcs
-
-MY_P=${P/graphicsm/GraphicsM}
-
-DESCRIPTION="Collection of tools and libraries for many image formats"
-HOMEPAGE="http://www.graphicsmagick.org/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="bzip2 cxx debug fpx imagemagick jbig jpeg jpeg2k lcms lzma modules openmp
- perl png postscript q16 q32 static-libs svg threads tiff truetype webp wmf X zlib"
-
-RDEPEND=">=sys-devel/libtool-2.2.6b
- bzip2? ( app-arch/bzip2 )
- fpx? ( media-libs/libfpx )
- imagemagick? ( !media-gfx/imagemagick )
- jbig? ( media-libs/jbigkit )
- jpeg? ( virtual/jpeg )
- jpeg2k? ( media-libs/jasper )
- lcms? ( media-libs/lcms:2 )
- lzma? ( app-arch/xz-utils )
- perl? ( dev-lang/perl )
- png? ( media-libs/libpng:0 )
- postscript? ( app-text/ghostscript-gpl )
- svg? ( dev-libs/libxml2 )
- tiff? ( media-libs/tiff:0 )
- truetype? (
- media-fonts/urw-fonts
- >=media-libs/freetype-2
- )
- webp? ( media-libs/libwebp )
- wmf? ( media-libs/libwmf )
- X? (
- x11-libs/libSM
- x11-libs/libXext
- )
- zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-1.3.19-freetype.patch
- epatch "${FILESDIR}"/${PN}-1.3.19-flags.patch
- epatch "${FILESDIR}"/${PN}-1.3.19-perl.patch
- epatch "${FILESDIR}"/${PN}-1.3.18-powerpc.patch
-
- epatch_user #498942
-
- eautoreconf
-}
-
-src_configure() {
- local depth=8
- use q16 && depth=16
- use q32 && depth=32
-
- local openmp=disable
- if use openmp && tc-has-openmp; then
- openmp=enable
- fi
-
- econf \
- --docdir="${EPREFIX}"/usr/share/doc/${PF} \
- --htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
- --${openmp}-openmp \
- --enable-largefile \
- --enable-shared \
- $(use_enable static-libs static) \
- $(use_enable debug prof) \
- $(use_enable debug gcov) \
- $(use_enable imagemagick magick-compat) \
- $(use_with threads) \
- $(use_with modules) \
- --with-quantum-depth=${depth} \
- --without-frozenpaths \
- $(use_with cxx magick-plus-plus) \
- $(use_with perl) \
- --with-perl-options=INSTALLDIRS=vendor \
- $(use_with bzip2 bzlib) \
- $(use_with postscript dps) \
- $(use_with fpx) \
- --without-gslib \
- $(use_with jbig) \
- $(use_with webp) \
- $(use_with jpeg) \
- $(use_with jpeg2k jp2) \
- --without-lcms \
- $(use_with lcms lcms2) \
- $(use_with lzma) \
- $(use_with png) \
- $(use_with tiff) \
- $(use_with truetype ttf) \
- $(use_with wmf) \
- --with-fontpath="${EPREFIX}"/usr/share/fonts \
- --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts \
- --with-windows-font-dir="${EPREFIX}"/usr/share/fonts/corefonts \
- $(use_with svg xml) \
- $(use_with zlib) \
- $(use_with X x)
-}
-
-src_compile() {
- default
- use perl && emake perl-build
-}
-
-src_test() {
- unset DISPLAY # some perl tests fail when DISPLAY is set
- default
-}
-
-src_install() {
- default
-
- if use perl; then
- emake -C PerlMagick DESTDIR="${D}" install
- find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
- find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
- fi
-
- find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
-}
diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.20-r1.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.20-r1.ebuild
deleted file mode 100644
index 6cc10fe..0000000
--- a/media-gfx/graphicsmagick/graphicsmagick-1.3.20-r1.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools eutils toolchain-funcs
-
-MY_P=${P/graphicsm/GraphicsM}
-
-DESCRIPTION="Collection of tools and libraries for many image formats"
-HOMEPAGE="http://www.graphicsmagick.org/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="bzip2 cxx debug fpx imagemagick jbig jpeg jpeg2k lcms lzma modules openmp
- perl png postscript q16 q32 static-libs svg threads tiff truetype webp wmf X zlib"
-
-RDEPEND=">=sys-devel/libtool-2.2.6b
- bzip2? ( app-arch/bzip2 )
- fpx? ( media-libs/libfpx )
- imagemagick? ( !media-gfx/imagemagick )
- jbig? ( media-libs/jbigkit )
- jpeg? ( virtual/jpeg:0 )
- jpeg2k? ( media-libs/jasper )
- lcms? ( media-libs/lcms:2 )
- lzma? ( app-arch/xz-utils )
- perl? ( dev-lang/perl )
- png? ( media-libs/libpng:0 )
- postscript? ( app-text/ghostscript-gpl )
- svg? ( dev-libs/libxml2 )
- tiff? ( media-libs/tiff:0 )
- truetype? (
- media-fonts/urw-fonts
- >=media-libs/freetype-2
- )
- webp? ( media-libs/libwebp )
- wmf? ( media-libs/libwmf )
- X? (
- x11-libs/libSM
- x11-libs/libXext
- )
- zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-1.3.19-freetype.patch
- epatch "${FILESDIR}"/${PN}-1.3.19-flags.patch
- epatch "${FILESDIR}"/${PN}-1.3.19-perl.patch
- epatch "${FILESDIR}"/${P}-powerpc.patch
-
- epatch_user #498942
-
- eautoreconf
-}
-
-src_configure() {
- local depth=8
- use q16 && depth=16
- use q32 && depth=32
-
- local openmp=disable
- if use openmp && tc-has-openmp; then
- openmp=enable
- fi
-
- econf \
- --docdir="${EPREFIX}"/usr/share/doc/${PF} \
- --htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
- --${openmp}-openmp \
- --enable-largefile \
- --enable-shared \
- $(use_enable static-libs static) \
- $(use_enable debug prof) \
- $(use_enable debug gcov) \
- $(use_enable imagemagick magick-compat) \
- $(use_with threads) \
- $(use_with modules) \
- --with-quantum-depth=${depth} \
- --without-frozenpaths \
- $(use_with cxx magick-plus-plus) \
- $(use_with perl) \
- --with-perl-options=INSTALLDIRS=vendor \
- $(use_with bzip2 bzlib) \
- $(use_with postscript dps) \
- $(use_with fpx) \
- --without-gslib \
- $(use_with jbig) \
- $(use_with webp) \
- $(use_with jpeg) \
- $(use_with jpeg2k jp2) \
- --without-lcms \
- $(use_with lcms lcms2) \
- $(use_with lzma) \
- $(use_with png) \
- $(use_with tiff) \
- $(use_with truetype ttf) \
- $(use_with wmf) \
- --with-fontpath="${EPREFIX}"/usr/share/fonts \
- --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts \
- --with-windows-font-dir="${EPREFIX}"/usr/share/fonts/corefonts \
- $(use_with svg xml) \
- $(use_with zlib) \
- $(use_with X x)
-}
-
-src_compile() {
- default
- use perl && emake perl-build
-}
-
-src_test() {
- unset DISPLAY # some perl tests fail when DISPLAY is set
- default
-}
-
-src_install() {
- default
-
- if use perl; then
- emake -C PerlMagick DESTDIR="${D}" install
- find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
- find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
- fi
-
- find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
-}
^ permalink raw reply related [flat|nested] 10+ messages in thread
end of thread, other threads:[~2023-12-27 22:48 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-12-27 0:19 [gentoo-commits] repo/gentoo:master commit in: media-gfx/graphicsmagick/files/, media-gfx/graphicsmagick/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2023-12-27 22:48 Sam James
2023-03-09 6:41 Sam James
2022-02-20 5:51 Sam James
2021-09-17 2:53 Sam James
2021-02-02 23:51 Sam James
2020-06-17 1:29 Thomas Deutschmann
2018-12-22 22:43 Andreas K. Hüttel
2017-12-11 13:09 Thomas Deutschmann
2016-06-02 6:18 Lars Wendler
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox