rpm/gwenview5
SHA256
1
0
Fork 0
forked from pool/gwenview5
Code Pull Requests Activity

Accepting request 1144974 from home:Vogtinator:branches:KDE:Applications

Browse Source 
- Add patch to support newer kImageAnnotator:
  * 0001-Support-building-against-kImageAnnotator-Qt5-as-well.patch

(Not built yet)

OBS-URL: https://build.opensuse.org/request/show/1144974
OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/gwenview5?expand=0&rev=281
This commit is contained in:
Christophe Marin 2024-02-07 16:29:45 +00:00 committed by Git OBS Bridge
parent 5eda57aeea
commit 0323f0a47c
3 changed files with 49 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
0001-Support-building-against-kImageAnnotator-Qt5-as-well.patch Normal file
View File

@ -0,0 +1,36 @@
From c3b867c3c1801aa654446c0a456aa2008fadd499 Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fabian@ritter-vogt.de>
Date: Wed, 7 Feb 2024 17:25:50 +0100
Subject: [PATCH] Support building against kImageAnnotator-Qt5 as well
Got renamed upstream, detect both versions.
Quick and dirty patch.
---
CMakeLists.txt | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4104d717..e47ce691 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -167,10 +167,14 @@ endif()
if (QT_MAJOR_VERSION STREQUAL "5")
find_package(kImageAnnotator)
- set_package_properties(kImageAnnotator PROPERTIES URL "https://github.com/ksnip/kImageAnnotator" DESCRIPTION "The kImageAnnotator library provides tools to annotate" TYPE REQUIRED)
- if(kImageAnnotator_FOUND)
+ find_package(kImageAnnotator-Qt5)
+ set_package_properties(kImageAnnotator PROPERTIES URL "https://github.com/ksnip/kImageAnnotator" DESCRIPTION "The kImageAnnotator library provides tools to annotate" TYPE OPTIONAL)
+ set_package_properties(kImageAnnotator-Qt5 PROPERTIES URL "https://github.com/ksnip/kImageAnnotator" DESCRIPTION "The kImageAnnotator library provides tools to annotate" TYPE OPTIONAL)
+ if(kImageAnnotator_FOUND OR kImageAnnotator-Qt5_FOUND)
+ set(kImageAnnotator_FOUND 1)
set(KIMAGEANNOTATOR_FOUND 1)
- find_package(kColorPicker REQUIRED)
+ find_package(kColorPicker)
+ find_package(kColorPicker-Qt5)
if(NOT kImageAnnotator_VERSION VERSION_LESS 0.5.0)
set(KIMAGEANNOTATOR_CAN_LOAD_TRANSLATIONS 1)
endif()
--
2.43.0

6
gwenview5.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Feb 7 16:27:25 UTC 2024 - Fabian Vogt <fabian@ritter-vogt.de>
- Add patch to support newer kImageAnnotator:
* 0001-Support-building-against-kImageAnnotator-Qt5-as-well.patch
-------------------------------------------------------------------
Tue Dec 5 14:19:06 UTC 2023 - Christophe Marin <christophe@krop.fr>

12
gwenview5.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package gwenview5
#
# Copyright (c) 2023 SUSE LLC
# Copyright (c) 2024 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -30,6 +30,8 @@ Source: https://download.kde.org/stable/release-service/%{version}/src/%
Source1: https://download.kde.org/stable/release-service/%{version}/src/%{rname}-%{version}.tar.xz.sig
Source2: applications.keyring
%endif
# PATCH-FIX-OPENSUSE
Patch1: 0001-Support-building-against-kImageAnnotator-Qt5-as-well.patch
BuildRequires: cfitsio-devel
BuildRequires: extra-cmake-modules >= %{kf5_version}
BuildRequires: kf5-filesystem
@ -37,8 +39,11 @@ BuildRequires: libexiv2-devel
BuildRequires: libjpeg-devel
BuildRequires: liblcms2-devel
BuildRequires: libpng-devel
BuildRequires: libqt5-qtbase-private-headers-devel
BuildRequires: pkgconfig
BuildRequires: update-desktop-files
BuildRequires: (cmake(kColorPicker) or cmake(kColorPicker-Qt5))
BuildRequires: (cmake(kImageAnnotator) or cmake(kImageAnnotator-Qt5))
BuildRequires: cmake(KF5Activities)
BuildRequires: cmake(KF5Baloo)
BuildRequires: cmake(KF5DocTools)
@ -61,14 +66,11 @@ BuildRequires: cmake(Qt5OpenGL)
BuildRequires: cmake(Qt5PrintSupport)
BuildRequires: cmake(Qt5Svg)
BuildRequires: cmake(Qt5Test)
BuildRequires: cmake(Qt5Widgets)
BuildRequires: cmake(Qt5WaylandClient)
BuildRequires: cmake(Qt5Widgets)
BuildRequires: cmake(Qt5X11Extras)
BuildRequires: cmake(kImageAnnotator)
BuildRequires: cmake(kColorPicker)
BuildRequires: pkgconfig(libtiff-4)
BuildRequires: pkgconfig(wayland-protocols)
BuildRequires: libqt5-qtbase-private-headers-devel
%requires_ge libQt5Core5
Provides: gwenview = %{version}
Obsoletes: gwenview < %{version}