* [gentoo-commits] repo/gentoo:master commit in: media-gfx/converseen/, media-gfx/converseen/files/
@ 2018-01-09 1:23 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2018-01-09 1:23 UTC (permalink / raw
To: gentoo-commits
commit: 4f01d583d3b144b0d102c7f9bc6cabcdff60eefe
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 9 01:15:13 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jan 9 01:22:45 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f01d583
media-gfx/converseen: 0.9.6.2 version bump
Thanks-to: Sergey Torokhov <torokhov_s_a <AT> mail.ru>
Bug: https://bugs.gentoo.org/628688
Package-Manager: Portage-2.3.19, Repoman-2.3.6
media-gfx/converseen/Manifest | 1 +
media-gfx/converseen/converseen-0.9.6.2.ebuild | 32 +++++++++++
.../files/converseen-0.9.6.2-gnuinstalldirs.patch | 64 ++++++++++++++++++++++
media-gfx/converseen/metadata.xml | 2 +-
4 files changed, 98 insertions(+), 1 deletion(-)
diff --git a/media-gfx/converseen/Manifest b/media-gfx/converseen/Manifest
index 452337ee81d..a271f6384b8 100644
--- a/media-gfx/converseen/Manifest
+++ b/media-gfx/converseen/Manifest
@@ -1,2 +1,3 @@
DIST converseen-0.6.4.tar.bz2 223060 BLAKE2B 94b0aa1bd629f3421ddf0eac9ee98c927cb4a12a6bd1e4df14a37f6fd5f3439562188b53f2c4e0ba4d7cda5cd7800f89216380d02b576b2dcdf9fd4cd601dcdc SHA512 432403cf13bb5eb1b6d0438775379295e05b250902c259bf0117efea7e21d1768cb0fe4fb8ed9bffcdca4b055a5b95612fb5e3c24b3061813b10b6db736314a9
DIST converseen-0.6.8.tar.bz2 226559 BLAKE2B e0df4901835aa928a502cc586cbcf1ffcfa44c6935d0223b8a8075ebe9c137c0527badd03919d7dec89ed3b706d6bdc691f8c4c173c1e3e70d7def70f643c9b0 SHA512 add32cb213a708f5311a7b885a2f50333c9cc1b83fc08a4e4e836882eabcf7ce170e514b2de08cc6b66c1680873ed65f774bcb62c7f69c55ba061c37bbab2836
+DIST converseen-0.9.6.2.tar.gz 276879 BLAKE2B 3f41c8a85d275b2a2fb1c2c8971f92e447b0c7b236d5b90a07629400925b8627e1e9e837239e2114cd2e6f755941b4ef28adfbecf9813963d01b925af4e348e0 SHA512 897bcb4554ca05d92dc939837f74022fcc21e05273cb40445c0d02ce3e10e87f9e74eeccee69e4ed1bdf63ca3bd759d4d51769daee5ea34df7997114c7937f7c
diff --git a/media-gfx/converseen/converseen-0.9.6.2.ebuild b/media-gfx/converseen/converseen-0.9.6.2.ebuild
new file mode 100644
index 00000000000..803e1a01e29
--- /dev/null
+++ b/media-gfx/converseen/converseen-0.9.6.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Batch image converter and resizer based on ImageMagick"
+HOMEPAGE="http://converseen.fasterland.net/"
+SRC_URI="https://github.com/Faster3ck/Converseen/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+# FIXME: graphicsmagick dependency does not work properly, failures when compiling
+# || ( media-gfx/imagemagick[cxx] media-gfx/graphicsmagick[cxx,imagemagick] )
+RDEPEND="
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtwidgets:5
+ media-gfx/imagemagick:=[cxx]
+"
+DEPEND="${RDEPEND}
+ dev-qt/linguist-tools:5
+"
+
+S="${WORKDIR}/${P^}"
+
+PATCHES=( "${FILESDIR}/${P}-gnuinstalldirs.patch" )
diff --git a/media-gfx/converseen/files/converseen-0.9.6.2-gnuinstalldirs.patch b/media-gfx/converseen/files/converseen-0.9.6.2-gnuinstalldirs.patch
new file mode 100644
index 00000000000..3b53d056948
--- /dev/null
+++ b/media-gfx/converseen/files/converseen-0.9.6.2-gnuinstalldirs.patch
@@ -0,0 +1,64 @@
+From ba62e29b7739c96ad073a7c14d4fdb5883dbe94c Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Tue, 9 Jan 2018 02:06:09 +0100
+Subject: [PATCH] Use GNUInstalldirs
+
+No need to reinvent the wheel, make use of standards provided by cmake.
+---
+ CMakeLists.txt | 36 +++++++++++++++++++-----------------
+ 1 file changed, 19 insertions(+), 17 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a944102..de5e556 100755
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -5,6 +5,8 @@ cmake_minimum_required(VERSION 2.6)
+ SET(GUI "converseen")
+ SET(QT_USE_QTNETWORK TRUE)
+
++include(GNUInstallDirs)
++
+ ADD_DEFINITIONS( ${OPTIMIZATION_FLAGS} )
+
+ SET(converseen_UIS
+@@ -129,20 +131,20 @@ ADD_EXECUTABLE(${GUI}
+
+ TARGET_LINK_LIBRARIES(${GUI} ${Qt5Network_LIBRARIES} ${Qt5Widgets_LIBRARIES} ${ImageMagick_LIBRARY} ${ImageMagick_Magick++_LIBRARY} ${ImageMagick_MagickCore_LIBRARY})
+
+-install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/converseen DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
+-install(FILES res/converseen.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications)
+-install(FILES res/converseen.png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pixmaps)
+-install(FILES res/converseen_import.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kservices5/ServiceMenus)
+-install(FILES converseen.appdata.xml DESTINATION /usr/share/appdata/)
+-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_cs_CZ.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc)
+-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_de_DE.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc)
+-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_es_CL.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc)
+-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_fr_FR.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc)
+-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_hu_HU.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc)
+-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_it_IT.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc)
+-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_pt_BR.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc)
+-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_tr_TR.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc)
+-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_ru_RU.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc)
+-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_pl_PL.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc)
+-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_ja_JP.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc)
+-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_da_DK.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc)
++install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/converseen DESTINATION ${CMAKE_INSTALL_BINDIR})
++install(FILES res/converseen.desktop DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications)
++install(FILES res/converseen.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/pixmaps)
++install(FILES res/converseen_import.desktop DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/kservices5/ServiceMenus)
++install(FILES converseen.appdata.xml DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/appdata/)
++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_cs_CZ.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc)
++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_de_DE.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc)
++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_es_CL.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc)
++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_fr_FR.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc)
++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_hu_HU.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc)
++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_it_IT.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc)
++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_pt_BR.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc)
++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_tr_TR.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc)
++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_ru_RU.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc)
++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_pl_PL.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc)
++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_ja_JP.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc)
++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_da_DK.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc)
+--
+2.15.1
+
diff --git a/media-gfx/converseen/metadata.xml b/media-gfx/converseen/metadata.xml
index 04b9e1a50d5..4716a659219 100644
--- a/media-gfx/converseen/metadata.xml
+++ b/media-gfx/converseen/metadata.xml
@@ -6,6 +6,6 @@
<name>Maxim Koltsov</name>
</maintainer>
<upstream>
- <remote-id type="sourceforge">converseen</remote-id>
+ <remote-id type="github">Faster3ck/Converseen</remote-id>
</upstream>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/converseen/, media-gfx/converseen/files/
@ 2021-02-26 22:16 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2021-02-26 22:16 UTC (permalink / raw
To: gentoo-commits
commit: ac191a9b76519325ee7557ebdca77098ada9a420
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 26 20:47:42 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Feb 26 22:16:28 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac191a9b
media-gfx/converseen: Drop 0.9.6.2
Package-Manager: Portage-3.0.15, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-gfx/converseen/Manifest | 1 -
media-gfx/converseen/converseen-0.9.6.2.ebuild | 33 -----------
.../files/converseen-0.9.6.2-gnuinstalldirs.patch | 64 ----------------------
3 files changed, 98 deletions(-)
diff --git a/media-gfx/converseen/Manifest b/media-gfx/converseen/Manifest
index 93bef72d41b..7440bc6d747 100644
--- a/media-gfx/converseen/Manifest
+++ b/media-gfx/converseen/Manifest
@@ -1,2 +1 @@
-DIST converseen-0.9.6.2.tar.gz 276879 BLAKE2B 3f41c8a85d275b2a2fb1c2c8971f92e447b0c7b236d5b90a07629400925b8627e1e9e837239e2114cd2e6f755941b4ef28adfbecf9813963d01b925af4e348e0 SHA512 897bcb4554ca05d92dc939837f74022fcc21e05273cb40445c0d02ce3e10e87f9e74eeccee69e4ed1bdf63ca3bd759d4d51769daee5ea34df7997114c7937f7c
DIST converseen-0.9.9.0.tar.gz 280547 BLAKE2B 978df93748cd5585b99f371f9538f9ae0a6fa683c9a452a8fb3eceb0c6a7b972423dbd396f8702a4db839852d39bb7c3b654603a08a5dc61481ed74c6aa3aa0b SHA512 8ec01de40fc32bc83c97b3e1d1d0400b9ae5c8c5f374dfae452a75f1bec648d6db26ea036103e15c84e4360ed83f27ce5d35a64592289de083e9701e6153ca63
diff --git a/media-gfx/converseen/converseen-0.9.6.2.ebuild b/media-gfx/converseen/converseen-0.9.6.2.ebuild
deleted file mode 100644
index 4432577b94d..00000000000
--- a/media-gfx/converseen/converseen-0.9.6.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-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="debug"
-
-# FIXME: graphicsmagick dependency does not work properly, failures when compiling
-# || ( media-gfx/imagemagick[cxx] media-gfx/graphicsmagick[cxx,imagemagick] )
-RDEPEND="
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtwidgets:5
- media-gfx/imagemagick:=[cxx]
-"
-DEPEND="${RDEPEND}
- dev-qt/linguist-tools:5
-"
-
-S="${WORKDIR}/${P^}"
-
-PATCHES=( "${FILESDIR}/${P}-gnuinstalldirs.patch" )
diff --git a/media-gfx/converseen/files/converseen-0.9.6.2-gnuinstalldirs.patch b/media-gfx/converseen/files/converseen-0.9.6.2-gnuinstalldirs.patch
deleted file mode 100644
index 3b53d056948..00000000000
--- a/media-gfx/converseen/files/converseen-0.9.6.2-gnuinstalldirs.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From ba62e29b7739c96ad073a7c14d4fdb5883dbe94c Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Tue, 9 Jan 2018 02:06:09 +0100
-Subject: [PATCH] Use GNUInstalldirs
-
-No need to reinvent the wheel, make use of standards provided by cmake.
----
- CMakeLists.txt | 36 +++++++++++++++++++-----------------
- 1 file changed, 19 insertions(+), 17 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a944102..de5e556 100755
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -5,6 +5,8 @@ cmake_minimum_required(VERSION 2.6)
- SET(GUI "converseen")
- SET(QT_USE_QTNETWORK TRUE)
-
-+include(GNUInstallDirs)
-+
- ADD_DEFINITIONS( ${OPTIMIZATION_FLAGS} )
-
- SET(converseen_UIS
-@@ -129,20 +131,20 @@ ADD_EXECUTABLE(${GUI}
-
- TARGET_LINK_LIBRARIES(${GUI} ${Qt5Network_LIBRARIES} ${Qt5Widgets_LIBRARIES} ${ImageMagick_LIBRARY} ${ImageMagick_Magick++_LIBRARY} ${ImageMagick_MagickCore_LIBRARY})
-
--install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/converseen DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
--install(FILES res/converseen.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications)
--install(FILES res/converseen.png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pixmaps)
--install(FILES res/converseen_import.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kservices5/ServiceMenus)
--install(FILES converseen.appdata.xml DESTINATION /usr/share/appdata/)
--install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_cs_CZ.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc)
--install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_de_DE.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc)
--install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_es_CL.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc)
--install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_fr_FR.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc)
--install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_hu_HU.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc)
--install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_it_IT.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc)
--install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_pt_BR.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc)
--install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_tr_TR.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc)
--install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_ru_RU.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc)
--install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_pl_PL.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc)
--install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_ja_JP.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc)
--install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_da_DK.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc)
-+install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/converseen DESTINATION ${CMAKE_INSTALL_BINDIR})
-+install(FILES res/converseen.desktop DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications)
-+install(FILES res/converseen.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/pixmaps)
-+install(FILES res/converseen_import.desktop DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/kservices5/ServiceMenus)
-+install(FILES converseen.appdata.xml DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/appdata/)
-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_cs_CZ.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc)
-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_de_DE.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc)
-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_es_CL.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc)
-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_fr_FR.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc)
-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_hu_HU.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc)
-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_it_IT.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc)
-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_pt_BR.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc)
-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_tr_TR.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc)
-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_ru_RU.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc)
-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_pl_PL.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc)
-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_ja_JP.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc)
-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_da_DK.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc)
---
-2.15.1
-
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/converseen/, media-gfx/converseen/files/
@ 2022-12-19 14:47 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2022-12-19 14:47 UTC (permalink / raw
To: gentoo-commits
commit: 19f99a59e0fbea119de259922af2cb1bb16e4780
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 18 12:16:41 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Dec 19 14:44:57 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19f99a59
media-gfx/converseen: drop 0.9.9.0, 0.9.9.6
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-gfx/converseen/Manifest | 2 -
media-gfx/converseen/converseen-0.9.9.0.ebuild | 38 ------------
media-gfx/converseen/converseen-0.9.9.6.ebuild | 46 ---------------
.../files/converseen-0.9.9.0-gnuinstalldirs.patch | 68 ----------------------
4 files changed, 154 deletions(-)
diff --git a/media-gfx/converseen/Manifest b/media-gfx/converseen/Manifest
index fe291bccc79d..07783b3a2e17 100644
--- a/media-gfx/converseen/Manifest
+++ b/media-gfx/converseen/Manifest
@@ -1,3 +1 @@
-DIST converseen-0.9.9.0.tar.gz 280547 BLAKE2B 978df93748cd5585b99f371f9538f9ae0a6fa683c9a452a8fb3eceb0c6a7b972423dbd396f8702a4db839852d39bb7c3b654603a08a5dc61481ed74c6aa3aa0b SHA512 8ec01de40fc32bc83c97b3e1d1d0400b9ae5c8c5f374dfae452a75f1bec648d6db26ea036103e15c84e4360ed83f27ce5d35a64592289de083e9701e6153ca63
-DIST converseen-0.9.9.6.tar.gz 290947 BLAKE2B 56772a2c1f55952d7531311fd1a915084810038677c91616e791cf99085cfb6548fd7d6aa86336ba3df2770c1ffd866523e9f96d3c0d572bc52246d81fb2b6cd SHA512 77b93752085f0f8ab086a30d8c327eb476756e1069736874ec914f99ac64b1fb5c8abd9a4ef7fc45d21edf7c1223c3c5e4e738755f6a71a997374622c98dc78e
DIST converseen-0.9.9.8.tar.gz 769184 BLAKE2B 136d4454825fd64bd8129544df25213346550d4a1bf550fd8c32eef7c2c02cda5965aa235ec8f637de53462968a08c1e1b7c5db454c68ed1cac64d08c322fd54 SHA512 64ef5c5614c6536d84c6fc5ad6f9180c45a4c9d1294e492f0b09a596203d91871191f62ef80c6f888f010377c834ae76d825a29b137885756cc33a7d38d70208
diff --git a/media-gfx/converseen/converseen-0.9.9.0.ebuild b/media-gfx/converseen/converseen-0.9.9.0.ebuild
deleted file mode 100644
index 56b91c7a0cc6..000000000000
--- a/media-gfx/converseen/converseen-0.9.9.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-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="debug"
-
-# FIXME: graphicsmagick dependency does not work properly, failures when compiling
-# || ( media-gfx/imagemagick[cxx] media-gfx/graphicsmagick[cxx,imagemagick] )
-RDEPEND="
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtwidgets:5
- media-gfx/imagemagick:=[cxx]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- dev-qt/linguist-tools:5
-"
-
-S="${WORKDIR}/${P^}"
-
-PATCHES=(
- "${FILESDIR}/${P}-gnuinstalldirs.patch"
- "${FILESDIR}/${P}-appdata-path.patch"
- "${FILESDIR}/${P}-no-update.patch"
-)
diff --git a/media-gfx/converseen/converseen-0.9.9.6.ebuild b/media-gfx/converseen/converseen-0.9.9.6.ebuild
deleted file mode 100644
index 17f9357eeb89..000000000000
--- a/media-gfx/converseen/converseen-0.9.9.6.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-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="debug"
-
-# FIXME: graphicsmagick dependency does not work properly, failures when compiling
-# || ( media-gfx/imagemagick[cxx] media-gfx/graphicsmagick[cxx,imagemagick] )
-RDEPEND="
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtwidgets:5
- 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"
-)
-
-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."
-}
diff --git a/media-gfx/converseen/files/converseen-0.9.9.0-gnuinstalldirs.patch b/media-gfx/converseen/files/converseen-0.9.9.0-gnuinstalldirs.patch
deleted file mode 100644
index 50ad7a01e8db..000000000000
--- a/media-gfx/converseen/files/converseen-0.9.9.0-gnuinstalldirs.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 6dbded67fdbe977719ded2a6ffdcdc87165dd541 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Tue, 9 Jan 2018 02:06:09 +0100
-Subject: [PATCH] Use GNUInstalldirs
-
-No need to reinvent the wheel, make use of standards provided by cmake.
----
- CMakeLists.txt | 40 +++++++++++++++++++++-------------------
- 1 file changed, 21 insertions(+), 19 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f135b66..4bd8764 100755
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -5,6 +5,8 @@ cmake_minimum_required(VERSION 2.6)
- SET(GUI "converseen")
- SET(QT_USE_QTNETWORK TRUE)
-
-+include(GNUInstallDirs)
-+
- ADD_DEFINITIONS( ${OPTIMIZATION_FLAGS} )
-
- SET(converseen_UIS
-@@ -131,22 +133,22 @@ ADD_EXECUTABLE(${GUI}
-
- TARGET_LINK_LIBRARIES(${GUI} ${Qt5Network_LIBRARIES} ${Qt5Widgets_LIBRARIES} ${ImageMagick_LIBRARY} ${ImageMagick_Magick++_LIBRARY} ${ImageMagick_MagickCore_LIBRARY})
-
--install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/converseen DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
--install(FILES res/converseen.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications)
--install(FILES res/converseen.png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pixmaps)
--install(FILES res/converseen_import.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kservices5/ServiceMenus)
--install(FILES converseen.appdata.xml DESTINATION /usr/share/metainfo/)
--install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_cs_CZ.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc)
--install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_de_DE.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc)
--install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_es_CL.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc)
--install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_fr_FR.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc)
--install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_hu_HU.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc)
--install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_it_IT.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc)
--install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_pt_BR.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc)
--install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_tr_TR.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc)
--install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_ru_RU.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc)
--install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_pl_PL.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc)
--install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_ja_JP.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc)
--install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_da_DK.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc)
--install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_uk_UA.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc)
--install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_sv_SE.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc)
-+install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/converseen DESTINATION ${CMAKE_INSTALL_BINDIR})
-+install(FILES res/converseen.desktop DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications)
-+install(FILES res/converseen.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/pixmaps)
-+install(FILES res/converseen_import.desktop DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/kservices5/ServiceMenus)
-+install(FILES converseen.appdata.xml DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/metainfo/)
-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_cs_CZ.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc)
-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_de_DE.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc)
-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_es_CL.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc)
-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_fr_FR.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc)
-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_hu_HU.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc)
-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_it_IT.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc)
-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_pt_BR.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc)
-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_tr_TR.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc)
-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_ru_RU.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc)
-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_pl_PL.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc)
-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_ja_JP.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc)
-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_da_DK.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc)
-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_uk_UA.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc)
-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_sv_SE.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc)
---
-2.30.1
-
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/converseen/, media-gfx/converseen/files/
@ 2023-04-10 7:37 Joonas Niilola
0 siblings, 0 replies; 5+ messages in thread
From: Joonas Niilola @ 2023-04-10 7:37 UTC (permalink / raw
To: gentoo-commits
commit: d8351df9051c2173bb6177b900225203a604633a
Author: Philipp Rösner <rndxelement <AT> protonmail <DOT> com>
AuthorDate: Mon Mar 20 09:07:07 2023 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Apr 10 07:37:20 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8351df9
media-gfx/converseen: add 0.9.11.1
Add ebuild for converseen-0.9.11.1 with support for
media-gfx/graphicsmagick through the patch
converseen-0.9.11.1-graphicsmagick-support.patch.
Closes: https://bugs.gentoo.org/628688
Signed-off-by: Philipp Rösner <rndxelement <AT> protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/30308
Signed-off-by: Joonas Niilola <juippis <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 insertions(+)
diff --git a/media-gfx/converseen/Manifest b/media-gfx/converseen/Manifest
index 725f9fcb6224..29df21a853c6 100644
--- a/media-gfx/converseen/Manifest
+++ b/media-gfx/converseen/Manifest
@@ -1,2 +1,3 @@
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
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..85321a19d51d
--- /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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/converseen/, media-gfx/converseen/files/
@ 2024-01-20 12:32 Sam James
0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2024-01-20 12:32 UTC (permalink / raw
To: gentoo-commits
commit: 74f9c50bdbb151a94c35a3a6036fb7b0292ca857
Author: Philipp Rösner <rndxelement <AT> protonmail <DOT> com>
AuthorDate: Fri Dec 29 23:27:47 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jan 20 12:31:06 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74f9c50b
media-gfx/converseen: add 0.12.0.1
Adjust GraphicsMagick linking to be compatible with upstream
CMakeLists.txt.
Add minor file patches to graphicsmagick-support patch.
Signed-off-by: Philipp Rösner <rndxelement <AT> protonmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-gfx/converseen/Manifest | 1 +
media-gfx/converseen/converseen-0.12.0.1.ebuild | 68 ++++++++++++++++++
...onverseen-0.12.0.1-graphicsmagick-support.patch | 82 ++++++++++++++++++++++
3 files changed, 151 insertions(+)
diff --git a/media-gfx/converseen/Manifest b/media-gfx/converseen/Manifest
index 29df21a853c6..387bb3b5722b 100644
--- a/media-gfx/converseen/Manifest
+++ b/media-gfx/converseen/Manifest
@@ -1,3 +1,4 @@
+DIST converseen-0.12.0.1.tar.gz 2296100 BLAKE2B 83a0271e1451fa196852d717332fa7446cd22bac7b675f3f306692aa1e11d4c5500d033fd9bbb7dd4ec9190ff3b15149bad1e9646006f533d930fc1d686b0a9b SHA512 4e6efa44953b097f8c6af19e3d849caf570a0fa2db673133e1d8ca2abee98b43d2fbd2d12e6c8c2a8ec6a9dd61a1ca3f25ee7a7787791cc783d8c967eacb9d9d
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
diff --git a/media-gfx/converseen/converseen-0.12.0.1.ebuild b/media-gfx/converseen/converseen-0.12.0.1.ebuild
new file mode 100644
index 000000000000..1ab74418a96e
--- /dev/null
+++ b/media-gfx/converseen/converseen-0.12.0.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}/${P}-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.12.0.1-graphicsmagick-support.patch b/media-gfx/converseen/files/converseen-0.12.0.1-graphicsmagick-support.patch
new file mode 100644
index 000000000000..79ae21989745
--- /dev/null
+++ b/media-gfx/converseen/files/converseen-0.12.0.1-graphicsmagick-support.patch
@@ -0,0 +1,82 @@
+# See https://bugs.gentoo.org/628688 for further info and
+# development discussion about this patch.
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -17,7 +17,18 @@ else ()
+ find_package(Qt5 COMPONENTS Core Gui Network Widgets LinguistTools REQUIRED)
+ endif()
+
+-find_package(ImageMagick REQUIRED COMPONENTS Magick++ MagickWand MagickCore)
++find_package(ImageMagick COMPONENTS Magick++ MagickWand MagickCore)
++if (NOT ImageMagick_FOUND)
++ set(ImageMagick_INCLUDE_DIRS "GENTOO_INCLUDE/GraphicsMagick")
++ set(ImageMagick_Magick++_INCLUDE_DIRS "GENTOO_INCLUDE/GraphicsMagick/Magick++")
++ set(ImageMagick_MagickCore_INCLUDE_DIRS "GENTOO_INCLUDE/GraphicsMagick/magic")
++ set(ImageMagick_LIBRARY "GENTOO_LIB/libGraphicsMagick.so")
++ set(ImageMagick_Magick++_LIBRARY "GENTOO_LIB/libGraphicsMagick++.so")
++ set(ImageMagick_MagickCore_LIBRARY "GENTOO_LIB/libGraphicsMagick.so")
++ set(ImageMagick_MagickWand_LIBRARY "GENTOO_LIB/libGraphicsMagickWand.so")
++ set(ImageMagick_MagickWand_INCLUDE_DIRS "GENTOO_INCLUDE/GraphicsMagick/wand")
++ set(ImageMagick_LIBRARIES ${ImageMagick_LIBRARY} ${ImageMagick_Magick++_LIBRARY} ${ImageMagick_MagickCore_LIBRARY} ${ImageMagick_MagickWand_LIBRARY})
++endif ()
+
+ set(converseen_SOURCES
+ src/main.cpp
+--- a/src/converter.cpp
++++ b/src/converter.cpp
+@@ -290,8 +290,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
+@@ -349,6 +355,8 @@ Image Converter::convertPDFtoImage(Image &my_image)
+
+ #if MagickLibVersion < 0x700
+ ximage.antiAlias(true);
++#elif MagickLibVersion > 0x100000
++ ximage.antiAlias(true);
+ #else
+ ximage.textAntiAlias(true);
+ #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
+--- a/src/formats.cpp
++++ b/src/formats.cpp
+@@ -174,6 +174,12 @@ bool Formats::isVideo(list<CoderInfo>::iterator entry)
+ QStringList videoFormats(QStringList() << "3G2" << "3GP" << "APNG" << "AVI" << "FLV" << "M2V" << "M4V" << "MKV" << "MOV" << "MP4" << "MPEG" << "MPG" << "WEBM" << "WMV");
+
+ return videoFormats.contains(currFormat);
++#elif MagickLibVersion > 0x100000
++ // Support for ImageMagick-6. This will be removed sooner as Linux distros drop the support!
++ QString currFormat = QString::fromStdString(entry->name());
++ QStringList videoFormats(QStringList() << "3G2" << "3GP" << "APNG" << "AVI" << "FLV" << "M2V" << "M4V" << "MKV" << "MOV" << "MP4" << "MPEG" << "MPG" << "WEBM" << "WMV");
++
++ return videoFormats.contains(currFormat);
+ #else
+ return (QString::fromStdString(entry->module()) == "VIDEO") ? true : false;
+ #endif
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-01-20 12:32 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-04-10 7:37 [gentoo-commits] repo/gentoo:master commit in: media-gfx/converseen/, media-gfx/converseen/files/ Joonas Niilola
-- strict thread matches above, loose matches on Subject: below --
2024-01-20 12:32 Sam James
2022-12-19 14:47 Andreas Sturmlechner
2021-02-26 22:16 Andreas Sturmlechner
2018-01-09 1:23 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox