Date: Tuesday, April 26, 2022 @ 21:34:27 Author: heftig Revision: 444063
archrelease: copy trunk to extra-x86_64 Added: modemmanager/repos/extra-x86_64/PKGBUILD (from rev 444062, modemmanager/trunk/PKGBUILD) Deleted: modemmanager/repos/extra-x86_64/PKGBUILD ----------+ PKGBUILD | 170 +++++++++++++++++++++++++++++++------------------------------ 1 file changed, 87 insertions(+), 83 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2022-04-26 21:34:06 UTC (rev 444062) +++ PKGBUILD 2022-04-26 21:34:27 UTC (rev 444063) @@ -1,83 +0,0 @@ -# Maintainer: Jan Alexander Steffens (heftig) <hef...@archlinux.org> -# Contributor: Ionut Biru <ib...@archlinux.org> - -pkgbase=modemmanager -pkgname=(modemmanager libmm-glib) -pkgver=1.18.6 -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 meson git bash-completion) -checkdepends=(python-gobject python-dbus) -_commit=a7bcf2036b34d5043dbc33fee7d98bae5859c4d3 # tags/1.18.6 -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/r&/;s/-/+/g' -} - -prepare() { - cd ModemManager -} - -build() { - local meson_options=( - -D dbus_policy_dir=/usr/share/dbus-1/system.d - -D dist_version="\"$pkgver-$pkgrel\"" - -D gtk_doc=true - -D plugin_qcom_soc=disabled - -D polkit=permissive - -D vapi=true - ) - - arch-meson ModemManager build "${meson_options[@]}" - meson compile -C build -} - -check() { - # Tests don't work yet - : meson test -C build --print-errorlogs -} - -_pick() { - local p="$1" f d; shift - for f; do - d="$srcdir/$p/${f#$pkgdir/}" - mkdir -p "$(dirname "$d")" - mv "$f" "$d" - rmdir -p --ignore-fail-on-non-empty "$(dirname "$f")" - done -} - -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') - - meson install -C build --destdir "$pkgdir" - - cd "$pkgdir" - _pick libmm usr/include - _pick libmm usr/lib/girepository-1.0 - _pick libmm usr/lib/libmm-glib.so* - _pick libmm usr/lib/pkgconfig - _pick libmm usr/share/gir-1.0 - _pick libmm usr/share/gtk-doc/html/libmm-glib - _pick libmm usr/share/vala -} - -package_libmm-glib() { - pkgdesc="ModemManager library" - depends=(libg{lib,object,io}-2.0.so) - provides=(libmm-glib.so) - - mv libmm/* "$pkgdir" -} - -# vim:set sw=2 et: Copied: modemmanager/repos/extra-x86_64/PKGBUILD (from rev 444062, modemmanager/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2022-04-26 21:34:27 UTC (rev 444063) @@ -0,0 +1,87 @@ +# Maintainer: Jan Alexander Steffens (heftig) <hef...@archlinux.org> +# Contributor: Ionut Biru <ib...@archlinux.org> + +pkgbase=modemmanager +pkgname=(modemmanager libmm-glib) +pkgver=1.18.6 +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 meson git bash-completion) +checkdepends=(python-gobject python-dbus) +options=(debug) +_commit=a7bcf2036b34d5043dbc33fee7d98bae5859c4d3 # tags/1.18.6 +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/r&/;s/-/+/g' +} + +prepare() { + cd ModemManager + + # https://bugs.archlinux.org/task/74329 + git cherry-pick -n c615be77fd0ce88b73285816266e112b45825637 +} + +build() { + local meson_options=( + -D dbus_policy_dir=/usr/share/dbus-1/system.d + -D dist_version="\"$pkgver-$pkgrel\"" + -D gtk_doc=true + -D plugin_qcom_soc=disabled + -D polkit=permissive + -D vapi=true + ) + + arch-meson ModemManager build "${meson_options[@]}" + meson compile -C build +} + +check() { + # Tests don't work yet + : meson test -C build --print-errorlogs +} + +_pick() { + local p="$1" f d; shift + for f; do + d="$srcdir/$p/${f#$pkgdir/}" + mkdir -p "$(dirname "$d")" + mv "$f" "$d" + rmdir -p --ignore-fail-on-non-empty "$(dirname "$f")" + done +} + +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') + + meson install -C build --destdir "$pkgdir" + + cd "$pkgdir" + _pick libmm usr/include + _pick libmm usr/lib/girepository-1.0 + _pick libmm usr/lib/libmm-glib.so* + _pick libmm usr/lib/pkgconfig + _pick libmm usr/share/gir-1.0 + _pick libmm usr/share/gtk-doc/html/libmm-glib + _pick libmm usr/share/vala +} + +package_libmm-glib() { + pkgdesc="ModemManager library" + depends=(libg{lib,object,io}-2.0.so) + provides=(libmm-glib.so) + + mv libmm/* "$pkgdir" +} + +# vim:set sw=2 et: