* [gentoo-commits] repo/gentoo:master commit in: media-gfx/converseen/files/, media-gfx/converseen/
@ 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: 5119aee6ef1c1470d8cfb0840d5d7913b7230f4b
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 26 19:11:27 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=5119aee6
media-gfx/converseen: 0.9.9.0 version bump, EAPI7, cmake.eclass
Disable update check
Rebase GNUInstallDirs patch
Closes: https://bugs.gentoo.org/740012
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.9.0.ebuild | 38 ++++++++++++
.../files/converseen-0.9.9.0-appdata-path.patch | 17 ++++++
.../files/converseen-0.9.9.0-gnuinstalldirs.patch | 68 ++++++++++++++++++++++
.../files/converseen-0.9.9.0-no-update.patch | 20 +++++++
5 files changed, 144 insertions(+)
diff --git a/media-gfx/converseen/Manifest b/media-gfx/converseen/Manifest
index ed16f72e505..93bef72d41b 100644
--- a/media-gfx/converseen/Manifest
+++ b/media-gfx/converseen/Manifest
@@ -1 +1,2 @@
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.9.0.ebuild b/media-gfx/converseen/converseen-0.9.9.0.ebuild
new file mode 100644
index 00000000000..06de610772d
--- /dev/null
+++ b/media-gfx/converseen/converseen-0.9.9.0.ebuild
@@ -0,0 +1,38 @@
+# 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/files/converseen-0.9.9.0-appdata-path.patch b/media-gfx/converseen/files/converseen-0.9.9.0-appdata-path.patch
new file mode 100644
index 00000000000..127fc7ad926
--- /dev/null
+++ b/media-gfx/converseen/files/converseen-0.9.9.0-appdata-path.patch
@@ -0,0 +1,17 @@
+Description: install appdata to package directory
+ The CMAKE_INSTALL_PREFIX was not set to install path and set its correct
+ location.
+Author: Laszlo Boszormenyi (GCS) <gcs@debian.org>
+Last-Update: 2018-08-21
+
+--- a/converseen.pro
++++ b/converseen.pro
+@@ -122,7 +122,7 @@ loc/converseen_uk_UA.qm
+ desktopFile.files = res/converseen.desktop
+ kdeservicemenu.path = $${SHARE_DIR}/kservices5/ServiceMenus
+ kdeservicemenu.files = res/converseen_import.desktop
+- appdata.path = /usr/share/appdata/
++ appdata.path = /usr/share/metainfo/
+ appdata.files = converseen.appdata.xml
+
+ isEmpty(QMAKE_LRELEASE) {
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
new file mode 100644
index 00000000000..50ad7a01e8d
--- /dev/null
+++ b/media-gfx/converseen/files/converseen-0.9.9.0-gnuinstalldirs.patch
@@ -0,0 +1,68 @@
+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
+
diff --git a/media-gfx/converseen/files/converseen-0.9.9.0-no-update.patch b/media-gfx/converseen/files/converseen-0.9.9.0-no-update.patch
new file mode 100644
index 00000000000..f4dad00586a
--- /dev/null
+++ b/media-gfx/converseen/files/converseen-0.9.9.0-no-update.patch
@@ -0,0 +1,20 @@
+Description: Don't check upstream versions
+ Don't check new versions page due to privacy concerns.
+Forwarded: no
+Last-Update: 2018-08-21
+Author: Laszlo Boszormenyi (GCS) <gcs@debian.org>
+Bug-Debian: https://bugs.debian.org/761944
+
+---
+
+--- a/src/mainwindowimpl.cpp
++++ b/src/mainwindowimpl.cpp
+@@ -1012,7 +1012,7 @@ void MainWindowImpl::openFlattrLink()
+ void MainWindowImpl::checkForUpdates()
+ {
+ UpdateChecker *up = new UpdateChecker();
+- up->checkForUpdates();
++// up->checkForUpdates();
+ }
+
+ void MainWindowImpl::bugReport()
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/converseen/files/, media-gfx/converseen/
@ 2024-12-31 9:08 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2024-12-31 9:08 UTC (permalink / raw
To: gentoo-commits
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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/converseen/files/, media-gfx/converseen/
@ 2025-01-01 18:26 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2025-01-01 18:26 UTC (permalink / raw
To: gentoo-commits
commit: 3411592bfb9a5d2aac45ba36e3113b4f518ca07f
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 1 18:25:41 2025 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jan 1 18:26:33 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3411592b
media-gfx/converseen: Revert "add 0.12.2.4"
This reverts commit 6bc703df5e9e696c848f09bb0f7245f7f349dff5.
Mistakenly pushed.
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-gfx/converseen/Manifest | 1 -
media-gfx/converseen/converseen-0.12.2.4.ebuild | 67 ----------------------
.../files/converseen-0.12.2.4-appdata-path.patch | 13 -----
3 files changed, 81 deletions(-)
diff --git a/media-gfx/converseen/Manifest b/media-gfx/converseen/Manifest
index f10450e6adeb..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.12.2.4.tar.gz 941270 BLAKE2B 4ac582a2dc3bbbabb48c1d12fe4ba4ed1d61b20e946645edab4eb6ac2d62cfa2df149b61c60842b36b55239694013661af4dd7c27a5195ee25f808d0a9b29605 SHA512 7d207207859f57037038b595935e3b0c5b202eda6a39e64226f6e898d5c3762077424a52f2ae6029263eae672607d05e30bf4ad2005ce15fd50348cca374413a
diff --git a/media-gfx/converseen/converseen-0.12.2.4.ebuild b/media-gfx/converseen/converseen-0.12.2.4.ebuild
deleted file mode 100644
index 8096327f78f3..000000000000
--- a/media-gfx/converseen/converseen-0.12.2.4.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2025 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"
-S="${WORKDIR}/${P^}"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="graphicsmagick debug"
-
-RDEPEND="
- dev-qt/qtbase:6[gui,network,widgets]
- graphicsmagick? ( media-gfx/graphicsmagick:=[cxx,imagemagick] )
- !graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="dev-qt/qttools[linguist]"
-
-PATCHES=(
- "${FILESDIR}/${P}-appdata-path.patch"
- "${FILESDIR}/${PN}-0.9.9.0-no-update.patch"
- "${FILESDIR}/${PN}-0.12.0.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
-}
-
-src_configure() {
- local mycmakeargs=(-DUSE_QT6=yes)
- cmake_src_configure
-}
-
-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.2.4-appdata-path.patch b/media-gfx/converseen/files/converseen-0.12.2.4-appdata-path.patch
deleted file mode 100644
index 5da3cec04e5c..000000000000
--- a/media-gfx/converseen/files/converseen-0.12.2.4-appdata-path.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/converseen.pro b/converseen.pro
-index c85620d..da49a71 100755
---- a/converseen.pro
-+++ b/converseen.pro
-@@ -171,7 +171,7 @@ win32 {
- desktopFile.files = res/converseen.desktop
- kdeservicemenu.path = $${SHARE_DIR}/kio/servicemenus
- kdeservicemenu.files = res/converseen_import.desktop
-- appdata.path = /usr/share/appdata/
-+ appdata.path = /usr/share/metainfo/
- appdata.files = converseen.appdata.xml
-
- isEmpty(QMAKE_LRELEASE) {
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/converseen/files/, media-gfx/converseen/
@ 2025-01-01 18:34 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2025-01-01 18:34 UTC (permalink / raw
To: gentoo-commits
commit: bfc6b5f4f1056e50bb6fc09b69706e068ee9dfd3
Author: Philipp Rösner <rndxelement <AT> protonmail <DOT> com>
AuthorDate: Tue Dec 31 11:59:11 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jan 1 18:33:44 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bfc6b5f4
media-gfx/converseen: add 0.12.2.4
Add ebuild for latest upstream release with support for
Qt6 and dropped support for Qt5.
Signed-off-by: Philipp Rösner <rndxelement <AT> protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/39919
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-gfx/converseen/Manifest | 1 +
media-gfx/converseen/converseen-0.12.2.4.ebuild | 67 ++++++++++++++++++++++
.../files/converseen-0.12.2.4-appdata-path.patch | 11 ++++
3 files changed, 79 insertions(+)
diff --git a/media-gfx/converseen/Manifest b/media-gfx/converseen/Manifest
index 69c341cdb887..f10450e6adeb 100644
--- a/media-gfx/converseen/Manifest
+++ b/media-gfx/converseen/Manifest
@@ -1 +1,2 @@
DIST converseen-0.12.0.1.tar.gz 2296100 BLAKE2B 83a0271e1451fa196852d717332fa7446cd22bac7b675f3f306692aa1e11d4c5500d033fd9bbb7dd4ec9190ff3b15149bad1e9646006f533d930fc1d686b0a9b SHA512 4e6efa44953b097f8c6af19e3d849caf570a0fa2db673133e1d8ca2abee98b43d2fbd2d12e6c8c2a8ec6a9dd61a1ca3f25ee7a7787791cc783d8c967eacb9d9d
+DIST converseen-0.12.2.4.tar.gz 941270 BLAKE2B 4ac582a2dc3bbbabb48c1d12fe4ba4ed1d61b20e946645edab4eb6ac2d62cfa2df149b61c60842b36b55239694013661af4dd7c27a5195ee25f808d0a9b29605 SHA512 7d207207859f57037038b595935e3b0c5b202eda6a39e64226f6e898d5c3762077424a52f2ae6029263eae672607d05e30bf4ad2005ce15fd50348cca374413a
diff --git a/media-gfx/converseen/converseen-0.12.2.4.ebuild b/media-gfx/converseen/converseen-0.12.2.4.ebuild
new file mode 100644
index 000000000000..8096327f78f3
--- /dev/null
+++ b/media-gfx/converseen/converseen-0.12.2.4.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2025 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"
+S="${WORKDIR}/${P^}"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="graphicsmagick debug"
+
+RDEPEND="
+ dev-qt/qtbase:6[gui,network,widgets]
+ graphicsmagick? ( media-gfx/graphicsmagick:=[cxx,imagemagick] )
+ !graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-qt/qttools[linguist]"
+
+PATCHES=(
+ "${FILESDIR}/${P}-appdata-path.patch"
+ "${FILESDIR}/${PN}-0.9.9.0-no-update.patch"
+ "${FILESDIR}/${PN}-0.12.0.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
+}
+
+src_configure() {
+ local mycmakeargs=(-DUSE_QT6=yes)
+ cmake_src_configure
+}
+
+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.2.4-appdata-path.patch b/media-gfx/converseen/files/converseen-0.12.2.4-appdata-path.patch
new file mode 100644
index 000000000000..2b07399b420d
--- /dev/null
+++ b/media-gfx/converseen/files/converseen-0.12.2.4-appdata-path.patch
@@ -0,0 +1,11 @@
+--- a/converseen.pro 2024-10-29 16:39:33.000000000 +0100
++++ b/converseen.pro 2025-01-01 19:30:59.323494846 +0100
+@@ -171,7 +171,7 @@
+ desktopFile.files = res/converseen.desktop
+ kdeservicemenu.path = $${SHARE_DIR}/kio/servicemenus
+ kdeservicemenu.files = res/converseen_import.desktop
+- appdata.path = /usr/share/appdata/
++ appdata.path = /usr/share/metainfo/
+ appdata.files = converseen.appdata.xml
+
+ isEmpty(QMAKE_LRELEASE) {
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/converseen/files/, media-gfx/converseen/
@ 2025-01-31 14:55 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2025-01-31 14:55 UTC (permalink / raw
To: gentoo-commits
commit: 42c5a1fd95d1a97984a3bbcdb2e76d01507b0d2a
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 31 14:48:50 2025 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Jan 31 14:53:25 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42c5a1fd
media-gfx/converseen: drop 0.12.0.1
Bug: https://bugs.gentoo.org/948011
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-gfx/converseen/Manifest | 1 -
media-gfx/converseen/converseen-0.12.0.1.ebuild | 68 ----------------------
.../files/converseen-0.9.9.0-appdata-path.patch | 17 ------
3 files changed, 86 deletions(-)
diff --git a/media-gfx/converseen/Manifest b/media-gfx/converseen/Manifest
index f10450e6adeb..ffd350a6d26e 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.12.2.4.tar.gz 941270 BLAKE2B 4ac582a2dc3bbbabb48c1d12fe4ba4ed1d61b20e946645edab4eb6ac2d62cfa2df149b61c60842b36b55239694013661af4dd7c27a5195ee25f808d0a9b29605 SHA512 7d207207859f57037038b595935e3b0c5b202eda6a39e64226f6e898d5c3762077424a52f2ae6029263eae672607d05e30bf4ad2005ce15fd50348cca374413a
diff --git a/media-gfx/converseen/converseen-0.12.0.1.ebuild b/media-gfx/converseen/converseen-0.12.0.1.ebuild
deleted file mode 100644
index 0535af0f44b8..000000000000
--- a/media-gfx/converseen/converseen-0.12.0.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2024 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.9.9.0-appdata-path.patch b/media-gfx/converseen/files/converseen-0.9.9.0-appdata-path.patch
deleted file mode 100644
index 127fc7ad926c..000000000000
--- a/media-gfx/converseen/files/converseen-0.9.9.0-appdata-path.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: install appdata to package directory
- The CMAKE_INSTALL_PREFIX was not set to install path and set its correct
- location.
-Author: Laszlo Boszormenyi (GCS) <gcs@debian.org>
-Last-Update: 2018-08-21
-
---- a/converseen.pro
-+++ b/converseen.pro
-@@ -122,7 +122,7 @@ loc/converseen_uk_UA.qm
- desktopFile.files = res/converseen.desktop
- kdeservicemenu.path = $${SHARE_DIR}/kservices5/ServiceMenus
- kdeservicemenu.files = res/converseen_import.desktop
-- appdata.path = /usr/share/appdata/
-+ appdata.path = /usr/share/metainfo/
- appdata.files = converseen.appdata.xml
-
- isEmpty(QMAKE_LRELEASE) {
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2025-01-31 14:55 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-01-31 14:55 [gentoo-commits] repo/gentoo:master commit in: media-gfx/converseen/files/, media-gfx/converseen/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2025-01-01 18:34 Andreas Sturmlechner
2025-01-01 18:26 Andreas Sturmlechner
2024-12-31 9:08 Andreas Sturmlechner
2021-02-26 22:16 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox