From 5624b373ecb0f22014642668d332e9eba18bf3bb Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Thu, 7 Jan 2021 15:10:48 +0100
Subject: [PATCH] git subrepo pull (merge) spnavcfg

subrepo:
  subdir:   "spnavcfg"
  merged:   "cfcd299"
upstream:
  origin:   "https://aur.archlinux.org/spnavcfg"
  branch:   "master"
  commit:   "ee823f9"
git-subrepo:
  version:  "0.4.3"
  origin:   "???"
  commit:   "???"
---
 spnavcfg/.SRCINFO         | 12 +++++++-----
 spnavcfg/.gitrepo         |  4 ++--
 spnavcfg/Makefile.in.diff | 11 +++++++++++
 spnavcfg/PKGBUILD         | 14 ++++++++------
 4 files changed, 28 insertions(+), 13 deletions(-)
 create mode 100644 spnavcfg/Makefile.in.diff

diff --git a/spnavcfg/.SRCINFO b/spnavcfg/.SRCINFO
index 8467d86..eba08e7 100644
--- a/spnavcfg/.SRCINFO
+++ b/spnavcfg/.SRCINFO
@@ -1,8 +1,8 @@
 pkgbase = spnavcfg
 	pkgdesc = The spacenav project provides a free, compatible alternative, to the proprietary 3Dconnexion device driver and SDK, for their 3D input devices (called 'space navigator', 'space pilot', 'space traveller', etc).
-	pkgver = 0.3
-	pkgrel = 2
-	url = http://spacenav.sourceforge.net/
+	pkgver = 0.3.1
+	pkgrel = 3
+	url = https://github.com/FreeSpacenav/spnavcfg
 	arch = i686
 	arch = x86_64
 	license = GPL
@@ -10,8 +10,10 @@ pkgbase = spnavcfg
 	makedepends = make
 	depends = gtk2
 	provides = spnavcfg
-	source = http://downloads.sourceforge.net/spacenav/spnavcfg-0.3.tar.gz
-	md5sums = ac4ac49b07c4a4dbfa6ba1cd0d357273
+	source = https://github.com/FreeSpacenav/spnavcfg/releases/download/v0.3.1/spnavcfg-0.3.1.tar.gz
+	source = Makefile.in.diff
+	md5sums = bf5bda8e4fd3fa3e45fe47cd26394fae
+	md5sums = b85402ad686e3ef10446c192166c3a0a
 
 pkgname = spnavcfg
 
diff --git a/spnavcfg/.gitrepo b/spnavcfg/.gitrepo
index d45f5d4..e253083 100644
--- a/spnavcfg/.gitrepo
+++ b/spnavcfg/.gitrepo
@@ -6,7 +6,7 @@
 [subrepo]
 	remote = https://aur.archlinux.org/spnavcfg
 	branch = master
-	commit = e8d31fafbd31df23c4408f7865c47d65816fd233
+	commit = ee823f9e6b665217bc9ae8801b834744cd215d49
 	parent = d5ba18ab24ef9c499c31289f363404099492740c
 	method = merge
-	cmdver = 0.4.1
+	cmdver = 0.4.3
diff --git a/spnavcfg/Makefile.in.diff b/spnavcfg/Makefile.in.diff
new file mode 100644
index 0000000..83d8aca
--- /dev/null
+++ b/spnavcfg/Makefile.in.diff
@@ -0,0 +1,11 @@
+--- Makefile.in	2021-01-06 23:26:24.592552843 +0100
++++ Makefile.in	2021-01-06 23:26:30.342582189 +0100
+@@ -39,7 +39,7 @@
+ 		destdir=$(DESTDIR)$(PREFIX)/share/icons/hicolor/$${i}x$${i}/apps; \
+ 		mkdir -p $$destdir; \
+ 		rm -f $$destdir/spnavcfg-$${i}x$${i}.png; \
+-		ln -s $(DESTDIR)$(PREFIX)/share/pixmaps/spnavcfg-$${i}x$${i}.png $$destdir/spnavcfg-$${i}x$${i}.png; \
++		ln -rs $(DESTDIR)$(PREFIX)/share/pixmaps/spnavcfg-$${i}x$${i}.png $$destdir/spnavcfg-$${i}x$${i}.png; \
+ 	done
+ 	mkdir -p $(DESTDIR)$(PREFIX)/share/applications
+ 	cp -a icons/spnavcfg.desktop $(DESTDIR)$(PREFIX)/share/applications/
diff --git a/spnavcfg/PKGBUILD b/spnavcfg/PKGBUILD
index 54caf7a..d11468e 100644
--- a/spnavcfg/PKGBUILD
+++ b/spnavcfg/PKGBUILD
@@ -1,22 +1,24 @@
 # Maintainer: Jan Hambrecht <jaham at gmx dot net>
 
 pkgname=spnavcfg
-pkgver=0.3
-pkgrel=2
+pkgver=0.3.1
+pkgrel=3
 pkgdesc="The spacenav project provides a free, compatible alternative, to the proprietary 3Dconnexion device driver and SDK, for their 3D input devices (called 'space navigator', 'space pilot', 'space traveller', etc)."
 arch=('i686' 'x86_64')
-url="http://spacenav.sourceforge.net/"
+url="https://github.com/FreeSpacenav/spnavcfg"
 license=('GPL')
 depends=(gtk2)
 makedepends=('gcc' 'make')
 provides=('spnavcfg')
 options=()
 install=
-source=(http://downloads.sourceforge.net/spacenav/$pkgname-$pkgver.tar.gz)
-md5sums=('ac4ac49b07c4a4dbfa6ba1cd0d357273')
-
+source=(https://github.com/FreeSpacenav/spnavcfg/releases/download/v$pkgver/$pkgname-$pkgver.tar.gz
+        Makefile.in.diff)
+md5sums=('bf5bda8e4fd3fa3e45fe47cd26394fae'
+         'b85402ad686e3ef10446c192166c3a0a')
 build() {
   cd ${pkgname}-${pkgver}
+  patch -p0 < $startdir/Makefile.in.diff
   ./configure --prefix=/usr
   make || return 1
 }