git » modemmanager.git » commit 9845b1b

1.14.0-1

author Jan Alexander Steffens
2020-06-26 14:41:28 UTC
committer Jan Alexander Steffens
2020-06-26 14:41:28 UTC
parent 96bef4a5f715a2df7b057dce499656f65cdea980

1.14.0-1

PKGBUILD +9 -12
strict-filter.diff +0 -13

diff --git a/PKGBUILD b/PKGBUILD
index 62e1cbf..73259bc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgbase=modemmanager
 pkgname=(modemmanager libmm-glib)
-pkgver=1.12.10
+pkgver=1.14.0
 pkgrel=1
 pkgdesc="Mobile broadband modem management service"
 arch=(x86_64)
@@ -12,11 +12,9 @@ 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')
+_commit=5f20662aeb9b0f79865a9a9df151349a29b4a2bd  # tags/1.14.0
+source=("git+https://gitlab.freedesktop.org/mobile-broadband/ModemManager.git#commit=$_commit")
+sha256sums=('SKIP')
 
 pkgver() {
   cd ModemManager
@@ -25,10 +23,6 @@ pkgver() {
 
 prepare() {
   cd ModemManager
-
-  # Recommended by upstream
-  git apply -3 ../strict-filter.diff
-
   NOCONFIGURE=1 ./autogen.sh
 }
 
@@ -44,6 +38,7 @@ build() {
     --with-polkit=permissive \
     --with-systemd-journal \
     --with-systemd-suspend-resume \
+    --enable-compile-warnings=yes \
     --enable-gtk-doc \
     --disable-static
 
@@ -59,7 +54,8 @@ check() {
 }
 
 package_modemmanager() {
-  depends+=(libmm-glib)
+  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)
 
@@ -75,7 +71,8 @@ package_modemmanager() {
 
 package_libmm-glib() {
   pkgdesc="ModemManager library"
-  depends=(glib2)
+  depends=(libg{lib,object,io}-2.0.so)
+  provides=(libmm-glib.so)
 
   install -d "$pkgdir/usr/lib"
   mv include "$pkgdir/usr"
diff --git a/strict-filter.diff b/strict-filter.diff
deleted file mode 100644
index fb144f6..0000000
--- a/strict-filter.diff
+++ /dev/null
@@ -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;
-