From b4bb39a0eb7f87d69c5108ea6222c6d2150927f7 Mon Sep 17 00:00:00 2001 From: Nathan Owens Date: Tue, 10 Nov 2020 20:27:50 -0600 Subject: [PATCH 1/3] ModemManager: update to 1.14.6 --- srcpkgs/ModemManager/template | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/srcpkgs/ModemManager/template b/srcpkgs/ModemManager/template index b87fac104be..3286e47d91b 100644 --- a/srcpkgs/ModemManager/template +++ b/srcpkgs/ModemManager/template @@ -1,16 +1,15 @@ # Template file for 'ModemManager' pkgname=ModemManager -version=1.12.10 +version=1.14.6 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 - $(vopt_if gir 'vala-devel gobject-introspection')" +hostmakedepends="pkg-config autoconf" makedepends="glib-devel libgudev-devel polkit-devel libqmi-devel - libmbim-devel ppp $(vopt_if gir vala)" + libmbim-devel libxslt-devel ppp $(vopt_if gir vala-devel)" depends="hicolor-icon-theme ppp" checkdepends="dbus tzdata" short_desc="Mobile broadband modem management service" @@ -18,15 +17,19 @@ 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=783d5da925b2ca69f6233fcead691dd0f5cba06aa479d71495efdc07053fc0fd build_options="gir" build_options_default="gir" +if [ "$CROSS_BUILD" ]; then + hostmakedepends+=" glib-devel libxslt-devel" +fi + pre_configure() { # Werror ___Guarantees___ failure to build for any non-trivial project # in any machine that doesn't run the same software as upstream - sed -i configure -e"s; -Werror;;g" + vsed -i configure -e"s; -Werror;;g" } ModemManager-devel_package() { From 3bd843202b2937f744210ac11b439080b67544a0 Mon Sep 17 00:00:00 2001 From: Nathan Owens Date: Tue, 10 Nov 2020 20:30:34 -0600 Subject: [PATCH 2/3] libqmi: update to 1.26.6 --- srcpkgs/libqmi/template | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/srcpkgs/libqmi/template b/srcpkgs/libqmi/template index ba9adcc2393..b56f6c99424 100644 --- a/srcpkgs/libqmi/template +++ b/srcpkgs/libqmi/template @@ -1,17 +1,25 @@ # Template file for 'libqmi' pkgname=libqmi -version=1.24.8 +version=1.26.6 revision=1 build_style=gnu-configure -configure_args="--disable-static --enable-mbim-qmux" -hostmakedepends="glib-devel pkg-config" -makedepends="libglib-devel libgudev-devel libmbim-devel" +build_helper=gir +configure_args="--disable-static --enable-mbim-qmux + $(vopt_enable introspection)" +hostmakedepends="pkg-config" +makedepends="glib-devel libgudev-devel libmbim-devel" short_desc="QMI modem protocol helper library" 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=a71963bb1097a42665287e40a9a36f95b8f9d6d6a4b7a5de22d660328af97cb9 +build_options="gir" +build_options_default="gir" + +if [ "$CROSS_BUILD" ]; then + hostmakedepends+=" glib-devel" +fi libqmi-devel_package() { depends="${makedepends} ${sourcepkg}-${version}_${revision}" From 06bbfcbbecca7f61ddf6761ca77081d406acb610 Mon Sep 17 00:00:00 2001 From: Nathan Owens Date: Tue, 10 Nov 2020 20:31:44 -0600 Subject: [PATCH 3/3] libmbim: update to 1.24.4 [ci skip] --- srcpkgs/ModemManager/template | 9 +++------ srcpkgs/libmbim/template | 18 +++++++++++++----- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/srcpkgs/ModemManager/template b/srcpkgs/ModemManager/template index 3286e47d91b..3cceb346807 100644 --- a/srcpkgs/ModemManager/template +++ b/srcpkgs/ModemManager/template @@ -7,8 +7,9 @@ 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 autoconf" -makedepends="glib-devel libgudev-devel polkit-devel libqmi-devel +hostmakedepends="pkg-config autoconf $(vopt_if gir vala-devel) + glib-devel libxslt-devel" +makedepends="libglib-devel libgudev-devel polkit-devel libqmi-devel libmbim-devel libxslt-devel ppp $(vopt_if gir vala-devel)" depends="hicolor-icon-theme ppp" checkdepends="dbus tzdata" @@ -22,10 +23,6 @@ checksum=783d5da925b2ca69f6233fcead691dd0f5cba06aa479d71495efdc07053fc0fd build_options="gir" build_options_default="gir" -if [ "$CROSS_BUILD" ]; then - hostmakedepends+=" glib-devel libxslt-devel" -fi - pre_configure() { # Werror ___Guarantees___ failure to build for any non-trivial project # in any machine that doesn't run the same software as upstream diff --git a/srcpkgs/libmbim/template b/srcpkgs/libmbim/template index dfb7d61b43d..1f2e4acb7d6 100644 --- a/srcpkgs/libmbim/template +++ b/srcpkgs/libmbim/template @@ -1,17 +1,25 @@ # Template file for 'libmbim' pkgname=libmbim -version=1.22.0 +version=1.24.4 revision=1 build_style=gnu-configure -configure_args="--disable-static" -hostmakedepends="glib-devel pkg-config" -makedepends="libgudev-devel" +build_helper=gir +configure_args="--disable-static $(vopt_enable gir introspection)" +hostmakedepends="pkg-config" +makedepends="glib-devel libgudev-devel" short_desc="MBIM modem protocol helper library" 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=dd488ee6176243a6adb27a5872897336272ea7bea33a3ad501ba268e5a58b285 + +build_options="gir" +build_options_default="gir" + +if [ "$CROSS_BUILD" ]; then + hostmakedepends+=" glib-devel" +fi libmbim-devel_package() { depends="${sourcepkg}-${version}_${revision}"