commit: 8aadbe25adc2c60e809a6c9eff3d4a1e01f3d94d Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sun Aug 13 06:34:17 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Aug 13 06:49:24 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8aadbe25
media-gfx/graphicsmagick: add 1.3.41 Signed-off-by: Sam James <sam <AT> gentoo.org> media-gfx/graphicsmagick/Manifest | 2 + .../files/graphicsmagick-1.3.41-flags.patch | 53 ++++++++++++++++++++++ .../files/graphicsmagick-1.3.41-perl.patch | 12 +++++ ...ck-9999.ebuild => graphicsmagick-1.3.41.ebuild} | 12 +++-- .../graphicsmagick/graphicsmagick-9999.ebuild | 12 +++-- 5 files changed, 81 insertions(+), 10 deletions(-) diff --git a/media-gfx/graphicsmagick/Manifest b/media-gfx/graphicsmagick/Manifest index b9635f463150..99ddfe68d68d 100644 --- a/media-gfx/graphicsmagick/Manifest +++ b/media-gfx/graphicsmagick/Manifest @@ -1,2 +1,4 @@ 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 +DIST GraphicsMagick-1.3.41.tar.xz 5533080 BLAKE2B 878c785b19feb3153cd2ea9cb105938ff7c4e577ce5e563cfdde501ca26b48f4c3ac6e875de240229938fa1b5776564607a35398dcc9adfd0fd801341d87ab63 SHA512 f2b850818f992349e8cb8f74ed8e897af4e1f4b9af9f3622c1ff30f3af5bc8530a60efbb24875fda80ff49e0db0304dfd6a39de87bd2e29b8ce42d653846890e +DIST GraphicsMagick-1.3.41.tar.xz.asc 228 BLAKE2B 298c1445d7de5114e38e02f4b3c5c91569b70c126849526a822cc5a2fc2623b6bc83b74a4a58cf0e326741a96ace95b60108f9a07bf9c37a3d9ca722485eb8be SHA512 13bb0218a436ab083518f4a32d17b231a941abd960b32b13a05e4fca3d6b57112f2b496bf7fba0996c2c9855c15158f8223003fcbcf4335bd0ba1a1ae7ee8ba9 diff --git a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.41-flags.patch b/media-gfx/graphicsmagick/files/graphicsmagick-1.3.41-flags.patch new file mode 100644 index 000000000000..f3f871cced37 --- /dev/null +++ b/media-gfx/graphicsmagick/files/graphicsmagick-1.3.41-flags.patch @@ -0,0 +1,53 @@ +--- a/Magick++/bin/GraphicsMagick++-config.in ++++ b/Magick++/bin/GraphicsMagick++-config.in +@@ -36,7 +36,7 @@ while test $# -gt 0; do + echo '@CXX@' + ;; + --cxxflags) +- echo '@CXXFLAGS@' ++ echo '@MAGICK_API_CXXFLAGS@' + ;; + --ldflags) + echo '@MAGICK_API_LDFLAGS@' +--- a/configure.ac ++++ b/configure.ac +@@ -338,6 +338,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]) +@@ -3883,9 +3884,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" + +@@ -3915,6 +3917,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]) +--- a/magick/GraphicsMagick-config.in ++++ b/magick/GraphicsMagick-config.in +@@ -33,7 +33,7 @@ while test $# -gt 0; do + echo '@CC@' + ;; + --cflags) +- echo '@CFLAGS@' ++ echo '@MAGICK_API_CFLAGS@' + ;; + --cppflags) + echo '@MAGICK_API_CPPFLAGS@' diff --git a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.41-perl.patch b/media-gfx/graphicsmagick/files/graphicsmagick-1.3.41-perl.patch new file mode 100644 index 000000000000..15cd28aba24c --- /dev/null +++ b/media-gfx/graphicsmagick/files/graphicsmagick-1.3.41-perl.patch @@ -0,0 +1,12 @@ +Link perl bindings against built libraries instead of system libraries (bug #456180). +--- a/PerlMagick/Makefile.PL.in ++++ b/PerlMagick/Makefile.PL.in +@@ -23,7 +23,7 @@ my $magick_LDFLAGS='@LDFLAGS@'; + my $magick_BIN_DIR="$ENV{'DESTDIR'}@BIN_DIR@"; + my $magick_API_LIBS='@MAGICK_API_LIBS@'; + my $magick_PERLMAINCC='@PERLMAINCC@'; +-my $magick_LIB_DIR="$ENV{'DESTDIR'}@MAGICKLIBDIR@"; ++my $magick_LIB_DIR="../magick/.libs"; + + # Compute test specification + my $delegate_tests='t/*.t'; diff --git a/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.41.ebuild similarity index 95% copy from media-gfx/graphicsmagick/graphicsmagick-9999.ebuild copy to media-gfx/graphicsmagick/graphicsmagick-1.3.41.ebuild index 4e497a4945c2..e829330a5e8f 100644 --- a/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild +++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.41.ebuild @@ -10,11 +10,12 @@ 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" + inherit mercurial 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}" @@ -26,7 +27,6 @@ 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" @@ -63,10 +63,11 @@ RDEPEND=" zstd? ( app-arch/zstd:= ) " DEPEND="${RDEPEND}" +BDEPEND+=" virtual/pkgconfig" PATCHES=( - "${FILESDIR}"/${PN}-1.3.36-flags.patch - "${FILESDIR}"/${PN}-1.3.19-perl.patch + "${FILESDIR}"/${PN}-1.3.41-flags.patch + "${FILESDIR}"/${PN}-1.3.41-perl.patch ) pkg_pretend() { @@ -141,7 +142,8 @@ src_compile() { } src_test() { - unset DISPLAY # some perl tests fail when DISPLAY is set + # Some perl tests fail when DISPLAY is set + unset DISPLAY default } diff --git a/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild b/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild index 4e497a4945c2..e829330a5e8f 100644 --- a/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild +++ b/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild @@ -10,11 +10,12 @@ 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" + inherit mercurial 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}" @@ -26,7 +27,6 @@ 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" @@ -63,10 +63,11 @@ RDEPEND=" zstd? ( app-arch/zstd:= ) " DEPEND="${RDEPEND}" +BDEPEND+=" virtual/pkgconfig" PATCHES=( - "${FILESDIR}"/${PN}-1.3.36-flags.patch - "${FILESDIR}"/${PN}-1.3.19-perl.patch + "${FILESDIR}"/${PN}-1.3.41-flags.patch + "${FILESDIR}"/${PN}-1.3.41-perl.patch ) pkg_pretend() { @@ -141,7 +142,8 @@ src_compile() { } src_test() { - unset DISPLAY # some perl tests fail when DISPLAY is set + # Some perl tests fail when DISPLAY is set + unset DISPLAY default }