| author | Jan Alexander Steffens
<heftig@archlinux.org> 2018-02-06 06:13:30 UTC |
| committer | Jan Alexander Steffens
<heftig@archlinux.org> 2018-02-06 06:13:30 UTC |
| parent | 591e8021bf06939d04372a8573129d3b1cca9e00 |
| 0001-ModemManager.pc-Add-glib-2.0-to-Requires.patch | +0 | -24 |
| PKGBUILD | +5 | -11 |
diff --git a/0001-ModemManager.pc-Add-glib-2.0-to-Requires.patch b/0001-ModemManager.pc-Add-glib-2.0-to-Requires.patch deleted file mode 100644 index d46649e..0000000 --- a/0001-ModemManager.pc-Add-glib-2.0-to-Requires.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 9e4be4a5e0e1fab437e255a72e1bdc55eb037fef Mon Sep 17 00:00:00 2001 -Message-Id: <9e4be4a5e0e1fab437e255a72e1bdc55eb037fef.1517857174.git.jan.steffens@gmail.com> -From: "Jan Alexander Steffens (heftig)" <jan.steffens@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 - diff --git a/PKGBUILD b/PKGBUILD index 2f1e58e..1174375 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -3,19 +3,17 @@ pkgbase=modemmanager pkgname=(modemmanager libmm-glib) -pkgver=1.8rc1 -pkgrel=2 +pkgver=1.8rc1+6+g0f377f94 +pkgrel=1 pkgdesc="Mobile broadband modem management service" arch=(x86_64) url="https://www.freedesktop.org/wiki/Software/ModemManager/" license=(GPL2 LGPL2.1) 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" - 0001-ModemManager.pc-Add-glib-2.0-to-Requires.patch) -sha256sums=('SKIP' - '9d66d29e0ad921335be3ae80e10ca202bd03aa168abde7a981e5c5c730fe7ffe') +_commit=0f377f943eeb81472fd73189f2c3d8fc65b8c609 # master +source=("git+https://anongit.freedesktop.org/git/ModemManager/ModemManager#commit=$_commit") +sha256sums=('SKIP') pkgver() { cd ModemManager @@ -24,10 +22,6 @@ pkgver() { 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 }