[gentoo-commits] repo/gentoo:master commit in: kde-apps/gwenview/
commit: 64d366374215e5e33932d51b5e4d28f0d568fa82
Author: Eli Schwartz gentoo org>
AuthorDate: Tue Sep 3 04:58:42 2024 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Oct 12 15:18:29 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64d36637
kde-apps/gwenview: apply patch to fix UB due to ODR violations
Bug: https://bugs.gentoo.org/921649
Closes: https://bugs.gentoo.org/941274
Acked-by: Sam James gentoo.org>
Signed-off-by: Eli Schwartz gentoo.org>
Signed-off-by: Andreas Sturmlechner gentoo.org>
kde-apps/gwenview/gwenview-24.08.2.ebuild | 3 +++
1 file changed, 3 insertions(+)
diff --git a/kde-apps/gwenview/gwenview-24.08.2.ebuild
b/kde-apps/gwenview/gwenview-24.08.2.ebuild
index f95e04331a44..c3efe7a36568 100644
--- a/kde-apps/gwenview/gwenview-24.08.2.ebuild
+++ b/kde-apps/gwenview/gwenview-24.08.2.ebuild
@@ -81,6 +81,9 @@ BDEPEND="
dev-util/wayland-scanner
"
+# Backport pending:
https://invent.kde.org/graphics/gwenview/-/merge_requests/298
+PATCHES=( "${FILESDIR}"/${PN}-24.08.0-odr.patch ) # bugs 941274, 921649
+
src_prepare() {
ecm_src_prepare
if ! use mpris; then
[gentoo-commits] repo/gentoo:master commit in: kde-apps/gwenview/
commit: d13b530ca421063d230e8a6a465f6ce86a8e660f Author: Arthur Zamarin gentoo org> AuthorDate: Mon Oct 7 05:40:26 2024 + Commit: Arthur Zamarin gentoo org> CommitDate: Mon Oct 7 05:40:26 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d13b530c kde-apps/gwenview: Keyword 24.08.1 ppc64, #938283 Signed-off-by: Arthur Zamarin gentoo.org> kde-apps/gwenview/gwenview-24.08.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-apps/gwenview/gwenview-24.08.1.ebuild b/kde-apps/gwenview/gwenview-24.08.1.ebuild index 9dede3c8e379..f76417e1a727 100644 --- a/kde-apps/gwenview/gwenview-24.08.1.ebuild +++ b/kde-apps/gwenview/gwenview-24.08.1.ebuild @@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/gwenview/ https://userbase.kde.org/Gwenview"; LICENSE="GPL-2+ handbook? ( FDL-1.2 )" SLOT="6" -KEYWORDS="~amd64 ~arm64 ~riscv ~x86" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" IUSE="activities fits +mpris raw semantic-desktop share X" # requires running environment
[gentoo-commits] repo/gentoo:master commit in: kde-apps/gwenview/
commit: 24bb40213ec1ac4d2423e54587aa327877bb8aed
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Fri Sep 20 19:39:34 2024 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Fri Sep 20 20:29:46 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24bb4021
kde-apps/gwenview: drop 24.05.2-r2, overshadowed by 24.08.1
Signed-off-by: Andreas Sturmlechner gentoo.org>
kde-apps/gwenview/gwenview-24.05.2-r2.ebuild | 113 ---
1 file changed, 113 deletions(-)
diff --git a/kde-apps/gwenview/gwenview-24.05.2-r2.ebuild
b/kde-apps/gwenview/gwenview-24.05.2-r2.ebuild
deleted file mode 100644
index 622f9c53904b..
--- a/kde-apps/gwenview/gwenview-24.05.2-r2.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2024 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=6.3.0
-QTMIN=6.6.2
-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="6"
-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, qtx11extras_p.h
-COMMON_DEPEND="
- dev-libs/wayland
- >=dev-qt/qtbase-${QTMIN}:6=[gui,opengl,widgets]
- >=dev-qt/qtsvg-${QTMIN}:6
- >=dev-qt/qtwayland-${QTMIN}:6
- >=kde-frameworks/kcompletion-${KFMIN}:6
- >=kde-frameworks/kconfig-${KFMIN}:6
- >=kde-frameworks/kconfigwidgets-${KFMIN}:6
- >=kde-frameworks/kcoreaddons-${KFMIN}:6
- >=kde-frameworks/kguiaddons-${KFMIN}:6
- >=kde-frameworks/ki18n-${KFMIN}:6
- >=kde-frameworks/kiconthemes-${KFMIN}:6
- >=kde-frameworks/kio-${KFMIN}:6
- >=kde-frameworks/kitemmodels-${KFMIN}:6
- >=kde-frameworks/kitemviews-${KFMIN}:6
- >=kde-frameworks/kjobwidgets-${KFMIN}:6
- >=kde-frameworks/knotifications-${KFMIN}:6
- >=kde-frameworks/kparts-${KFMIN}:6
- >=kde-frameworks/kservice-${KFMIN}:6
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:6
- >=kde-frameworks/kxmlgui-${KFMIN}:6
- >=kde-frameworks/solid-${KFMIN}:6
- media-gfx/exiv2:=
- >=media-libs/kcolorpicker-0.3.1
- >=media-libs/kimageannotator-0.7.1
- media-libs/lcms:2
- media-libs/libjpeg-turbo:=
- media-libs/libpng:0=
- >=media-libs/phonon-4.12.0[qt6]
- media-libs/tiff:=
- activities? ( kde-plasma/plasma-activities:6 )
- fits? ( sci-libs/cfitsio )
- mpris? ( >=dev-qt/qtbase-${QTMIN}:6[dbus] )
- raw? ( >=kde-apps/libkdcraw-${PVCUT}:6 )
- semantic-desktop? (
- >=kde-frameworks/baloo-${KFMIN}:6
- >=kde-frameworks/kfilemetadata-${KFMIN}:6
- )
- share? ( >=kde-frameworks/purpose-${KFMIN}:6 )
- X? (
- >=dev-qt/qtbase-${QTMIN}:6=[gui]
- x11-libs/libX11
- )
-"
-DEPEND="${COMMON_DEPEND}
- dev-libs/wayland-protocols
- >=dev-qt/qtbase-${QTMIN}:6[concurrent]
- >=kde-frameworks/kwindowsystem-${KFMIN}:6
-"
-RDEPEND="${COMMON_DEPEND}
- >=dev-qt/qtimageformats-${QTMIN}:6
- >=kde-apps/thumbnailers-${PVCUT}:6
- >=kde-frameworks/kimageformats-${KFMIN}:6
-"
-BDEPEND="
- >=dev-qt/qtwayland-${QTMIN}:6
- dev-util/wayland-scanner
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-24.08.0-odr.patch
-)
-
-src_prepare() {
- ecm_src_prepare
- if ! use mpris; then
- # FIXME: upstream a better solution
- sed -e "/set(HAVE_QTDBUS/s/\${Qt6DBus_FOUND}/0/" -i
CMakeLists.txt || die
- fi
-}
-
-src_configure() {
- local mycmakeargs=(
- $(cmake_use_find_package activities PlasmaActivities)
- $(cmake_use_find_package fits CFitsio)
- $(cmake_use_find_package raw KDcrawQt6)
- -DGWENVIEW_SEMANTICINFO_BACKEND=$(usex semantic-desktop Baloo
None)
- $(cmake_use_find_package share KF6Purpose)
- -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
-}
[gentoo-commits] repo/gentoo:master commit in: kde-apps/gwenview/, kde-apps/gwenview/files/
commit: 02627a66a2883017dc5888ce730e9d4f63e9ed86
Author: Eli Schwartz gentoo org>
AuthorDate: Tue Sep 3 04:58:42 2024 +
Commit: Eli Schwartz gentoo org>
CommitDate: Tue Sep 3 05:29:23 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02627a66
kde-apps/gwenview: apply patch to fix UB due to ODR violations
Closes: https://bugs.gentoo.org/921649
Acked-by: Sam James gentoo.org>
Signed-off-by: Eli Schwartz gentoo.org>
kde-apps/gwenview/files/gwenview-24.08.0-odr.patch | 58 ++
...w-24.08.0.ebuild => gwenview-24.05.2-r2.ebuild} | 10 ++--
...w-24.08.0.ebuild => gwenview-24.08.0-r1.ebuild} | 4 ++
3 files changed, 69 insertions(+), 3 deletions(-)
diff --git a/kde-apps/gwenview/files/gwenview-24.08.0-odr.patch
b/kde-apps/gwenview/files/gwenview-24.08.0-odr.patch
new file mode 100644
index ..148921f18169
--- /dev/null
+++ b/kde-apps/gwenview/files/gwenview-24.08.0-odr.patch
@@ -0,0 +1,58 @@
+From b5cc214574eeb62f469a058daf52cd92270e4aa9 Mon Sep 17 00:00:00 2001
+From: Eli Schwartz
+Date: Tue, 3 Sep 2024 00:40:11 -0400
+Subject: [PATCH] fix ODR violation: many files had the wrong definition of
+ Enum
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This enum has a different number of values, depending on whether
+gwenview is configured with the semanticinfo backend "none" or
+fake/baloo.
+
+In order to avoid Undefined Behavior, every file that includes sorting.h
+also has to include config-gwenview.h *before* sorting.h, which was not
+true. Solve this by including the config header inside the sorting.h
+header.
+
+Fixes link failures when LTO is enabled, since LTO allows the compiler
+to do whole-program optimization and type-check across the entire
+program:
+
+```
+/var/tmp/portage/kde-apps/gwenview-24.08.0/work/gwenview-24.08.0/app/../lib/sorting.h:37:6:
error: type ‘Gwenview::Sorting::Enum’ violates the C++ One Definition Rule
[-Werror=odr]
+ 37 | enum Enum {
+ | ^
+/var/tmp/portage/kde-apps/gwenview-24.08.0/work/gwenview-24.08.0/app/../lib/sorting.h:37:6:
note: an enum with different number of values is defined in another
translation unit
+ 37 | enum Enum {
+ | ^
+lto1: some warnings being treated as errors
+lto-wrapper: fatal error: /usr/bin/x86_64-pc-linux-gnu-g++ returned 1 exit
status
+compilation terminated.
+/usr/libexec/gcc/x86_64-pc-linux-gnu/ld: error: lto-wrapper failed
+collect2: error: ld returned 1 exit status
+```
+
+Fixes: https://bugs.gentoo.org/921649
+---
+ lib/sorting.h | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/lib/sorting.h b/lib/sorting.h
+index 529ea6fc9..c008865cf 100644
+--- a/lib/sorting.h
b/lib/sorting.h
+@@ -21,6 +21,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor,
Cambridge, MA 02110-1301, USA
+ #ifndef SORTING_H
+ #define SORTING_H
+
++// Do not assume every file that includes this one, includes the config.h
++#include
++
+ // Qt
+
+ // KF
+--
+GitLab
+
diff --git a/kde-apps/gwenview/gwenview-24.08.0.ebuild
b/kde-apps/gwenview/gwenview-24.05.2-r2.ebuild
similarity index 96%
copy from kde-apps/gwenview/gwenview-24.08.0.ebuild
copy to kde-apps/gwenview/gwenview-24.05.2-r2.ebuild
index d209a9e40aee..622f9c53904b 100644
--- a/kde-apps/gwenview/gwenview-24.08.0.ebuild
+++ b/kde-apps/gwenview/gwenview-24.05.2-r2.ebuild
@@ -6,8 +6,8 @@ EAPI=8
ECM_HANDBOOK="optional"
ECM_TEST="true"
PVCUT=$(ver_cut 1-3)
-KFMIN=6.5.0
-QTMIN=6.7.2
+KFMIN=6.3.0
+QTMIN=6.6.2
inherit ecm gear.kde.org optfeature
DESCRIPTION="Image viewer by KDE"
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/gwenview/
https://userbase.kde.org/Gwenview";
LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE="activities fits +mpris raw semantic-desktop share X"
# requires running environment
@@ -81,6 +81,10 @@ BDEPEND="
dev-util/wayland-scanner
"
+PATCHES=(
+ "${FILESDIR}"/${PN}-24.08.0-odr.patch
+)
+
src_prepare() {
ecm_src_prepare
if ! use mpris; then
diff --git a/kde-apps/gwenview/gwenview-24.08.0.ebuild
b/kde-apps/gwenview/gwenview-24.08.0-r1.ebuild
similarity index 98%
rename from kde-apps/gwenview/gwenview-24.08.0.ebuild
rename to kde-apps/gwenview/gwenview-24.08.0-r1.ebuild
index d209a9e40aee..d720385f4680 100644
--- a/kde-apps/gwenview/gwenview-24.08.0.ebuild
+++ b/kde-apps/gwenview/gwenview-24.08.0-r1.ebuild
@@ -81,6 +81,10 @@ BDEPEND="
dev-util/wayland-scanner
"
+PATCHES=(
+ "${FILESDIR}"/${P}-odr.patch
+)
+
src_prepare() {
ecm_src_prepare
if ! use mpris; then
[gentoo-commits] repo/gentoo:master commit in: kde-apps/gwenview/
commit: f84b40c117650e29e17f0d4da5437f0c3948160d
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Sep 1 22:00:09 2024 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Mon Sep 2 13:22:07 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f84b40c1
kde-apps/gwenview: drop 23.08.5
Signed-off-by: Andreas Sturmlechner gentoo.org>
kde-apps/gwenview/Manifest| 1 -
kde-apps/gwenview/gwenview-23.08.5.ebuild | 112 --
2 files changed, 113 deletions(-)
diff --git a/kde-apps/gwenview/Manifest b/kde-apps/gwenview/Manifest
index f5affa31825d..8d64907d5ada 100644
--- a/kde-apps/gwenview/Manifest
+++ b/kde-apps/gwenview/Manifest
@@ -1,3 +1,2 @@
-DIST gwenview-23.08.5.tar.xz 6904128 BLAKE2B
f8f2a54ef438c4d3144198ee3a48de1ec72e7e3fc0f9b811130499087424b7c7a659d269c8be31998642589c0cad3d9e8c7cfebf6582c8d97999eb4e501a4aaa
SHA512
8607f17b57211e31efc709dbec1091f7ca1587db90877583222acb5a82a19340530068adb85ca1748b0c849cf1f6551bd2fefdc2d55dfae1446b3582dc1615b9
DIST gwenview-24.05.2.tar.xz 6513176 BLAKE2B
526bf8fe8caf319368997e31eac48013ba67e023f2e2a0a3082e69b4bff04828308ee85cc8a7cda9ca79a7429d0d749a08deb960149be337ded351d49f823026
SHA512
3c0cc7faa2c7f65b4146a0c7e4a1689ed7629510c9afd4fa891e422ad379e25fd6367e02326cf3721e7862d56661759d0fc9afa37d4cd0392d917d44ef8110e6
DIST gwenview-24.08.0.tar.xz 6514240 BLAKE2B
33203bdcd5c81baff569c01a7bd21eb09288caf30c26c8cfecec1f8ed71a90eba064d67b2c4faf86486ae3fdb90e6c652c9077dc3f08ec548b128db28713d22c
SHA512
4bd00ca9bec99fce7c894e51df68c606eecaaf65bfd8936a942f761ebe199c62ee579e64f90052359ab32a44a218736f8bcfbf9921c382467a588c1a234011c5
diff --git a/kde-apps/gwenview/gwenview-23.08.5.ebuild
b/kde-apps/gwenview/gwenview-23.08.5.ebuild
deleted file mode 100644
index 496e5bb95e14..
--- a/kde-apps/gwenview/gwenview-23.08.5.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2024 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.106.0
-QTMIN=5.15.9
-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-0.2.0
- =media-libs/kimageannotator-0.5.0
- =media-libs/phonon-4.11.0[qt5(+)]
- media-libs/tiff:=
- activities? ( >=kde-plasma/plasma-activities-${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
-"
-
-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_pac
[gentoo-commits] repo/gentoo:master commit in: kde-apps/gwenview/
commit: 0bca1cdec6eb32102506a695e513894bb473b6ad
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Mon Aug 12 15:04:54 2024 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Aug 15 17:46:52 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0bca1cde
kde-apps/gwenview: RDEPEND on kde-apps/thumbnailers:6
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../gwenview/{gwenview-24.05.2.ebuild => gwenview-24.05.2-r1.ebuild} | 1 +
1 file changed, 1 insertion(+)
diff --git a/kde-apps/gwenview/gwenview-24.05.2.ebuild
b/kde-apps/gwenview/gwenview-24.05.2-r1.ebuild
similarity index 98%
rename from kde-apps/gwenview/gwenview-24.05.2.ebuild
rename to kde-apps/gwenview/gwenview-24.05.2-r1.ebuild
index 309747474a54..cefdfad20a88 100644
--- a/kde-apps/gwenview/gwenview-24.05.2.ebuild
+++ b/kde-apps/gwenview/gwenview-24.05.2-r1.ebuild
@@ -73,6 +73,7 @@ DEPEND="${COMMON_DEPEND}
"
RDEPEND="${COMMON_DEPEND}
>=dev-qt/qtimageformats-${QTMIN}:6
+ >=kde-apps/thumbnailers-${PVCUT}:6
>=kde-frameworks/kimageformats-${KFMIN}:6
"
BDEPEND="
[gentoo-commits] repo/gentoo:master commit in: kde-apps/gwenview/
commit: 9b16675c6941c2306e06be0aeb4e696fde560980
Author: Alexey Shvetsov gentoo org>
AuthorDate: Sat Feb 24 11:13:16 2024 +
Commit: Alexey Shvetsov gentoo org>
CommitDate: Sat Feb 24 11:13:33 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b16675c
kde-apps/gwenview: Restrict deps
Signed-off-by: Alexey Shvetsov gentoo.org>
kde-apps/gwenview/gwenview-23.08.4.ebuild | 4 +++-
kde-apps/gwenview/gwenview-23.08.5.ebuild | 4 +++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/kde-apps/gwenview/gwenview-23.08.4.ebuild
b/kde-apps/gwenview/gwenview-23.08.4.ebuild
index 679c54c8d039..496e5bb95e14 100644
--- a/kde-apps/gwenview/gwenview-23.08.4.ebuild
+++ b/kde-apps/gwenview/gwenview-23.08.4.ebuild
@@ -47,8 +47,10 @@ COMMON_DEPEND="
>=kde-frameworks/kxmlgui-${KFMIN}:5
>=kde-frameworks/solid-${KFMIN}:5
media-gfx/exiv2:=
- media-libs/kcolorpicker
+ >=media-libs/kcolorpicker-0.2.0
+ =media-libs/kimageannotator-0.5.0
+
[gentoo-commits] repo/gentoo:master commit in: kde-apps/gwenview/, kde-apps/gwenview/files/
commit: bc7d8c325d342435ed3d3f52627f3ea46d472835
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Mon May 22 17:32:11 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Mon May 22 17:32:11 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc7d8c32
kde-apps/gwenview: Fix build with >=exiv2-0.28
Closes: https://bugs.gentoo.org/906467
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../files/gwenview-23.04.1-exiv2-0.28.patch| 83 ++
kde-apps/gwenview/gwenview-23.04.1.ebuild | 2 +
2 files changed, 85 insertions(+)
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
new file mode 100644
index ..dde9b1c2321e
--- /dev/null
+++ b/kde-apps/gwenview/files/gwenview-23.04.1-exiv2-0.28.patch
@@ -0,0 +1,83 @@
+From a7275c90bf51a352783c723116a716af419896f4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Bernhard=20Rosenkr=C3=A4nzer?=
+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
index 423f549f8d73..62079ea15c37 100644
--- a/kde-apps/gwenview/gwenview-23.04.1.ebuild
+++ b/kde-apps/gwenview/gwenview-23.04.1.ebuild
@@ -82,6 +82,8 @@ BDEPEND="
dev-util/wayland-scanner
"
+PATCHES=( "${FILESDIR}/${P}-exiv2-0.28.patch" ) # bug 906467
+
src_prepare() {
ecm_src_prepare
if ! use mpris; then
[gentoo-commits] repo/gentoo:master commit in: kde-apps/gwenview/
commit: 17b83f2a2c146391259ab83d155ec7452422f833
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Fri Feb 3 21:07:45 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Fri Feb 3 21:43:24 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17b83f2a
kde-apps/gwenview: drop 22.08.3-r1
Closes: https://bugs.gentoo.org/892027
Signed-off-by: Andreas Sturmlechner gentoo.org>
kde-apps/gwenview/gwenview-22.08.3-r1.ebuild | 104 ---
1 file changed, 104 deletions(-)
diff --git a/kde-apps/gwenview/gwenview-22.08.3-r1.ebuild
b/kde-apps/gwenview/gwenview-22.08.3-r1.ebuild
deleted file mode 100644
index 5ac22d1ac5fd..
--- a/kde-apps/gwenview/gwenview-22.08.3-r1.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# 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
-}
[gentoo-commits] repo/gentoo:master commit in: kde-apps/gwenview/
commit: e4501fd381a0fb8ea3eb7111ec77f0c5978f440c Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri Feb 3 21:07:06 2023 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Feb 3 21:43:24 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4501fd3 kde-apps/gwenview: stabilize 22.08.3-r2 for amd64 Closes: https://bugs.gentoo.org/892027 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-apps/gwenview/gwenview-22.08.3-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-apps/gwenview/gwenview-22.08.3-r2.ebuild b/kde-apps/gwenview/gwenview-22.08.3-r2.ebuild index 8afb31926767..e712c33d05f4 100644 --- a/kde-apps/gwenview/gwenview-22.08.3-r2.ebuild +++ b/kde-apps/gwenview/gwenview-22.08.3-r2.ebuild @@ -15,7 +15,7 @@ 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" +KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86" IUSE="activities fits +mpris raw semantic-desktop share X" # requires running environment
[gentoo-commits] repo/gentoo:master commit in: kde-apps/gwenview/
commit: 8346eb1fb4ce7599e4fcbcde1df4870028d25faa Author: Arthur Zamarin gentoo org> AuthorDate: Wed Feb 1 11:14:11 2023 + Commit: Arthur Zamarin gentoo org> CommitDate: Wed Feb 1 11:14:11 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8346eb1f kde-apps/gwenview: Stabilize 22.08.3-r2 arm64, #892027 Signed-off-by: Arthur Zamarin gentoo.org> kde-apps/gwenview/gwenview-22.08.3-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-apps/gwenview/gwenview-22.08.3-r2.ebuild b/kde-apps/gwenview/gwenview-22.08.3-r2.ebuild index 9610c81f6525..8afb31926767 100644 --- a/kde-apps/gwenview/gwenview-22.08.3-r2.ebuild +++ b/kde-apps/gwenview/gwenview-22.08.3-r2.ebuild @@ -15,7 +15,7 @@ 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" +KEYWORDS="~amd64 arm64 ~ppc64 ~riscv x86" IUSE="activities fits +mpris raw semantic-desktop share X" # requires running environment
[gentoo-commits] repo/gentoo:master commit in: kde-apps/gwenview/
commit: cab33c8e8bbc849290047ea5b9035b56bbe323f6 Author: Arthur Zamarin gentoo org> AuthorDate: Thu Jan 26 17:52:30 2023 + Commit: Arthur Zamarin gentoo org> CommitDate: Thu Jan 26 17:52:30 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cab33c8e kde-apps/gwenview: Stabilize 22.08.3-r2 x86, #892027 Signed-off-by: Arthur Zamarin gentoo.org> kde-apps/gwenview/gwenview-22.08.3-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-apps/gwenview/gwenview-22.08.3-r2.ebuild b/kde-apps/gwenview/gwenview-22.08.3-r2.ebuild index 6ec7c9ce9c16..9610c81f6525 100644 --- a/kde-apps/gwenview/gwenview-22.08.3-r2.ebuild +++ b/kde-apps/gwenview/gwenview-22.08.3-r2.ebuild @@ -15,7 +15,7 @@ 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" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv x86" IUSE="activities fits +mpris raw semantic-desktop share X" # requires running environment
[gentoo-commits] repo/gentoo:master commit in: kde-apps/gwenview/
commit: 8fce4fc21baccf0d5f6c8b00728b7a98c70edcd0
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed Jan 25 19:06:19 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed Jan 25 19:07:25 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fce4fc2
kde-apps/gwenview: drop 22.12.1
Signed-off-by: Andreas Sturmlechner gentoo.org>
kde-apps/gwenview/gwenview-22.12.1.ebuild | 102 --
1 file changed, 102 deletions(-)
diff --git a/kde-apps/gwenview/gwenview-22.12.1.ebuild
b/kde-apps/gwenview/gwenview-22.12.1.ebuild
deleted file mode 100644
index a8cced58e360..
--- a/kde-apps/gwenview/gwenview-22.12.1.ebuild
+++ /dev/null
@@ -1,102 +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.101.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
-"
-
-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
-}
[gentoo-commits] repo/gentoo:master commit in: kde-apps/gwenview/, kde-apps/gwenview/files/
commit: 2719d30e9a3c60fa2c089a39952c8060d097f197
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed Jan 25 19:01:50 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed Jan 25 19:07:25 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2719d30e
kde-apps/gwenview: Fix RAW plugin coexistence
Upstream commit c419ec4a052b39eae7c17caf2a89d39d76b43777
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=463132
Signed-off-by: Andreas Sturmlechner gentoo.org>
...enview-22.08.3-fix-raw-plugin-coexistence.patch | 58 +++
kde-apps/gwenview/gwenview-22.08.3-r2.ebuild | 107 +
kde-apps/gwenview/gwenview-22.12.1-r1.ebuild | 103
3 files changed, 268 insertions(+)
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
new file mode 100644
index ..759b23095ff9
--- /dev/null
+++ b/kde-apps/gwenview/files/gwenview-22.08.3-fix-raw-plugin-coexistence.patch
@@ -0,0 +1,58 @@
+From c419ec4a052b39eae7c17caf2a89d39d76b43777 Mon Sep 17 00:00:00 2001
+From: Mirco Miranda
+Date: Tue, 10 Jan 2023 14:53:30 +
+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/gwenview-22.08.3-r2.ebuild
b/kde-apps/gwenview/gwenview-22.08.3-r2.ebuild
new file mode 100644
index ..6ec7c9ce9c16
--- /dev/null
+++ b/kde-apps/gwenview/gwenview-22.08.3-r2.ebuild
@@ -0,0 +1,107 @@
+# 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
+
[gentoo-commits] repo/gentoo:master commit in: kde-apps/gwenview/
commit: 188967b9af8d4a4dfc0beda891f1989eb33618d4
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue Sep 6 18:54:01 2022 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue Sep 6 19:21:13 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=188967b9
kde-apps/gwenview: Drop IUSE annotate
It's actually required. Follow-up to 0af99b556a8a5c1b6aa37b70c7295d4278e4a329
Upstream commit 8f3bf87bcda2f678a15a48a5cefdca912d80dff8
Closes: https://bugs.gentoo.org/868333
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../{gwenview-22.08.0.ebuild => gwenview-22.08.0-r1.ebuild} | 6 +++---
kde-apps/gwenview/metadata.xml | 1 -
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/kde-apps/gwenview/gwenview-22.08.0.ebuild
b/kde-apps/gwenview/gwenview-22.08.0-r1.ebuild
similarity index 93%
rename from kde-apps/gwenview/gwenview-22.08.0.ebuild
rename to kde-apps/gwenview/gwenview-22.08.0-r1.ebuild
index bca7878f9036..d341db59c116 100644
--- a/kde-apps/gwenview/gwenview-22.08.0.ebuild
+++ b/kde-apps/gwenview/gwenview-22.08.0-r1.ebuild
@@ -16,7 +16,7 @@ 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 +annotate fits +mpris raw semantic-desktop share X"
+IUSE="activities fits +mpris raw semantic-desktop share X"
# requires running environment
RESTRICT="test"
@@ -44,13 +44,14 @@ COMMON_DEPEND="
>=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 )
- annotate? ( >=media-libs/kimageannotator-0.5.0 )
fits? ( sci-libs/cfitsio )
mpris? ( >=dev-qt/qtdbus-${QTMIN}:5 )
raw? ( >=kde-apps/libkdcraw-${PVCUT}:5 )
@@ -84,7 +85,6 @@ src_prepare() {
src_configure() {
local mycmakeargs=(
$(cmake_use_find_package activities KF5Activities)
- $(cmake_use_find_package annotate kImageAnnotator)
$(cmake_use_find_package fits CFitsio)
$(cmake_use_find_package raw KF5KDcraw)
-DGWENVIEW_SEMANTICINFO_BACKEND=$(usex semantic-desktop Baloo
None)
diff --git a/kde-apps/gwenview/metadata.xml b/kde-apps/gwenview/metadata.xml
index b0e63c7843d5..4e5e4b8b8586 100644
--- a/kde-apps/gwenview/metadata.xml
+++ b/kde-apps/gwenview/metadata.xml
@@ -10,7 +10,6 @@
Enable kactivities support
- Enable support for image annotations
using media-libs/kimageannotator
Enable support for NASA's
sci-libs/cfitsio library
Enable support for MPRIS2 interface,
requiring dev-qt/qtdbus as dependency.
Enable support for a share menu using
kde-frameworks/purpose
[gentoo-commits] repo/gentoo:master commit in: kde-apps/gwenview/
commit: 91f2cc511026b0c541c9e59785633d4cb0479f8b Author: Sam James gentoo org> AuthorDate: Fri Apr 22 19:17:47 2022 + Commit: Sam James gentoo org> CommitDate: Fri Apr 22 19:18:25 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91f2cc51 kde-apps/gwenview: fix UnusedLocalUse Signed-off-by: Sam James gentoo.org> kde-apps/gwenview/metadata.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/kde-apps/gwenview/metadata.xml b/kde-apps/gwenview/metadata.xml index 47b45ed92b6f..6e80e390db19 100644 --- a/kde-apps/gwenview/metadata.xml +++ b/kde-apps/gwenview/metadata.xml @@ -11,7 +11,6 @@ Enable kactivities support Enable support for NASA's sci-libs/cfitsio library - Enable support for the KDE Image Plugin Interface Enable support for MPRIS2 interface, requiring dev-qt/qtdbus as dependency. Enable support for a share menu using kde-frameworks/purpose
[gentoo-commits] repo/gentoo:master commit in: kde-apps/gwenview/
commit: 131bc274978e27b81ed100bab221c8503ca227b2
Author: Sam James gentoo org>
AuthorDate: Tue Dec 21 03:58:55 2021 +
Commit: Sam James gentoo org>
CommitDate: Tue Dec 21 04:19:17 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=131bc274
kde-apps/gwenview: fix kipi automagic typo
Signed-off-by: Sam James gentoo.org>
.../gwenview/{gwenview-21.12.0.ebuild => gwenview-21.12.0-r1.ebuild}| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kde-apps/gwenview/gwenview-21.12.0.ebuild
b/kde-apps/gwenview/gwenview-21.12.0-r1.ebuild
similarity index 98%
rename from kde-apps/gwenview/gwenview-21.12.0.ebuild
rename to kde-apps/gwenview/gwenview-21.12.0-r1.ebuild
index cfb6126ed526..b4caa495c7c9 100644
--- a/kde-apps/gwenview/gwenview-21.12.0.ebuild
+++ b/kde-apps/gwenview/gwenview-21.12.0-r1.ebuild
@@ -82,7 +82,7 @@ src_prepare() {
src_configure() {
local mycmakeargs=(
- -DCMAKE_DISABLE_FIND_PACKAGE_KF5Kipi=OFF
+ -DCMAKE_DISABLE_FIND_PACKAGE_KF5Kipi=ON
$(cmake_use_find_package activities KF5Activities)
$(cmake_use_find_package fits CFitsio)
$(cmake_use_find_package raw KF5KDcraw)
[gentoo-commits] repo/gentoo:master commit in: kde-apps/gwenview/
commit: bc0c3adf47f36bc214e49e318b647cb5be2e402a Author: Alex Fan yahoo com> AuthorDate: Mon Sep 13 10:23:37 2021 + Commit: Yixun Lan gentoo org> CommitDate: Tue Sep 14 14:14:44 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc0c3adf kde-apps/gwenview: keyword 21.08.1 for ~riscv Signed-off-by: Alex Fan yahoo.com> Signed-off-by: Yixun Lan gentoo.org> kde-apps/gwenview/gwenview-21.08.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-apps/gwenview/gwenview-21.08.1.ebuild b/kde-apps/gwenview/gwenview-21.08.1.ebuild index 60cdc5af10a..015f3e661f3 100644 --- a/kde-apps/gwenview/gwenview-21.08.1.ebuild +++ b/kde-apps/gwenview/gwenview-21.08.1.ebuild @@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/gwenview/ https://userbase.kde.org/Gwenview"; LICENSE="GPL-2+ handbook? ( FDL-1.2 )" SLOT="5" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" IUSE="activities fits kipi +mpris raw semantic-desktop share X" # requires running environment
[gentoo-commits] repo/gentoo:master commit in: kde-apps/gwenview/
commit: 782eca11523eac245852f5181563d78bf630aef8 Author: Georgy Yakovlev gentoo org> AuthorDate: Sun Jan 26 06:10:51 2020 + Commit: Georgy Yakovlev gentoo org> CommitDate: Sun Jan 26 10:17:41 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=782eca11 kde-apps/gwenview: keyword on ~ppc64 Package-Manager: Portage-2.3.85, Repoman-2.3.20 Signed-off-by: Georgy Yakovlev gentoo.org> kde-apps/gwenview/gwenview-19.12.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-apps/gwenview/gwenview-19.12.1.ebuild b/kde-apps/gwenview/gwenview-19.12.1.ebuild index 41828c72a35..fbf112e706a 100644 --- a/kde-apps/gwenview/gwenview-19.12.1.ebuild +++ b/kde-apps/gwenview/gwenview-19.12.1.ebuild @@ -16,7 +16,7 @@ https://userbase.kde.org/Gwenview"; LICENSE="GPL-2+ handbook? ( FDL-1.2 )" SLOT="5" -KEYWORDS="~amd64 ~arm64 ~x86" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" IUSE="activities fits kipi +mpris raw semantic-desktop share X" # requires running environment
[gentoo-commits] repo/gentoo:master commit in: kde-apps/gwenview/files/
commit: d7091303920e6e28ce14fe0cd4fb10102a6d7744 Author: Michael Mair-Keimberger gmail com> AuthorDate: Sun Jun 16 15:28:27 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Jun 16 21:50:54 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7091303 kde-apps/gwenview: remove unused patch Signed-off-by: Michael Mair-Keimberger gmail.com> Closes: https://github.com/gentoo/gentoo/pull/12269 Signed-off-by: Andreas Sturmlechner gentoo.org> .../files/gwenview-19.04.1-exiv2-0.27.1.patch | 34 -- 1 file changed, 34 deletions(-) diff --git a/kde-apps/gwenview/files/gwenview-19.04.1-exiv2-0.27.1.patch b/kde-apps/gwenview/files/gwenview-19.04.1-exiv2-0.27.1.patch deleted file mode 100644 index f95f26c68bd..000 --- a/kde-apps/gwenview/files/gwenview-19.04.1-exiv2-0.27.1.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 3f3e9a546fa5e9a335ad3dc9afc805fd4d2809fd Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner -Date: Sun, 12 May 2019 08:40:53 +0200 -Subject: [PATCH] Fix build with exiv2-0.27.1 - -Summary: Upstream is moving things around between headers. While they are busy doing that, they recommend including exiv2.hpp. - -Reviewers: #gwenview - -Tags: #gwenview - -Differential Revision: https://phabricator.kde.org/D21148 - lib/imagemetainfomodel.cpp | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) - -diff --git a/lib/imagemetainfomodel.cpp b/lib/imagemetainfomodel.cpp -index d7b89ab2..58f1c13d 100644 a/lib/imagemetainfomodel.cpp -+++ b/lib/imagemetainfomodel.cpp -@@ -33,9 +33,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - #include - - // Exiv2 --#include --#include --#include -+#include - - // Local - #ifdef HAVE_FITS --- -2.21.0 -
[gentoo-commits] repo/gentoo:master commit in: kde-apps/gwenview/, kde-apps/gwenview/files/
commit: 85cfe3d430d0d89cda610d5343618757223498dc
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun May 12 06:53:57 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Mon May 13 00:12:54 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85cfe3d4
kde-apps/gwenview: Fix build with media-libs/exiv2-0.27.1
Closes: https://bugs.gentoo.org/685682
Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../files/gwenview-19.04.1-exiv2-0.27.1.patch | 34 ++
kde-apps/gwenview/gwenview-19.04.1.ebuild | 2 ++
2 files changed, 36 insertions(+)
diff --git a/kde-apps/gwenview/files/gwenview-19.04.1-exiv2-0.27.1.patch
b/kde-apps/gwenview/files/gwenview-19.04.1-exiv2-0.27.1.patch
new file mode 100644
index 000..f95f26c68bd
--- /dev/null
+++ b/kde-apps/gwenview/files/gwenview-19.04.1-exiv2-0.27.1.patch
@@ -0,0 +1,34 @@
+From 3f3e9a546fa5e9a335ad3dc9afc805fd4d2809fd Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner
+Date: Sun, 12 May 2019 08:40:53 +0200
+Subject: [PATCH] Fix build with exiv2-0.27.1
+
+Summary: Upstream is moving things around between headers. While they are busy
doing that, they recommend including exiv2.hpp.
+
+Reviewers: #gwenview
+
+Tags: #gwenview
+
+Differential Revision: https://phabricator.kde.org/D21148
+---
+ lib/imagemetainfomodel.cpp | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/lib/imagemetainfomodel.cpp b/lib/imagemetainfomodel.cpp
+index d7b89ab2..58f1c13d 100644
+--- a/lib/imagemetainfomodel.cpp
b/lib/imagemetainfomodel.cpp
+@@ -33,9 +33,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
MA 02110-1301, USA.
+ #include
+
+ // Exiv2
+-#include
+-#include
+-#include
++#include
+
+ // Local
+ #ifdef HAVE_FITS
+--
+2.21.0
+
diff --git a/kde-apps/gwenview/gwenview-19.04.1.ebuild
b/kde-apps/gwenview/gwenview-19.04.1.ebuild
index 4bc3b01ee80..d4b54e523ff 100644
--- a/kde-apps/gwenview/gwenview-19.04.1.ebuild
+++ b/kde-apps/gwenview/gwenview-19.04.1.ebuild
@@ -71,6 +71,8 @@ RDEPEND="${COMMON_DEPEND}
kipi? ( media-plugins/kipi-plugins:5 )
"
+PATCHES=( "${FILESDIR}/${P}-exiv2-0.27.1.patch" )
+
src_prepare() {
kde5_src_prepare
if ! use mpris; then
[gentoo-commits] repo/gentoo:master commit in: kde-apps/gwenview/
commit: 9afbfc8f066cb9e0466e8016ade935da9b3bb23e
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed Feb 20 19:04:01 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Feb 21 10:29:08 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9afbfc8f
kde-apps/gwenview: Drop 18.08.3
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner gentoo.org>
kde-apps/gwenview/gwenview-18.08.3.ebuild | 111 --
1 file changed, 111 deletions(-)
diff --git a/kde-apps/gwenview/gwenview-18.08.3.ebuild
b/kde-apps/gwenview/gwenview-18.08.3.ebuild
deleted file mode 100644
index f82a3952a33..000
--- a/kde-apps/gwenview/gwenview-18.08.3.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="true"
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="Image viewer by KDE"
-HOMEPAGE="
- https://www.kde.org/applications/graphics/gwenview/
- https://userbase.kde.org/Gwenview
-"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
-KEYWORDS="amd64 x86"
-IUSE="activities fits kipi +mpris raw semantic-desktop X"
-
-# requires running environment
-RESTRICT+=" test"
-
-COMMON_DEPEND="
- $(add_frameworks_dep kcompletion)
- $(add_frameworks_dep kconfig)
- $(add_frameworks_dep kconfigwidgets)
- $(add_frameworks_dep kcoreaddons)
- $(add_frameworks_dep ki18n)
- $(add_frameworks_dep kiconthemes)
- $(add_frameworks_dep kio)
- $(add_frameworks_dep kitemmodels)
- $(add_frameworks_dep kitemviews)
- $(add_frameworks_dep kjobwidgets)
- $(add_frameworks_dep knotifications)
- $(add_frameworks_dep kparts)
- $(add_frameworks_dep kservice)
- $(add_frameworks_dep kwidgetsaddons)
- $(add_frameworks_dep kxmlgui)
- $(add_frameworks_dep solid)
- $(add_qt_dep qtgui)
- $(add_qt_dep qtopengl)
- $(add_qt_dep qtprintsupport)
- $(add_qt_dep qtsvg)
- $(add_qt_dep qtwidgets)
- media-gfx/exiv2:=
- media-libs/lcms:2
- media-libs/libpng:0=
- media-libs/phonon[qt5(+)]
- virtual/jpeg:0
- activities? ( $(add_frameworks_dep kactivities) )
- fits? ( sci-libs/cfitsio )
- kipi? ( $(add_kdeapps_dep libkipi '' '' '5=') )
- mpris? ( $(add_qt_dep qtdbus) )
- raw? ( $(add_kdeapps_dep libkdcraw) )
- semantic-desktop? (
- $(add_frameworks_dep baloo)
- $(add_frameworks_dep kfilemetadata)
- )
- X? (
- $(add_qt_dep qtx11extras)
- x11-libs/libX11
- )
-"
-DEPEND="${COMMON_DEPEND}
- $(add_frameworks_dep kwindowsystem)
- $(add_qt_dep qtconcurrent)
-"
-RDEPEND="${COMMON_DEPEND}
- $(add_frameworks_dep kimageformats)
- $(add_qt_dep qtimageformats)
-"
-
-PATCHES=( "${FILESDIR}/${PN}-18.07.90-activities-optional.patch" )
-
-src_prepare() {
- kde5_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-utils_use_find_package activities KF5Activities)
- $(cmake-utils_use_find_package fits CFitsio)
- $(cmake-utils_use_find_package kipi KF5Kipi)
- $(cmake-utils_use_find_package raw KF5KDcraw)
- $(cmake-utils_use_find_package X X11)
- )
-
- if use semantic-desktop; then
- mycmakeargs+=( -DGWENVIEW_SEMANTICINFO_BACKEND=Baloo )
- else
- mycmakeargs+=( -DGWENVIEW_SEMANTICINFO_BACKEND=None )
- fi
-
- kde5_src_configure
-}
-
-pkg_postinst() {
- kde5_pkg_postinst
-
- if ! has_version kde-apps/svgpart:${SLOT} ; then
- elog "For SVG support, install kde-apps/svgpart:${SLOT}"
- fi
-
- if use kipi && ! has_version media-plugins/kipi-plugins ; then
- elog "Plugins for the KIPI interface can be found in
media-plugins/kipi-plugins"
- fi
-}
[gentoo-commits] repo/gentoo:master commit in: kde-apps/gwenview/
commit: 12b6583ca40abcc766ea9b3e2981b50dba750142 Author: Mikle Kolyada gentoo org> AuthorDate: Wed Feb 20 13:06:10 2019 + Commit: Mikle Kolyada gentoo org> CommitDate: Wed Feb 20 13:06:10 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12b6583c kde-apps/gwenview: amd64 stable wrt bug #677710 Signed-off-by: Mikle Kolyada gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11 RepoMan-Options: --include-arches="amd64" kde-apps/gwenview/gwenview-18.08.3-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-apps/gwenview/gwenview-18.08.3-r1.ebuild b/kde-apps/gwenview/gwenview-18.08.3-r1.ebuild index eae183f7399..3b88c8c471d 100644 --- a/kde-apps/gwenview/gwenview-18.08.3-r1.ebuild +++ b/kde-apps/gwenview/gwenview-18.08.3-r1.ebuild @@ -15,7 +15,7 @@ HOMEPAGE=" " LICENSE="GPL-2+ handbook? ( FDL-1.2 )" -KEYWORDS="~amd64 x86" +KEYWORDS="amd64 x86" IUSE="activities fits kipi +mpris raw semantic-desktop X" # requires running environment
[gentoo-commits] repo/gentoo:master commit in: kde-apps/gwenview/
commit: c958e66940b478d8d0c36e2414e44237d90868fc Author: Thomas Deutschmann gentoo org> AuthorDate: Mon Feb 18 00:38:36 2019 + Commit: Thomas Deutschmann gentoo org> CommitDate: Mon Feb 18 00:38:36 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c958e669 kde-apps/gwenview: x86 stable (bug #677710) Package-Manager: Portage-2.3.60, Repoman-2.3.12 Signed-off-by: Thomas Deutschmann gentoo.org> kde-apps/gwenview/gwenview-18.08.3-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-apps/gwenview/gwenview-18.08.3-r1.ebuild b/kde-apps/gwenview/gwenview-18.08.3-r1.ebuild index 9200871fb27..eae183f7399 100644 --- a/kde-apps/gwenview/gwenview-18.08.3-r1.ebuild +++ b/kde-apps/gwenview/gwenview-18.08.3-r1.ebuild @@ -15,7 +15,7 @@ HOMEPAGE=" " LICENSE="GPL-2+ handbook? ( FDL-1.2 )" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 x86" IUSE="activities fits kipi +mpris raw semantic-desktop X" # requires running environment
[gentoo-commits] repo/gentoo:master commit in: kde-apps/gwenview/
commit: c8829674232d96fe0f9cb30f954fda37b193b752 Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri Feb 8 20:12:47 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Feb 9 09:52:00 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8829674 kde-apps/gwenview: Set KDE_HANDBOOK to forceoptional Bug: https://bugs.gentoo.org/677506 Package-Manager: Portage-2.3.59, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-apps/gwenview/gwenview-18.08.3-r1.ebuild | 2 +- kde-apps/gwenview/gwenview-18.12.2.ebuild| 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kde-apps/gwenview/gwenview-18.08.3-r1.ebuild b/kde-apps/gwenview/gwenview-18.08.3-r1.ebuild index 09a5bab1ab7..9200871fb27 100644 --- a/kde-apps/gwenview/gwenview-18.08.3-r1.ebuild +++ b/kde-apps/gwenview/gwenview-18.08.3-r1.ebuild @@ -4,7 +4,7 @@ EAPI=6 FRAMEWORKS_MINIMAL="5.54.0" -KDE_HANDBOOK="true" +KDE_HANDBOOK="forceoptional" KDE_TEST="true" inherit kde5 diff --git a/kde-apps/gwenview/gwenview-18.12.2.ebuild b/kde-apps/gwenview/gwenview-18.12.2.ebuild index 178049da64e..5ff86b2a7bb 100644 --- a/kde-apps/gwenview/gwenview-18.12.2.ebuild +++ b/kde-apps/gwenview/gwenview-18.12.2.ebuild @@ -3,7 +3,7 @@ EAPI=7 -KDE_HANDBOOK="true" +KDE_HANDBOOK="forceoptional" KDE_TEST="true" inherit kde5
[gentoo-commits] repo/gentoo:master commit in: kde-apps/gwenview/files/, kde-apps/gwenview/
commit: 498bb8f66868ec99e1a971fb4815edb2781d226d
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed Feb 6 22:51:42 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Feb 7 12:59:57 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=498bb8f6
kde-apps/gwenview: Backport exiv2-0.27 support to 18.08.3
Refresh patch for 18.12.x as well.
Package-Manager: Portage-2.3.59, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../files/gwenview-18.12.1-exiv2-0.27.patch| 142 ++---
kde-apps/gwenview/gwenview-18.08.3-r1.ebuild | 112
2 files changed, 237 insertions(+), 17 deletions(-)
diff --git a/kde-apps/gwenview/files/gwenview-18.12.1-exiv2-0.27.patch
b/kde-apps/gwenview/files/gwenview-18.12.1-exiv2-0.27.patch
index 66ed9ed8345..3e528e49285 100644
--- a/kde-apps/gwenview/files/gwenview-18.12.1-exiv2-0.27.patch
+++ b/kde-apps/gwenview/files/gwenview-18.12.1-exiv2-0.27.patch
@@ -1,7 +1,7 @@
-From 61543b42289fc986e580f2e3443719f3334f17b5 Mon Sep 17 00:00:00 2001
+From 3637438dd1a772ee65e6b3091087bde89dc91db0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Br=C3=BCns?=
Date: Sun, 30 Dec 2018 02:46:28 +0100
-Subject: [PATCH 1/2] Use forward declaration for Exiv2::Image, port to
+Subject: [PATCH 1/4] Use forward declaration for Exiv2::Image, port to
std::unique_ptr
Summary:
@@ -104,7 +104,7 @@ index d841ae5f..d3d0002c 100644
void AbstractDocumentImpl::setDocumentDownSampledImage(const QImage& image,
int invertedZoom)
diff --git a/lib/document/abstractdocumentimpl.h
b/lib/document/abstractdocumentimpl.h
-index 1f427e60..86e6bfd2 100644
+index 5d6862b8..6c6be825 100644
--- a/lib/document/abstractdocumentimpl.h
+++ b/lib/document/abstractdocumentimpl.h
@@ -34,6 +34,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
MA 02110-1301, USA.
@@ -129,7 +129,7 @@ index 1f427e60..86e6bfd2 100644
void setDocumentCmsProfile(Cms::Profile::Ptr profile);
void setDocumentErrorString(const QString&);
diff --git a/lib/document/document.cpp b/lib/document/document.cpp
-index 18756700..afa9ed03 100644
+index c760be96..27003b3e 100644
--- a/lib/document/document.cpp
+++ b/lib/document/document.cpp
@@ -31,6 +31,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
MA 02110-1301, USA.
@@ -155,7 +155,7 @@ index 18756700..afa9ed03 100644
emit metaInfoUpdated();
}
diff --git a/lib/document/document.h b/lib/document/document.h
-index c0bb454b..4b40a6e1 100644
+index 782111d9..4b2b3d48 100644
--- a/lib/document/document.h
+++ b/lib/document/document.h
@@ -22,8 +22,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
MA 02110-1301, USA.
@@ -191,7 +191,7 @@ index c0bb454b..4b40a6e1 100644
void switchToImpl(AbstractDocumentImpl* impl);
void setErrorString(const QString&);
diff --git a/lib/document/document_p.h b/lib/document/document_p.h
-index 78e0ac6e..4de25f15 100644
+index 00c6f7ff..2701440f 100644
--- a/lib/document/document_p.h
+++ b/lib/document/document_p.h
@@ -21,6 +21,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor,
Cambridge, MA 02110-1301, USA
@@ -226,7 +226,7 @@ index 78e0ac6e..4de25f15 100644
QByteArray mFormat;
ImageMetaInfoModel mImageMetaInfoModel;
diff --git a/lib/document/loadingdocumentimpl.cpp
b/lib/document/loadingdocumentimpl.cpp
-index 07675783..766a1831 100644
+index 713ef32c..3bcf613a 100644
--- a/lib/document/loadingdocumentimpl.cpp
+++ b/lib/document/loadingdocumentimpl.cpp
@@ -24,6 +24,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
MA 02110-1301, USA.
@@ -248,7 +248,7 @@ index 07675783..766a1831 100644
std::unique_ptr mJpegContent;
QImage mImage;
Cms::Profile::Ptr mCmsProfile;
-@@ -486,7 +489,7 @@ void LoadingDocumentImpl::slotMetaInfoLoaded()
+@@ -488,7 +491,7 @@ void LoadingDocumentImpl::slotMetaInfoLoaded()
setDocumentFormat(d->mFormat);
setDocumentImageSize(d->mImageSize);
@@ -258,7 +258,7 @@ index 07675783..766a1831 100644
d->mMetaInfoLoaded = true;
diff --git a/lib/exiv2imageloader.cpp b/lib/exiv2imageloader.cpp
-index f2830f81..f13dff7a 100644
+index c298c9c3..49bdf2c8 100644
--- a/lib/exiv2imageloader.cpp
+++ b/lib/exiv2imageloader.cpp
@@ -29,8 +29,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
MA 02110-1301, USA.
@@ -288,7 +288,7 @@ index f2830f81..f13dff7a 100644
+
d->mImage.reset(Exiv2::ImageFactory::open(filePathByteArray.constData()).release());
d->mImage->readMetadata();
} catch (const Exiv2::Error& error) {
- d->mErrorMessage = QString::fromUtf8(error.what());
+ d->mErrorMessage = error.what();
@@ -69,7 +68,7 @@ bool Exiv2ImageLoader::load(const QString& filePath)
bool Exiv2ImageLoader::load(const QByteArray& data)
{
@@ -297,7 +297,7 @@ index f2830f81..f13dff7a 100644
+d->mImage.reset(Exiv2::ImageFactory::open((unsigned
[gentoo-commits] repo/gentoo:master commit in: kde-apps/gwenview/files/
commit: e9e00e80e356314a68de6fc555730d38c3392a5b
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed Jan 16 22:25:42 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Jan 17 00:36:04 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9e00e80
kde-apps/gwenview: Drop unused patch
Package-Manager: Portage-2.3.56, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../files/gwenview-18.12.0-exiv2-0.27.patch| 216 -
1 file changed, 216 deletions(-)
diff --git a/kde-apps/gwenview/files/gwenview-18.12.0-exiv2-0.27.patch
b/kde-apps/gwenview/files/gwenview-18.12.0-exiv2-0.27.patch
deleted file mode 100644
index fa0d62d84b7..000
--- a/kde-apps/gwenview/files/gwenview-18.12.0-exiv2-0.27.patch
+++ /dev/null
@@ -1,216 +0,0 @@
-From 7e4cd5e91d7434448b7227ee8cf3307435cc7d00 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner
-Date: Sun, 30 Dec 2018 12:59:05 +0100
-Subject: [PATCH 1/2] Include exiv2.hpp instead of individual headers
-
-Headers are subject to refactoring upstream, using exiv2.hpp per
recommendation.
- lib/cms/cmsprofile.h | 2 +-
- lib/document/document.h | 2 +-
- lib/exiv2imageloader.cpp | 4
- lib/exiv2imageloader.h| 2 +-
- lib/imagemetainfomodel.cpp| 4 +---
- lib/jpegcontent.cpp | 4
- lib/timeutils.cpp | 4
- tests/auto/documenttest.cpp | 2 --
- tests/auto/imagemetainfomodeltest.cpp | 2 --
- 9 files changed, 4 insertions(+), 22 deletions(-)
-
-diff --git a/lib/cms/cmsprofile.h b/lib/cms/cmsprofile.h
-index a2a38a87..bc378ff9 100644
a/lib/cms/cmsprofile.h
-+++ b/lib/cms/cmsprofile.h
-@@ -30,7 +30,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor,
Cambridge, MA 02110-1301, USA
- #include
-
- // Exiv2
--#include
-+#include
-
- class QByteArray;
- class QString;
-diff --git a/lib/document/document.h b/lib/document/document.h
-index c0bb454b..8e32c044 100644
a/lib/document/document.h
-+++ b/lib/document/document.h
-@@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
MA 02110-1301, USA.
- #include
-
- #include
--#include
-+#include
-
- // Qt
- #include
-diff --git a/lib/exiv2imageloader.cpp b/lib/exiv2imageloader.cpp
-index f2830f81..f12b7383 100644
a/lib/exiv2imageloader.cpp
-+++ b/lib/exiv2imageloader.cpp
-@@ -28,10 +28,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
MA 02110-1301, USA.
-
- // KDE
-
--// Exiv2
--#include
--#include
--
- // Local
-
- namespace Gwenview
-diff --git a/lib/exiv2imageloader.h b/lib/exiv2imageloader.h
-index 57ef24d2..866e7fac 100644
a/lib/exiv2imageloader.h
-+++ b/lib/exiv2imageloader.h
-@@ -29,7 +29,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
MA 02110-1301, USA.
-
- // Exiv2
- #include
--#include
-+#include
-
- // Local
-
-diff --git a/lib/imagemetainfomodel.cpp b/lib/imagemetainfomodel.cpp
-index d7b89ab2..58f1c13d 100644
a/lib/imagemetainfomodel.cpp
-+++ b/lib/imagemetainfomodel.cpp
-@@ -33,9 +33,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
MA 02110-1301, USA.
- #include
-
- // Exiv2
--#include
--#include
--#include
-+#include
-
- // Local
- #ifdef HAVE_FITS
-diff --git a/lib/jpegcontent.cpp b/lib/jpegcontent.cpp
-index bb810dd4..a628e8a8 100644
a/lib/jpegcontent.cpp
-+++ b/lib/jpegcontent.cpp
-@@ -41,10 +41,6 @@ extern "C" {
- // KDE
- #include
-
--// Exiv2
--#include
--#include
--
- // Local
- #include "jpegerrormanager.h"
- #include "iodevicejpegsourcemanager.h"
-diff --git a/lib/timeutils.cpp b/lib/timeutils.cpp
-index 9e8836a9..19befff5 100644
a/lib/timeutils.cpp
-+++ b/lib/timeutils.cpp
-@@ -29,10 +29,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor,
Cambridge, MA 02110-1301, USA
- // KDE
- #include
-
--// Exiv2
--#include
--#include
--
- // Local
- #include
- #include
-diff --git a/tests/auto/documenttest.cpp b/tests/auto/documenttest.cpp
-index 9373641f..496346f0 100644
a/tests/auto/documenttest.cpp
-+++ b/tests/auto/documenttest.cpp
-@@ -39,8 +39,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
MA 02110-1301, USA.
- #include "../lib/transformimageoperation.h"
- #include "testutils.h"
-
--#include
--
- #include "documenttest.h"
-
- QTEST_MAIN(DocumentTest)
-diff --git a/tests/auto/imagemetainfomodeltest.cpp
b/tests/auto/imagemetainfomodeltest.cpp
-index e3ec8d30..c4467a73 100644
a/tests/auto/imagemetainfomodeltest.cpp
-+++ b/tests/auto/imagemetainfomodeltest.cpp
-@@ -28,8 +28,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
MA 02110-1301, USA.
- #include "../lib/imagemetainfomodel.h"
- #include "testutils.h"
-
--#include
--
- #include "imagemetainfomodeltest.h"
-
- QTEST_MAIN(ImageMetaInfoModelTest)
---
-2.20.1
-
-
-From 7d6c5d95cf4e4d7c857f5d659a58f82bdc46259c Mon Sep 17 00:00:00 2001
-From:
[gentoo-commits] repo/gentoo:master commit in: kde-apps/gwenview/, kde-apps/gwenview/files/
commit: 4368fe063eb2065a56ccc943a8cabacb80735ba3
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Dec 30 13:19:43 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Dec 30 13:21:51 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4368fe06
kde-apps/gwenview: Fix build with exiv2-0.27
Apply conditionally for now while patch is in review upstream.
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../files/gwenview-18.12.0-exiv2-0.27.patch| 216 +
kde-apps/gwenview/gwenview-18.12.0.ebuild | 1 +
2 files changed, 217 insertions(+)
diff --git a/kde-apps/gwenview/files/gwenview-18.12.0-exiv2-0.27.patch
b/kde-apps/gwenview/files/gwenview-18.12.0-exiv2-0.27.patch
new file mode 100644
index 000..fa0d62d84b7
--- /dev/null
+++ b/kde-apps/gwenview/files/gwenview-18.12.0-exiv2-0.27.patch
@@ -0,0 +1,216 @@
+From 7e4cd5e91d7434448b7227ee8cf3307435cc7d00 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner
+Date: Sun, 30 Dec 2018 12:59:05 +0100
+Subject: [PATCH 1/2] Include exiv2.hpp instead of individual headers
+
+Headers are subject to refactoring upstream, using exiv2.hpp per
recommendation.
+---
+ lib/cms/cmsprofile.h | 2 +-
+ lib/document/document.h | 2 +-
+ lib/exiv2imageloader.cpp | 4
+ lib/exiv2imageloader.h| 2 +-
+ lib/imagemetainfomodel.cpp| 4 +---
+ lib/jpegcontent.cpp | 4
+ lib/timeutils.cpp | 4
+ tests/auto/documenttest.cpp | 2 --
+ tests/auto/imagemetainfomodeltest.cpp | 2 --
+ 9 files changed, 4 insertions(+), 22 deletions(-)
+
+diff --git a/lib/cms/cmsprofile.h b/lib/cms/cmsprofile.h
+index a2a38a87..bc378ff9 100644
+--- a/lib/cms/cmsprofile.h
b/lib/cms/cmsprofile.h
+@@ -30,7 +30,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor,
Cambridge, MA 02110-1301, USA
+ #include
+
+ // Exiv2
+-#include
++#include
+
+ class QByteArray;
+ class QString;
+diff --git a/lib/document/document.h b/lib/document/document.h
+index c0bb454b..8e32c044 100644
+--- a/lib/document/document.h
b/lib/document/document.h
+@@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
MA 02110-1301, USA.
+ #include
+
+ #include
+-#include
++#include
+
+ // Qt
+ #include
+diff --git a/lib/exiv2imageloader.cpp b/lib/exiv2imageloader.cpp
+index f2830f81..f12b7383 100644
+--- a/lib/exiv2imageloader.cpp
b/lib/exiv2imageloader.cpp
+@@ -28,10 +28,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
MA 02110-1301, USA.
+
+ // KDE
+
+-// Exiv2
+-#include
+-#include
+-
+ // Local
+
+ namespace Gwenview
+diff --git a/lib/exiv2imageloader.h b/lib/exiv2imageloader.h
+index 57ef24d2..866e7fac 100644
+--- a/lib/exiv2imageloader.h
b/lib/exiv2imageloader.h
+@@ -29,7 +29,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
MA 02110-1301, USA.
+
+ // Exiv2
+ #include
+-#include
++#include
+
+ // Local
+
+diff --git a/lib/imagemetainfomodel.cpp b/lib/imagemetainfomodel.cpp
+index d7b89ab2..58f1c13d 100644
+--- a/lib/imagemetainfomodel.cpp
b/lib/imagemetainfomodel.cpp
+@@ -33,9 +33,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
MA 02110-1301, USA.
+ #include
+
+ // Exiv2
+-#include
+-#include
+-#include
++#include
+
+ // Local
+ #ifdef HAVE_FITS
+diff --git a/lib/jpegcontent.cpp b/lib/jpegcontent.cpp
+index bb810dd4..a628e8a8 100644
+--- a/lib/jpegcontent.cpp
b/lib/jpegcontent.cpp
+@@ -41,10 +41,6 @@ extern "C" {
+ // KDE
+ #include
+
+-// Exiv2
+-#include
+-#include
+-
+ // Local
+ #include "jpegerrormanager.h"
+ #include "iodevicejpegsourcemanager.h"
+diff --git a/lib/timeutils.cpp b/lib/timeutils.cpp
+index 9e8836a9..19befff5 100644
+--- a/lib/timeutils.cpp
b/lib/timeutils.cpp
+@@ -29,10 +29,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor,
Cambridge, MA 02110-1301, USA
+ // KDE
+ #include
+
+-// Exiv2
+-#include
+-#include
+-
+ // Local
+ #include
+ #include
+diff --git a/tests/auto/documenttest.cpp b/tests/auto/documenttest.cpp
+index 9373641f..496346f0 100644
+--- a/tests/auto/documenttest.cpp
b/tests/auto/documenttest.cpp
+@@ -39,8 +39,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
MA 02110-1301, USA.
+ #include "../lib/transformimageoperation.h"
+ #include "testutils.h"
+
+-#include
+-
+ #include "documenttest.h"
+
+ QTEST_MAIN(DocumentTest)
+diff --git a/tests/auto/imagemetainfomodeltest.cpp
b/tests/auto/imagemetainfomodeltest.cpp
+index e3ec8d30..c4467a73 100644
+--- a/tests/auto/imagemetainfomodeltest.cpp
b/tests/auto/imagemetainfomodeltest.cpp
+@@ -28,8 +28,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
MA 02110-1301, USA.
+ #include "../lib/imagemetainfomodel.h"
+ #include "testutils.h"
+
+-#include
+-
+ #include "imagemetainfomodeltest.h"
+
+
[gentoo-commits] repo/gentoo:master commit in: kde-apps/gwenview/
commit: eec553abbf4ddc2b063218c62730cd33250e720c
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu Dec 13 22:07:42 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Dec 13 22:25:47 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eec553ab
kde-apps/gwenview: Reduce pkg_postinst spam
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner gentoo.org>
kde-apps/gwenview/gwenview-18.12.0.ebuild | 7 ++-
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/kde-apps/gwenview/gwenview-18.12.0.ebuild
b/kde-apps/gwenview/gwenview-18.12.0.ebuild
index 5481e1d6300..a580d5a58cc 100644
--- a/kde-apps/gwenview/gwenview-18.12.0.ebuild
+++ b/kde-apps/gwenview/gwenview-18.12.0.ebuild
@@ -68,6 +68,7 @@ DEPEND="${COMMON_DEPEND}
RDEPEND="${COMMON_DEPEND}
$(add_frameworks_dep kimageformats)
$(add_qt_dep qtimageformats)
+ kipi? ( media-plugins/kipi-plugins:5 )
"
src_prepare() {
@@ -99,11 +100,7 @@ src_configure() {
pkg_postinst() {
kde5_pkg_postinst
- if ! has_version kde-apps/svgpart:${SLOT} ; then
+ if [[ -z "${REPLACING_VERSIONS}" ]] && ! has_version
kde-apps/svgpart:${SLOT} ; then
elog "For SVG support, install kde-apps/svgpart:${SLOT}"
fi
-
- if use kipi && ! has_version media-plugins/kipi-plugins ; then
- elog "Plugins for the KIPI interface can be found in
media-plugins/kipi-plugins"
- fi
}
[gentoo-commits] repo/gentoo:master commit in: kde-apps/gwenview/
commit: fa601121cc16aad94a26d8ec5e2c55b95385173e
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed Sep 12 10:11:12 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed Sep 12 10:12:15 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa601121
kde-apps/gwenview: Fix USE=-mpris
Use a workaround, but this should be fixed upstream.
Closes: https://bugs.gentoo.org/663340
Package-Manager: Portage-2.3.49, Repoman-2.3.10
kde-apps/gwenview/gwenview-18.08.1.ebuild | 9 -
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/kde-apps/gwenview/gwenview-18.08.1.ebuild
b/kde-apps/gwenview/gwenview-18.08.1.ebuild
index 417f47c75dd..2a5b51186bd 100644
--- a/kde-apps/gwenview/gwenview-18.08.1.ebuild
+++ b/kde-apps/gwenview/gwenview-18.08.1.ebuild
@@ -72,12 +72,19 @@ RDEPEND="${COMMON_DEPEND}
PATCHES=( "${FILESDIR}/${PN}-18.07.90-activities-optional.patch" )
+src_prepare() {
+ kde5_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-utils_use_find_package activities KF5Activities)
$(cmake-utils_use_find_package fits CFitsio)
$(cmake-utils_use_find_package kipi KF5Kipi)
- $(cmake-utils_use_find_package mpris Qt5DBus)
$(cmake-utils_use_find_package raw KF5KDcraw)
$(cmake-utils_use_find_package X X11)
)
[gentoo-commits] repo/gentoo:master commit in: kde-apps/gwenview/files/
commit: 4ba1b2e31f26bb8b31890fc3ce6eb7ef0aaf8b9b
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Sep 8 12:50:51 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Sep 8 12:51:34 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ba1b2e3
kde-apps/gwenview: Add missing patch
Package-Manager: Portage-2.3.49, Repoman-2.3.10
.../gwenview-18.07.90-activities-optional.patch| 160 +
1 file changed, 160 insertions(+)
diff --git
a/kde-apps/gwenview/files/gwenview-18.07.90-activities-optional.patch
b/kde-apps/gwenview/files/gwenview-18.07.90-activities-optional.patch
new file mode 100644
index 000..bf66688a6b9
--- /dev/null
+++ b/kde-apps/gwenview/files/gwenview-18.07.90-activities-optional.patch
@@ -0,0 +1,160 @@
+From a00eecc78507f48843f719f32e80ae8805a34c15 Mon Sep 17 00:00:00 2001
+From: Alexander Volkov
+Date: Tue, 7 Aug 2018 23:59:15 +0300
+Subject: Make dependency on KActivities optional
+
+Reviewers: #gwenview, rkflx
+
+Reviewed By: #gwenview, rkflx
+
+Subscribers: asturmlechner, rkflx
+
+Differential Revision: https://phabricator.kde.org/D14512
+---
+ CMakeLists.txt | 4 +++-
+ app/CMakeLists.txt | 5 -
+ app/viewmainpage.cpp| 19 ---
+ config-gwenview.h.cmake | 1 +
+ 4 files changed, 24 insertions(+), 5 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 6e3e412..810813a 100644
+--- a/CMakeLists.txt
b/CMakeLists.txt
+@@ -71,7 +71,6 @@ add_definitions(-DPHONON_LIB_SONAME=\"${PHONON_LIB_SONAME}\")
+
+ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
+ KIO
+-Activities
+ ItemModels
+ I18n
+ DocTools
+@@ -80,6 +79,9 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
+ IconThemes
+ Notifications
+ )
++find_package(KF5 ${KF5_MIN_VERSION} OPTIONAL_COMPONENTS
++Activities
++)
+
+ ## Dependencies
+ find_package(JPEG)
+diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
+index 5fe34d6..0d24360 100644
+--- a/app/CMakeLists.txt
b/app/CMakeLists.txt
+@@ -78,11 +78,14 @@ add_executable(gwenview ${gwenview_SRCS})
+
+ target_link_libraries(gwenview
+ KF5::ItemModels
+-KF5::Activities
+ KF5::Notifications
+ gwenviewlib
+ )
+
++if (KF5Activities_FOUND)
++target_link_libraries(gwenview KF5::Activities)
++endif()
++
+ target_link_libraries(gwenview LINK_INTERFACE_LIBRARIES KF5::KIOCore
Qt5::Core)
+
+ if (KF5Kipi_FOUND)
+diff --git a/app/viewmainpage.cpp b/app/viewmainpage.cpp
+index fa06e80..480d3c2 100644
+--- a/app/viewmainpage.cpp
b/app/viewmainpage.cpp
+@@ -18,6 +18,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
MA 02110-1301, USA.
+
+ */
+ #include "viewmainpage.h"
++#include "config-gwenview.h"
+
+ // Qt
+ #include
+@@ -35,8 +36,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
MA 02110-1301, USA.
+ #include
+ #include
+ #include
+-#include
+ #include
++#ifdef KF5Activities_FOUND
++#include
++#endif
+
+ // Local
+ #include "fileoperations.h"
+@@ -132,7 +135,9 @@ struct ViewMainPagePrivate
+ // Activity Resource events reporting needs to be above KPart,
+ // in the shell itself, to avoid problems with other MDI applications
+ // that use this KPart
++#ifdef KF5Activities_FOUND
+ QHash mActivityResources;
++#endif
+
+ bool mCompareMode;
+ ZoomMode::Enum mZoomMode;
+@@ -250,7 +255,9 @@ struct ViewMainPagePrivate
+ QObject::connect(view, &DocumentView::videoFinished, mSlideShow,
&SlideShow::resumeAndGoToNextUrl);
+
+ mDocumentViews << view;
++#ifdef KF5Activities_FOUND
+ mActivityResources.insert(view, new
KActivities::ResourceInstance(q->window()->winId(), view));
++#endif
+
+ return view;
+ }
+@@ -269,7 +276,9 @@ struct ViewMainPagePrivate
+ QObject::disconnect(view, nullptr, mSlideShow, nullptr);
+
+ mDocumentViews.removeOne(view);
++#ifdef KF5Activities_FOUND
+ mActivityResources.remove(view);
++#endif
+ mDocumentViewContainer->deleteView(view);
+ }
+
+@@ -344,8 +353,10 @@ struct ViewMainPagePrivate
+ }
+ if (oldView) {
+ oldView->setCurrent(false);
++#ifdef KF5Activities_FOUND
+ Q_ASSERT(mActivityResources.contains(oldView));
+ mActivityResources.value(oldView)->notifyFocusedOut();
++#endif
+ }
+ view->setCurrent(true);
+ mDocumentViewController->setView(view);
+@@ -358,10 +369,10 @@ struct ViewMainPagePrivate
+ // *before* listing /foo (because it matters less to the user)
+ mThumbnailBar->selectionModel()->setCurrentIndex(index,
QItemSelectionModel::Current);
+ }
+-
++#ifdef KF5Activities_FOUND
+ Q_ASSERT(mActivityResources.contains(view));
+ mActivityResources.value(view)->notifyFocusedIn();
+-
++#endif
+ QObject::connect(view, &DocumentView::currentToolChanged,
+
[gentoo-commits] repo/gentoo:master commit in: kde-apps/gwenview/
commit: 16f4e9fdeef8c2d95acc168a993b879947490edd Author: Mikle Kolyada gentoo org> AuthorDate: Tue May 24 11:25:53 2016 + Commit: Mikle Kolyada gentoo org> CommitDate: Tue May 24 11:38:02 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16f4e9fd kde-apps/gwenview: amd64 stable wrt bug #579992 Package-Manager: portage-2.2.28 kde-apps/gwenview/gwenview-15.12.3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-apps/gwenview/gwenview-15.12.3.ebuild b/kde-apps/gwenview/gwenview-15.12.3.ebuild index 7292b6a..aedcaeb 100644 --- a/kde-apps/gwenview/gwenview-15.12.3.ebuild +++ b/kde-apps/gwenview/gwenview-15.12.3.ebuild @@ -13,7 +13,7 @@ HOMEPAGE=" https://www.kde.org/applications/graphics/gwenview/ https://userbase.kde.org/Gwenview " -KEYWORDS=" ~amd64 ~x86" +KEYWORDS="amd64 ~x86" IUSE="kipi raw semantic-desktop X" # requires running environment
