Date: Wednesday, October 24, 2018 @ 11:07:47 Author: heftig Revision: 337212
1.14.4-1 Modified: networkmanager/trunk/PKGBUILD Deleted: networkmanager/trunk/26.patch ----------+ 26.patch | 53 ----------------------------------------------------- PKGBUILD | 13 ++++--------- 2 files changed, 4 insertions(+), 62 deletions(-) Deleted: 26.patch =================================================================== --- 26.patch 2018-10-24 10:55:18 UTC (rev 337211) +++ 26.patch 2018-10-24 11:07:47 UTC (rev 337212) @@ -1,53 +0,0 @@ -From 7b9eb1528d7092ebe62c0a816cd3d14d4407463b Mon Sep 17 00:00:00 2001 -From: Taegil Bae <[email protected]> -Date: Mon, 22 Oct 2018 02:50:05 +0000 -Subject: [PATCH 1/2] Set RPATH for libnm_device_plugin_bluetooth.so - ---- - src/devices/bluetooth/meson.build | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/devices/bluetooth/meson.build b/src/devices/bluetooth/meson.build -index 019f04f6b..628a3bc80 100644 ---- a/src/devices/bluetooth/meson.build -+++ b/src/devices/bluetooth/meson.build -@@ -26,7 +26,8 @@ libnm_device_plugin_bluetooth = shared_module( - link_args: ldflags_linker_script_devices, - link_depends: linker_script_devices, - install: true, -- install_dir: nm_plugindir -+ install_dir: nm_plugindir, -+ install_rpath: nm_plugindir - ) - - core_plugins += libnm_device_plugin_bluetooth --- -2.18.1 - - -From f7c5745d81205ce3675bee55b0ab1e814a63c817 Mon Sep 17 00:00:00 2001 -From: Taegil Bae <[email protected]> -Date: Mon, 22 Oct 2018 02:52:06 +0000 -Subject: [PATCH 2/2] Set RPATH for libnm_device_plugin_wwan.so - ---- - src/devices/wwan/meson.build | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/devices/wwan/meson.build b/src/devices/wwan/meson.build -index 2c0ea5a10..5fe6e433e 100644 ---- a/src/devices/wwan/meson.build -+++ b/src/devices/wwan/meson.build -@@ -54,7 +54,8 @@ libnm_device_plugin_wwan = shared_module( - link_args: ldflags_linker_script_devices, - link_depends: linker_script_devices, - install: true, -- install_dir: nm_plugindir -+ install_dir: nm_plugindir, -+ install_rpath: nm_plugindir - ) - - core_plugins += libnm_device_plugin_wwan --- -2.18.1 - Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-10-24 10:55:18 UTC (rev 337211) +++ PKGBUILD 2018-10-24 11:07:47 UTC (rev 337212) @@ -7,7 +7,7 @@ pkgbase=networkmanager pkgname=(networkmanager libnm libnm-glib) -pkgver=1.14.3dev+21+g0ffb390bf +pkgver=1.14.4 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=0ffb390bf3390aafd08ba5df5d0b4eb96e93327e # nm-1-14 -source=("git+https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git#commit=$_commit"; - 26.patch) -sha256sums=('SKIP' - '0051e1021494d0b56050e7d6c0d44668ae12465ea1429f88a38f26ac90416e9e') +_commit=66cad942f2404a5bac0df1a623fb5d72ab8f4d20 # tags/1.14.4^0 +source=("git+https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git#commit=$_commit";) +sha256sums=('SKIP') pkgver() { cd NetworkManager @@ -32,9 +30,6 @@ prepare() { cd NetworkManager - - # https://gitlab.freedesktop.org/NetworkManager/NetworkManager/merge_requests/26 - git apply -3 ../26.patch } build() {
