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

[Jan Steffens]

    Date: Monday, April 4, 2022 @ 18:33:33
  Author: heftig
Revision: 1181368

1.4.0-2: support GTK 4

Modified:
  networkmanager-fortisslvpn/trunk/PKGBUILD
Deleted:
  networkmanager-fortisslvpn/trunk/gtk4-optional.diff

--------------------+
 PKGBUILD           |   20 ++++++++------------
 gtk4-optional.diff |   19 -------------------
 2 files changed, 8 insertions(+), 31 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-04-04 18:30:43 UTC (rev 1181367)
+++ PKGBUILD	2022-04-04 18:33:33 UTC (rev 1181368)
@@ -2,7 +2,7 @@
 
 pkgname=networkmanager-fortisslvpn
 pkgver=1.4.0
-pkgrel=1
+pkgrel=2
 pkgdesc="NetworkManager VPN plugin for Fortinet SSLVPN"
 url="https://wiki.gnome.org/Projects/NetworkManager"
 arch=(x86_64)
@@ -9,13 +9,13 @@
 license=(GPL)
 _pppver=2.4.9
 depends=(libnm libsecret "ppp=$_pppver" openfortivpn)
-makedepends=(libnma intltool python git)
-optdepends=('libnma: GUI support')
+makedepends=(libnma libnma-gtk4 intltool python git)
+optdepends=('libnma: GUI support (GTK 3)'
+            'libnma-gtk4: GUI support (GTK 4)')
+options=(debug)
 _commit=308987d45faee919e54547eb7ff0120c32c5a84e  # tags/1.4.0^0
-source=("git+https://gitlab.gnome.org/GNOME/NetworkManager-fortisslvpn.git#commit=$_commit"
-        gtk4-optional.diff)
-sha256sums=('SKIP'
-            '576ceb6b9471bc54c75b81ea25650e1caad780af769e6497b219c7bfd8a8e98b')
+source=("git+https://gitlab.gnome.org/GNOME/NetworkManager-fortisslvpn.git#commit=$_commit")
+sha256sums=('SKIP')
 
 pkgver() {
   cd NetworkManager-fortisslvpn
@@ -24,10 +24,6 @@
 
 prepare() {
   cd NetworkManager-fortisslvpn
-
-  # Fix build without GTK 4
-  git apply -3 ../gtk4-optional.diff
-
   intltoolize --automake --copy
   autoreconf -fvi
 }
@@ -35,7 +31,7 @@
 build() {
   cd NetworkManager-fortisslvpn
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-    --libexecdir=/usr/lib --disable-static \
+    --libexecdir=/usr/lib --disable-static --with-gtk4 \
     --with-pppd-plugin-dir=/usr/lib/pppd/$_pppver
   sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
   make

Deleted: gtk4-optional.diff
===================================================================
--- gtk4-optional.diff	2022-04-04 18:30:43 UTC (rev 1181367)
+++ gtk4-optional.diff	2022-04-04 18:33:33 UTC (rev 1181368)
@@ -1,19 +0,0 @@
-diff --git i/Makefile.am w/Makefile.am
-index f6bb29d..243da1f 100644
---- i/Makefile.am
-+++ w/Makefile.am
-@@ -174,10 +174,13 @@ properties_cppflags = \
- 	$(GLIB_CFLAGS)
- 
- BUILT_SOURCES += \
--	gtk4/resources.c \
- 	properties/resources.c \
- 	properties/resources.h
- 
-+if WITH_GTK4
-+BUILT_SOURCES += gtk4/resources.c
-+endif
-+
- CLEANFILES += \
- 	gtk4/nm-fortisslvpn-dialog.ui \
- 	gtk4/resources.c \