From 2334c1904fa6dd220d33b240a90da4104cf42301 Mon Sep 17 00:00:00 2001 From: Julio Galvan Date: Sat, 12 Sep 2020 22:23:27 -0700 Subject: [PATCH 1/3] ModemManager: update to 1.14.2 --- .../files/org.freedesktop.ModemManager.rules | 9 +++++++++ srcpkgs/ModemManager/template | 14 +++++++++----- 2 files changed, 18 insertions(+), 5 deletions(-) create mode 100644 srcpkgs/ModemManager/files/org.freedesktop.ModemManager.rules diff --git a/srcpkgs/ModemManager/files/org.freedesktop.ModemManager.rules b/srcpkgs/ModemManager/files/org.freedesktop.ModemManager.rules new file mode 100644 index 00000000000..15a671ffa6d --- /dev/null +++ b/srcpkgs/ModemManager/files/org.freedesktop.ModemManager.rules @@ -0,0 +1,9 @@ +polkit.addRule(function(action, subject) { + if ((action.id == "org.freedesktop.ModemManager1.Device.Control" || + action.id == "org.freedesktop.ModemManager1.Contacts" || + action.id == "org.freedesktop.ModemManager1.Messaging" || + action.id == "org.freedesktop.ModemManager1.Location") && + subject.isInGroup("network") && subject.active) { + return polkit.Result.YES; + } +}); diff --git a/srcpkgs/ModemManager/template b/srcpkgs/ModemManager/template index b87fac104be..a2f00aa2c47 100644 --- a/srcpkgs/ModemManager/template +++ b/srcpkgs/ModemManager/template @@ -1,13 +1,13 @@ # Template file for 'ModemManager' pkgname=ModemManager -version=1.12.10 +version=1.14.2 revision=1 build_style=gnu-configure build_helper="gir" configure_args="--disable-static --with-polkit=permissive - --with-udev-base-dir=/usr/lib/udev $(vopt_enable gir introspection) - $(vopt_enable gir vala)" -hostmakedepends="pkg-config glib-devel autoconf + --with-udev-base-dir=/usr/lib/udev --with-dbus-sys-dir=/etc/dbus-1/system.d + $(vopt_enable gir introspection) $(vopt_enable gir vala)" +hostmakedepends="libxslt-devel pkg-config glib-devel autoconf $(vopt_if gir 'vala-devel gobject-introspection')" makedepends="glib-devel libgudev-devel polkit-devel libqmi-devel libmbim-devel ppp $(vopt_if gir vala)" @@ -18,7 +18,7 @@ maintainer="Orphaned " license="GPL-2.0-or-later" homepage="https://www.freedesktop.org/wiki/Software/ModemManager/" distfiles="${FREEDESKTOP_SITE}/${pkgname}/${pkgname}-${version}.tar.xz" -checksum=b2b3058bbb72adf98b24707fdbebe58e590644a38145e30d574f685f154bf8aa +checksum=5fb5553aecd6eb9d6d8ecd130a24f3461e5f93c5f91a0e4ae0508b5228e8b0be build_options="gir" build_options_default="gir" @@ -29,6 +29,10 @@ pre_configure() { sed -i configure -e"s; -Werror;;g" } +post_install() { + vinstall ${FILESDIR}/org.freedesktop.ModemManager.rules 644 usr/share/polkit-1/rules.d +} + ModemManager-devel_package() { depends="libmm-glib>=${version}_${revision}" short_desc+=" - development files" From d5b3d1fa5ab482c9b62110b4e66ca524d6b98e5b Mon Sep 17 00:00:00 2001 From: Julio Galvan Date: Sat, 12 Sep 2020 22:24:56 -0700 Subject: [PATCH 2/3] libmbim: update to 1.24.2 --- srcpkgs/libmbim/template | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/srcpkgs/libmbim/template b/srcpkgs/libmbim/template index dfb7d61b43d..d3e3325216f 100644 --- a/srcpkgs/libmbim/template +++ b/srcpkgs/libmbim/template @@ -1,9 +1,10 @@ # Template file for 'libmbim' pkgname=libmbim -version=1.22.0 +version=1.24.2 revision=1 build_style=gnu-configure -configure_args="--disable-static" +build_helper="gir" +configure_args="--disable-static $(vopt_enable gir introspection)" hostmakedepends="glib-devel pkg-config" makedepends="libgudev-devel" short_desc="MBIM modem protocol helper library" @@ -11,7 +12,10 @@ maintainer="Orphaned " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://www.freedesktop.org/wiki/Software/libmbim/" distfiles="${FREEDESKTOP_SITE}/${pkgname}/${pkgname}-${version}.tar.xz" -checksum=5c0778eb1cd12c3604523134e55183f5147b0cae71150e875b583768f7aa1f38 +checksum=32198c099987849c5f442d1cbf4b6e43e645cbdbe9cfdc197b19ddd63c6981e4 + +build_options="gir" +build_options_default="gir" libmbim-devel_package() { depends="${sourcepkg}-${version}_${revision}" @@ -20,6 +24,10 @@ libmbim-devel_package() { vmove usr/include vmove usr/lib/pkgconfig vmove "usr/lib/*.so" - vmove usr/share + vmove usr/share/gtk-doc + if [ "$build_option_gir" ]; then + vmove usr/share/gir-1.0 + vmove usr/lib/girepository-1.0 + fi } } From 6da6093ff0219ca743586b6208f6d614eb634b72 Mon Sep 17 00:00:00 2001 From: Julio Galvan Date: Sat, 12 Sep 2020 22:28:40 -0700 Subject: [PATCH 3/3] libqmi: update to 1.26.4 --- srcpkgs/libqmi/template | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/srcpkgs/libqmi/template b/srcpkgs/libqmi/template index ba9adcc2393..ac034f8344e 100644 --- a/srcpkgs/libqmi/template +++ b/srcpkgs/libqmi/template @@ -1,9 +1,11 @@ # Template file for 'libqmi' pkgname=libqmi -version=1.24.8 +version=1.26.4 revision=1 build_style=gnu-configure -configure_args="--disable-static --enable-mbim-qmux" +build_helper="gir" +configure_args="--disable-static --enable-mbim-qmux --enable-qrtr + --enable-more-warnings=yes $(vopt_enable gir introspection)" hostmakedepends="glib-devel pkg-config" makedepends="libglib-devel libgudev-devel libmbim-devel" short_desc="QMI modem protocol helper library" @@ -11,7 +13,10 @@ maintainer="Orphaned " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="http://www.freedesktop.org/wiki/Software/libqmi/" distfiles="${FREEDESKTOP_SITE}/${pkgname}/${pkgname}-${version}.tar.xz" -checksum=c793db2c91d7928160341b357b26315d9c879ecb36699cb7a6b36054cba60893 +checksum=c0adcb84ba452e3e13edeb3f94f7b003ea927b354bc187629e05efb333ce270b + +build_options="gir" +build_options_default="gir" libqmi-devel_package() { depends="${makedepends} ${sourcepkg}-${version}_${revision}" @@ -20,6 +25,10 @@ libqmi-devel_package() { vmove usr/include vmove usr/lib/pkgconfig vmove "usr/lib/*.so" - vmove usr/share + vmove usr/share/gtk-doc + if [ "$build_option_gir" ]; then + vmove usr/share/gir-1.0 + vmove usr/lib/girepository-1.0 + fi } }