From f738e5b51d05fb629f14dd58803c482a23c5c78c Mon Sep 17 00:00:00 2001
From: ptrcnull <git@ptrcnull.me>
Date: Sun, 12 Feb 2023 22:51:35 +0100
Subject: [PATCH] testing/spnavcfg: upgrade to 1.1
---
testing/spnavcfg/APKBUILD | 13 ++++++++-----
testing/spnavcfg/makefile.patch | 14 ++++++++++++++
2 files changed, 22 insertions(+), 5 deletions(-)
create mode 100644 testing/spnavcfg/makefile.patch
diff --git a/testing/spnavcfg/APKBUILD b/testing/spnavcfg/APKBUILD
index 382400057a23..56db2146fefd 100644
--- a/testing/spnavcfg/APKBUILD
+++ b/testing/spnavcfg/APKBUILD
@@ -1,20 +1,22 @@
# Contributor: guddaff <guddaff@protonmail.com>
# Maintainer: guddaff <guddaff@protonmail.com>
pkgname=spnavcfg
-pkgver=1.0
-pkgrel=1
+pkgver=1.1
+pkgrel=0
pkgdesc="spacenav interactive configuration GUI"
url="https://spacenav.sourceforge.net/"
arch="all"
license="GPL-3.0-or-later"
makedepends="qt5-qtbase-dev libspnav-dev"
options="!check" # no checks
-source="$pkgname-$pkgver.tar.gz::https://github.com/FreeSpacenav/spnavcfg/archive/refs/tags/v$pkgver.tar.gz"
+source="$pkgname-$pkgver.tar.gz::https://github.com/FreeSpacenav/spnavcfg/archive/refs/tags/v$pkgver.tar.gz
+ makefile.patch
+ "
build() {
# not automake
./configure --prefix=/usr
- make UIC=uic-qt5 MOC=moc-qt5 RCC=rcc-qt5
+ make
}
package() {
@@ -22,5 +24,6 @@ package() {
}
sha512sums="
-36db54c47db14a684bf8ba78342d5070b94e8969db7d542626c5a225180f9858bfecb8f46fd11d1bb5364b315599fd173edd5db241f93d304236a271ed49aec3 spnavcfg-1.0.tar.gz
+00166b2cf507a449df4cdf2e7865ec002a3b8d193e961c87569b944e1a81bbc4104dd16335c4bf7628a2477cbec2ab07e4f88e6e60792e0156002b52152d3fb7 spnavcfg-1.1.tar.gz
+8391b27c94e83157294d84b32164e2fb82a7998d2df4c07da478eb7294b7c2b49b2b371dbed7bbd2e0ac3264973a97e7a455cf227bb2ac196b7232fe816cd829 makefile.patch
"
diff --git a/testing/spnavcfg/makefile.patch b/testing/spnavcfg/makefile.patch
new file mode 100644
index 000000000000..8e5d70a65e2b
--- /dev/null
+++ b/testing/spnavcfg/makefile.patch
@@ -0,0 +1,14 @@
+Patch-Source: https://aur.archlinux.org/cgit/aur.git/tree/Makefile.in.diff?h=spnavcfg
+diff --git a/Makefile.in b/Makefile.in
+index b760f4d..f66ba22 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -2,7 +2,7 @@ csrc = $(wildcard src/*.c)
+ ccsrc = $(wildcard src/*.cc)
+ mochdr = src/ui.h
+ mocsrc = $(mochdr:.h=.moc.cc)
+-obj = $(csrc:.c=.o) $(ccsrc:.cc=.o) $(mocsrc:.cc=.o) res.cc
++obj = $(sort $(csrc:.c=.o) $(ccsrc:.cc=.o) $(mocsrc:.cc=.o)) res.cc
+ dep = $(csrc:.c=.d) $(ccsrc:.cc=.d)
+ bin = spnavcfg
+
--
GitLab