[SCM] networkmanager-qt packaging branch, master, updated. debian/5.28.0-1-6-gcd3dbe6
Maximiliano Curia
maxy at moszumanska.debian.org
Sat Apr 8 08:47:18 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/networkmanager-qt.git;a=commitdiff;h=45fbb8b
The following commit has been merged in the master branch:
commit 45fbb8ba495d9e5f95d513d571191d72ab903d11
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date: Fri Apr 7 19:17:01 2017 +0200
Pick "CMake: Use SYSTEM for nm-glib/nm-util includes" (ad5587c)
Add upstream patch as:
CMake-Use-SYSTEM-for-nm-glib-nm-util-includes.patch
Gbp-Dch: Full
---
...e-Use-SYSTEM-for-nm-glib-nm-util-includes.patch | 34 ++++++++++++++++++++++
debian/patches/series | 1 +
2 files changed, 35 insertions(+)
diff --git a/debian/patches/CMake-Use-SYSTEM-for-nm-glib-nm-util-includes.patch b/debian/patches/CMake-Use-SYSTEM-for-nm-glib-nm-util-includes.patch
new file mode 100644
index 0000000..86d3691
--- /dev/null
+++ b/debian/patches/CMake-Use-SYSTEM-for-nm-glib-nm-util-includes.patch
@@ -0,0 +1,34 @@
+From: Kevin Funk <kfunk at kde.org>
+Date: Mon, 16 Jan 2017 09:40:05 +0100
+Subject: CMake: Use SYSTEM for nm-glib/nm-util includes
+
+---
+ src/CMakeLists.txt | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index a8951ef..eb056a5 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -7,8 +7,10 @@ include_directories(
+ else()
+ include_directories(
+ ${NETWORKMANAGER_INCLUDE_DIRS}
+- ${NM-UTIL_INCLUDE_DIRS}
+- ${NM-GLIB_INCLUDE_DIRS}
++
++ SYSTEM
++ ${NM-UTIL_INCLUDE_DIRS}
++ ${NM-GLIB_INCLUDE_DIRS}
+ )
+ endif()
+
+@@ -143,7 +145,7 @@ set_target_properties(KF5NetworkManagerQt PROPERTIES VERSION ${NETWORKMANAGERQT_
+ if (${NETWORKMANAGER_VERSION} VERSION_EQUAL 1.0.0 OR ${NETWORKMANAGER_VERSION} VERSION_GREATER 1.0.0)
+ target_include_directories(KF5NetworkManagerQt PUBLIC ${NM-CORE_INCLUDE_DIRS})
+ else()
+- target_include_directories(KF5NetworkManagerQt PUBLIC ${NETWORKMANAGER_INCLUDE_DIRS} ${NM-UTIL_INCLUDE_DIRS} ${NM-GLIB_INCLUDE_DIRS})
++ target_include_directories(KF5NetworkManagerQt PUBLIC ${NETWORKMANAGER_INCLUDE_DIRS} SYSTEM PUBLIC ${NM-UTIL_INCLUDE_DIRS} ${NM-GLIB_INCLUDE_DIRS})
+ endif()
+
+ ########### static lib for tests ###############
diff --git a/debian/patches/series b/debian/patches/series
index ed91ae4..2364c3e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
Don-t-force-logging-with-setFilterRules.patch
Initialise-a-member-variable.patch
+CMake-Use-SYSTEM-for-nm-glib-nm-util-includes.patch
--
networkmanager-qt packaging
More information about the pkg-kde-commits
mailing list