commit: 362e9b8b81b47da9c015abf3af60a705609a0080 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sat Jul 30 08:18:35 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Jul 30 08:18:41 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=362e9b8b
media-gfx/graphicsmagick: fix automagic deps; bashism in configure Signed-off-by: Sam James <sam <AT> gentoo.org> .../graphicsmagick-1.3.38-configure-bashism.patch | 34 ++++++++++++++++++++++ ...9999.ebuild => graphicsmagick-1.3.38-r1.ebuild} | 19 ++++++++---- .../graphicsmagick/graphicsmagick-9999.ebuild | 18 ++++++++---- 3 files changed, 61 insertions(+), 10 deletions(-) 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 new file mode 100644 index 000000000000..69d5fd50a1bf --- /dev/null +++ b/media-gfx/graphicsmagick/files/graphicsmagick-1.3.38-configure-bashism.patch @@ -0,0 +1,34 @@ +# HG changeset patch +# User Sam James <[email protected]> +# 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-9999.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.38-r1.ebuild similarity index 89% copy from media-gfx/graphicsmagick/graphicsmagick-9999.ebuild copy to media-gfx/graphicsmagick/graphicsmagick-1.3.38-r1.ebuild index ed7baccc45e1..f3cdeac277df 100644 --- a/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild +++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.38-r1.ebuild @@ -28,16 +28,17 @@ 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 threads tiff truetype" -IUSE+=" webp wmf X zlib" +IUSE+=" openmp perl png postscript q16 q32 static-libs svg tcmalloc threads tiff truetype" +IUSE+=" webp wmf X zlib zstd" -RDEPEND="dev-libs/libltdl +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? ( virtual/jpeg ) + jpeg? ( media-libs/libjpeg-turbo:= ) jpegxl? ( media-libs/libjxl:= ) lcms? ( media-libs/lcms:2 ) lzma? ( app-arch/xz-utils ) @@ -45,6 +46,7 @@ RDEPEND="dev-libs/libltdl 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 @@ -56,12 +58,15 @@ RDEPEND="dev-libs/libltdl x11-libs/libSM x11-libs/libXext ) - zlib? ( sys-libs/zlib )" + 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() { @@ -107,11 +112,14 @@ src_configure() { $(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 @@ -119,6 +127,7 @@ src_configure() { --with-windows-font-dir="${EPREFIX}"/usr/share/fonts/corefonts $(use_with svg xml) $(use_with zlib) + $(use_with zstd) $(use_with X x) ) diff --git a/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild b/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild index ed7baccc45e1..c3cfd69b4baf 100644 --- a/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild +++ b/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild @@ -28,16 +28,17 @@ 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 threads tiff truetype" -IUSE+=" webp wmf X zlib" +IUSE+=" openmp perl png postscript q16 q32 static-libs svg tcmalloc threads tiff truetype" +IUSE+=" webp wmf X zlib zstd" -RDEPEND="dev-libs/libltdl +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? ( virtual/jpeg ) + jpeg? ( media-libs/libjpeg-turbo:= ) jpegxl? ( media-libs/libjxl:= ) lcms? ( media-libs/lcms:2 ) lzma? ( app-arch/xz-utils ) @@ -45,6 +46,7 @@ RDEPEND="dev-libs/libltdl 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 @@ -56,7 +58,9 @@ RDEPEND="dev-libs/libltdl x11-libs/libSM x11-libs/libXext ) - zlib? ( sys-libs/zlib )" + zlib? ( sys-libs/zlib ) + zstd? ( app-arch/zstd:= ) +" DEPEND="${RDEPEND}" PATCHES=( @@ -107,11 +111,14 @@ src_configure() { $(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 @@ -119,6 +126,7 @@ src_configure() { --with-windows-font-dir="${EPREFIX}"/usr/share/fonts/corefonts $(use_with svg xml) $(use_with zlib) + $(use_with zstd) $(use_with X x) )
