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

[Jan Steffens]

    Date: Monday, February 5, 2018 @ 19:03:15
  Author: heftig
Revision: 315909

1.8rc1-2

Added:
  modemmanager/trunk/0001-ModemManager.pc-Add-glib-2.0-to-Requires.patch
Modified:
  modemmanager/trunk/PKGBUILD

-----------------------------------------------------+
 0001-ModemManager.pc-Add-glib-2.0-to-Requires.patch |   24 ++++++++++++++++++
 PKGBUILD                                            |   12 ++++++---
 2 files changed, 33 insertions(+), 3 deletions(-)

Added: 0001-ModemManager.pc-Add-glib-2.0-to-Requires.patch
===================================================================
--- 0001-ModemManager.pc-Add-glib-2.0-to-Requires.patch	                        (rev 0)
+++ 0001-ModemManager.pc-Add-glib-2.0-to-Requires.patch	2018-02-05 19:03:15 UTC (rev 315909)
@@ -0,0 +1,24 @@
+From 9e4be4a5e0e1fab437e255a72e1bdc55eb037fef Mon Sep 17 00:00:00 2001
+Message-Id: <9e4be4a5e0e1fab437e255a72e1bdc55eb037fef.1517857174.git.jan.steffens at gmail.com>
+From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
+Date: Mon, 5 Feb 2018 19:58:47 +0100
+Subject: [PATCH] ModemManager.pc: Add glib-2.0 to Requires
+
+This is now needed as ModemManager-compat.h includes <glib.h>.
+---
+ data/ModemManager.pc.in | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/data/ModemManager.pc.in b/data/ModemManager.pc.in
+index 85e06a53..09fa380e 100644
+--- a/data/ModemManager.pc.in
++++ b/data/ModemManager.pc.in
+@@ -6,4 +6,5 @@ includedir=@includedir@
+ Name: ModemManager
+ Description: Common headers provided by ModemManager
+ Version: @VERSION@
++Requires: glib-2.0
+ Cflags: -I${includedir}/ModemManager
+-- 
+2.16.1
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-02-05 18:44:08 UTC (rev 315908)
+++ PKGBUILD	2018-02-05 19:03:15 UTC (rev 315909)
@@ -5,7 +5,7 @@
 pkgbase=modemmanager
 pkgname=(modemmanager libmm-glib)
 pkgver=1.8rc1
-pkgrel=1
+pkgrel=2
 pkgdesc="Mobile broadband modem management service"
 arch=(x86_64)
 url="https://www.freedesktop.org/wiki/Software/ModemManager/"
@@ -13,8 +13,10 @@
 depends=(systemd libgudev polkit ppp libqmi libmbim)
 makedepends=(gtk-doc gobject-introspection vala autoconf-archive git)
 _commit=223b754fccba28dbb3ce950058a81bd133c8ce86  # tags/1.8-rc1
-source=("git+https://anongit.freedesktop.org/git/ModemManager/ModemManager#commit=$_commit")
-sha256sums=('SKIP')
+source=("git+https://anongit.freedesktop.org/git/ModemManager/ModemManager#commit=$_commit"
+        0001-ModemManager.pc-Add-glib-2.0-to-Requires.patch)
+sha256sums=('SKIP'
+            '9d66d29e0ad921335be3ae80e10ca202bd03aa168abde7a981e5c5c730fe7ffe')
 
 pkgver() {
   cd ModemManager
@@ -23,6 +25,10 @@
 
 prepare() {
   cd ModemManager
+
+  # Fix compilation of modemmanager-qt
+  patch -Np1 -i ../0001-ModemManager.pc-Add-glib-2.0-to-Requires.patch
+
   NOCONFIGURE=1 ./autogen.sh
 }