summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2022-11-03 12:51:23 +0100
committerAndreas Sturmlechner <asturm@gentoo.org>2022-11-03 17:38:36 +0100
commit399a4b22af7824dbbf5ec935bee502f68c4a1f95 (patch)
tree5437eda0586c29e89cea2c73fb85d9e73b69ec97
parentkde-apps/picmi: 22.08.3 version bump (diff)
downloadgentoo-399a4b22af7824dbbf5ec935bee502f68c4a1f95.tar.gz
gentoo-399a4b22af7824dbbf5ec935bee502f68c4a1f95.tar.bz2
gentoo-399a4b22af7824dbbf5ec935bee502f68c4a1f95.zip
kde-apps/gwenview: 22.08.3 version bump
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
-rw-r--r--kde-apps/gwenview/Manifest1
-rw-r--r--kde-apps/gwenview/files/gwenview-22.08.3-without_x11.patch52
-rw-r--r--kde-apps/gwenview/gwenview-22.08.3.ebuild104
3 files changed, 157 insertions, 0 deletions
diff --git a/kde-apps/gwenview/Manifest b/kde-apps/gwenview/Manifest
index b7bc9bd4e9c8..bb0d60447b50 100644
--- a/kde-apps/gwenview/Manifest
+++ b/kde-apps/gwenview/Manifest
@@ -1,2 +1,3 @@
DIST gwenview-22.04.3.tar.xz 6821928 BLAKE2B cabf701b4ea43bd85b2babe4b982b6757d1302d9c01ac7cef951827b7953a359564d679f5be8cb792fe1d915cd32a2b2092d33dea0c463aa459761252022a920 SHA512 8b7460eee6d2c47ab08978db0cee56b2c7cf5933c85b6d077cd11781f105e5d3dca0e97a3cca9af097074e64ed5b9f396f7699d91c599eee57d04c53191372c7
DIST gwenview-22.08.2.tar.xz 6824936 BLAKE2B 17860e79ec5b3b86dc8b84704090e381decaab4dfd503f50b42de23d7fde144763de770ac3241974bdec2f140756ad7eae340128a6b267b6cac4fe6c67fed927 SHA512 a3baea5fd0e78c4655ceb364db631760e5140a49e21d309cf92b461dbfc454bd8f079536a5c313e5429335254b66fb1eedb1db88ca8e0a9c3e1e61ca118febb0
+DIST gwenview-22.08.3.tar.xz 6825392 BLAKE2B 60f7ea9623a88fc153e6ba60bd7f3ae8e76e5e3da95940578e89d41a90f401b48c927d15f3270cbf18ff93998e50b7fdefde6ad9944ee9a11733f12262df0f7f SHA512 1a450a6df3b5976cca2f4077695e7360e434fbe500d07b1d8f4adb72d3cad6caee8c886a89c2067082c721959f78fce6385fd561c8ec8916b3c6b0ceef2b6462
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
new file mode 100644
index 000000000000..89724ce4bb1d
--- /dev/null
+++ b/kde-apps/gwenview/files/gwenview-22.08.3-without_x11.patch
@@ -0,0 +1,52 @@
+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.ebuild b/kde-apps/gwenview/gwenview-22.08.3.ebuild
new file mode 100644
index 000000000000..9f34c3cac069
--- /dev/null
+++ b/kde-apps/gwenview/gwenview-22.08.3.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2022 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" )
+
+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
+}