[SCM] KDE Base Runtime module packaging branch, master, updated. debian/14.12.3-1-10-gd0b0a26

Maximiliano Curia maxy at moszumanska.debian.org
Mon Aug 31 20:35:50 UTC 2015


Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kde-runtime.git;a=commitdiff;h=282fec2

The following commit has been merged in the master branch:
commit 282fec2ff91487ad84637ab914e572dccc2e0d82
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Mon Aug 31 17:26:00 2015 +0200

    New patch: add_glib_for_nm.
---
 debian/changelog               |  1 +
 debian/patches/add_glib_for_nm | 17 +++++++++++++++++
 debian/patches/series          |  1 +
 3 files changed, 19 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 4e92e76..9b0693e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ kde-runtime (4:15.08.0-1~) UNRELEASED; urgency=medium
   * New upstream release (15.04.2).
   * New upstream release (15.04.3).
   * New upstream release (15.08.0).
+  * New patch: add_glib_for_nm.
 
  -- Maximiliano Curia <maxy at debian.org>  Mon, 31 Aug 2015 17:07:52 +0200
 
diff --git a/debian/patches/add_glib_for_nm b/debian/patches/add_glib_for_nm
new file mode 100644
index 0000000..f109adb
--- /dev/null
+++ b/debian/patches/add_glib_for_nm
@@ -0,0 +1,17 @@
+Index: kde-runtime/solid-networkstatus/kded/CMakeLists.txt
+===================================================================
+--- kde-runtime.orig/solid-networkstatus/kded/CMakeLists.txt	2015-08-31 17:08:45.262292739 +0200
++++ kde-runtime/solid-networkstatus/kded/CMakeLists.txt	2015-08-31 18:50:55.592167844 +0200
+@@ -16,6 +16,12 @@
+                       )
+ 
+ if(NETWORKMANAGER_FOUND)
++    find_package(PkgConfig REQUIRED)
++    pkg_check_modules(GLIB_PKG glib-2.0)
++
++    if (GLIB_PKG_FOUND)
++       include_directories(${GLIB_PKG_INCLUDE_DIRS})
++    endif()
+     macro_ensure_version("0.7.0" ${NETWORKMANAGER_VERSION} NM_0_7)
+     if(NM_0_7)
+         MESSAGE(STATUS "Adding in-process NetworkManager service-wart to kded module")
diff --git a/debian/patches/series b/debian/patches/series
index a0c29ba..5add865 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,3 +10,4 @@ kubuntu_nodisplay_knetattach.diff
 kubuntu_shutup_shutup_shutup.diff
 kubuntu_drkonqi_whoopsie_integration.patch
 kubuntu_disable-gpg-backend.diff
+add_glib_for_nm

-- 
KDE Base Runtime module packaging



More information about the pkg-kde-commits mailing list