[arch-commits] Commit in networkmanager/repos/extra-x86_64 (4 files)

Jan Steffens heftig at archlinux.org
Mon Oct 22 13:09:00 UTC 2018


    Date: Monday, October 22, 2018 @ 13:08:59
  Author: heftig
Revision: 336996

archrelease: copy trunk to extra-x86_64

Added:
  networkmanager/repos/extra-x86_64/0001-meson-Fix-platform-tests.patch
    (from rev 336995, networkmanager/trunk/0001-meson-Fix-platform-tests.patch)
  networkmanager/repos/extra-x86_64/PKGBUILD
    (from rev 336995, networkmanager/trunk/PKGBUILD)
Deleted:
  networkmanager/repos/extra-x86_64/0001-meson-Fix-platform-tests.patch
  networkmanager/repos/extra-x86_64/PKGBUILD

-------------------------------------+
 0001-meson-Fix-platform-tests.patch |  274 ++++++++++++++++-----------------
 PKGBUILD                            |  282 ++++++++++++++++------------------
 2 files changed, 276 insertions(+), 280 deletions(-)

Deleted: 0001-meson-Fix-platform-tests.patch
===================================================================
--- 0001-meson-Fix-platform-tests.patch	2018-10-22 13:08:43 UTC (rev 336995)
+++ 0001-meson-Fix-platform-tests.patch	2018-10-22 13:08:59 UTC (rev 336996)
@@ -1,137 +0,0 @@
-From a407e10a2646771cd649976aae03f2cc6111ff92 Mon Sep 17 00:00:00 2001
-Message-Id: <a407e10a2646771cd649976aae03f2cc6111ff92.1539968035.git.jan.steffens at gmail.com>
-From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
-Date: Fri, 19 Oct 2018 18:48:43 +0200
-Subject: [PATCH] meson: Fix platform tests
-
-All platform tests were run twice with the `linux` platform, instead of
-`fake` and `linux`, as expected.
----
- src/meson.build                | 13 ++++++++++---
- src/ndisc/tests/meson.build    |  6 ++----
- src/platform/tests/meson.build | 26 ++++++++++++--------------
- 3 files changed, 24 insertions(+), 21 deletions(-)
-
-diff --git a/src/meson.build b/src/meson.build
-index f293f299b..d58fb4d1f 100644
---- a/src/meson.build
-+++ b/src/meson.build
-@@ -216,23 +216,30 @@ if enable_tests
-     test_cflags += ['-DREQUIRE_ROOT_TESTS=1']
-   endif
- 
--  platform = (host_machine.system().contains('linux') ? 'linux' : 'fake')
--  test_cflags_platform = '-DSETUP=nm_' + platform + '_platform_setup'
--
-   libnetwork_manager_test = static_library(
-     nm_name + 'Test',
-     sources: sources,
-     dependencies: deps,
-     c_args: cflags + test_cflags,
-     link_with: libnetwork_manager
-   )
- 
-   test_nm_dep = declare_dependency(
-     dependencies: nm_dep,
-     compile_args: test_cflags,
-     link_with: libnetwork_manager_test
-   )
- 
-+  test_nm_dep_fake = declare_dependency(
-+    dependencies: test_nm_dep,
-+    compile_args: ['-DSETUP=nm_fake_platform_setup']
-+  )
-+
-+  test_nm_dep_linux = declare_dependency(
-+    dependencies: test_nm_dep,
-+    compile_args: ['-DSETUP=nm_linux_platform_setup']
-+  )
-+
-   subdir('dnsmasq/tests')
-   subdir('ndisc/tests')
-   subdir('platform/tests')
-diff --git a/src/ndisc/tests/meson.build b/src/ndisc/tests/meson.build
-index 2f479c2d9..e0dc9aa6c 100644
---- a/src/ndisc/tests/meson.build
-+++ b/src/ndisc/tests/meson.build
-@@ -3,21 +3,19 @@ test_unit = 'test-ndisc-fake'
- exe = executable(
-   test_unit,
-   test_unit + '.c',
--  dependencies: test_nm_dep,
--  c_args: test_cflags_platform
-+  dependencies: test_nm_dep_fake,
- )
- 
- test(
-   'ndisc/' + test_unit,
-   test_script,
-   args: test_args + [exe.full_path()]
- )
- 
- test = 'test-ndisc-linux'
- 
- exe = executable(
-   test,
-   test + '.c',
--  dependencies: test_nm_dep,
--  c_args: test_cflags_platform
-+  dependencies: test_nm_dep_linux,
- )
-diff --git a/src/platform/tests/meson.build b/src/platform/tests/meson.build
-index 0571efacf..67582d776 100644
---- a/src/platform/tests/meson.build
-+++ b/src/platform/tests/meson.build
-@@ -1,37 +1,35 @@
- test_units = [
--  ['test-link-fake', 'test-link.c', 60],
--  ['test-link-linux', 'test-link.c', 60],
--  ['test-address-fake', 'test-address.c'],
--  ['test-address-linux', 'test-address.c'],
--  ['test-general', 'test-general.c'],
--  ['test-nmp-object', 'test-nmp-object.c'],
--  ['test-route-fake', 'test-route.c'],
--  ['test-route-linux', 'test-route.c'],
--  ['test-cleanup-fake', 'test-cleanup.c'],
--  ['test-cleanup-linux', 'test-cleanup.c'],
-+  ['test-link-fake',     'test-link.c',       test_nm_dep_fake,  30],
-+  ['test-link-linux',    'test-link.c',       test_nm_dep_linux, 90],
-+  ['test-address-fake',  'test-address.c',    test_nm_dep_fake,  30],
-+  ['test-address-linux', 'test-address.c',    test_nm_dep_linux, 30],
-+  ['test-general',       'test-general.c',    test_nm_dep,       30],
-+  ['test-nmp-object',    'test-nmp-object.c', test_nm_dep,       30],
-+  ['test-route-fake',    'test-route.c',      test_nm_dep_fake,  30],
-+  ['test-route-linux',   'test-route.c',      test_nm_dep_linux, 30],
-+  ['test-cleanup-fake',  'test-cleanup.c',    test_nm_dep_fake,  30],
-+  ['test-cleanup-linux', 'test-cleanup.c',    test_nm_dep_linux, 30],
- ]
- 
- foreach test_unit: test_units
-   exe = executable(
-     'platform-' + test_unit[0],
-     test_unit[1],
--    dependencies: test_nm_dep,
--    c_args: test_cflags_platform
-+    dependencies: test_unit[2],
-   )
- 
-   test(
-     'platform/' + test_unit[0],
-     test_script,
--    timeout: test_unit.length() > 2 ? test_unit[2] : 30,
-+    timeout: test_unit[3],
-     args: test_args + [exe.full_path()]
-   )
- endforeach
- 
- test = 'monitor'
- 
- executable(
-   test,
-   test + '.c',
-   dependencies: test_nm_dep,
--  c_args: test_cflags_platform
- )
--- 
-2.19.1
-

Copied: networkmanager/repos/extra-x86_64/0001-meson-Fix-platform-tests.patch (from rev 336995, networkmanager/trunk/0001-meson-Fix-platform-tests.patch)
===================================================================
--- 0001-meson-Fix-platform-tests.patch	                        (rev 0)
+++ 0001-meson-Fix-platform-tests.patch	2018-10-22 13:08:59 UTC (rev 336996)
@@ -0,0 +1,137 @@
+From a407e10a2646771cd649976aae03f2cc6111ff92 Mon Sep 17 00:00:00 2001
+Message-Id: <a407e10a2646771cd649976aae03f2cc6111ff92.1539968035.git.jan.steffens at gmail.com>
+From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
+Date: Fri, 19 Oct 2018 18:48:43 +0200
+Subject: [PATCH] meson: Fix platform tests
+
+All platform tests were run twice with the `linux` platform, instead of
+`fake` and `linux`, as expected.
+---
+ src/meson.build                | 13 ++++++++++---
+ src/ndisc/tests/meson.build    |  6 ++----
+ src/platform/tests/meson.build | 26 ++++++++++++--------------
+ 3 files changed, 24 insertions(+), 21 deletions(-)
+
+diff --git a/src/meson.build b/src/meson.build
+index f293f299b..d58fb4d1f 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -216,23 +216,30 @@ if enable_tests
+     test_cflags += ['-DREQUIRE_ROOT_TESTS=1']
+   endif
+ 
+-  platform = (host_machine.system().contains('linux') ? 'linux' : 'fake')
+-  test_cflags_platform = '-DSETUP=nm_' + platform + '_platform_setup'
+-
+   libnetwork_manager_test = static_library(
+     nm_name + 'Test',
+     sources: sources,
+     dependencies: deps,
+     c_args: cflags + test_cflags,
+     link_with: libnetwork_manager
+   )
+ 
+   test_nm_dep = declare_dependency(
+     dependencies: nm_dep,
+     compile_args: test_cflags,
+     link_with: libnetwork_manager_test
+   )
+ 
++  test_nm_dep_fake = declare_dependency(
++    dependencies: test_nm_dep,
++    compile_args: ['-DSETUP=nm_fake_platform_setup']
++  )
++
++  test_nm_dep_linux = declare_dependency(
++    dependencies: test_nm_dep,
++    compile_args: ['-DSETUP=nm_linux_platform_setup']
++  )
++
+   subdir('dnsmasq/tests')
+   subdir('ndisc/tests')
+   subdir('platform/tests')
+diff --git a/src/ndisc/tests/meson.build b/src/ndisc/tests/meson.build
+index 2f479c2d9..e0dc9aa6c 100644
+--- a/src/ndisc/tests/meson.build
++++ b/src/ndisc/tests/meson.build
+@@ -3,21 +3,19 @@ test_unit = 'test-ndisc-fake'
+ exe = executable(
+   test_unit,
+   test_unit + '.c',
+-  dependencies: test_nm_dep,
+-  c_args: test_cflags_platform
++  dependencies: test_nm_dep_fake,
+ )
+ 
+ test(
+   'ndisc/' + test_unit,
+   test_script,
+   args: test_args + [exe.full_path()]
+ )
+ 
+ test = 'test-ndisc-linux'
+ 
+ exe = executable(
+   test,
+   test + '.c',
+-  dependencies: test_nm_dep,
+-  c_args: test_cflags_platform
++  dependencies: test_nm_dep_linux,
+ )
+diff --git a/src/platform/tests/meson.build b/src/platform/tests/meson.build
+index 0571efacf..67582d776 100644
+--- a/src/platform/tests/meson.build
++++ b/src/platform/tests/meson.build
+@@ -1,37 +1,35 @@
+ test_units = [
+-  ['test-link-fake', 'test-link.c', 60],
+-  ['test-link-linux', 'test-link.c', 60],
+-  ['test-address-fake', 'test-address.c'],
+-  ['test-address-linux', 'test-address.c'],
+-  ['test-general', 'test-general.c'],
+-  ['test-nmp-object', 'test-nmp-object.c'],
+-  ['test-route-fake', 'test-route.c'],
+-  ['test-route-linux', 'test-route.c'],
+-  ['test-cleanup-fake', 'test-cleanup.c'],
+-  ['test-cleanup-linux', 'test-cleanup.c'],
++  ['test-link-fake',     'test-link.c',       test_nm_dep_fake,  30],
++  ['test-link-linux',    'test-link.c',       test_nm_dep_linux, 90],
++  ['test-address-fake',  'test-address.c',    test_nm_dep_fake,  30],
++  ['test-address-linux', 'test-address.c',    test_nm_dep_linux, 30],
++  ['test-general',       'test-general.c',    test_nm_dep,       30],
++  ['test-nmp-object',    'test-nmp-object.c', test_nm_dep,       30],
++  ['test-route-fake',    'test-route.c',      test_nm_dep_fake,  30],
++  ['test-route-linux',   'test-route.c',      test_nm_dep_linux, 30],
++  ['test-cleanup-fake',  'test-cleanup.c',    test_nm_dep_fake,  30],
++  ['test-cleanup-linux', 'test-cleanup.c',    test_nm_dep_linux, 30],
+ ]
+ 
+ foreach test_unit: test_units
+   exe = executable(
+     'platform-' + test_unit[0],
+     test_unit[1],
+-    dependencies: test_nm_dep,
+-    c_args: test_cflags_platform
++    dependencies: test_unit[2],
+   )
+ 
+   test(
+     'platform/' + test_unit[0],
+     test_script,
+-    timeout: test_unit.length() > 2 ? test_unit[2] : 30,
++    timeout: test_unit[3],
+     args: test_args + [exe.full_path()]
+   )
+ endforeach
+ 
+ test = 'monitor'
+ 
+ executable(
+   test,
+   test + '.c',
+   dependencies: test_nm_dep,
+-  c_args: test_cflags_platform
+ )
+-- 
+2.19.1
+

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2018-10-22 13:08:43 UTC (rev 336995)
+++ PKGBUILD	2018-10-22 13:08:59 UTC (rev 336996)
@@ -1,143 +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.2
-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=ef5ada1d1d53b04a468dc44838afb459f85e95e7  # tags/1.14.2^0
-source=("git+https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git#commit=$_commit"
-        0001-meson-Fix-platform-tests.patch)
-sha256sums=('SKIP'
-            'e993a727bb06494419071baea3c20fcc00aa2f9cf110d14f09f043be23952a1b')
-
-pkgver() {
-  cd NetworkManager
-  git describe | sed 's/-dev/dev/;s/-rc/rc/;s/-/+/g'
-}
-
-prepare() {
-  cd NetworkManager
-
-  # Meson fixes
-  git cherry-pick -n 1ff00d51e750610ec5a1a1736ccb5b75c8457f20
-  patch -Np1 -i ../0001-meson-Fix-platform-tests.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 336995, networkmanager/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2018-10-22 13:08:59 UTC (rev 336996)
@@ -0,0 +1,139 @@
+# 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+15+g3fc592219
+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=3fc592219e106fdbf98e9e994a4531d9d045d0da  # nm-1-14
+source=("git+https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git#commit=$_commit"
+        0001-meson-Fix-platform-tests.patch)
+sha256sums=('SKIP'
+            'e993a727bb06494419071baea3c20fcc00aa2f9cf110d14f09f043be23952a1b')
+
+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