[arch-commits] Commit in networkmanager-openvpn/repos/extra-x86_64 (3 files)
Jan Steffens
heftig at archlinux.org
Fri Feb 8 16:29:31 UTC 2019
Date: Friday, February 8, 2019 @ 16:29:30
Author: heftig
Revision: 345659
archrelease: copy trunk to extra-x86_64
Added:
networkmanager-openvpn/repos/extra-x86_64/0001-build-disable-libnm-glib-support-by-default.patch
(from rev 345658, networkmanager-openvpn/trunk/0001-build-disable-libnm-glib-support-by-default.patch)
networkmanager-openvpn/repos/extra-x86_64/PKGBUILD
(from rev 345658, networkmanager-openvpn/trunk/PKGBUILD)
Deleted:
networkmanager-openvpn/repos/extra-x86_64/PKGBUILD
--------------------------------------------------------+
0001-build-disable-libnm-glib-support-by-default.patch | 51 +++++++
PKGBUILD | 98 +++++++--------
2 files changed, 101 insertions(+), 48 deletions(-)
Copied: networkmanager-openvpn/repos/extra-x86_64/0001-build-disable-libnm-glib-support-by-default.patch (from rev 345658, networkmanager-openvpn/trunk/0001-build-disable-libnm-glib-support-by-default.patch)
===================================================================
--- 0001-build-disable-libnm-glib-support-by-default.patch (rev 0)
+++ 0001-build-disable-libnm-glib-support-by-default.patch 2019-02-08 16:29:30 UTC (rev 345659)
@@ -0,0 +1,51 @@
+From 52aad4911ffad04cf8274b5574124a4d5470c7fa Mon Sep 17 00:00:00 2001
+Message-Id: <52aad4911ffad04cf8274b5574124a4d5470c7fa.1549642989.git.jan.steffens at gmail.com>
+From: Lubomir Rintel <lkundrak at v3.sk>
+Date: Wed, 17 Oct 2018 15:21:30 +0200
+Subject: [PATCH] build: disable libnm-glib support by default
+
+By now nobody should be using this. Keep the code around for a little
+longer just in case anybody still uses this.
+
+The libnm-glib support also serves as an example how do we build two
+different versions of the properties plugin. We'll soon be in a similar
+situation with Gtk 4.0. (sigh.) Just don't drop it yet.
+
+Conflicts:
+ NEWS
+---
+ configure.ac | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 11ff5d0..eaf015b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -75,20 +75,20 @@ dnl
+ dnl GNOME support
+ dnl
+ AC_ARG_WITH(gnome, AS_HELP_STRING([--without-gnome], [Build NetworkManager-openvpn without GNOME support, e.g. vpn service only]), [], [with_gnome_specified=no])
+-AC_ARG_WITH(libnm-glib, AS_HELP_STRING([--without-libnm-glib], [Build NetworkManager-openvpn without libnm-glib comatibility]), [], [with_libnm_glib_specified=no])
++AC_ARG_WITH(libnm-glib, AS_HELP_STRING([--with-libnm-glib], [Build NetworkManager-openvpn with libnm-glib comatibility (depreacted)]), [], [with_libnm_glib_specified=no])
+ if test "$with_libnm_glib_specified" != no -a "$with_libnm_glib" != no; then
+ if test "$with_gnome_specified" != no -a "$with_gnome" == no; then
+ AC_MSG_ERROR(Building --with-libnm-glib conflicts with --without-gnome)
+ fi
+ fi
+ if test "$with_gnome" != no; then
+ with_gnome=yes
+ fi
+ if test "$with_libnm_glib_specified" == no; then
+- with_libnm_glib="$with_gnome"
++ with_libnm_glib=no
+ fi
+-if test "$with_libnm_glib" != no; then
+- with_libnm_glib=yes
++if test "$with_libnm_glib" != yes; then
++ with_libnm_glib=no
+ fi
+ AM_CONDITIONAL(WITH_GNOME, test "$with_gnome" != no)
+ AM_CONDITIONAL(WITH_LIBNM_GLIB, test "$with_libnm_glib" != no)
+--
+2.20.1
+
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2019-02-08 16:29:15 UTC (rev 345658)
+++ PKGBUILD 2019-02-08 16:29:30 UTC (rev 345659)
@@ -1,48 +0,0 @@
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-# Contributor: Ionut Biru <ibiru at archlinux.org>
-
-pkgname=networkmanager-openvpn
-pkgver=1.8.9dev+16+g33c941d
-pkgrel=1
-pkgdesc="NetworkManager VPN plugin for OpenVPN"
-url="https://wiki.gnome.org/Projects/NetworkManager"
-arch=(x86_64)
-license=(GPL)
-depends=(libnm libsecret openvpn)
-makedepends=(libnma intltool python git)
-optdepends=('libnma: GUI support')
-_commit=33c941d21002e279d4ac36a641c16a37d114c759 # master
-source=("git+https://gitlab.gnome.org/GNOME/NetworkManager-openvpn.git#commit=$_commit")
-sha256sums=('SKIP')
-
-pkgver() {
- cd NetworkManager-openvpn
- git describe --tags | sed 's/-dev/dev/;s/-/+/g'
-}
-
-prepare() {
- cd NetworkManager-openvpn
-
- # Don't build against libnm-glib/gtk
- git cherry-pick -n b423aa8214b2ef6b97e419d0b0e3e5e68f4b2e5b
-
- intltoolize --automake --copy
- autoreconf -fvi
-}
-
-build() {
- cd NetworkManager-openvpn
- ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
- --libexecdir=/usr/lib --disable-static
- sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
- make
-}
-
-package() {
- cd NetworkManager-openvpn
- make DESTDIR="$pkgdir" install dbusservicedir=/usr/share/dbus-1/system.d
- echo 'u nm-openvpn - "NetworkManager OpenVPN"' |
- install -Dm644 /dev/stdin "$pkgdir/usr/lib/sysusers.d/$pkgname.conf"
-}
-
-# vim:set sw=2 et:
Copied: networkmanager-openvpn/repos/extra-x86_64/PKGBUILD (from rev 345658, networkmanager-openvpn/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2019-02-08 16:29:30 UTC (rev 345659)
@@ -0,0 +1,50 @@
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Contributor: Ionut Biru <ibiru at archlinux.org>
+
+pkgname=networkmanager-openvpn
+pkgver=1.8.10
+pkgrel=1
+pkgdesc="NetworkManager VPN plugin for OpenVPN"
+url="https://wiki.gnome.org/Projects/NetworkManager"
+arch=(x86_64)
+license=(GPL)
+depends=(libnm libsecret openvpn)
+makedepends=(libnma intltool python git)
+optdepends=('libnma: GUI support')
+_commit=ac8a34354ecede5c68812a1c269d712da93afdb1 # tags/1.8.10^0
+source=("git+https://gitlab.gnome.org/GNOME/NetworkManager-openvpn.git#commit=$_commit"
+ 0001-build-disable-libnm-glib-support-by-default.patch)
+sha256sums=('SKIP'
+ '0c574c0432948d0b66a2cdf22dab9657618fe90a44e74e681e6fd8a57c127773')
+
+pkgver() {
+ cd NetworkManager-openvpn
+ git describe --tags | sed 's/-dev/dev/;s/-/+/g'
+}
+
+prepare() {
+ cd NetworkManager-openvpn
+
+ # Don't build against libnm-glib/gtk
+ patch -Np1 -i ../0001-build-disable-libnm-glib-support-by-default.patch
+
+ intltoolize --automake --copy
+ autoreconf -fvi
+}
+
+build() {
+ cd NetworkManager-openvpn
+ ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+ --libexecdir=/usr/lib --disable-static
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+ make
+}
+
+package() {
+ cd NetworkManager-openvpn
+ make DESTDIR="$pkgdir" install dbusservicedir=/usr/share/dbus-1/system.d
+ echo 'u nm-openvpn - "NetworkManager OpenVPN"' |
+ install -Dm644 /dev/stdin "$pkgdir/usr/lib/sysusers.d/$pkgname.conf"
+}
+
+# vim:set sw=2 et:
More information about the arch-commits
mailing list