[arch-commits] Commit in networkmanager/repos/testing-x86_64 (3 files)

Jan Steffens heftig at archlinux.org
Tue Dec 17 12:07:04 UTC 2019


    Date: Tuesday, December 17, 2019 @ 12:07:04
  Author: heftig
Revision: 371597

archrelease: copy trunk to testing-x86_64

Added:
  networkmanager/repos/testing-x86_64/PKGBUILD
    (from rev 371596, networkmanager/trunk/PKGBUILD)
Deleted:
  networkmanager/repos/testing-x86_64/PKGBUILD
  networkmanager/repos/testing-x86_64/build.diff

------------+
 PKGBUILD   |  271 ++++++++++++++++++++++++++++-------------------------------
 build.diff |   15 ---
 2 files changed, 133 insertions(+), 153 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2019-12-17 12:06:50 UTC (rev 371596)
+++ PKGBUILD	2019-12-17 12:07:04 UTC (rev 371597)
@@ -1,138 +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 nm-cloud-setup)
-pkgver=1.22rc1
-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
-             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=9b8c4c1cfd93b56602e5a9a481e94c80f2e49897  # tags/1.22-rc1^0
-source=("git+https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git#commit=$_commit"
-        build.diff)
-sha256sums=('SKIP'
-            'e69f7da243a87fab9128032f0243e36162d53a1b18228593ed577845a5cb8d45')
-
-pkgver() {
-  cd NetworkManager
-  git describe | sed 's/-dev/dev/;s/-rc/rc/;s/-/+/g'
-}
-
-prepare() {
-  cd NetworkManager
-
-  # Fix building nm-bt-test
-  git apply -3 ../build.diff
-}
-
-build() {
-  local meson_args=(
-    -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 nm_cloud_setup=true
-    -D bluez5_dun=true
-    -D ebpf=true
-    -D config_plugins_default=keyfile
-    -D vapi=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() {
-  # iproute2 bug 
-  # https://gitlab.freedesktop.org/NetworkManager/NetworkManager/commit/be76d8b624fab99cbd76092ff511e6adc305279c
-  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_networkmanager() {
-  depends=(libnm iproute2 polkit wpa_supplicant libmm-glib libnewt libndp libteam curl
-           bluez-libs libpsl audit mobile-broadband-provider-info)
-  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
-
-  shopt -s globstar
-
-  _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.*
-
-  _pick nm-cloud-setup "$pkgdir"/usr/lib/**/*nm-cloud-setup*
-
-  # Restore empty dir
-  mkdir "$pkgdir/usr/lib/NetworkManager/dispatcher.d/no-wait.d"
-}
-
-package_libnm() {
-  pkgdesc="NetworkManager client library"
-  depends=(glib2 nss libutil-linux jansson systemd-libs)
-  mv libnm/* "$pkgdir"
-}
-
-package_nm-cloud-setup() {
-  pkgdesc="Automatically configure NetworkManager in cloud"
-  depends=(networkmanager)
-  mv nm-cloud-setup/* "$pkgdir"
-}
-
-# vim:set sw=2 et:

Copied: networkmanager/repos/testing-x86_64/PKGBUILD (from rev 371596, networkmanager/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2019-12-17 12:07:04 UTC (rev 371597)
@@ -0,0 +1,133 @@
+# 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 nm-cloud-setup)
+pkgver=1.22.0
+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
+             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=7fe734f8bc0661ff476204a034eb987df43ee461  # tags/1.22.0^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=(
+    -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 nm_cloud_setup=true
+    -D bluez5_dun=true
+    -D ebpf=true
+    -D config_plugins_default=keyfile
+    -D vapi=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() {
+  # iproute2 bug 
+  # https://gitlab.freedesktop.org/NetworkManager/NetworkManager/commit/be76d8b624fab99cbd76092ff511e6adc305279c
+  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_networkmanager() {
+  depends=(libnm iproute2 polkit wpa_supplicant libmm-glib libnewt libndp libteam curl
+           bluez-libs libpsl audit mobile-broadband-provider-info)
+  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
+
+  shopt -s globstar
+
+  _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.*
+
+  _pick nm-cloud-setup "$pkgdir"/usr/lib/**/*nm-cloud-setup*
+
+  # Restore empty dir
+  mkdir "$pkgdir/usr/lib/NetworkManager/dispatcher.d/no-wait.d"
+}
+
+package_libnm() {
+  pkgdesc="NetworkManager client library"
+  depends=(glib2 nss libutil-linux jansson systemd-libs)
+  mv libnm/* "$pkgdir"
+}
+
+package_nm-cloud-setup() {
+  pkgdesc="Automatically configure NetworkManager in cloud"
+  depends=(networkmanager)
+  mv nm-cloud-setup/* "$pkgdir"
+}
+
+# vim:set sw=2 et:

Deleted: build.diff
===================================================================
--- build.diff	2019-12-17 12:06:50 UTC (rev 371596)
+++ build.diff	2019-12-17 12:07:04 UTC (rev 371597)
@@ -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


More information about the arch-commits mailing list