[arch-commits] Commit in modemmanager/repos/testing-x86_64 (3 files)
Jan Steffens
heftig at archlinux.org
Tue Feb 6 06:14:10 UTC 2018
Date: Tuesday, February 6, 2018 @ 06:14:09
Author: heftig
Revision: 315931
archrelease: copy trunk to testing-x86_64
Added:
modemmanager/repos/testing-x86_64/PKGBUILD
(from rev 315930, modemmanager/trunk/PKGBUILD)
Deleted:
modemmanager/repos/testing-x86_64/0001-ModemManager.pc-Add-glib-2.0-to-Requires.patch
modemmanager/repos/testing-x86_64/PKGBUILD
-----------------------------------------------------+
0001-ModemManager.pc-Add-glib-2.0-to-Requires.patch | 24 --
PKGBUILD | 168 ++++++++----------
2 files changed, 81 insertions(+), 111 deletions(-)
Deleted: 0001-ModemManager.pc-Add-glib-2.0-to-Requires.patch
===================================================================
--- 0001-ModemManager.pc-Add-glib-2.0-to-Requires.patch 2018-02-06 06:13:30 UTC (rev 315930)
+++ 0001-ModemManager.pc-Add-glib-2.0-to-Requires.patch 2018-02-06 06:14:09 UTC (rev 315931)
@@ -1,24 +0,0 @@
-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
-
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2018-02-06 06:13:30 UTC (rev 315930)
+++ PKGBUILD 2018-02-06 06:14:09 UTC (rev 315931)
@@ -1,87 +0,0 @@
-# $Id$
-# Contributor: Ionut Biru <ibiru at archlinux.org>
-# Contributor: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-
-pkgbase=modemmanager
-pkgname=(modemmanager libmm-glib)
-pkgver=1.8rc1
-pkgrel=2
-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')
-
-pkgver() {
- cd ModemManager
- git describe --tags | sed 's/-rc/rc/;s/-/+/g'
-}
-
-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
-}
-
-build() {
- cd ModemManager
- ./configure \
- --prefix=/usr \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --sbindir=/usr/bin \
- --with-dbus-sys-dir=/usr/share/dbus-1/system.d \
- --with-udev-base-dir=/usr/lib/udev \
- --with-polkit=permissive \
- --with-systemd-journal \
- --with-systemd-suspend-resume \
- --enable-gtk-doc \
- --disable-static
-
- # https://bugzilla.gnome.org/show_bug.cgi?id=655517
- sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-
- make
-}
-
-check() {
- cd ModemManager
- make -k check
-}
-
-package_modemmanager() {
- depends+=(libmm-glib)
- optdepends=('usb_modeswitch: install if your modem shows up as a storage drive')
- options=(!emptydirs)
-
- cd ModemManager
- make DESTDIR="$pkgdir" install
- make DESTDIR="$pkgdir" -C libmm-glib uninstall
- make DESTDIR="$pkgdir" -C vapi uninstall
-
- # Some stuff to move is left over
- mv "$pkgdir/usr/include" ..
- mv "$pkgdir/usr/lib/pkgconfig" ..
-}
-
-package_libmm-glib() {
- pkgdesc="ModemManager library"
- depends=(glib2)
-
- install -d "$pkgdir/usr/lib"
- mv include "$pkgdir/usr"
- mv pkgconfig "$pkgdir/usr/lib"
-
- cd ModemManager
- make DESTDIR="$pkgdir" -C libmm-glib install
- make DESTDIR="$pkgdir" -C vapi install
-}
Copied: modemmanager/repos/testing-x86_64/PKGBUILD (from rev 315930, modemmanager/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-02-06 06:14:09 UTC (rev 315931)
@@ -0,0 +1,81 @@
+# $Id$
+# Contributor: Ionut Biru <ibiru at archlinux.org>
+# Contributor: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+
+pkgbase=modemmanager
+pkgname=(modemmanager libmm-glib)
+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=0f377f943eeb81472fd73189f2c3d8fc65b8c609 # master
+source=("git+https://anongit.freedesktop.org/git/ModemManager/ModemManager#commit=$_commit")
+sha256sums=('SKIP')
+
+pkgver() {
+ cd ModemManager
+ git describe --tags | sed 's/-rc/rc/;s/-/+/g'
+}
+
+prepare() {
+ cd ModemManager
+ NOCONFIGURE=1 ./autogen.sh
+}
+
+build() {
+ cd ModemManager
+ ./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --sbindir=/usr/bin \
+ --with-dbus-sys-dir=/usr/share/dbus-1/system.d \
+ --with-udev-base-dir=/usr/lib/udev \
+ --with-polkit=permissive \
+ --with-systemd-journal \
+ --with-systemd-suspend-resume \
+ --enable-gtk-doc \
+ --disable-static
+
+ # https://bugzilla.gnome.org/show_bug.cgi?id=655517
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
+ make
+}
+
+check() {
+ cd ModemManager
+ make -k check
+}
+
+package_modemmanager() {
+ depends+=(libmm-glib)
+ optdepends=('usb_modeswitch: install if your modem shows up as a storage drive')
+ options=(!emptydirs)
+
+ cd ModemManager
+ make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" -C libmm-glib uninstall
+ make DESTDIR="$pkgdir" -C vapi uninstall
+
+ # Some stuff to move is left over
+ mv "$pkgdir/usr/include" ..
+ mv "$pkgdir/usr/lib/pkgconfig" ..
+}
+
+package_libmm-glib() {
+ pkgdesc="ModemManager library"
+ depends=(glib2)
+
+ install -d "$pkgdir/usr/lib"
+ mv include "$pkgdir/usr"
+ mv pkgconfig "$pkgdir/usr/lib"
+
+ cd ModemManager
+ make DESTDIR="$pkgdir" -C libmm-glib install
+ make DESTDIR="$pkgdir" -C vapi install
+}
More information about the arch-commits
mailing list