diff options
author | Andreas Sturmlechner <asturm@gentoo.org> | 2023-06-08 12:58:21 +0200 |
---|---|---|
committer | Andreas Sturmlechner <asturm@gentoo.org> | 2023-06-08 13:36:50 +0200 |
commit | f42c1affbd1695523647a708cb9cb57cfa727187 (patch) | |
tree | 2b9d005bb83c4817c914b99a7ff975cbc9089a74 /kde-apps/gwenview | |
parent | kde-apps/picmi: drop 23.04.1 (diff) | |
download | gentoo-f42c1affbd1695523647a708cb9cb57cfa727187.tar.gz gentoo-f42c1affbd1695523647a708cb9cb57cfa727187.tar.bz2 gentoo-f42c1affbd1695523647a708cb9cb57cfa727187.zip |
kde-apps/gwenview: drop 23.04.1
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'kde-apps/gwenview')
-rw-r--r-- | kde-apps/gwenview/Manifest | 1 | ||||
-rw-r--r-- | kde-apps/gwenview/files/gwenview-23.04.1-exiv2-0.28.patch | 83 | ||||
-rw-r--r-- | kde-apps/gwenview/gwenview-23.04.1.ebuild | 112 |
3 files changed, 0 insertions, 196 deletions
diff --git a/kde-apps/gwenview/Manifest b/kde-apps/gwenview/Manifest index dd15737e6047..a14f751ca26c 100644 --- a/kde-apps/gwenview/Manifest +++ b/kde-apps/gwenview/Manifest @@ -1,3 +1,2 @@ DIST gwenview-22.12.3.tar.xz 6877352 BLAKE2B 8a1b363ef4587edee849cecec3902284e8c543846979d1e1fc956cfac3acfee6ed0638153d00d617aff9ac209b7627b558db430079323708156d49d6639ac15b SHA512 6dad3ec18dab6f0325070317aec7077c539ab69c3873b2148416e83b07daa581490245bf7e319a11575f767382deceba260a40263fc81a58554d4c31ce76c3dd -DIST gwenview-23.04.1.tar.xz 6891664 BLAKE2B df1f370e6d7d5655f82ebdd826ff29f2b7b903a9856e3ab2305c8461f44a6577a5e3699933d393ce591b744f24b24741b277525416e6fbeb91ab2a73e6ab6821 SHA512 f1e39d4356d2afaa75d79635073324bcf9ea9c1d98b5bea593eeab92ba2acfd9df71399727d8f28e6d4c2fc99f484144ed89a2f38ba414845ebb2c2dc52a4f65 DIST gwenview-23.04.2.tar.xz 6891640 BLAKE2B bd9a2b2bf827f770cd7e5b32a743e1cd6954904e0fb999fd816048adb1155a75f9d92cf4ac06cef40d955689f5a52a120ca0a0609a1f64d229a599ab152ec6c5 SHA512 a8503d117995afcd665a95d50d349946bb0e40545b3ccd93ef8435d0eee74c31d77328881ff7363dbe953ed0a81d3c4ded841939f72de24784de5ef2b8fd4dcc diff --git a/kde-apps/gwenview/files/gwenview-23.04.1-exiv2-0.28.patch b/kde-apps/gwenview/files/gwenview-23.04.1-exiv2-0.28.patch deleted file mode 100644 index dde9b1c2321e..000000000000 --- a/kde-apps/gwenview/files/gwenview-23.04.1-exiv2-0.28.patch +++ /dev/null @@ -1,83 +0,0 @@ -From a7275c90bf51a352783c723116a716af419896f4 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Bernhard=20Rosenkr=C3=A4nzer?= <bero@lindev.ch> -Date: Sun, 21 May 2023 01:09:59 +0200 -Subject: [PATCH] Fix build with exiv2 >= 0.28 - ---- - lib/jpegcontent.cpp | 25 +++++++++++++++++++++++++ - 1 file changed, 25 insertions(+) - -diff --git a/lib/jpegcontent.cpp b/lib/jpegcontent.cpp -index 284fb6e61..286333f69 100644 ---- a/lib/jpegcontent.cpp -+++ b/lib/jpegcontent.cpp -@@ -301,7 +301,11 @@ Orientation JpegContent::orientation() const - if (it == d->mExifData.end() || it->count() == 0 || it->typeId() != Exiv2::unsignedShort) { - return NOT_AVAILABLE; - } -+#if EXIV2_TEST_VERSION(0,28,0) -+ return Orientation(it->toUint32()); -+#else - return Orientation(it->toLong()); -+#endif - } - - int JpegContent::dotsPerMeterX() const -@@ -321,7 +325,11 @@ int JpegContent::dotsPerMeter(const QString &keyName) const - if (it == d->mExifData.end()) { - return 0; - } -+#if EXIV2_TEST_VERSION(0,28,0) -+ int res = it->toUint32(); -+#else - int res = it->toLong(); -+#endif - QString keyVal = QStringLiteral("Exif.Image.") + keyName; - Exiv2::ExifKey keyResolution(keyVal.toLocal8Bit().data()); - it = d->mExifData.findKey(keyResolution); -@@ -337,9 +345,17 @@ int JpegContent::dotsPerMeter(const QString &keyName) const - const float INCHESPERMETER = (100. / 2.54); - switch (res) { - case 3: // dots per cm -+#if EXIV2_TEST_VERSION(0,28,0) -+ return int(it->toUint32() * 100); -+#else - return int(it->toLong() * 100); -+#endif - default: // dots per inch -+#if EXIV2_TEST_VERSION(0,28,0) -+ return int(it->toUint32() * INCHESPERMETER); -+#else - return int(it->toLong() * INCHESPERMETER); -+#endif - } - - return 0; -@@ -568,15 +584,24 @@ QImage JpegContent::thumbnail() const - auto it = d->mExifData.findKey(Exiv2::ExifKey("Exif.Canon.ThumbnailImageValidArea")); - // ensure ThumbnailImageValidArea actually specifies a rectangle, i.e. there must be 4 coordinates - if (it != d->mExifData.end() && it->count() == 4) { -+#if EXIV2_TEST_VERSION(0,28,0) -+ QRect validArea(QPoint(it->toUint32(0), it->toUint32(2)), QPoint(it->toUint32(1), it->toUint32(3))); -+#else - QRect validArea(QPoint(it->toLong(0), it->toLong(2)), QPoint(it->toLong(1), it->toLong(3))); -+#endif - image = image.copy(validArea); - } else { - // Unfortunately, Sony does not provide an exif tag that specifies the valid area of the - // embedded thumbnail. Need to derive it from the size of the preview image instead. - it = d->mExifData.findKey(Exiv2::ExifKey("Exif.Sony1.PreviewImageSize")); - if (it != d->mExifData.end() && it->count() == 2) { -+#if EXIV2_TEST_VERSION(0,28,0) -+ const long prevHeight = it->toUint32(0); -+ const long prevWidth = it->toUint32(1); -+#else - const long prevHeight = it->toLong(0); - const long prevWidth = it->toLong(1); -+#endif - - if (image.width() > 0 && prevWidth > 0) { - const double scale = prevWidth / image.width(); --- -GitLab - diff --git a/kde-apps/gwenview/gwenview-23.04.1.ebuild b/kde-apps/gwenview/gwenview-23.04.1.ebuild deleted file mode 100644 index 62079ea15c37..000000000000 --- a/kde-apps/gwenview/gwenview-23.04.1.ebuild +++ /dev/null @@ -1,112 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_HANDBOOK="optional" -ECM_TEST="true" -PVCUT=$(ver_cut 1-3) -KFMIN=5.104.0 -QTMIN=5.15.5 -inherit ecm gear.kde.org optfeature - -DESCRIPTION="Image viewer by KDE" -HOMEPAGE="https://apps.kde.org/gwenview/ https://userbase.kde.org/Gwenview" - -LICENSE="GPL-2+ handbook? ( FDL-1.2 )" -SLOT="5" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" -IUSE="activities fits +mpris raw semantic-desktop share X" - -# requires running environment -RESTRICT="test" - -# slot op: includes qpa/qplatformnativeinterface.h -COMMON_DEPEND=" - dev-libs/wayland - >=dev-qt/qtgui-${QTMIN}:5= - >=dev-qt/qtprintsupport-${QTMIN}:5 - >=dev-qt/qtsvg-${QTMIN}:5 - >=dev-qt/qtwayland-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-frameworks/kcompletion-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kguiaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kiconthemes-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/kitemmodels-${KFMIN}:5 - >=kde-frameworks/kitemviews-${KFMIN}:5 - >=kde-frameworks/kjobwidgets-${KFMIN}:5 - >=kde-frameworks/knotifications-${KFMIN}:5 - >=kde-frameworks/kparts-${KFMIN}:5 - >=kde-frameworks/kservice-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 - >=kde-frameworks/solid-${KFMIN}:5 - media-gfx/exiv2:= - media-libs/kcolorpicker - >=media-libs/kimageannotator-0.5.0 - media-libs/lcms:2 - media-libs/libjpeg-turbo:= - media-libs/libpng:0= - >=media-libs/phonon-4.11.0 - media-libs/tiff:= - activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 ) - fits? ( sci-libs/cfitsio ) - mpris? ( >=dev-qt/qtdbus-${QTMIN}:5 ) - raw? ( >=kde-apps/libkdcraw-${PVCUT}:5 ) - semantic-desktop? ( - >=kde-frameworks/baloo-${KFMIN}:5 - >=kde-frameworks/kfilemetadata-${KFMIN}:5 - ) - share? ( >=kde-frameworks/purpose-${KFMIN}:5 ) - X? ( - >=dev-qt/qtx11extras-${QTMIN}:5 - x11-libs/libX11 - ) -" -DEPEND="${COMMON_DEPEND} - dev-libs/wayland-protocols - >=dev-qt/qtconcurrent-${QTMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 -" -RDEPEND="${COMMON_DEPEND} - >=dev-qt/qtimageformats-${QTMIN}:5 - >=kde-frameworks/kimageformats-${KFMIN}:5 -" -BDEPEND=" - >=dev-qt/qtwaylandscanner-${QTMIN}:5 - dev-util/wayland-scanner -" - -PATCHES=( "${FILESDIR}/${P}-exiv2-0.28.patch" ) # bug 906467 - -src_prepare() { - ecm_src_prepare - if ! use mpris; then - # FIXME: upstream a better solution - sed -e "/set(HAVE_QTDBUS/s/\${Qt5DBus_FOUND}/0/" -i CMakeLists.txt || die - fi -} - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package activities KF5Activities) - $(cmake_use_find_package fits CFitsio) - $(cmake_use_find_package raw KF5KDcraw) - -DGWENVIEW_SEMANTICINFO_BACKEND=$(usex semantic-desktop Baloo None) - $(cmake_use_find_package share KF5Purpose) - -DWITHOUT_X11=$(usex !X) - ) - ecm_src_configure -} - -pkg_postinst() { - if [[ -z "${REPLACING_VERSIONS}" ]]; then - optfeature "SVG support" "kde-apps/svgpart:${SLOT}" - fi - ecm_pkg_postinst -} |