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) <[email protected]> +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 <[email protected]> +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) <[email protected]> +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()
