[arch-commits] Commit in networkmanager/repos/extra-x86_64 (3 files)
Jan Steffens
heftig at archlinux.org
Wed Oct 24 11:08:54 UTC 2018
Date: Wednesday, October 24, 2018 @ 11:08:54
Author: heftig
Revision: 337213
archrelease: copy trunk to extra-x86_64
Added:
networkmanager/repos/extra-x86_64/PKGBUILD
(from rev 337212, networkmanager/trunk/PKGBUILD)
Deleted:
networkmanager/repos/extra-x86_64/26.patch
networkmanager/repos/extra-x86_64/PKGBUILD
----------+
26.patch | 53 -----------
PKGBUILD | 279 +++++++++++++++++++++++++++++--------------------------------
2 files changed, 137 insertions(+), 195 deletions(-)
Deleted: 26.patch
===================================================================
--- 26.patch 2018-10-24 11:07:47 UTC (rev 337212)
+++ 26.patch 2018-10-24 11:08:54 UTC (rev 337213)
@@ -1,53 +0,0 @@
-From 7b9eb1528d7092ebe62c0a816cd3d14d4407463b Mon Sep 17 00:00:00 2001
-From: Taegil Bae <esrevinu at gmail.com>
-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 <esrevinu at gmail.com>
-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
-
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2018-10-24 11:07:47 UTC (rev 337212)
+++ PKGBUILD 2018-10-24 11:08:54 UTC (rev 337213)
@@ -1,142 +0,0 @@
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-# Maintainer: Jan de Groot <jgc at archlinxu.org>
-# Contributor: Wael Nasreddine <gandalf at siemens-mobiles.org>
-# Contributor: Tor Krill <tor at krill.nu>
-# Contributor: Will Rea <sillywilly at gmail.com>
-# Contributor: Valentine Sinitsyn <e_val at inbox.ru>
-
-pkgbase=networkmanager
-pkgname=(networkmanager libnm libnm-glib)
-pkgver=1.14.3dev+21+g0ffb390bf
-pkgrel=1
-pkgdesc="Network connection manager and user applications"
-url="https://wiki.gnome.org/Projects/NetworkManager"
-arch=(x86_64)
-license=(GPL2 LGPL2.1)
-_pppver=2.4.7
-makedepends=(intltool dhclient iptables gobject-introspection gtk-doc "ppp=$_pppver" modemmanager
- dbus-glib iproute2 nss polkit wpa_supplicant curl systemd libmm-glib
- 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')
-
-pkgver() {
- cd NetworkManager
- git describe | sed 's/-dev/dev/;s/-rc/rc/;s/-/+/g'
-}
-
-prepare() {
- cd NetworkManager
-
- # https://gitlab.freedesktop.org/NetworkManager/NetworkManager/merge_requests/26
- git apply -3 ../26.patch
-}
-
-build() {
- local meson_args=(
- # LTO breaks NM_BACKPORT_SYMBOL
- # https://gitlab.freedesktop.org/NetworkManager/NetworkManager/issues/63
- -D b_lto=false
-
- -D dbus_conf_dir=/usr/share/dbus-1/system.d
- -D dist_version="$pkgver-$pkgrel"
- -D session_tracking_consolekit=false
- -D suspend_resume=systemd
- -D modify_system=true
- -D polkit_agent=true
- -D selinux=false
- -D iwd=true
- -D pppd_plugin_dir=/usr/lib/pppd/$_pppver
- -D teamdctl=true
- -D libnm_glib=true
- -D bluez5_dun=true
- -D config_plugins_default=keyfile,ibft
- -D ibft=true
- -D docs=true
- -D more_asserts=no
- -D more_logging=false
- -D qt=false
- )
-
- arch-meson NetworkManager build "${meson_args[@]}"
- ninja -C build
-}
-
-check() {
- meson test -C build
-}
-
-_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_networkmanager() {
- depends=(libnm libnm-glib iproute2 polkit wpa_supplicant libmm-glib libnewt libndp libteam curl
- bluez-libs libpsl audit)
- optdepends=('dnsmasq: connection sharing'
- 'bluez: Bluetooth support'
- 'ppp: dialup connection support'
- 'modemmanager: cellular network support'
- 'iwd: wpa_supplicant alternative')
- backup=(etc/NetworkManager/NetworkManager.conf)
- groups=(gnome)
-
- DESTDIR="$pkgdir" meson install -C build
-
- # /etc/NetworkManager
- install -d "$pkgdir"/etc/NetworkManager/{conf,dnsmasq}.d
- install -dm700 "$pkgdir/etc/NetworkManager/system-connections"
- install -m644 /dev/stdin "$pkgdir/etc/NetworkManager/NetworkManager.conf" <<END
-# Configuration file for NetworkManager.
-# See "man 5 NetworkManager.conf" for details.
-END
-
- # packaged configuration
- install -Dm644 /dev/stdin "$pkgdir/usr/lib/NetworkManager/conf.d/20-connectivity.conf" <<END
-[connectivity]
-uri=http://www.archlinux.org/check_network_status.txt
-END
-
-### Split libnm
- _pick libnm "$pkgdir"/usr/include/libnm
- _pick libnm "$pkgdir"/usr/lib/girepository-1.0/NM-*
- _pick libnm "$pkgdir"/usr/lib/libnm.*
- _pick libnm "$pkgdir"/usr/lib/pkgconfig/libnm.pc
- _pick libnm "$pkgdir"/usr/share/gir-1.0/NM-*
- _pick libnm "$pkgdir"/usr/share/gtk-doc/html/libnm
- _pick libnm "$pkgdir"/usr/share/vala/vapi/libnm.*
-
-### Split libnm-glib
- _pick libnm-glib "$pkgdir"/usr/include/*
- _pick libnm-glib "$pkgdir"/usr/lib/girepository-1.0/*
- _pick libnm-glib "$pkgdir"/usr/lib/libnm-*
- _pick libnm-glib "$pkgdir"/usr/lib/pkgconfig/*
- _pick libnm-glib "$pkgdir"/usr/share/gir-1.0/*
- _pick libnm-glib "$pkgdir"/usr/share/gtk-doc/html/libnm-*
- _pick libnm-glib "$pkgdir"/usr/share/vala/vapi/*
-}
-
-package_libnm() {
- pkgdesc="NetworkManager client library"
- depends=(glib2 nss libutil-linux jansson libsystemd)
- mv libnm/* "$pkgdir"
-}
-
-package_libnm-glib() {
- pkgdesc="NetworkManager client library (legacy)"
- depends=(libnm dbus-glib)
- mv libnm-glib/* "$pkgdir"
-}
-
-# vim:set sw=2 et:
Copied: networkmanager/repos/extra-x86_64/PKGBUILD (from rev 337212, networkmanager/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-10-24 11:08:54 UTC (rev 337213)
@@ -0,0 +1,137 @@
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Maintainer: Jan de Groot <jgc at archlinxu.org>
+# Contributor: Wael Nasreddine <gandalf at siemens-mobiles.org>
+# Contributor: Tor Krill <tor at krill.nu>
+# Contributor: Will Rea <sillywilly at gmail.com>
+# Contributor: Valentine Sinitsyn <e_val at inbox.ru>
+
+pkgbase=networkmanager
+pkgname=(networkmanager libnm libnm-glib)
+pkgver=1.14.4
+pkgrel=1
+pkgdesc="Network connection manager and user applications"
+url="https://wiki.gnome.org/Projects/NetworkManager"
+arch=(x86_64)
+license=(GPL2 LGPL2.1)
+_pppver=2.4.7
+makedepends=(intltool dhclient iptables gobject-introspection gtk-doc "ppp=$_pppver" modemmanager
+ dbus-glib iproute2 nss polkit wpa_supplicant curl systemd libmm-glib
+ 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=66cad942f2404a5bac0df1a623fb5d72ab8f4d20 # tags/1.14.4^0
+source=("git+https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git#commit=$_commit")
+sha256sums=('SKIP')
+
+pkgver() {
+ cd NetworkManager
+ git describe | sed 's/-dev/dev/;s/-rc/rc/;s/-/+/g'
+}
+
+prepare() {
+ cd NetworkManager
+}
+
+build() {
+ local meson_args=(
+ # LTO breaks NM_BACKPORT_SYMBOL
+ # https://gitlab.freedesktop.org/NetworkManager/NetworkManager/issues/63
+ -D b_lto=false
+
+ -D dbus_conf_dir=/usr/share/dbus-1/system.d
+ -D dist_version="$pkgver-$pkgrel"
+ -D session_tracking_consolekit=false
+ -D suspend_resume=systemd
+ -D modify_system=true
+ -D polkit_agent=true
+ -D selinux=false
+ -D iwd=true
+ -D pppd_plugin_dir=/usr/lib/pppd/$_pppver
+ -D teamdctl=true
+ -D libnm_glib=true
+ -D bluez5_dun=true
+ -D config_plugins_default=keyfile,ibft
+ -D ibft=true
+ -D docs=true
+ -D more_asserts=no
+ -D more_logging=false
+ -D qt=false
+ )
+
+ arch-meson NetworkManager build "${meson_args[@]}"
+ ninja -C build
+}
+
+check() {
+ meson test -C build
+}
+
+_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_networkmanager() {
+ depends=(libnm libnm-glib iproute2 polkit wpa_supplicant libmm-glib libnewt libndp libteam curl
+ bluez-libs libpsl audit)
+ optdepends=('dnsmasq: connection sharing'
+ 'bluez: Bluetooth support'
+ 'ppp: dialup connection support'
+ 'modemmanager: cellular network support'
+ 'iwd: wpa_supplicant alternative')
+ backup=(etc/NetworkManager/NetworkManager.conf)
+ groups=(gnome)
+
+ DESTDIR="$pkgdir" meson install -C build
+
+ # /etc/NetworkManager
+ install -d "$pkgdir"/etc/NetworkManager/{conf,dnsmasq}.d
+ install -dm700 "$pkgdir/etc/NetworkManager/system-connections"
+ install -m644 /dev/stdin "$pkgdir/etc/NetworkManager/NetworkManager.conf" <<END
+# Configuration file for NetworkManager.
+# See "man 5 NetworkManager.conf" for details.
+END
+
+ # packaged configuration
+ install -Dm644 /dev/stdin "$pkgdir/usr/lib/NetworkManager/conf.d/20-connectivity.conf" <<END
+[connectivity]
+uri=http://www.archlinux.org/check_network_status.txt
+END
+
+### Split libnm
+ _pick libnm "$pkgdir"/usr/include/libnm
+ _pick libnm "$pkgdir"/usr/lib/girepository-1.0/NM-*
+ _pick libnm "$pkgdir"/usr/lib/libnm.*
+ _pick libnm "$pkgdir"/usr/lib/pkgconfig/libnm.pc
+ _pick libnm "$pkgdir"/usr/share/gir-1.0/NM-*
+ _pick libnm "$pkgdir"/usr/share/gtk-doc/html/libnm
+ _pick libnm "$pkgdir"/usr/share/vala/vapi/libnm.*
+
+### Split libnm-glib
+ _pick libnm-glib "$pkgdir"/usr/include/*
+ _pick libnm-glib "$pkgdir"/usr/lib/girepository-1.0/*
+ _pick libnm-glib "$pkgdir"/usr/lib/libnm-*
+ _pick libnm-glib "$pkgdir"/usr/lib/pkgconfig/*
+ _pick libnm-glib "$pkgdir"/usr/share/gir-1.0/*
+ _pick libnm-glib "$pkgdir"/usr/share/gtk-doc/html/libnm-*
+ _pick libnm-glib "$pkgdir"/usr/share/vala/vapi/*
+}
+
+package_libnm() {
+ pkgdesc="NetworkManager client library"
+ depends=(glib2 nss libutil-linux jansson libsystemd)
+ mv libnm/* "$pkgdir"
+}
+
+package_libnm-glib() {
+ pkgdesc="NetworkManager client library (legacy)"
+ depends=(libnm dbus-glib)
+ mv libnm-glib/* "$pkgdir"
+}
+
+# vim:set sw=2 et:
More information about the arch-commits
mailing list