diff options
Diffstat (limited to 'kde-apps/gwenview')
-rw-r--r-- | kde-apps/gwenview/Manifest | 4 | ||||
-rw-r--r-- | kde-apps/gwenview/files/gwenview-22.08.3-fix-raw-plugin-coexistence.patch | 58 | ||||
-rw-r--r-- | kde-apps/gwenview/files/gwenview-22.08.3-without_x11.patch | 52 | ||||
-rw-r--r-- | kde-apps/gwenview/gwenview-22.08.3-r2.ebuild | 107 |
4 files changed, 0 insertions, 221 deletions
diff --git a/kde-apps/gwenview/Manifest b/kde-apps/gwenview/Manifest index c66c8cf713d3..70168d4d3249 100644 --- a/kde-apps/gwenview/Manifest +++ b/kde-apps/gwenview/Manifest @@ -1,7 +1,3 @@ -AUX gwenview-22.08.3-fix-raw-plugin-coexistence.patch 2536 BLAKE2B 767851191a080c7046528cd9f688750accacde1983bf523fac9c30c8470b8ca08cb77ceab1219bb130c1050f34df3abd9857632cbd6f6c663ae7135f3eb216f9 SHA512 0e405f4c6e9dd919772c82ab3e59ef43ac920367c1c2748a41b341396891ffe350580cfbc1008d6dca5bfdaff24c3b39d45bfeb9a2bafcf83015288e8d579c7b -AUX gwenview-22.08.3-without_x11.patch 1872 BLAKE2B 3bf81001d4d27e1baa0f4a9e44fb0265eab29d60cd9befba3f6fc6e7a194f54ef36e32f8e03726bd46c5fe6a6d3577c6175a10ac5d3516f98b2498b7c3030be4 SHA512 93d271f4647aff5728c6be0d0732c60c3e670b63332195e480a8288b4d7d9e97187ad99c7ddf00631309e33ca60782eb1ff0c991b1d8b516fdce2acba17668fe -DIST gwenview-22.08.3.tar.xz 6825392 BLAKE2B 60f7ea9623a88fc153e6ba60bd7f3ae8e76e5e3da95940578e89d41a90f401b48c927d15f3270cbf18ff93998e50b7fdefde6ad9944ee9a11733f12262df0f7f SHA512 1a450a6df3b5976cca2f4077695e7360e434fbe500d07b1d8f4adb72d3cad6caee8c886a89c2067082c721959f78fce6385fd561c8ec8916b3c6b0ceef2b6462 DIST gwenview-22.12.3.tar.xz 6877352 BLAKE2B 8a1b363ef4587edee849cecec3902284e8c543846979d1e1fc956cfac3acfee6ed0638153d00d617aff9ac209b7627b558db430079323708156d49d6639ac15b SHA512 6dad3ec18dab6f0325070317aec7077c539ab69c3873b2148416e83b07daa581490245bf7e319a11575f767382deceba260a40263fc81a58554d4c31ce76c3dd -EBUILD gwenview-22.08.3-r2.ebuild 2914 BLAKE2B 7636021059927829ddef9af48e7d33111987384318228356dc306d3f784e1953fb54914e0fb4897804f7f8195644e8ff88e98210d6cb3ef50a436a809bd8fc08 SHA512 55e0982e59cfae27c2ba488416047f59d7401a0e89f70782576161e19898069bc50da3128997556d56333a311c2ee033fe746d21bae128f355d2d635b9554ec3 EBUILD gwenview-22.12.3.ebuild 2796 BLAKE2B cd7ec4f23c602b10d89e7fb99c3de7850a7f034a129e7b4a302899f27b41f0c96909eede9f83d3aaf3f02b622fe9dc8802ade22630805a549ed25cc522fa1e81 SHA512 e987f385383abec17ef17bbcac31f860ea6b82452e58e36f54ae64703e9b1486ea8080151418b94db339c9781c66ae9941a0d28ee1ed64d31e4871e1919e7b7b MISC metadata.xml 697 BLAKE2B 1b9d505c5490486b4a5b6e11447a8c0bf3d52f678f80a1825164458188cc4dee675b3f620818d6a402f7a4dc14498370efa0c08baacc7f78b928beda8f54b697 SHA512 4cf16eb17b7b10862f6268a2082dfaf808c00ae9342a2b864716a64c23dcfca6c837d39a2637d8b9a6c7ec391492b4c3fc7bfd5e21e81c97f21053ff4acd9aed diff --git a/kde-apps/gwenview/files/gwenview-22.08.3-fix-raw-plugin-coexistence.patch b/kde-apps/gwenview/files/gwenview-22.08.3-fix-raw-plugin-coexistence.patch deleted file mode 100644 index 759b23095ff9..000000000000 --- a/kde-apps/gwenview/files/gwenview-22.08.3-fix-raw-plugin-coexistence.patch +++ /dev/null @@ -1,58 +0,0 @@ -From c419ec4a052b39eae7c17caf2a89d39d76b43777 Mon Sep 17 00:00:00 2001 -From: Mirco Miranda <mirco.miranda@systemceramics.com> -Date: Tue, 10 Jan 2023 14:53:30 +0000 -Subject: [PATCH] Fixed coexistence between Qt Raw plugin and KDcraw - -Use the RAW plugin to load raw images if installed: -- Previews are always generated from the RAW image at the fastest possible speed. -- Images are loaded in the highest possible quality (default plugin raw). -- If the raw plugin is not installed everything works as before (use KDcraw). - -BUG: 463132 -FIXED-IN: 22.12.2 - - -(cherry picked from commit a7dc8feefc2147a08526b61bf361b63f78645ea0) ---- - lib/document/loadingdocumentimpl.cpp | 3 ++- - lib/thumbnailprovider/thumbnailgenerator.cpp | 8 +++++++- - 2 files changed, 9 insertions(+), 2 deletions(-) - -diff --git a/lib/document/loadingdocumentimpl.cpp b/lib/document/loadingdocumentimpl.cpp -index baa0542a..ece4d9e2 100644 ---- a/lib/document/loadingdocumentimpl.cpp -+++ b/lib/document/loadingdocumentimpl.cpp -@@ -205,7 +205,8 @@ struct LoadingDocumentImplPrivate { - QImageReader reader; - - #ifdef KDCRAW_FOUND -- if (KDcrawIface::KDcraw::rawFilesList().contains(QString::fromLatin1(mFormatHint))) { -+ if (!QImageReader::supportedImageFormats().contains(QByteArray("raw")) -+ && KDcrawIface::KDcraw::rawFilesList().contains(QString::fromLatin1(mFormatHint))) { - QByteArray previewData; - - // if the image is in format supported by dcraw, fetch its embedded preview -diff --git a/lib/thumbnailprovider/thumbnailgenerator.cpp b/lib/thumbnailprovider/thumbnailgenerator.cpp -index 3179dfae..f01d5c04 100644 ---- a/lib/thumbnailprovider/thumbnailgenerator.cpp -+++ b/lib/thumbnailprovider/thumbnailgenerator.cpp -@@ -70,9 +70,15 @@ bool ThumbnailContext::load(const QString &pixPath, int pixelSize) - QBuffer buffer; - int previewRatio = 1; - -+ bool useRawPlugin = QImageReader::imageFormat(pixPath) == QByteArray("raw"); -+ if (useRawPlugin) { // make preview generation faster (same as KDcrawIface::KDcraw::loadHalfPreview) -+ reader.setQuality(1); -+ previewRatio = 2; -+ } -+ - #ifdef KDCRAW_FOUND - // raw images deserve special treatment -- if (KDcrawIface::KDcraw::rawFilesList().contains(QString::fromLatin1(formatHint))) { -+ if (!useRawPlugin && KDcrawIface::KDcraw::rawFilesList().contains(QString::fromLatin1(formatHint))) { - // use KDCraw to extract the preview - bool ret = KDcrawIface::KDcraw::loadEmbeddedPreview(data, pixPath); - --- -GitLab - diff --git a/kde-apps/gwenview/files/gwenview-22.08.3-without_x11.patch b/kde-apps/gwenview/files/gwenview-22.08.3-without_x11.patch deleted file mode 100644 index 89724ce4bb1d..000000000000 --- a/kde-apps/gwenview/files/gwenview-22.08.3-without_x11.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 2ffdf26b81a90c91abadbc8582f82d219dd19e90 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <asturm@gentoo.org> -Date: Sat, 27 Nov 2021 12:49:09 +0100 -Subject: [PATCH] Add CMake option to build WITHOUT_X11 - -We want to be able to build without X11 support even if some of the used -libraries may not work w/o X11 themselves yet or need to be built with -X11 support for other reverse dependencies. - -HAVE_X11 already exists and is set automagically so far, but using --DCMAKE_DISABLE_FIND_PACKAGE_X11 will break if any dependencies list X11 -as required in their cmake config. - -Introducing this option means there is no behavior change by default, -cmake will just skip finding X11 or adding unwanted features if the -option is enabled. - -Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> ---- - CMakeLists.txt | 15 +++++++++------ - 1 file changed, 9 insertions(+), 6 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 22ebcb42..d1b0b5fe 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -132,13 +132,16 @@ endif() - set_package_properties(KF5KDcraw PROPERTIES URL "https://invent.kde.org/graphics/libkdcraw/" DESCRIPTION "C++ interface around LibRaw library used to decode RAW picture files" TYPE OPTIONAL) - - --find_package(X11) --if(X11_FOUND) -- if (QT_MAJOR_VERSION STREQUAL "5") -- find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED X11Extras) -+option(WITHOUT_X11 "Build without X11 integration (disables finding X11)" OFF) -+if(NOT WITHOUT_X11) -+ find_package(X11) -+ if(X11_FOUND) -+ if (QT_MAJOR_VERSION STREQUAL "5") -+ find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED X11Extras) -+ endif() -+ # we need to add qt6 lib when we found x11 -+ set(HAVE_X11 TRUE) - endif() -- # we need to add qt6 lib when we found x11 -- set(HAVE_X11 1) - endif() - - if (QT_MAJOR_VERSION STREQUAL "5") --- -GitLab - diff --git a/kde-apps/gwenview/gwenview-22.08.3-r2.ebuild b/kde-apps/gwenview/gwenview-22.08.3-r2.ebuild deleted file mode 100644 index e712c33d05f4..000000000000 --- a/kde-apps/gwenview/gwenview-22.08.3-r2.ebuild +++ /dev/null @@ -1,107 +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.96.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" - -COMMON_DEPEND=" - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtprintsupport-${QTMIN}:5 - >=dev-qt/qtsvg-${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-qt/qtconcurrent-${QTMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 -" -RDEPEND="${COMMON_DEPEND} - >=dev-qt/qtimageformats-${QTMIN}:5 - >=kde-frameworks/kimageformats-${KFMIN}:5 -" - -PATCHES=( - "${FILESDIR}/${P}-without_x11.patch" - "${FILESDIR}/${P}-fix-raw-plugin-coexistence.patch" # KDE-bug 463132 -) - -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 -} |