Date: Tuesday, December 17, 2019 @ 12:06:50 Author: heftig Revision: 371596
1.22.0-1 Modified: networkmanager/trunk/PKGBUILD Deleted: networkmanager/trunk/build.diff ------------+ PKGBUILD | 13 ++++--------- build.diff | 15 --------------- 2 files changed, 4 insertions(+), 24 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2019-12-17 11:42:00 UTC (rev 371595) +++ PKGBUILD 2019-12-17 12:06:50 UTC (rev 371596) @@ -7,7 +7,7 @@ pkgbase=networkmanager pkgname=(networkmanager libnm nm-cloud-setup) -pkgver=1.22rc1 +pkgver=1.22.0 pkgrel=1 pkgdesc="Network connection manager and user applications" url="https://wiki.gnome.org/Projects/NetworkManager"; @@ -19,11 +19,9 @@ libnewt libndp libteam vala perl-yaml python-gobject git vala jansson bluez-libs glib2-docs dhcpcd iwd dnsmasq systemd-resolvconf libpsl audit meson) checkdepends=(libx11 python-dbus) -_commit=9b8c4c1cfd93b56602e5a9a481e94c80f2e49897 # tags/1.22-rc1^0 -source=("git+https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git#commit=$_commit"; - build.diff) -sha256sums=('SKIP' - 'e69f7da243a87fab9128032f0243e36162d53a1b18228593ed577845a5cb8d45') +_commit=7fe734f8bc0661ff476204a034eb987df43ee461 # tags/1.22.0^0 +source=("git+https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git#commit=$_commit";) +sha256sums=('SKIP') pkgver() { cd NetworkManager @@ -32,9 +30,6 @@ prepare() { cd NetworkManager - - # Fix building nm-bt-test - git apply -3 ../build.diff } build() { Deleted: build.diff =================================================================== --- build.diff 2019-12-17 11:42:00 UTC (rev 371595) +++ build.diff 2019-12-17 12:06:50 UTC (rev 371596) @@ -1,15 +0,0 @@ -diff --git i/src/devices/bluetooth/meson.build w/src/devices/bluetooth/meson.build -index a77ad60d4..1505f2820 100644 ---- i/src/devices/bluetooth/meson.build -+++ w/src/devices/bluetooth/meson.build -@@ -40,8 +40,9 @@ if enable_tests - - executable( - test_unit, -+ sources, - 'tests/' + test_unit + '.c', -- dependencies: libnetwork_manager_test_dep, -+ dependencies: deps + [libnetwork_manager_test_dep], - c_args: test_c_flags, - ) - endif
