[arch-commits] Commit in networkmanager/trunk (2 files)

[Jan Steffens]

    Date: Friday, September 11, 2015 @ 22:21:30
  Author: heftig
Revision: 245815

Fix building kdebase-runtime

Added:
  networkmanager/trunk/0001-Add-Requires.private-glib-2.0.patch
Modified:
  networkmanager/trunk/PKGBUILD

------------------------------------------+
 0001-Add-Requires.private-glib-2.0.patch |   26 ++++++++++++++++++++++++++
 PKGBUILD                                 |    9 ++++++---
 2 files changed, 32 insertions(+), 3 deletions(-)

Added: 0001-Add-Requires.private-glib-2.0.patch
===================================================================
--- 0001-Add-Requires.private-glib-2.0.patch	                        (rev 0)
+++ 0001-Add-Requires.private-glib-2.0.patch	2015-09-11 20:21:30 UTC (rev 245815)
@@ -0,0 +1,26 @@
+From 7fa07211320e4cb00d537844720edbf2b4fd047d Mon Sep 17 00:00:00 2001
+From: Rex Dieter <rdieter at math.unl.edu>
+Date: Thu, 27 Aug 2015 11:13:40 -0500
+Subject: [PATCH] Add Requires.private: glib-2.0
+
+since commit 6f616d4c4b04d5478f60d0311317bc84c5459ea to nm-version.h
+a dependency to glib was added, but this wasn't reflected in pkg-config
+deps... until now.
+---
+ NetworkManager.pc.in | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/NetworkManager.pc.in b/NetworkManager.pc.in
+index 877c344..a0557ee 100644
+--- a/NetworkManager.pc.in
++++ b/NetworkManager.pc.in
+@@ -9,5 +9,6 @@ configdir=@sysconfdir@/NetworkManager
+ Name: NetworkManager
+ Description: System for maintaining active network connection
+ Requires:
++Requires.private: glib-2.0
+ Version: @VERSION@
+ Cflags: -I${includedir}/NetworkManager
+-- 
+1.9.3
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-09-11 15:37:09 UTC (rev 245814)
+++ PKGBUILD	2015-09-11 20:21:30 UTC (rev 245815)
@@ -9,7 +9,7 @@
 pkgbase=networkmanager
 pkgname=(networkmanager libnm-glib)
 pkgver=1.0.6
-pkgrel=1
+pkgrel=2
 pkgdesc="Network Management daemon"
 arch=(i686 x86_64)
 license=(GPL2 LGPL2.1)
@@ -20,14 +20,17 @@
              systemd libgudev libmm-glib rp-pppoe libnewt libndp libteam vala)
 checkdepends=(libx11 python-gobject python-dbus)
 source=(http://ftp.gnome.org/pub/gnome/sources/NetworkManager/${pkgver:0:3}/NetworkManager-$pkgver.tar.xz
-        NetworkManager.conf disable_set_hostname.patch)
+        NetworkManager.conf disable_set_hostname.patch
+        0001-Add-Requires.private-glib-2.0.patch)
 sha256sums=('38ea002403e3b884ffa9aae25aea431d2a8420f81f4919761c83fb92648254bd'
             '2c6a647b5aec9f3c356d5d95251976a21297c6e64bd8d2a59339f8450a86cb3b'
-            '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460')
+            '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460'
+            '96fa0ecd0dabf7ba48b0af4220165d5777ac41f2e4cafd9d5c7a8d072ce0c9d7')
 
 prepare() {
   cd NetworkManager-$pkgver
   patch -Np1 -i ../disable_set_hostname.patch
+  patch -Np1 -i ../0001-Add-Requires.private-glib-2.0.patch
   NOCONFIGURE=1 ./autogen.sh
 }