summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Fischer2020-09-23 23:16:44 +0200
committerAaron Fischer2020-09-23 23:16:44 +0200
commit099dd3447030e6b5b0abcc99387f0b0d97bbaa38 (patch)
treed345fb6be00f26569c8d3cbb78fc950c31e89194
parentf632169499c4aff79d215365a0fd27a61ef1f5a7 (diff)
downloadaur-099dd3447030e6b5b0abcc99387f0b0d97bbaa38.tar.gz
Integrate lua5.4 fixes from @Martchus
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD13
-rw-r--r--fix-multiple-definitions.patch9
3 files changed, 24 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 06d8183982d..e95e31c94f3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -15,12 +15,15 @@ pkgbase = roccat-tools
depends = udev
depends = hicolor-icon-theme
depends = libgudev
- depends = lua>=5.3
+ depends = lua>=5.4
+ depends = lua<5.5
optdepends = kmod-roccat: Adds support for the old kone device.
source = http://downloads.sourceforge.net/project/roccat/roccat-tools/roccat-tools-5.9.0.tar.bz2
+ source = fix-multiple-definitions.patch
source = 90-uinput.rules
source = uhid.conf
sha256sums = 6f6766309bace2aece09910912d4a6d8bec61c9b4432f4f3ed388ebf7e16408a
+ sha256sums = 6268347c22392606c1ea3ea265a43607ed708b5428faa87c0ed1f6d776edb80b
sha256sums = 097a333b61921698d60f448e66c34c57905d2098aca998d987be782a0e4862ff
sha256sums = 0d328038322f62ff1f3319666df5f8f58c0a028415a917ad247b0446c1ff90f5
diff --git a/PKGBUILD b/PKGBUILD
index e237370442a..6e3d13180c9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,6 +6,7 @@
# Contributor: Jesus Gonzalez <jesusmgh@gmail.com>
# Contributor: Francisco Pina-Martins <f.pinamartins@gmail.com>
# Contributor: Alex <antianno52@gmail.com>
+# Contributor: Martchus <martchus@gmx.net>
pkgname=('roccat-tools-common'
'roccat-tools-arvo'
@@ -39,16 +40,24 @@ pkgdesc='Userland applications to configure and make extended use of ROCCAT devi
arch=('i686' 'x86_64')
url='http://roccat.sourceforge.net'
license=('GPL2')
-depends=('libgaminggear>=0.15.1' 'libcanberra' 'gtk2' 'libnotify>=0.7.0' 'dbus-glib' 'udev' 'hicolor-icon-theme' 'libgudev' 'lua>=5.3')
+depends=('libgaminggear>=0.15.1' 'libcanberra' 'gtk2' 'libnotify>=0.7.0' 'dbus-glib' 'udev' 'hicolor-icon-theme' 'libgudev' 'lua>=5.4' 'lua<5.5')
makedepends=('cmake')
optdepends=('kmod-roccat: Adds support for the old kone device.')
source=("http://downloads.sourceforge.net/project/roccat/roccat-tools/roccat-tools-$pkgver.tar.bz2"
+ 'fix-multiple-definitions.patch'
'90-uinput.rules'
'uhid.conf')
sha256sums=('6f6766309bace2aece09910912d4a6d8bec61c9b4432f4f3ed388ebf7e16408a'
+ '6268347c22392606c1ea3ea265a43607ed708b5428faa87c0ed1f6d776edb80b'
'097a333b61921698d60f448e66c34c57905d2098aca998d987be782a0e4862ff'
'0d328038322f62ff1f3319666df5f8f58c0a028415a917ad247b0446c1ff90f5')
+prepare() {
+ cd "$srcdir/$pkgbase-$pkgver"
+
+ patch -p1 -i ../fix-multiple-definitions.patch
+}
+
build() {
cd "$srcdir/$pkgbase-$pkgver"
@@ -57,7 +66,7 @@ build() {
-DUDEVDIR=/usr/lib/udev/rules.d \
-DWITHOUT_PYTHON=TRUE \
-DLIBDIR="/usr/lib" \
- -DWITH_LUA="5.3" \
+ -DWITH_LUA="5.4" \
-DCMAKE_C_FLAGS="$(pkg-config --cflags harfbuzz)" \
-DCMAKE_MODULE_PATH="/usr/share/libgaminggear/cmake/Modules"
make
diff --git a/fix-multiple-definitions.patch b/fix-multiple-definitions.patch
new file mode 100644
index 00000000000..91916ab3142
--- /dev/null
+++ b/fix-multiple-definitions.patch
@@ -0,0 +1,9 @@
+--- ./ryosmk/libroccatryosmk/ryos_device.h.orig 2020-06-30 16:41:33.348116743 +0200
++++ ./ryosmk/libroccatryosmk/ryos_device.h 2020-06-30 16:40:18.701450210 +0200
+@@ -23,5 +23,5 @@
+ G_BEGIN_DECLS
+
+-enum {
++typedef enum {
+ RYOS_WRITE_CHECK_WAIT_LIGHT_CONTROL = 10,
+ } RyosWriteCheckWait;