migrate to github.com/NetworkManager/NetworkManager-ssh, gtk4 port

2 files changed, 76 insertions, 39 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1240322b18e1..162885e1c386 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,32 @@
 pkgbase = networkmanager-ssh-git
-	pkgdesc = SSH VPN support for NetworkManager
-	pkgver = r233.fe3dc5d
+	pkgdesc = SSH VPN support for NetworkManager - git version, gtk4 port
+	pkgver = r270.d7996e7
 	pkgrel = 1
-	url = https://github.com/danfruehauf/NetworkManager-ssh
-	arch = any
+	url = https://github.com/NetworkManager/NetworkManager-ssh/tree/lr/gtk-4.0
+	arch = x86_64
 	license = GPL2
 	makedepends = git
-	makedepends = make
-	makedepends = gcc
-	makedepends = autoconf
 	makedepends = intltool
-	depends = networkmanager>=1.1.0
-	depends = libnm-glib>=1.1.0
+	depends = at-spi2-core
+	depends = cairo
+	depends = gdk-pixbuf2
+	depends = glib2
+	depends = glibc
+	depends = graphene
+	depends = gtk3
+	depends = gtk4
+	depends = harfbuzz
+	depends = libnm
+	depends = libnma
+	depends = libnma-gtk4
+	depends = libsecret
+	depends = networkmanager
 	depends = nm-connection-editor
+	depends = pango
+	depends = zlib
 	provides = networkmanager-ssh
-	source = networkmanager-ssh-git::git://github.com/danfruehauf/NetworkManager-ssh.git
-	md5sums = SKIP
+	conflicts = networkmanager-ssh
+	source = networkmanager-ssh::git+https://github.com/NetworkManager/NetworkManager-ssh.git#branch=lr/gtk-4.0
+	b2sums = SKIP
 
 pkgname = networkmanager-ssh-git
-
diff --git a/PKGBUILD b/PKGBUILD
index b0eeda006a21..b4e7d10446dd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,36 +1,56 @@
-# Maintainer: Tom Nguyen <tom81094@gmail.com>
+# Contributor: Tom Nguyen <tom81094@gmail.com>
 # Contributor: lyoko
 
-pkgname=networkmanager-ssh-git
-pkgver=r233.fe3dc5d
+_pkgbase='networkmanager-ssh'
+pkgname="${_pkgbase}-git"
+pkgver=r270.d7996e7
 pkgrel=1
-pkgdesc="SSH VPN support for NetworkManager"
-arch=('any')
-url="https://github.com/danfruehauf/NetworkManager-ssh"
+pkgdesc="SSH VPN support for NetworkManager - git version, gtk4 port"
+arch=('x86_64')
+_repourl='https://github.com/NetworkManager/NetworkManager-ssh'
+_repobranch='lr/gtk-4.0'
+url="${_repourl}/tree/${_repobranch}"
 license=('GPL2')
-depends=('networkmanager>=1.1.0'
-	 'libnm-glib>=1.1.0'
-	 'nm-connection-editor')
-optdepends=()
-options=()
-makedepends=('git' 'make' 'gcc' 'autoconf' 'intltool')
-provides=('networkmanager-ssh')
-
-source=($pkgname::'git://github.com/danfruehauf/NetworkManager-ssh.git')
-md5sums=('SKIP')
+depends=(
+  'at-spi2-core'
+  'cairo'
+  'gdk-pixbuf2'
+  'glib2'
+  'glibc'
+  'graphene'
+  'gtk3'      # still needed by auth_dialog; might become superfluous later
+  'gtk4'
+  'harfbuzz'
+  'libnm'
+  'libnma'    # still required by some components; might become superfluous later
+  'libnma-gtk4'
+  'libsecret'
+  'networkmanager'
+  'nm-connection-editor'
+  'pango'
+  'zlib'
+)
+makedepends=(
+  'git'
+  'intltool'
+)
+provides=("${_pkgbase}")
+conflicts=("${_pkgbase}")
+source=("${_pkgbase}::git+${_repourl}.git#branch=${_repobranch}")
+b2sums=('SKIP')
 
 pkgver() {
-  cd "$pkgname"
+  cd "${_pkgbase}"
   printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
-build() {
-  cd "$pkgname"
-
-  if [ ! -f configure ]; then
-    autoreconf -fvi
-  fi
-
+prepare() {
+  cd "${_pkgbase}"
+  echo 'executing autoreconf...'
+  autoreconf -fvi
+  echo 'autoreconf done.'
+  echo
+  echo 'executing configure...'
   ./configure \
     --prefix=/usr \
     --sysconfdir=/etc \
@@ -38,12 +58,18 @@ build() {
     --libexecdir=/usr/lib/NetworkManager \
     --disable-static \
     --disable-dependency-tracking \
-    --enable-more-warnings=no
+    --enable-more-warnings=no \
+    --with-gtk4 \
+    --without-libnm-glib
+  echo 'configure done.'
+}
 
-  make ${MAKEFLAGS}
+build() {
+  cd "${_pkgbase}"
+  make
 }
 
 package() {
-  cd "$pkgname"
+  cd "${_pkgbase}"
   make DESTDIR="$pkgdir/" INSTALL="install -p" CP="cp -p" install
 }