summaryrefslogtreecommitdiff
path: root/kde-apps/gwenview
diff options
context:
space:
mode:
Diffstat (limited to 'kde-apps/gwenview')
-rw-r--r--kde-apps/gwenview/Manifest10
-rw-r--r--kde-apps/gwenview/files/gwenview-24.08.0-odr.patch58
-rw-r--r--kde-apps/gwenview/gwenview-23.08.5.ebuild112
-rw-r--r--kde-apps/gwenview/gwenview-24.05.2-r1.ebuild2
-rw-r--r--kde-apps/gwenview/gwenview-24.05.2-r2.ebuild113
-rw-r--r--kde-apps/gwenview/gwenview-24.08.1.ebuild (renamed from kde-apps/gwenview/gwenview-24.08.0.ebuild)4
6 files changed, 180 insertions, 119 deletions
diff --git a/kde-apps/gwenview/Manifest b/kde-apps/gwenview/Manifest
index 9eb6b1c87135..6c854a25291d 100644
--- a/kde-apps/gwenview/Manifest
+++ b/kde-apps/gwenview/Manifest
@@ -1,7 +1,7 @@
-DIST gwenview-23.08.5.tar.xz 6904128 BLAKE2B f8f2a54ef438c4d3144198ee3a48de1ec72e7e3fc0f9b811130499087424b7c7a659d269c8be31998642589c0cad3d9e8c7cfebf6582c8d97999eb4e501a4aaa SHA512 8607f17b57211e31efc709dbec1091f7ca1587db90877583222acb5a82a19340530068adb85ca1748b0c849cf1f6551bd2fefdc2d55dfae1446b3582dc1615b9
+AUX gwenview-24.08.0-odr.patch 2024 BLAKE2B b3de601985470bd6489fac15c84c973e0d17027f0cf0655f69860696103b0ecdf4f75c08d192634ed037da7c123ae21ffc9eac3c67854af825bdb736f8af632d SHA512 286f211c76c1a39023d00037eefa41ea7bee7b80b4cd6010b75f0b9d99ad7a39d792bade9ec408c075f6f2a2cfd13861e06c525c518e072fb6d27307c3ac951f
DIST gwenview-24.05.2.tar.xz 6513176 BLAKE2B 526bf8fe8caf319368997e31eac48013ba67e023f2e2a0a3082e69b4bff04828308ee85cc8a7cda9ca79a7429d0d749a08deb960149be337ded351d49f823026 SHA512 3c0cc7faa2c7f65b4146a0c7e4a1689ed7629510c9afd4fa891e422ad379e25fd6367e02326cf3721e7862d56661759d0fc9afa37d4cd0392d917d44ef8110e6
-DIST gwenview-24.08.0.tar.xz 6514240 BLAKE2B 33203bdcd5c81baff569c01a7bd21eb09288caf30c26c8cfecec1f8ed71a90eba064d67b2c4faf86486ae3fdb90e6c652c9077dc3f08ec548b128db28713d22c SHA512 4bd00ca9bec99fce7c894e51df68c606eecaaf65bfd8936a942f761ebe199c62ee579e64f90052359ab32a44a218736f8bcfbf9921c382467a588c1a234011c5
-EBUILD gwenview-23.08.5.ebuild 3086 BLAKE2B f2b5e2a10199518e3d98641ad67b129af77768f4a9374d1e22ed0072adbfbb3cc7af7561331c71bd63108cccaa49502f00b5ae1fa96d7749fa8574d409cc38ee SHA512 b4a3c184561c4f5f2e9fb35065b0287763dff405e1728b05c3dd5ba53368b3b64311a7fd9d73dd3b6336c59518af762c4ffc9cf53a682183c405d9ef29459e1e
-EBUILD gwenview-24.05.2-r1.ebuild 3021 BLAKE2B bc03069c88536b0797d4fdcd652aa6469d419792b27c711d847a5974bff9403cb86c9ddc6560462b1a1f7cf5c5b6729f7b0b7a6aafc5c52f009a4e1ba123d178 SHA512 264852a97954876b3e40dc71cd223ae722af560435a698f788d0503ed1ce11d02596ed6cc349317fb4cf98c079ad842f0f42914fa9c910b8484785a46c3dc7e7
-EBUILD gwenview-24.08.0.ebuild 3014 BLAKE2B 875f7def5425fd99fb4200aa00097f75fa2e86eec2f13c77f2b8eb2db966d1f1716971f95d002ae8e2dca89958f17ccfc77176c8e81c73b19e8da9ee164deddb SHA512 0a95fb651ca23860401c13470137b7d8bd81fc050d27ec648ee05be5cefc50f3a60a77178d2bf2fdebc54e5511bccdbfdead93437742ff7ddb09d0a050d1dead
+DIST gwenview-24.08.1.tar.xz 6514684 BLAKE2B bfb281f7a6aa74f2d08527c8583ff560e5162d5e4e87d8ae7021a187240364d654a484dcbb81da44c7afb9cc08214d442fa782228c09c794a75ff5836ef02e99 SHA512 17a67a11a611a39c9ab0389c8a931fcd3f48ffd6c01e13c2ba6dd3dedc630fe65c6a0fd42f7a7c1ce16887fe8b6b9fb94390704ea3f53a152a40eb665d600203
+EBUILD gwenview-24.05.2-r1.ebuild 3019 BLAKE2B 0f23d47d5b8e4beb228cb142d283f1d8c8813694b0356921f921dcc2bee187639359e52136cf2ce0d3e0d0de62482be39ebfcc2f1a8d04421955ab0b6d41613b SHA512 1043f5f9df96ea2de5890303bc3dbb040779f64767ca9d91d39ac47b2ad0660102bb07524b6c232f2e56034929d26ec3a6fed6a4dc8e33851b84433e6136d1ee
+EBUILD gwenview-24.05.2-r2.ebuild 3073 BLAKE2B ae208870490470a0dfdee2bbc1ef66496603f890eaccde6ff31a9455fd0150eb27a71eeb8d37faf30ec9b47d60ac40eed608f00df7643a1c64d58793cb9fd1e3 SHA512 3f6ef27fa2282c453beceda1cdc0a90e491773250eb07a0e335f79ec5fa9c5b83c591b0197aaf3ea15ef8dc8017cab9c2d3d2f8b49bc7c3f9e03b5408aee2d3e
+EBUILD gwenview-24.08.1.ebuild 3081 BLAKE2B 35cea8a93471b8d2e5abeeb8e6ca2a0fa70d15d9728385c2f85d86a824164c7b5f061f7f17daf015f5038584618807ae960bba9a111bcfce5a29b8557f0196db SHA512 a908b3b224d875dd279c5e5f52903a5443d926095de2189fb66306c16031a68967861e29df5f08756b70b818e1d94883b2a80e00368a66725ab9b9b14371e8c1
MISC metadata.xml 697 BLAKE2B 1b9d505c5490486b4a5b6e11447a8c0bf3d52f678f80a1825164458188cc4dee675b3f620818d6a402f7a4dc14498370efa0c08baacc7f78b928beda8f54b697 SHA512 4cf16eb17b7b10862f6268a2082dfaf808c00ae9342a2b864716a64c23dcfca6c837d39a2637d8b9a6c7ec391492b4c3fc7bfd5e21e81c97f21053ff4acd9aed
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 000000000000..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 <eschwartz@gentoo.org>
+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 <config-gwenview.h>
++
+ // Qt
+
+ // KF
+--
+GitLab
+
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..000000000000
--- 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/kcolorpicker-0.3.0
- >=media-libs/kimageannotator-0.5.0
- <media-libs/kimageannotator-0.7.0
- media-libs/lcms:2
- media-libs/libjpeg-turbo:=
- media-libs/libpng: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_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
-}
diff --git a/kde-apps/gwenview/gwenview-24.05.2-r1.ebuild b/kde-apps/gwenview/gwenview-24.05.2-r1.ebuild
index cefdfad20a88..20be90540f14 100644
--- a/kde-apps/gwenview/gwenview-24.05.2-r1.ebuild
+++ b/kde-apps/gwenview/gwenview-24.05.2-r1.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 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
IUSE="activities fits +mpris raw semantic-desktop share X"
# requires running environment
diff --git a/kde-apps/gwenview/gwenview-24.05.2-r2.ebuild b/kde-apps/gwenview/gwenview-24.05.2-r2.ebuild
new file mode 100644
index 000000000000..622f9c53904b
--- /dev/null
+++ b/kde-apps/gwenview/gwenview-24.05.2-r2.ebuild
@@ -0,0 +1,113 @@
+# 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
+}
diff --git a/kde-apps/gwenview/gwenview-24.08.0.ebuild b/kde-apps/gwenview/gwenview-24.08.1.ebuild
index d209a9e40aee..9dede3c8e379 100644
--- a/kde-apps/gwenview/gwenview-24.08.0.ebuild
+++ b/kde-apps/gwenview/gwenview-24.08.1.ebuild
@@ -50,7 +50,7 @@ COMMON_DEPEND="
media-libs/lcms:2
media-libs/libjpeg-turbo:=
media-libs/libpng:0=
- >=media-libs/phonon-4.12.0[qt6]
+ >=media-libs/phonon-4.12.0[qt6(+)]
media-libs/tiff:=
activities? ( kde-plasma/plasma-activities:6 )
fits? ( sci-libs/cfitsio )
@@ -81,6 +81,8 @@ BDEPEND="
dev-util/wayland-scanner
"
+PATCHES=( "${FILESDIR}"/${PN}-24.08.0-odr.patch ) # bug 921649
+
src_prepare() {
ecm_src_prepare
if ! use mpris; then
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-18 08:04:45 +0000