[arch-commits] Commit in modemmanager/repos/extra-x86_64 (3 files)
Jan Steffens
heftig at archlinux.org
Fri Jun 26 14:41:39 UTC 2020
Date: Friday, June 26, 2020 @ 14:41:38
Author: heftig
Revision: 390497
archrelease: copy trunk to extra-x86_64
Added:
modemmanager/repos/extra-x86_64/PKGBUILD
(from rev 390496, modemmanager/trunk/PKGBUILD)
Deleted:
modemmanager/repos/extra-x86_64/PKGBUILD
modemmanager/repos/extra-x86_64/strict-filter.diff
--------------------+
PKGBUILD | 171 +++++++++++++++++++++++++--------------------------
strict-filter.diff | 13 ---
2 files changed, 84 insertions(+), 100 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2020-06-26 14:41:28 UTC (rev 390496)
+++ PKGBUILD 2020-06-26 14:41:38 UTC (rev 390497)
@@ -1,87 +0,0 @@
-# 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.12.10
-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
- mobile-broadband-provider-info)
-makedepends=(gtk-doc gobject-introspection vala autoconf-archive git)
-_commit=1c6f356089bbee7c4f4421ca95e1fb4002677f49 # tags/1.12.10
-source=("git+https://gitlab.freedesktop.org/mobile-broadband/ModemManager.git#commit=$_commit"
- strict-filter.diff)
-sha256sums=('SKIP'
- '0602cc5088b193426c3af3d6ce14a7fd6502b06f77982dc56291d834280f311e')
-
-pkgver() {
- cd ModemManager
- git describe --tags | sed 's/-rc/rc/;s/-/+/g'
-}
-
-prepare() {
- cd ModemManager
-
- # Recommended by upstream
- git apply -3 ../strict-filter.diff
-
- 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/extra-x86_64/PKGBUILD (from rev 390496, modemmanager/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-06-26 14:41:38 UTC (rev 390497)
@@ -0,0 +1,84 @@
+# 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.14.0
+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
+ mobile-broadband-provider-info)
+makedepends=(gtk-doc gobject-introspection vala autoconf-archive git)
+_commit=5f20662aeb9b0f79865a9a9df151349a29b4a2bd # tags/1.14.0
+source=("git+https://gitlab.freedesktop.org/mobile-broadband/ModemManager.git#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-compile-warnings=yes \
+ --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.so libg{lib,object,io,module}-2.0.so libsystemd.so libgudev-1.0.so
+ libqmi-glib.so libmbim-glib.so)
+ 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=(libg{lib,object,io}-2.0.so)
+ provides=(libmm-glib.so)
+
+ 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
+}
Deleted: strict-filter.diff
===================================================================
--- strict-filter.diff 2020-06-26 14:41:28 UTC (rev 390496)
+++ strict-filter.diff 2020-06-26 14:41:38 UTC (rev 390497)
@@ -1,13 +0,0 @@
-diff --git i/src/mm-context.c w/src/mm-context.c
-index 88d71384..fd17f830 100644
---- i/src/mm-context.c
-+++ w/src/mm-context.c
-@@ -38,7 +38,7 @@
- static gboolean help_flag;
- static gboolean version_flag;
- static gboolean debug;
--static MMFilterRule filter_policy = MM_FILTER_POLICY_DEFAULT;
-+static MMFilterRule filter_policy = MM_FILTER_POLICY_STRICT;
- static gboolean no_auto_scan = NO_AUTO_SCAN_DEFAULT;
- static const gchar *initial_kernel_events;
-
More information about the arch-commits
mailing list