commit: 9aa50106ebf25b9884b376a9adf0dc330a49d3cd Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Mon Dec 30 14:24:00 2024 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Tue Dec 31 09:07:47 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9aa50106
media-gfx/converseen: drop 0.9.11.1 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> media-gfx/converseen/Manifest | 1 - media-gfx/converseen/converseen-0.9.11.1.ebuild | 68 ---------------------- ...onverseen-0.9.11.1-graphicsmagick-support.patch | 53 ----------------- 3 files changed, 122 deletions(-) diff --git a/media-gfx/converseen/Manifest b/media-gfx/converseen/Manifest index f88d459fbfa5..69c341cdb887 100644 --- a/media-gfx/converseen/Manifest +++ b/media-gfx/converseen/Manifest @@ -1,2 +1 @@ DIST converseen-0.12.0.1.tar.gz 2296100 BLAKE2B 83a0271e1451fa196852d717332fa7446cd22bac7b675f3f306692aa1e11d4c5500d033fd9bbb7dd4ec9190ff3b15149bad1e9646006f533d930fc1d686b0a9b SHA512 4e6efa44953b097f8c6af19e3d849caf570a0fa2db673133e1d8ca2abee98b43d2fbd2d12e6c8c2a8ec6a9dd61a1ca3f25ee7a7787791cc783d8c967eacb9d9d -DIST converseen-0.9.11.1.tar.gz 770024 BLAKE2B 671599099abf5b143bde7c57efc547626c14e15bebbd3a70ce4ec43d4febbaf69eebedebaaac935572b785afaa086c383b68bae0f02bc16ca68625dfb55b8c85 SHA512 1d61fa88d9e3d6ed23fb98d0495b00315adca880fd1d0d95e8322c48d9fdcd161ee00b5e2f5f52212c4db66d97e26ac0da561926e55de4bc047d3ad98b6f69dd diff --git a/media-gfx/converseen/converseen-0.9.11.1.ebuild b/media-gfx/converseen/converseen-0.9.11.1.ebuild deleted file mode 100644 index c77e1a0977df..000000000000 --- a/media-gfx/converseen/converseen-0.9.11.1.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake xdg-utils - -DESCRIPTION="Batch image converter and resizer based on ImageMagick" -HOMEPAGE="https://converseen.fasterland.net/ - https://github.com/Faster3ck/Converseen/"; -SRC_URI="https://github.com/Faster3ck/Converseen/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="graphicsmagick debug" - -RDEPEND=" - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtwidgets:5 - graphicsmagick? ( media-gfx/graphicsmagick:=[cxx,imagemagick] ) - !graphicsmagick? ( media-gfx/imagemagick:=[cxx] ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - dev-qt/linguist-tools:5 -" - -S="${WORKDIR}/${P^}" - -PATCHES=( - "${FILESDIR}/${PN}-0.9.9.0-appdata-path.patch" - "${FILESDIR}/${PN}-0.9.9.0-no-update.patch" - "${FILESDIR}/${PN}-0.9.11.1-graphicsmagick-support.patch" -) - -src_prepare() { - cmake_src_prepare - - if use graphicsmagick; then - # Replace variables in CMakeLists.txt - sed -i -e "s/GENTOO_LIB/\/usr\/$(get_libdir)/g" \ - -e "s/GENTOO_INCLUDE/\/usr\/include/g" \ - "${S}/CMakeLists.txt" || - die "Failed to sed graphicsmagick patch" - - # Replace MagickCore in globals.cpp - sed -i -e "s/MagickCore/MagickLib/" "${S}/src/globals.cpp" || - die "Failed to sed globals.cpp" - fi -} - -pkg_postinst() { - elog "Please note that due to security policy restrictions" - elog "on media-gfx/imagemagick the support for PS, PDF and" - elog "XPS files must be explicitly enabled by commenting out" - elog "the respective policies in /etc/ImageMagick-7/policy.xml." - elog "See https://wiki.gentoo.org/wiki/ImageMagick#Troubleshooting"; - elog "for more information." - - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_icon_cache_update -} diff --git a/media-gfx/converseen/files/converseen-0.9.11.1-graphicsmagick-support.patch b/media-gfx/converseen/files/converseen-0.9.11.1-graphicsmagick-support.patch deleted file mode 100644 index a76f108e335c..000000000000 --- a/media-gfx/converseen/files/converseen-0.9.11.1-graphicsmagick-support.patch +++ /dev/null @@ -1,53 +0,0 @@ -# See https://bugs.gentoo.org/628688 for further info and -# development discussion about this patch. ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -100,6 +100,14 @@ FIND_PACKAGE(ImageMagick REQUIRED) - FIND_PACKAGE(ImageMagick COMPONENTS Magick++) - FIND_PACKAGE(ImageMagick COMPONENTS MagickWand) - FIND_PACKAGE(ImageMagick COMPONENTS MagickCore) -+if (NOT ImageMagick_MagickCore_FOUND) -+ set(ImageMagick_INCLUDE_DIRS "GENTOO_INCLUDE/GraphicsMagick") -+ set(ImageMagick_Magick++_INCLUDE_DIRS "GENTOO_INCLUDE/GraphicsMagick/Magick++") -+ set(ImageMagick_MagickCore_INCLUDE_DIRS "") -+ set(ImageMagick_LIBRARY "GENTOO_LIB/libGraphicsMagick.so") -+ set(ImageMagick_Magick++_LIBRARY "GENTOO_LIB/libGraphicsMagick++.so") -+ set(ImageMagick_MagickCore_LIBRARY "") -+endif () - - INCLUDE_DIRECTORIES(${Qt5Core_INCLUDE_DIRS}) - INCLUDE_DIRECTORIES(${Qt5Gui_INCLUDE_DIRS}) ---- a/src/converter.cpp -+++ b/src/converter.cpp -@@ -254,8 +254,14 @@ bool Converter::writeImage(Image &my_image, const QString &format, const int &qu - - error_status = ""; - -+/* Workaround to compile with GraphicsMagick: -+ GraphicsMagick "MagickLibVersion" is greater that 0x100000 -+ e.g. GraphicsMagick-1.3.25 has "MagickLibVersion=0x181501" -+ or GraphicsMagick-1.3.26 has "MagickLibVersion=0x191600" */ - #if MagickLibVersion < 0x700 - hasTransparency = my_image.matte(); -+#elif MagickLibVersion > 0x100000 -+ hasTransparency = my_image.matte(); - #else - hasTransparency = my_image.alpha(); - #endif ---- a/src/globals.h -+++ b/src/globals.h -@@ -32,8 +32,14 @@ - using namespace Magick; - using namespace std; - -+/* Workaround to compile with GraphicsMagick: -+ GraphicsMagick "MagickLibVersion" is greater that 0x100000 -+ e.g. GraphicsMagick-1.3.25 has "MagickLibVersion=0x181501" -+ or GraphicsMagick-1.3.26 has "MagickLibVersion=0x191600" */ - #if MagickLibVersion < 0x700 - typedef FilterTypes IMFilterType; -+#elif MagickLibVersion > 0x100000 -+ typedef FilterTypes IMFilterType; - #else - typedef FilterType IMFilterType; - #endif
