Hello community,
here is the log from the commit of package kImageAnnotator for openSUSE:Factory
checked in at 2020-09-14 12:29:43
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kImageAnnotator (Old)
and /work/SRC/openSUSE:Factory/.kImageAnnotator.new.4249 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kImageAnnotator"
Mon Sep 14 12:29:43 2020 rev:8 rq:834107 version:0.3.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/kImageAnnotator/kImageAnnotator.changes
2020-08-03 14:18:36.108692576 +0200
+++
/work/SRC/openSUSE:Factory/.kImageAnnotator.new.4249/kImageAnnotator.changes
2020-09-14 12:30:54.197197174 +0200
@@ -1,0 +2,7 @@
+Sun Sep 13 09:04:04 UTC 2020 - Christophe Giboudeaux <[email protected]>
+
+- Add upstream patches to mark private link target as such:
+ * 0001-Make-link-against-X11-private.patch
+ * 0002-Make-kcolorpicker-link-private.patch
+
+-------------------------------------------------------------------
New:
----
0001-Make-link-against-X11-private.patch
0002-Make-kcolorpicker-link-private.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kImageAnnotator.spec ++++++
--- /var/tmp/diff_new_pack.FElUzX/_old 2020-09-14 12:30:55.525198020 +0200
+++ /var/tmp/diff_new_pack.FElUzX/_new 2020-09-14 12:30:55.529198023 +0200
@@ -26,6 +26,9 @@
Group: Development/Tools/Other
URL: https://github.com/ksnip/kImageAnnotator
Source:
https://github.com/ksnip/kImageAnnotator/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
+# PATCH-FIX-UPSTREAM -- Mark private link targets as such
+Patch0: 0001-Make-link-against-X11-private.patch
+Patch1: 0002-Make-kcolorpicker-link-private.patch
BuildRequires: cmake
BuildRequires: gcc-c++
BuildRequires: kColorPicker-devel >= 0.1.4
@@ -35,7 +38,6 @@
BuildRequires: pkgconfig(Qt5Test)
BuildRequires: pkgconfig(Qt5Widgets)
BuildRequires: pkgconfig(x11)
-
%lang_package
%description
@@ -57,13 +59,14 @@
Development files for %{name} including headers and libraries
%prep
-%setup -q
+%autosetup -p1
%build
%cmake \
-DBUILD_EXAMPLE=ON \
-DCMAKE_INSTALL_DATAROOTDIR="share"
-make %{?_smp_mflags}
+
+%cmake_build
%install
%cmake_install
++++++ 0001-Make-link-against-X11-private.patch ++++++
>From f8c72d3b186860ca8e7636c8674a93b62d7e4bb6 Mon Sep 17 00:00:00 2001
From: Nicolas Fella <[email protected]>
Date: Fri, 11 Sep 2020 02:00:58 +0200
Subject: [PATCH 1/2] Make link against X11 private
It is not used in public headers so we don't need to mark the link as public.
This saves users of the API from searching for X11
---
CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 999ee84..ec987ab 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -70,7 +70,7 @@ target_include_directories(kImageAnnotator
target_link_libraries(kImageAnnotator PUBLIC Qt5::Widgets Qt5::Svg
kColorPicker::kColorPicker)
if (UNIX AND NOT APPLE)
- target_link_libraries(kImageAnnotator PUBLIC X11)
+ target_link_libraries(kImageAnnotator PRIVATE X11)
endif ()
target_compile_definitions(kImageAnnotator PRIVATE KIMAGEANNOTATOR_LIB)
--
2.28.0
++++++ 0002-Make-kcolorpicker-link-private.patch ++++++
>From f01b20e0427535dd1141b9324b66e1b725888864 Mon Sep 17 00:00:00 2001
From: Nicolas Fella <[email protected]>
Date: Fri, 11 Sep 2020 02:10:26 +0200
Subject: [PATCH 2/2] Make kcolorpicker link private
It's not used in any public header, so we can make it private
---
CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ec987ab..cdf0bcc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -67,7 +67,7 @@ target_include_directories(kImageAnnotator
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
)
-target_link_libraries(kImageAnnotator PUBLIC Qt5::Widgets Qt5::Svg
kColorPicker::kColorPicker)
+target_link_libraries(kImageAnnotator PUBLIC Qt5::Widgets Qt5::Svg PRIVATE
kColorPicker::kColorPicker)
if (UNIX AND NOT APPLE)
target_link_libraries(kImageAnnotator PRIVATE X11)
--
2.28.0
