From 2cb362cefa3de4c8d8e9fc883ed0a3c74bc47ad6 Mon Sep 17 00:00:00 2001 From: Nicolas PARLANT Date: Thu, 25 Jun 2026 15:59:35 +0200 Subject: [PATCH] media-gfx/photoqt: drop 4.9.2, 5.0, 5.2 Signed-off-by: Nicolas PARLANT Part-of: https://codeberg.org/gentoo/gentoo/pulls/1254 Merges: https://codeberg.org/gentoo/gentoo/pulls/1254 Signed-off-by: Sam James --- media-gfx/photoqt/Manifest | 4 - .../files/photoqt-5.2-disable_sign_ext.patch | 14 -- media-gfx/photoqt/metadata.xml | 1 - media-gfx/photoqt/photoqt-4.9.2.ebuild | 109 --------------- media-gfx/photoqt/photoqt-5.0.ebuild | 130 ------------------ media-gfx/photoqt/photoqt-5.2.ebuild | 122 ---------------- 6 files changed, 380 deletions(-) delete mode 100644 media-gfx/photoqt/files/photoqt-5.2-disable_sign_ext.patch delete mode 100644 media-gfx/photoqt/photoqt-4.9.2.ebuild delete mode 100644 media-gfx/photoqt/photoqt-5.0.ebuild delete mode 100644 media-gfx/photoqt/photoqt-5.2.ebuild diff --git a/media-gfx/photoqt/Manifest b/media-gfx/photoqt/Manifest index ee457dc585f23..dc45acb54565f 100644 --- a/media-gfx/photoqt/Manifest +++ b/media-gfx/photoqt/Manifest @@ -1,6 +1,2 @@ -DIST photoqt-extensions-v5.0.tar.bz2 76917 BLAKE2B 218c598e54dda49e97e0f6450172da49e6bd4ffe699be3618d606e2f0115987eb44335c9e7b6180e71455bb3781de633e57011bf93e1913b1e3d8f0ffb07563a SHA512 ddbb35fce38a1232ad3c65edb48ad9d9186691d156a28064a652efeb22241c46a64c4526ca7393de927d98d99c87372766166bd5365b6d5fab7e9214593d9074 -DIST photoqt-v4.9.2.tar.bz2 5297183 BLAKE2B cbe56e99c6749a186b1b9c654915db9b90c865f8c3ac2cb99ca2fce2eb5295a4b07a75872e90a1ab922d3b85589fb58ae4281610c56aa8ec6f54025da5f011bb SHA512 0d94b68efce131fbeb2cb230291aed45adccc622116075a6757055566e97cef17a53afcdb1873d5ebb059d611cad9dbff0ad40cb2170d21397f8f02aa8010c38 -DIST photoqt-v5.0.tar.bz2 5686155 BLAKE2B 26c2869b0d59d10fb74e5611820fae5beec01a264969317163445dd05b01b7fe3f22e3a2c2aa67f7d99c114a2865757c35c930b3184208d4835520ccbc33a78f SHA512 abaac4e997e6b5c28428ec77824044b937c82a0166d51ac82db1f873115ab798cf1696d4915add755474e46d46bf63cef257cf062d80531c755313c952fd30a1 -DIST photoqt-v5.2.tar.bz2 5779631 BLAKE2B b0689e39af14bbceb4db3b4fea8e87a7564afd9687988e8b1f7b99f3da0b4a1440267ff6a7f7443527f3e55c6435f69a40772c98cb4c348455d07551c66fe6f4 SHA512 7c0a7f45782fafdf026e41fcb795cbd398209673ff10eac69dcb771e1a9738a6fc3ac307083ec37d6bc3e6242bee82bed4a7beafed02a3faa651de536d3654c5 DIST photoqt-v5.3.tar.bz2 5782225 BLAKE2B 9f8635879dcb692351400e33bc1c31328b221285abae1af742d28b6cd065aa46d31e495f8c7c645534ee7d61687dcb8b1097912713ebc12a3b85dae5f8791115 SHA512 5fa4ac9856ecea1acdf845d9e62227ce404656c520cf6040a37829e7af53c34b7391c384515e0e009c7cbfc7d8325b2b8ebfccca742e9d9c295e8cd85951d8ac DIST photoqt-v5.4.tar.bz2 6749999 BLAKE2B d0d8b3832101dfe5f08d8f931999be62ce31949e61a5abb1b0ec53f284bcc455ae82e999b64a28dea9176ce4838ebe7b9395fc12c9788add435bea5c3c9e7d7d SHA512 1fa691cf217349c8162e5c03129c199ce2222eb382d37d6d68a9bb406854fdecb4641ce3f67b10c47c1f4af13fa4a0db3e1a293fb0cbfaf62655bfa17ea6f802 diff --git a/media-gfx/photoqt/files/photoqt-5.2-disable_sign_ext.patch b/media-gfx/photoqt/files/photoqt-5.2-disable_sign_ext.patch deleted file mode 100644 index e5595e04bd3ae..0000000000000 --- a/media-gfx/photoqt/files/photoqt-5.2-disable_sign_ext.patch +++ /dev/null @@ -1,14 +0,0 @@ -Manifest signature verification is currently disabled; the checksum for Cropimage.qml is -incorrect, and the shared libraries aren't ignored as expected. -This will be reworked and made optional in version 5.3. ---- a/cplusplus/extensions/pqc_extensionshandler.cpp -+++ b/cplusplus/extensions/pqc_extensionshandler.cpp -@@ -1451,7 +1451,7 @@ bool PQCExtensionsHandler::verifyExtension(QString extensionDir, QString nameId) - - if(hash != hashMap.value(f)) { - qWarning() << identifyName << "- Invalid hash for file:" << f; -- return false; -+ return true; - } - - } diff --git a/media-gfx/photoqt/metadata.xml b/media-gfx/photoqt/metadata.xml index f0edd1539e519..38e3791fc0e1e 100644 --- a/media-gfx/photoqt/metadata.xml +++ b/media-gfx/photoqt/metadata.xml @@ -15,7 +15,6 @@ Support additional image formats using media-libs/devil Support additional features using extensions Support for video thumbnail using media-video/ffmpegthumbnailer - Support additional image formats using media-libs/freeimage Support for video files using media-video/mpv Support for media-libs/vips image processing library diff --git a/media-gfx/photoqt/photoqt-4.9.2.ebuild b/media-gfx/photoqt/photoqt-4.9.2.ebuild deleted file mode 100644 index 662c5149c398b..0000000000000 --- a/media-gfx/photoqt/photoqt-4.9.2.ebuild +++ /dev/null @@ -1,109 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{11..13} ) -inherit cmake optfeature python-single-r1 xdg - -DESCRIPTION="Simple but powerful Qt-based image viewer" -HOMEPAGE="https://photoqt.org/" -SRC_URI="https://gitlab.com/lspies/photoqt/-/archive/v${PV}/${PN}-v${PV}.tar.bz2" -S="${WORKDIR}/${PN}-v${PV}" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="amd64 ~x86" -IUSE="barcode chromecast devil exif freeimage geolocation graphicsmagick +imagemagick lcms mpv pdf raw test vips wayland" -REQUIRED_USE="chromecast? ( ${PYTHON_REQUIRED_USE} )" -RESTRICT="!test? ( test )" - -COMMON_DEPEND=" - app-arch/libarchive:= - dev-libs/pugixml - dev-qt/qtbase:6[concurrent,dbus,gui,icu,network,opengl,sql,sqlite,widgets,xml] - dev-qt/qtdeclarative:6[opengl] - dev-qt/qtimageformats:6 - dev-qt/qtmultimedia:6[qml] - dev-qt/qtsvg:6 - barcode? ( media-libs/zxing-cpp:= ) - chromecast? ( - ${PYTHON_DEPS} - $(python_gen_cond_dep 'dev-python/pychromecast[${PYTHON_USEDEP}]') - ) - devil? ( media-libs/devil ) - exif? ( media-gfx/exiv2:=[bmff] ) - freeimage? ( media-libs/freeimage ) - imagemagick? ( - !graphicsmagick? ( media-gfx/imagemagick:=[cxx,hdri] ) - graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) - ) - lcms? ( media-libs/lcms:2 ) - mpv? ( media-video/mpv:=[libmpv] ) - pdf? ( app-text/poppler[qt6] ) - raw? ( media-libs/libraw:= ) - vips? ( - dev-libs/glib:2 - media-libs/vips:= - ) - wayland? ( dev-libs/wayland ) -" -RDEPEND="${COMMON_DEPEND} - dev-qt/qtcharts:6[qml] - geolocation? ( - dev-qt/qtlocation:6 - dev-qt/qtpositioning:6[qml] - ) -" -DEPEND="${COMMON_DEPEND} - vips? ( x11-base/xorg-proto ) -" -BDEPEND=" - dev-qt/qttools:6[linguist] - >=kde-frameworks/extra-cmake-modules-6.5.0:* - virtual/pkgconfig - chromecast? ( ${PYTHON_DEPS} ) -" - -pkg_setup() { - use chromecast && python-single-r1_pkg_setup -} - -src_configure() { - local mycmakeargs=( - -DWITH_CHROMECAST=$(usex chromecast) - -DWITH_DEVIL=$(usex devil) - -DWITH_EXIV2=$(usex exif) - -DWITH_EXIV2_ENABLE_BMFF=$(usex exif) - -DWITH_FREEIMAGE=$(usex freeimage) - -DWITH_GRAPHICSMAGICK=$(usex graphicsmagick $(usex imagemagick)) - -DWITH_IMAGEMAGICK=$(usex imagemagick $(usex !graphicsmagick)) - -DWITH_LCMS2=$(usex lcms) - -DWITH_LOCATION=$(usex geolocation) - -DWITH_VIDEO_MPV=$(usex mpv) - -DWITH_POPPLER=$(usex pdf) - -DWITH_LIBRAW=$(usex raw) - -DWITH_RESVG=OFF # qt5 only - -DWITH_TESTING=$(usex test) - -DWITH_LIBVIPS=$(usex vips) - -DWITH_WAYLANDSPECIFIC=$(usex wayland) - -DWITH_ZXING=$(usex barcode) - ) - - cmake_src_configure -} - -src_test() { - local -x QT_QPA_PLATFORM=offscreen - # QCollator::setNumericMode is not supported w/ POSIX/C locale or w/o icu - # Set LC_COLLATE=en_US.utf8 if available. - # Required for PQCTest::getFoldersIn() - unset LC_COLLATE - locale -a | grep -iq "en_US.utf8" || die "locale en_US.utf8 not available, testsuite not launched" - LC_COLLATE="en_US.utf8" "${BUILD_DIR}"/photoqt_test || die -} - -pkg_postinst() { - optfeature "additional image formats like AVIF, EPS, HEIF/HEIC, PSD, etc." "kde-frameworks/kimageformats:6" - xdg_pkg_postinst -} diff --git a/media-gfx/photoqt/photoqt-5.0.ebuild b/media-gfx/photoqt/photoqt-5.0.ebuild deleted file mode 100644 index d618465fc7f3f..0000000000000 --- a/media-gfx/photoqt/photoqt-5.0.ebuild +++ /dev/null @@ -1,130 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{11..13} ) -inherit cmake optfeature python-single-r1 xdg - -DESCRIPTION="Simple but powerful Qt-based image viewer" -HOMEPAGE="https://photoqt.org/" -SRC_URI=" - https://gitlab.com/lspies/photoqt/-/archive/v${PV}/${PN}-v${PV}.tar.bz2 - extensions? ( https://gitlab.com/lspies/photoqt-extensions/-/archive/v${PV}/${PN}-extensions-v${PV}.tar.bz2 ) -" -S="${WORKDIR}/${PN}-v${PV}" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="barcode chromecast devil exif extensions freeimage geolocation graphicsmagick +imagemagick lcms mpv pdf raw test vips wayland" -REQUIRED_USE="chromecast? ( ${PYTHON_REQUIRED_USE} )" -RESTRICT="!test? ( test )" - -COMMON_DEPEND=" - app-arch/libarchive:= - dev-libs/pugixml - dev-qt/qtbase:6[concurrent,dbus,gui,icu,network,opengl,sql,sqlite,widgets,xml] - dev-qt/qtdeclarative:6[opengl] - dev-qt/qtimageformats:6 - dev-qt/qtmultimedia:6[qml] - dev-qt/qtsvg:6 - barcode? ( media-libs/zxing-cpp:= ) - chromecast? ( - ${PYTHON_DEPS} - $(python_gen_cond_dep 'dev-python/pychromecast[${PYTHON_USEDEP}]') - ) - devil? ( media-libs/devil ) - exif? ( media-gfx/exiv2:=[bmff] ) - extensions? ( - app-crypt/qca:2 - dev-cpp/yaml-cpp:= - ) - freeimage? ( media-libs/freeimage ) - imagemagick? ( - !graphicsmagick? ( media-gfx/imagemagick:=[cxx,hdri] ) - graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) - ) - lcms? ( media-libs/lcms:2 ) - mpv? ( media-video/mpv:=[libmpv] ) - pdf? ( app-text/poppler[qt6] ) - raw? ( media-libs/libraw:= ) - vips? ( - dev-libs/glib:2 - media-libs/vips:= - ) - wayland? ( dev-libs/wayland ) -" -RDEPEND=" - ${COMMON_DEPEND} - dev-qt/qtcharts:6[qml] - geolocation? ( - dev-qt/qtlocation:6 - dev-qt/qtpositioning:6[qml] - ) -" -DEPEND=" - ${COMMON_DEPEND} - vips? ( x11-base/xorg-proto ) -" -BDEPEND=" - dev-qt/qttools:6[linguist] - >=kde-frameworks/extra-cmake-modules-6.5.0:* - virtual/pkgconfig - chromecast? ( ${PYTHON_DEPS} ) -" - -pkg_setup() { - use chromecast && python-single-r1_pkg_setup -} - -src_unpack() { - default - if use extensions; then - rmdir "${S}"/extensions || die - ln -sfT ../${PN}-extensions-v${PV} "${S}"/extensions || die - fi -} - -src_configure() { - local mycmakeargs=( - -DWITH_ZXING=$(usex barcode) - -DWITH_CHROMECAST=$(usex chromecast) - -DWITH_DEVIL=$(usex devil) - -DWITH_EXIV2=$(usex exif) - -DWITH_EXIV2_ENABLE_BMFF=$(usex exif) - -DWITH_EXTENSIONS_SUPPORT=$(usex extensions) - -DWITH_FREEIMAGE=$(usex freeimage) - -DWITH_LOCATION=$(usex geolocation) - -DWITH_GRAPHICSMAGICK=$(usex graphicsmagick $(usex imagemagick)) - -DWITH_IMAGEMAGICK=$(usex imagemagick $(usex !graphicsmagick)) - -DWITH_LCMS2=$(usex lcms) - -DWITH_VIDEO_MPV=$(usex mpv) - -DWITH_POPPLER=$(usex pdf) - -DWITH_LIBRAW=$(usex raw) - -DWITH_LIBVIPS=$(usex vips) - -DWITH_WAYLANDSPECIFIC=$(usex wayland) - -DWITH_ADAPTSOURCE=ON # adapt the sources according to the Qt version - -DWITH_LIBSAI=OFF # Wunkolo/libsai, no release, experimental - -DWITH_QTPDF=OFF # use poppler instead - -DWITH_RESVG=OFF # qt5 only - -DWITH_TESTING=$(usex test) - ) - - cmake_src_configure -} - -src_test() { - local -x QT_QPA_PLATFORM=offscreen - # QCollator::setNumericMode is not supported w/ POSIX/C locale or w/o icu - # Set LC_COLLATE=en_US.utf8 if available. - # Required for PQTScriptsFilesPaths::getFoldersIn() - unset LC_COLLATE - locale -a | grep -iq "en_US.utf8" || die "locale en_US.utf8 not available, testsuite not launched" - LC_COLLATE="en_US.utf8" cmake_src_test -j1 -} - -pkg_postinst() { - optfeature "additional image formats like AVIF, EPS, HEIF/HEIC, PSD, etc." "kde-frameworks/kimageformats:6" - xdg_pkg_postinst -} diff --git a/media-gfx/photoqt/photoqt-5.2.ebuild b/media-gfx/photoqt/photoqt-5.2.ebuild deleted file mode 100644 index 33bdd2f76cf39..0000000000000 --- a/media-gfx/photoqt/photoqt-5.2.ebuild +++ /dev/null @@ -1,122 +0,0 @@ -# Copyright 1999-2026 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{11..14} ) -inherit cmake optfeature python-single-r1 xdg - -DESCRIPTION="Simple but powerful Qt-based image viewer" -HOMEPAGE="https://photoqt.org/" -SRC_URI="https://gitlab.com/lspies/photoqt/-/archive/v${PV}/${PN}-v${PV}.tar.bz2" -S="${WORKDIR}/${PN}-v${PV}" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="barcode chromecast devil exif extensions geolocation graphicsmagick +imagemagick lcms mpv pdf raw test vips wayland" -REQUIRED_USE="chromecast? ( ${PYTHON_REQUIRED_USE} )" -RESTRICT="!test? ( test )" - -COMMON_DEPEND=" - app-arch/libarchive:= - dev-qt/qtbase:6[concurrent,dbus,gui,icu,network,opengl,sql,sqlite,widgets,xml] - dev-qt/qtdeclarative:6[opengl] - dev-qt/qtimageformats:6 - dev-qt/qtmultimedia:6[qml] - dev-qt/qtsvg:6 - barcode? ( media-libs/zxing-cpp:= ) - chromecast? ( - ${PYTHON_DEPS} - $(python_gen_cond_dep 'dev-python/pychromecast[${PYTHON_USEDEP}]') - ) - devil? ( media-libs/devil ) - exif? ( media-gfx/exiv2:=[bmff] ) - extensions? ( - app-crypt/qca:2 - dev-cpp/yaml-cpp:= - ) - imagemagick? ( - !graphicsmagick? ( media-gfx/imagemagick:=[cxx,hdri] ) - graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) - ) - lcms? ( media-libs/lcms:2 ) - mpv? ( media-video/mpv:=[libmpv] ) - pdf? ( app-text/poppler[qt6] ) - raw? ( media-libs/libraw:= ) - vips? ( - dev-libs/glib:2 - media-libs/vips:= - ) - wayland? ( dev-libs/wayland ) -" -RDEPEND=" - ${COMMON_DEPEND} - geolocation? ( - dev-qt/qtlocation:6 - dev-qt/qtpositioning:6[qml] - ) -" -PDEPEND="extensions? ( ~media-plugins/photoqt-extensions-${PV} )" -DEPEND=" - ${COMMON_DEPEND} - vips? ( x11-base/xorg-proto ) -" -BDEPEND=" - dev-qt/qttools:6[linguist] - >=kde-frameworks/extra-cmake-modules-6.5.0:* - virtual/pkgconfig - chromecast? ( ${PYTHON_DEPS} ) -" - -PATCHES=( - "${FILESDIR}"/${P}-disable_sign_ext.patch -) - -pkg_setup() { - use chromecast && python-single-r1_pkg_setup -} - -src_configure() { - local mycmakeargs=( - # required for extensions dir - -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="-DNDEBUG" - -DWITH_ZXING=$(usex barcode) - -DWITH_CHROMECAST=$(usex chromecast) - -DWITH_DEVIL=$(usex devil) - -DWITH_EXIV2=$(usex exif) - -DWITH_EXIV2_ENABLE_BMFF=$(usex exif) - -DWITH_EXTENSIONS_SUPPORT=$(usex extensions) - -DWITH_LOCATION=$(usex geolocation) - -DWITH_GRAPHICSMAGICK=$(usex graphicsmagick $(usex imagemagick)) - -DWITH_IMAGEMAGICK=$(usex imagemagick $(usex !graphicsmagick)) - -DWITH_LCMS2=$(usex lcms) - -DWITH_VIDEO_MPV=$(usex mpv) - -DWITH_POPPLER=$(usex pdf) - -DWITH_LIBRAW=$(usex raw) - -DWITH_LIBVIPS=$(usex vips) - -DWITH_WAYLANDSPECIFIC=$(usex wayland) - -DWITH_ADAPTSOURCE=ON # adapt the sources according to the Qt version - -DWITH_LIBSAI=OFF # Wunkolo/libsai, no release, experimental - -DWITH_QTPDF=OFF # use poppler instead - -DWITH_RESVG=OFF # qt5 only - -DWITH_TESTING=$(usex test) - ) - - cmake_src_configure -} - -src_test() { - local -x QT_QPA_PLATFORM=offscreen - # QCollator::setNumericMode is not supported w/ POSIX/C locale or w/o icu - # Set LC_COLLATE=en_US.utf8 if available. - # Required for PQTScriptsFilesPaths::getFoldersIn() - unset LC_COLLATE - locale -a | grep -iq "en_US.utf8" || die "locale en_US.utf8 not available, testsuite not launched" - LC_COLLATE="en_US.utf8" cmake_src_test -j1 -} - -pkg_postinst() { - optfeature "additional image formats like AVIF, EPS, HEIF/HEIC, PSD, etc." "kde-frameworks/kimageformats:6" - xdg_pkg_postinst -}