[arch-commits] Commit in lib32-libnm-glib/trunk (PKGBUILD)

2019-12-22 Thread Jan Steffens via arch-commits
Date: Sunday, December 22, 2019 @ 17:14:11
  Author: heftig
Revision: 538857

1.18.5dev+12+ga8746f48ca-1: reduce makedeps; sync with new libnm-glib package

Modified:
  lib32-libnm-glib/trunk/PKGBUILD

--+
 PKGBUILD |  117 -
 1 file changed, 62 insertions(+), 55 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-12-22 17:14:08 UTC (rev 538856)
+++ PKGBUILD2019-12-22 17:14:11 UTC (rev 538857)
@@ -7,8 +7,8 @@
 # Contributor: Valentine Sinitsyn 
 
 pkgname=lib32-libnm-glib
-pkgver=1.18.2
-pkgrel=3
+pkgver=1.18.5dev+12+ga8746f48ca
+pkgrel=1
 pkgdesc='NetworkManager client library (legacy)'
 arch=(x86_64)
 url=https://wiki.gnome.org/Projects/NetworkManager
@@ -28,79 +28,86 @@
   libnm-glib
 )
 makedepends=(
-  dhclient
   git
-  gtk-doc
   intltool
-  iptables
-  iwd
-  lib32-curl
-  lib32-jansson
-  lib32-libmm-glib
   lib32-libndp
-  lib32-libnewt
-  lib32-libnl
-  lib32-libpsl
-  lib32-libsoup
-  lib32-polkit
+  libxslt
   meson
-  modemmanager
-  perl-yaml
-  python-gobject
-  systemd
-  wpa_supplicant
 )
-source=(git+https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git#tag=822216ae3691e44e5af6c17e1d941a56257dad10)
-sha256sums=(SKIP)
+_commit=a8746f48ca088b4cd3799e540b8606df1f1e8522  # nm-1-18
+source=("git+https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git#commit=$_commit;)
+sha256sums=('SKIP')
 
 pkgver() {
   cd NetworkManager
-
-  git describe --tags
+  git describe | sed 's/-dev/dev/;s/-rc/rc/;s/-/+/g'
 }
 
 prepare() {
-  sed "s/'lib'/'lib32'/g" -i NetworkManager/meson.build
+  cd NetworkManager
 }
 
 build() {
   export CC='gcc -m32'
-  export PKG_CONFIG_PATH=/usr/lib32/pkgconfig
+  export PKG_CONFIG=i686-pc-linux-gnu-pkg-config
 
-  arch-meson NetworkManager build \
---libdir=lib32 \
--D config_plugins_default=keyfile,ibft \
--D dbus_conf_dir=/usr/share/dbus-1/system.d \
--D dist_version="${pkgver}-${pkgrel}" \
--D docs=false \
--D ebpf=true \
--D ibft=true \
--D introspection=false \
--D iwd=true \
--D libaudit=no \
--D libnm_glib=true \
--D modify_system=true \
--D more_asserts=no \
--D more_logging=false \
--D nmcli=false \
--D nmtui=false \
--D polkit_agent=true \
--D qt=false \
--D selinux=false \
--D session_tracking_consolekit=false \
--D suspend_resume=systemd \
--D tests=no \
+  local meson_args=(
+--libdir=lib32
+
+# system paths
+-D dbus_conf_dir=/usr/share/dbus-1/system.d
+
+# platform
+-D dist_version="$pkgver-$pkgrel"
+-D session_tracking_consolekit=false
+-D suspend_resume=systemd
+-D polkit=false
+-D modify_system=true
+-D polkit_agent=false
+-D selinux=false
+-D libaudit=no
+
+# features
+-D ppp=false
+-D modem_manager=false
+-D concheck=false
+-D ovs=false
+-D libnm_glib=true
+-D nmcli=false
+-D nmtui=false
+-D ebpf=true
+
+# configuration plugins
+-D config_plugins_default=keyfile
+
+# miscellaneous
+-D introspection=false
 -D vapi=false
+-D docs=false
+-D tests=no
+-D more_asserts=no
+-D more_logging=false
+-D libpsl=false
+-D json_validation=false
+-D qt=false
+  )
+
+  arch-meson NetworkManager build "${meson_args[@]}"
   ninja -C build
 }
 
 package() {
-  install -dm 755 "${pkgdir}"/usr/lib32/pkgconfig
-  cp -dr --no-preserve=ownership build/libnm-glib/libnm*.so* 
"${pkgdir}"/usr/lib32/
-  cp -dr --no-preserve=ownership build/libnm-util/libnm*.so* 
"${pkgdir}"/usr/lib32/
-  cp -dr --no-preserve=ownership build/meson-private/libnm-glib*.pc 
"${pkgdir}"/usr/lib32/pkgconfig/
-  cp -dr --no-preserve=ownership build/meson-private/libnm-util.pc 
"${pkgdir}"/usr/lib32/pkgconfig/
-  cp -dr --no-preserve=ownership build/meson-private/NetworkManager.pc 
"${pkgdir}"/usr/lib32/pkgconfig/
+  DESTDIR="$PWD/install" meson install -C build
+
+  local src dst
+  for src in \
+install/usr/lib32/libnm-* \
+install/usr/lib32/pkgconfig/{NetworkManager,libnm-}*
+  do
+dst="$pkgdir/${src#install/}"
+mkdir -p "${dst%/*}"
+mv "$src" "$dst"
+  done
 }
 
-# vim: ts=2 sw=2 et:
+# vim:set sw=2 et:


[arch-commits] Commit in lib32-libnm-glib/trunk (PKGBUILD)

2019-09-12 Thread Maxime Gauduin via arch-commits
Date: Thursday, September 12, 2019 @ 18:38:57
  Author: alucryd
Revision: 509749

fix libexecdir: lib32-libnm-glib 1.18.2-3

Modified:
  lib32-libnm-glib/trunk/PKGBUILD

--+
 PKGBUILD |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-09-12 18:36:51 UTC (rev 509748)
+++ PKGBUILD2019-09-12 18:38:57 UTC (rev 509749)
@@ -8,7 +8,7 @@
 
 pkgname=lib32-libnm-glib
 pkgver=1.18.2
-pkgrel=2
+pkgrel=3
 pkgdesc='NetworkManager client library (legacy)'
 arch=(x86_64)
 url=https://wiki.gnome.org/Projects/NetworkManager
@@ -69,7 +69,6 @@
 
   arch-meson NetworkManager build \
 --libdir=lib32 \
---libexecdir=lib32 \
 -D config_plugins_default=keyfile,ibft \
 -D dbus_conf_dir=/usr/share/dbus-1/system.d \
 -D dist_version="${pkgver}-${pkgrel}" \


[arch-commits] Commit in lib32-libnm-glib/trunk (PKGBUILD)

2017-01-06 Thread Maxime Gauduin
Date: Friday, January 6, 2017 @ 21:20:51
  Author: alucryd
Revision: 205824

upgpkg: lib32-libnm-glib 1.4.4-1

Modified:
  lib32-libnm-glib/trunk/PKGBUILD

--+
 PKGBUILD |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-01-06 21:05:14 UTC (rev 205823)
+++ PKGBUILD2017-01-06 21:20:51 UTC (rev 205824)
@@ -8,11 +8,11 @@
 # Contributor: Valentine Sinitsyn 
 
 pkgname=lib32-libnm-glib
-pkgver=1.4.0
-pkgrel=2
+pkgver=1.4.4
+pkgrel=1
 pkgdesc='NetworkManager library'
 arch=('x86_64')
-url='http://www.gnome.org/projects/NetworkManager/'
+url='https://wiki.gnome.org/Projects/NetworkManager'
 license=('GPL2' 'LGPL2.1')
 depends=('lib32-dbus-glib' 'lib32-glib2' 'lib32-glibc' 'lib32-jansson'
  'lib32-dbus' 'lib32-libgudev' 'lib32-nspr' 'lib32-nss'
@@ -23,8 +23,8 @@
  'lib32-libsoup' 'lib32-libteam' 'lib32-polkit' 'modemmanager'
  'perl-yaml' 'ppp=2.4.7' 'python-gobject' 'rp-pppoe' 'systemd'
  'vala' 'wpa_supplicant')
-_commit='93b4119a81af57c274ac58210a8776afecf2a252'
-source=("git://anongit.freedesktop.org/NetworkManager/NetworkManager#commit=${_commit}")
+_commit='3c70a03cf5be420afaaf44f3a0bab5d00cc4e993'
+source=("git+https://anongit.freedesktop.org/git/NetworkManager/NetworkManager#commit=${_commit};)
 sha256sums=('SKIP')
 
 pkgver() {


[arch-commits] Commit in lib32-libnm-glib/trunk (PKGBUILD)

2016-10-23 Thread Laurent Carlier
Date: Sunday, October 23, 2016 @ 12:13:33
  Author: lcarlier
Revision: 193043

upgpkg: lib32-libnm-glib 1.4.0-2

update dependency from lib32-libdbus to lib32-dbus

Modified:
  lib32-libnm-glib/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-10-23 12:08:12 UTC (rev 193042)
+++ PKGBUILD2016-10-23 12:13:33 UTC (rev 193043)
@@ -9,13 +9,13 @@
 
 pkgname=lib32-libnm-glib
 pkgver=1.4.0
-pkgrel=1
+pkgrel=2
 pkgdesc='NetworkManager library'
 arch=('x86_64')
 url='http://www.gnome.org/projects/NetworkManager/'
 license=('GPL2' 'LGPL2.1')
 depends=('lib32-dbus-glib' 'lib32-glib2' 'lib32-glibc' 'lib32-jansson'
- 'lib32-libdbus' 'lib32-libgudev' 'lib32-nspr' 'lib32-nss'
+ 'lib32-dbus' 'lib32-libgudev' 'lib32-nspr' 'lib32-nss'
  'lib32-util-linux'
  'libnm-glib')
 makedepends=('dhclient' 'gcc-multilib' 'git' 'gtk-doc' 'intltool' 'iproute2'


[arch-commits] Commit in lib32-libnm-glib/trunk (PKGBUILD)

2016-08-29 Thread Maxime Gauduin
Date: Monday, August 29, 2016 @ 14:50:14
  Author: alucryd
Revision: 187921

upgpkg: lib32-libnm-glib 1.4.0-1

Modified:
  lib32-libnm-glib/trunk/PKGBUILD

--+
 PKGBUILD |9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-08-29 13:54:03 UTC (rev 187920)
+++ PKGBUILD2016-08-29 14:50:14 UTC (rev 187921)
@@ -8,14 +8,15 @@
 # Contributor: Valentine Sinitsyn 
 
 pkgname=lib32-libnm-glib
-pkgver=1.2.5dev+5+g99e34d7
+pkgver=1.4.0
 pkgrel=1
 pkgdesc='NetworkManager library'
 arch=('x86_64')
 url='http://www.gnome.org/projects/NetworkManager/'
 license=('GPL2' 'LGPL2.1')
-depends=('lib32-dbus-glib' 'lib32-glib2' 'lib32-glibc' 'lib32-libdbus'
- 'lib32-libgudev' 'lib32-nspr' 'lib32-nss' 'lib32-util-linux'
+depends=('lib32-dbus-glib' 'lib32-glib2' 'lib32-glibc' 'lib32-jansson'
+ 'lib32-libdbus' 'lib32-libgudev' 'lib32-nspr' 'lib32-nss'
+ 'lib32-util-linux'
  'libnm-glib')
 makedepends=('dhclient' 'gcc-multilib' 'git' 'gtk-doc' 'intltool' 'iproute2'
  'iptables' 'lib32-libmm-glib' 'lib32-libndp' 'lib32-libnewt'
@@ -22,7 +23,7 @@
  'lib32-libsoup' 'lib32-libteam' 'lib32-polkit' 'modemmanager'
  'perl-yaml' 'ppp=2.4.7' 'python-gobject' 'rp-pppoe' 'systemd'
  'vala' 'wpa_supplicant')
-_commit=99e34d757967efdee5945ee3467fcfc380767699
+_commit='93b4119a81af57c274ac58210a8776afecf2a252'
 
source=("git://anongit.freedesktop.org/NetworkManager/NetworkManager#commit=${_commit}")
 sha256sums=('SKIP')