Date: Tuesday, December 10, 2019 @ 15:06:14 Author: heftig Revision: 370615
archrelease: copy trunk to extra-x86_64 Added: modemmanager/repos/extra-x86_64/PKGBUILD (from rev 370614, modemmanager/trunk/PKGBUILD) modemmanager/repos/extra-x86_64/strict-filter.diff (from rev 370614, modemmanager/trunk/strict-filter.diff) Deleted: modemmanager/repos/extra-x86_64/PKGBUILD modemmanager/repos/extra-x86_64/strict-filter.diff --------------------+ PKGBUILD | 174 +++++++++++++++++++++++++-------------------------- strict-filter.diff | 26 +++---- 2 files changed, 100 insertions(+), 100 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2019-12-10 15:06:00 UTC (rev 370614) +++ PKGBUILD 2019-12-10 15:06:14 UTC (rev 370615) @@ -1,87 +0,0 @@ -# Contributor: Ionut Biru <ib...@archlinux.org> -# Contributor: Jan Alexander Steffens (heftig) <jan.steff...@gmail.com> - -pkgbase=modemmanager -pkgname=(modemmanager libmm-glib) -pkgver=1.12.0 -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 - mobile-broadband-provider-info) -makedepends=(gtk-doc gobject-introspection vala autoconf-archive git) -_commit=8c2a6629d7e7e76c18fb785fd61f3d98942f5a7a # tags/1.12.0 -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 370614, modemmanager/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2019-12-10 15:06:14 UTC (rev 370615) @@ -0,0 +1,87 @@ +# Contributor: Ionut Biru <ib...@archlinux.org> +# Contributor: Jan Alexander Steffens (heftig) <jan.steff...@gmail.com> + +pkgbase=modemmanager +pkgname=(modemmanager libmm-glib) +pkgver=1.12.2 +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=dc0f43e71f63e832c708ffd3db3e706302fe376c # tags/1.12.2 +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 +} Deleted: strict-filter.diff =================================================================== --- strict-filter.diff 2019-12-10 15:06:00 UTC (rev 370614) +++ strict-filter.diff 2019-12-10 15:06:14 UTC (rev 370615) @@ -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; - Copied: modemmanager/repos/extra-x86_64/strict-filter.diff (from rev 370614, modemmanager/trunk/strict-filter.diff) =================================================================== --- strict-filter.diff (rev 0) +++ strict-filter.diff 2019-12-10 15:06:14 UTC (rev 370615) @@ -0,0 +1,13 @@ +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; +