[arch-commits] Commit in networkmanager-openvpn/trunk (2 files)

[Jan Steffens]

    Date: Friday, March 6, 2020 @ 21:27:45
  Author: heftig
Revision: 376871

1.8.12-1

Modified:
  networkmanager-openvpn/trunk/PKGBUILD
Deleted:
  networkmanager-openvpn/trunk/0001-build-disable-libnm-glib-support-by-default.patch

--------------------------------------------------------+
 0001-build-disable-libnm-glib-support-by-default.patch |   51 ---------------
 PKGBUILD                                               |   14 +---
 2 files changed, 4 insertions(+), 61 deletions(-)

Deleted: 0001-build-disable-libnm-glib-support-by-default.patch
===================================================================
--- 0001-build-disable-libnm-glib-support-by-default.patch	2020-03-06 15:38:17 UTC (rev 376870)
+++ 0001-build-disable-libnm-glib-support-by-default.patch	2020-03-06 21:27:45 UTC (rev 376871)
@@ -1,51 +0,0 @@
-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
-

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-03-06 15:38:17 UTC (rev 376870)
+++ PKGBUILD	2020-03-06 21:27:45 UTC (rev 376871)
@@ -2,7 +2,7 @@
 # Contributor: Ionut Biru <ibiru at archlinux.org>
 
 pkgname=networkmanager-openvpn
-pkgver=1.8.10
+pkgver=1.8.12
 pkgrel=1
 pkgdesc="NetworkManager VPN plugin for OpenVPN"
 url="https://wiki.gnome.org/Projects/NetworkManager"
@@ -11,11 +11,9 @@
 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')
+_commit=606257bb8ac1f8207ceed93d99e3af651d8d4cc3  # tags/1.8.12^0
+source=("git+https://gitlab.gnome.org/GNOME/NetworkManager-openvpn.git#commit=$_commit")
+sha256sums=('SKIP')
 
 pkgver() {
   cd NetworkManager-openvpn
@@ -24,10 +22,6 @@
 
 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
 }