Hello community,
here is the log from the commit of package kImageAnnotator for
openSUSE:Leap:15.2 checked in at 2020-04-17 13:38:39
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Leap:15.2/kImageAnnotator (Old)
and /work/SRC/openSUSE:Leap:15.2/.kImageAnnotator.new.2738 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kImageAnnotator"
Fri Apr 17 13:38:39 2020 rev:4 rq:794780 version:0.2.1
Changes:
--------
--- /work/SRC/openSUSE:Leap:15.2/kImageAnnotator/kImageAnnotator.changes
2020-03-06 12:40:40.134735013 +0100
+++
/work/SRC/openSUSE:Leap:15.2/.kImageAnnotator.new.2738/kImageAnnotator.changes
2020-04-17 13:39:08.184291785 +0200
@@ -1,0 +2,9 @@
+Thu Apr 16 09:17:11 UTC 2020 - Fabian Vogt <[email protected]>
+
+- Add patches to fix building against libkImageAnnotator:
+ * 0001-Don-t-use-lowercase-Qt-keywords-in-public-headers.patch
+ * 0001-Improve-kcolorpicker-linking.patch
+- Update URLs to new location on GitHub
+- Match the full soversion in %files to prevent mismatches
+
+-------------------------------------------------------------------
New:
----
0001-Don-t-use-lowercase-Qt-keywords-in-public-headers.patch
0001-Improve-kcolorpicker-linking.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kImageAnnotator.spec ++++++
--- /var/tmp/diff_new_pack.7Cq8DH/_old 2020-04-17 13:39:08.584292086 +0200
+++ /var/tmp/diff_new_pack.7Cq8DH/_new 2020-04-17 13:39:08.588292089 +0200
@@ -24,8 +24,11 @@
Summary: Tool for annotating images
License: GPL-2.0-or-later
Group: Development/Tools/Other
-URL: https://github.com/DamirPorobic/kImageAnnotator
-Source:
https://github.com/DamirPorobic/kImageAnnotator/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
+URL: https://github.com/ksnip/kImageAnnotator
+Source:
https://github.com/ksnip/kImageAnnotator/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
+# PATCH-FIX-UPSTREAM
+Patch1: 0001-Improve-kcolorpicker-linking.patch
+Patch2: 0001-Don-t-use-lowercase-Qt-keywords-in-public-headers.patch
BuildRequires: cmake
BuildRequires: gcc-c++
BuildRequires: kColorPicker-devel >= 0.1.1
@@ -53,7 +56,7 @@
Development files for %{name} including headers and libraries
%prep
-%setup -q
+%autosetup -p1
%build
%cmake \
@@ -68,7 +71,7 @@
%files -n %{libname}
%license LICENSE
-%{_libdir}/lib%{name}.so.*
+%{_libdir}/lib%{name}.so.%{version}
%files devel
%doc CHANGELOG.md README.md
++++++ 0001-Don-t-use-lowercase-Qt-keywords-in-public-headers.patch ++++++
>From f3e2b1a23b33d3001a3168dfcdbd5dbe3f9ba278 Mon Sep 17 00:00:00 2001
From: Nicolas Fella <[email protected]>
Date: Wed, 15 Apr 2020 21:03:47 +0200
Subject: [PATCH] Don't use lowercase Qt keywords in public headers
---
include/kImageAnnotator/KImageAnnotator.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Index: kImageAnnotator-0.2.1/include/kImageAnnotator/KImageAnnotator.h
===================================================================
--- kImageAnnotator-0.2.1.orig/include/kImageAnnotator/KImageAnnotator.h
+++ kImageAnnotator-0.2.1/include/kImageAnnotator/KImageAnnotator.h
@@ -45,7 +45,7 @@ public:
void showCropper();
void showScaler();
-public slots:
+public Q_SLOTS:
void loadImage(const QPixmap &pixmap);
void insertImageItem(const QPointF &position, const QPixmap &pixmap);
void setTextFont(const QFont &font);
@@ -55,7 +55,7 @@ public slots:
void setSaveToolSelection(bool enabled);
void setSmoothFactor(int factor);
-signals:
+Q_SIGNALS:
void imageChanged() const;
private:
++++++ 0001-Improve-kcolorpicker-linking.patch ++++++
>From 643e15e45ef7474f6f4c4b01ee3c3f71ef82f022 Mon Sep 17 00:00:00 2001
From: Nicolas Fella <[email protected]>
Date: Wed, 15 Apr 2020 20:13:12 +0200
Subject: [PATCH] Improve kcolorpicker linking
Use imported target for kcolorpicker, fixes include directories when installing
kcolorpicker in non-standard locations
extract duplicate target_link_library calls
Make link to kcolorpicker private
---
CMakeLists.txt | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 98df51c..a923453 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -55,10 +55,10 @@ target_include_directories(kImageAnnotator
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
)
+target_link_libraries(kImageAnnotator PUBLIC Qt5::Widgets PRIVATE
kColorPicker::kColorPicker)
+
if (UNIX)
- target_link_libraries(kImageAnnotator PUBLIC Qt5::Widgets kColorPicker
X11)
-else ()
- target_link_libraries(kImageAnnotator PUBLIC Qt5::Widgets kColorPicker)
+ target_link_libraries(kImageAnnotator PRIVATE X11)
endif ()
target_compile_definitions(kImageAnnotator PRIVATE KIMAGEANNOTATOR_LIB)
--
2.25.1
