gentoo auto-resync : 10:04:2023 - 11:36:36

3 files changed, 124 insertions, 0 deletions

diff --git a/media-gfx/converseen/Manifest b/media-gfx/converseen/Manifest
index 2f9ea089ef6a..51533f31f8b6 100644
--- a/media-gfx/converseen/Manifest
+++ b/media-gfx/converseen/Manifest
@@ -1,7 +1,10 @@
+AUX converseen-0.9.11.1-graphicsmagick-support.patch 2051 BLAKE2B 463c48357df2f76b7e224e211e9c0f36356a1d143ffd5a7245f31c489fe91360262adf165a243b81798e084fee07923d2c89d7aaf45ecff2066928b2fea6547d SHA512 0c85c6ada5516c6b454bb57e829684b8ccbdb12f4de320cec01668df08ad86ea2088ae442ef3debbbf0fb947c72cd205c1aab3bb915d303d3ba9ac94329a7a96
 AUX converseen-0.9.9.0-appdata-path.patch 604 BLAKE2B ca524ae4a52f74b687e0e0246d758178d4287b3e866651293233c7055a38cdf6330fd2c2dfb0728c0b07f37b631dbd1c59159039b56be35fbc349d183dfd0dbd SHA512 411696d39dcca09a33119537600efd80bcf675714ea72548500f9c2a1112e61d53edc6d891cef770aac3cdd2cb881e169b4ab833521ae152859609871807066e
 AUX converseen-0.9.9.0-no-update.patch 540 BLAKE2B b8a7bcf561a4be48fdf9137a40c1f5b1451915a6cf4b2043f9adaf8dd1aa853b331ee1499bb34d05ae9e7da2d9f3f0515c62dca8146d4957126054557ebfcceb SHA512 b5ed008bd7a01cb99ec97faa6c9bd412009f1d438c420e201d2605c713ff57c346391d5389ed019c0538a263154d1ed36c4a581d0582d2c2eadf8dc77a67b97b
 DIST converseen-0.9.10.0.tar.gz 769693 BLAKE2B 651edf41b6cdf010fdae47d457f2459c4e99a1657302bc4facfbd70bd7d7b7b85842290b74ea76a396fa75ca5f5398234d309aae179704ce40f1dbb61195835c SHA512 c2ee7c59685879dffcb6f3f4ef9267cb611d358bec21ecd57b90bbc7fa86a07b4aa8dd855956970b35ec671c57b8bbc4d0620c2cb5629a36ca4305e47f4d3b59
+DIST converseen-0.9.11.1.tar.gz 770024 BLAKE2B 671599099abf5b143bde7c57efc547626c14e15bebbd3a70ce4ec43d4febbaf69eebedebaaac935572b785afaa086c383b68bae0f02bc16ca68625dfb55b8c85 SHA512 1d61fa88d9e3d6ed23fb98d0495b00315adca880fd1d0d95e8322c48d9fdcd161ee00b5e2f5f52212c4db66d97e26ac0da561926e55de4bc047d3ad98b6f69dd
 DIST converseen-0.9.9.8.tar.gz 769184 BLAKE2B 136d4454825fd64bd8129544df25213346550d4a1bf550fd8c32eef7c2c02cda5965aa235ec8f637de53462968a08c1e1b7c5db454c68ed1cac64d08c322fd54 SHA512 64ef5c5614c6536d84c6fc5ad6f9180c45a4c9d1294e492f0b09a596203d91871191f62ef80c6f888f010377c834ae76d825a29b137885756cc33a7d38d70208
 EBUILD converseen-0.9.10.0.ebuild 1340 BLAKE2B 2652ded3c0f7e80a537ceebf9b5cd40f8afc1fb488bad9520f70edde5638953283a7fbcee3baadaed93f57c977fb0d5de48b1a210f27d7cd42a31a4f68d53d08 SHA512 08fc3020f5cacd259814577532a95116a75579a6dd83132be0fe373fe544dfe4a4d1009499d51c8b1d6b667b4c203ca13f1e06c4413450dff54226a8cce99156
+EBUILD converseen-0.9.11.1.ebuild 1761 BLAKE2B f4fc04951cf6f6da3346ad7b6cd507b1688a83def469b068266329f4f1a06d33b8893f3e61d6fac922abefc3625c3c38881cc9ee5eec9b1b98f7f9cf263392ff SHA512 59f99b60d9f430a3473c43a965e8baed9d74e7f82d31bc32b63d6917034d63b4f81466d59a979b0640a73a315d0c792ffac33da1209fe3e5aa03e6c8c7b770c9
 EBUILD converseen-0.9.9.8.ebuild 1340 BLAKE2B 78bb751dc0f18f8b6137a5217daa30556c45fb15914bcab9bac1c3eda476e235703e9aaa801004972fa11e9fb8b653bce113a3cfa3857f75d2711fd69855abcb SHA512 bca13c456769461e90b2fe34f1e7267a194fd0f4cef26ab564d58702e6beed0ce574c818f7a34b86b81599414c4c2637794b3022bf739e7b1ecc390b2e8a3d3a
 MISC metadata.xml 490 BLAKE2B 7ee59abe13eee7dff622a3e7b701f6e0128a208e3e49f5b22b3fcaf06357991a50ece3ffa9cb607675f94a7784efcec37c2176464e4c7741efbfb8b8427cb5dc SHA512 a56719d55ea41683315c5d3f98b8351d3b15b68fd8f598a9e692691c771a94bec23b8263c8a017e29d63a20a8de8b440db1acfd26558c6f8d51add12e4016ba6
diff --git a/media-gfx/converseen/converseen-0.9.11.1.ebuild b/media-gfx/converseen/converseen-0.9.11.1.ebuild
new file mode 100644
index 000000000000..254fc8f4a423
--- /dev/null
+++ b/media-gfx/converseen/converseen-0.9.11.1.ebuild
@@ -0,0 +1,68 @@
+# 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
new file mode 100644
index 000000000000..a76f108e335c
--- /dev/null
+++ b/media-gfx/converseen/files/converseen-0.9.11.1-graphicsmagick-support.patch
@@ -0,0 +1,53 @@
+# 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