[arch-commits] Commit in networkmanager-fortisslvpn/repos/community-x86_64 (3 files)

[Jan Steffens]

    Date: Monday, April 4, 2022 @ 18:34:10
  Author: heftig
Revision: 1181369

archrelease: copy trunk to community-x86_64

Added:
  networkmanager-fortisslvpn/repos/community-x86_64/PKGBUILD
    (from rev 1181368, networkmanager-fortisslvpn/trunk/PKGBUILD)
Deleted:
  networkmanager-fortisslvpn/repos/community-x86_64/PKGBUILD
  networkmanager-fortisslvpn/repos/community-x86_64/gtk4-optional.diff

--------------------+
 PKGBUILD           |   94 ++++++++++++++++++++++++---------------------------
 gtk4-optional.diff |   19 ----------
 2 files changed, 45 insertions(+), 68 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2022-04-04 18:33:33 UTC (rev 1181368)
+++ PKGBUILD	2022-04-04 18:34:10 UTC (rev 1181369)
@@ -1,49 +0,0 @@
-# Maintainer: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
-
-pkgname=networkmanager-fortisslvpn
-pkgver=1.4.0
-pkgrel=1
-pkgdesc="NetworkManager VPN plugin for Fortinet SSLVPN"
-url="https://wiki.gnome.org/Projects/NetworkManager"
-arch=(x86_64)
-license=(GPL)
-_pppver=2.4.9
-depends=(libnm libsecret "ppp=$_pppver" openfortivpn)
-makedepends=(libnma intltool python git)
-optdepends=('libnma: GUI support')
-_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')
-
-pkgver() {
-  cd NetworkManager-fortisslvpn
-  git describe --tags | sed 's/-dev/dev/;s/[^-]*-g/r&/;s/-/+/g'
-}
-
-prepare() {
-  cd NetworkManager-fortisslvpn
-
-  # Fix built without GTK 4
-  git apply -3 ../gtk4-optional.diff
-
-  intltoolize --automake --copy
-  autoreconf -fvi
-}
-
-build() {
-  cd NetworkManager-fortisslvpn
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-    --libexecdir=/usr/lib --disable-static \
-    --with-pppd-plugin-dir=/usr/lib/pppd/$_pppver
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-  make
-}
-
-package() {
-  cd NetworkManager-fortisslvpn
-  make DESTDIR="$pkgdir" install dbusservicedir=/usr/share/dbus-1/system.d
-}
-
-# vim:set sw=2 et:

Copied: networkmanager-fortisslvpn/repos/community-x86_64/PKGBUILD (from rev 1181368, networkmanager-fortisslvpn/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2022-04-04 18:34:10 UTC (rev 1181369)
@@ -0,0 +1,45 @@
+# Maintainer: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
+
+pkgname=networkmanager-fortisslvpn
+pkgver=1.4.0
+pkgrel=2
+pkgdesc="NetworkManager VPN plugin for Fortinet SSLVPN"
+url="https://wiki.gnome.org/Projects/NetworkManager"
+arch=(x86_64)
+license=(GPL)
+_pppver=2.4.9
+depends=(libnm libsecret "ppp=$_pppver" openfortivpn)
+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")
+sha256sums=('SKIP')
+
+pkgver() {
+  cd NetworkManager-fortisslvpn
+  git describe --tags | sed 's/-dev/dev/;s/[^-]*-g/r&/;s/-/+/g'
+}
+
+prepare() {
+  cd NetworkManager-fortisslvpn
+  intltoolize --automake --copy
+  autoreconf -fvi
+}
+
+build() {
+  cd NetworkManager-fortisslvpn
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+    --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
+}
+
+package() {
+  cd NetworkManager-fortisslvpn
+  make DESTDIR="$pkgdir" install dbusservicedir=/usr/share/dbus-1/system.d
+}
+
+# vim:set sw=2 et:

Deleted: gtk4-optional.diff
===================================================================
--- gtk4-optional.diff	2022-04-04 18:33:33 UTC (rev 1181368)
+++ gtk4-optional.diff	2022-04-04 18:34:10 UTC (rev 1181369)
@@ -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 \