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

6 files changed, 127 insertions, 9 deletions

diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 5c35b5a1a9d6..cc9613e2f7e0 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
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
diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest
index 5d2cc900f9df..39d8784e2bb5 100644
--- a/media-gfx/hydrus/Manifest
+++ b/media-gfx/hydrus/Manifest
@@ -1,10 +1,9 @@
 AUX hydrus-client 98 BLAKE2B c08af22c2ee9ea3d5c95ed3196ceb9b74b9c886bfa9b91141584f7ea884830fbdd300c948af199ac82a016e1a9dd7314e9c7fdfa8f47f07a9336eff9e2bd2ce1 SHA512 453ac6f9685325b6510c7f833b658491f01e92be213ae26da0d86490033951d3a825f9b15fd33d8a0727992cd83bf7ed491b88f0808674d6fdc23af90c7911a5
 AUX hydrus-server 62 BLAKE2B dac100012fb03c2a14438b67a1c68daa1673eb23dfe7725a941325eb67149064c1276f462732e62db294acce75d111f948599698615e9fa15be43fe74ce444cd SHA512 5b7f9ca4b364ff529e5f4feb6fb11c91aff9cf1ad3ae6c12ff301915fa1d7b9920d51028b820000635d071a049a4e98a0e4e815ffa6ca31d2e67bec5a78afdea
 AUX userpath-in-local-share.patch 443 BLAKE2B 2562bdb6207a35a872a7c1b22ee378504ec4f53ee7b64bdce31649d62780cae00b42be7297aa82e069a9df5e01f76c508d97c47a25a9dffec8cbf8829e7ff674 SHA512 f96cf0040a663c534bd539e40413c95928ea45238f765f741db3c251b7c141fe99989b092d4033695a99e7267fec7fac74641fdc4a0887e74d23d3695f8ce467
-DIST hydrus-3.11-test-fixes.patch 8493 BLAKE2B 598c9a82ced8c181ac2c9f91bef34ad9136444f40d909a69c0c0d3a5f620bb2818a684ed221ae62f1e6226d6b534b6ac06cedb3f65a5f3be8fc2b12612a9daad SHA512 6dd8206b02f5f209cf86d2b8cd65952cc3d449352d3cb91c654d325077306415e6482191a4e64cba6aec2c4f1ff358c01e2ecbe7d3b56c9027673757a3590051
-DIST hydrus-518.tar.gz 41105373 BLAKE2B e766cdb7e8ffdc1148f5970724a6d3293522a0ae750c4e5c996d5cdbabc837dc3a9c002251080b6253a869b2cf87a17cb9c7b99ad912d68b6b5c4207e1d3ae7a SHA512 7e551ba83e97b490c98bf1858b87c78e9d5564cfaecfc83426ad2d802005e7cb84c9aadc61b762f3dca1916b8e786ca044bb310c93462e4c4f953f60f3291ed2
 DIST hydrus-519.tar.gz 41113296 BLAKE2B 7193fea1d0171af3799a33af68855bd67aa990802e110a3beec4f4f96597e78228e7ad169fce713bd91f862e48d973ca4acef88c204eb3c91f2cebf1d445cb16 SHA512 80abff327a8857d4fe311c4834016b46c45b6889e080675520998cfa196df2c97305368acada570c3a2ebd19caebb2e71c40f6ccd3d17912ad5f19cce09ceac7
-EBUILD hydrus-518.ebuild 4800 BLAKE2B 3a573ba85b4fc71b38c2b60b42501e131a364e425221911c53b083a9ba6f9482a769a4d18e2bd58b7983dd3f1936aeed9766ea6ef62af61ed5ecbd9587f4482c SHA512 2520868ad133903ed058470c8508c777b9735e9a2772d5a5933064dd51b90f9935c2aacedd036f28fa8596bba35176da5d2d3d2ab8a588db96a5bbd6ddfb1df6
+DIST hydrus-522.tar.gz 41149565 BLAKE2B 7306f1d275fb6cf4786f012eea8469c58eac8d9ee6392481cd92f791125dec5377f62dceb36005c24102771493e04b00f425579aad95cf5cfdb5310ff7de7c62 SHA512 adcf6c99d579e50248c81ca3016489c15aec8c3763f13634c50ed921b0fe7c974868b082bb2e5d26915ed877bc8df3b70af7e99549bdc177a3e9f46a50cce113
 EBUILD hydrus-519.ebuild 4504 BLAKE2B 1fb820de20593ae7e4447a5e83e3241a2da677474ca33d3a436176f1b7f06386f84f6ea8bfd0311e7780b05909564be2ca899d6a36c6ec86ce6d79ba11abe8fa SHA512 1db559209c9d79ece06b83a2b9a076ae899d765383edc1217ef362ec84d3ac2ede830a16028ceb3fa57c91f7d49248203c8257aac171d953bef334786985d29d
+EBUILD hydrus-522.ebuild 4504 BLAKE2B 1fb820de20593ae7e4447a5e83e3241a2da677474ca33d3a436176f1b7f06386f84f6ea8bfd0311e7780b05909564be2ca899d6a36c6ec86ce6d79ba11abe8fa SHA512 1db559209c9d79ece06b83a2b9a076ae899d765383edc1217ef362ec84d3ac2ede830a16028ceb3fa57c91f7d49248203c8257aac171d953bef334786985d29d
 EBUILD hydrus-9999.ebuild 4504 BLAKE2B 1fb820de20593ae7e4447a5e83e3241a2da677474ca33d3a436176f1b7f06386f84f6ea8bfd0311e7780b05909564be2ca899d6a36c6ec86ce6d79ba11abe8fa SHA512 1db559209c9d79ece06b83a2b9a076ae899d765383edc1217ef362ec84d3ac2ede830a16028ceb3fa57c91f7d49248203c8257aac171d953bef334786985d29d
 MISC metadata.xml 836 BLAKE2B 049faa70763ba176b6e4930abcdb5f4b4b87bd243759aba42dec32b9f2a199b3f2c33f0415ffdd1a392af3b461d939e633ec1f9333b0ff538f74d24306790fbe SHA512 0404c79e85e51eaba13fef930e695f168074e69734d3d8a604515f77196706bae9d36a2df9b3db0530c9f17b32881602509c7e22e7383c957a67e13c2a46e7bb
diff --git a/media-gfx/hydrus/hydrus-518.ebuild b/media-gfx/hydrus/hydrus-522.ebuild
index 072c47dfe381..57ab39e51e10 100644
--- a/media-gfx/hydrus/hydrus-518.ebuild
+++ b/media-gfx/hydrus/hydrus-522.ebuild
@@ -18,12 +18,8 @@ if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
 
 	EGIT_REPO_URI="https://github.com/hydrusnetwork/hydrus.git"
-	SRC_URI="https://github.com/vaartis/hydrus/commit/106a55b3aca945d047685eb53bd1d2aa8b8a7c50.diff -> ${PN}-3.11-test-fixes.patch"
 else
-	SRC_URI="
-		https://github.com/hydrusnetwork/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-		https://github.com/vaartis/hydrus/commit/106a55b3aca945d047685eb53bd1d2aa8b8a7c50.diff -> ${PN}-3.11-test-fixes.patch
-	"
+	SRC_URI="https://github.com/hydrusnetwork/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 	KEYWORDS="~amd64"
 fi
@@ -79,7 +75,6 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}/userpath-in-local-share.patch"
-	"${DISTDIR}/${PN}-3.11-test-fixes.patch"
 )
 
 src_prepare() {