summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Fischer2015-05-24 22:33:51 +0200
committerAaron Fischer2015-05-24 22:33:51 +0200
commit7e949803ae54de317209374a1fdccd3bd94c7f6a (patch)
treec5867b7b52a95e288c8cc9a3d344c1c0cb815b61
parent2ddb84980b5e9e413fd860992436a94491bebcab (diff)
downloadaur-7e949803ae54de317209374a1fdccd3bd94c7f6a.tar.gz
Fix roccat-tools again
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD14
-rw-r--r--ryosmk-dbus-bindings-v320.patch38
-rw-r--r--udev-compilation-error-fix.patch11
4 files changed, 27 insertions, 46 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 6492075cfb6..d44220d09ad 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,13 @@
pkgbase = roccat-tools
pkgdesc = Userland applications to configure and make extended use of ROCCAT devices
- pkgver = 3.3.0
+ pkgver = 3.4.0
pkgrel = 1
url = http://roccat.sourceforge.net
arch = i686
arch = x86_64
license = GPL2
makedepends = cmake
- depends = libgaminggear=0.8.0
+ depends = libgaminggear=0.9.0
depends = libcanberra
depends = gtk2
depends = libnotify>=0.7.0
@@ -15,8 +15,10 @@ pkgbase = roccat-tools
depends = udev
depends = hicolor-icon-theme
optdepends = kmod-roccat: Adds support for the old kone device.
- source = http://downloads.sourceforge.net/project/roccat/roccat-tools/roccat-tools-3.3.0.tar.bz2
- md5sums = 62c8283c7cd92ee005eebfa7a68e990b
+ source = http://downloads.sourceforge.net/project/roccat/roccat-tools/roccat-tools-3.4.0.tar.bz2
+ source = udev-compilation-error-fix.patch
+ md5sums = 3450bb0fb771f33d159ffff7a4860ab6
+ md5sums = 414d6306796c659a3adc86ef213e3569
pkgname = roccat-tools-common
pkgdesc = ROCCAT tools common files
diff --git a/PKGBUILD b/PKGBUILD
index bb70a54da61..6b34ea7b22e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -22,23 +22,29 @@ pkgname=('roccat-tools-common'
'roccat-tools-savu'
'roccat-tools-tyon')
pkgbase=roccat-tools
-pkgver=3.3.0
+pkgver=3.4.0
pkgrel=1
pkgdesc='Userland applications to configure and make extended use of ROCCAT devices'
arch=('i686' 'x86_64')
url='http://roccat.sourceforge.net'
license=('GPL2')
-depends=('libgaminggear=0.8.0' 'libcanberra' 'gtk2' 'libnotify>=0.7.0' 'dbus-glib' 'udev' 'hicolor-icon-theme')
+depends=('libgaminggear=0.9.0' 'libcanberra' 'gtk2' 'libnotify>=0.7.0' 'dbus-glib' 'udev' 'hicolor-icon-theme')
makedepends=('cmake')
optdepends=('kmod-roccat: Adds support for the old kone device.')
conflicts=
-source=("http://downloads.sourceforge.net/project/roccat/roccat-tools/roccat-tools-$pkgver.tar.bz2")
+source=("http://downloads.sourceforge.net/project/roccat/roccat-tools/roccat-tools-$pkgver.tar.bz2"
+ 'udev-compilation-error-fix.patch')
-md5sums=('62c8283c7cd92ee005eebfa7a68e990b')
+md5sums=('3450bb0fb771f33d159ffff7a4860ab6'
+ '414d6306796c659a3adc86ef213e3569')
build() {
cd "$srcdir/$pkgbase-$pkgver"
+ # See here for more detail and progress on this:
+ # https://sourceforge.net/p/roccat/bugs/51/
+ patch -p1 -i ../udev-compilation-error-fix.patch
+
cmake . -DCMAKE_INSTALL_PREFIX=/usr -DUDEVDIR=/usr/lib/udev/rules.d -DWITHOUT_PYTHON=TRUE
make
}
diff --git a/ryosmk-dbus-bindings-v320.patch b/ryosmk-dbus-bindings-v320.patch
deleted file mode 100644
index 8f4c27197c0..00000000000
--- a/ryosmk-dbus-bindings-v320.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff --git a/libroccat/CMakeLists.txt b/libroccat/CMakeLists.txt
-index ead603c..bf61d05 100644
---- a/libroccat/CMakeLists.txt
-+++ b/libroccat/CMakeLists.txt
-@@ -46,6 +46,7 @@ SET(SOURCES
-
- SET(LIBRARIES
- libroccathelper
-+ ${DBUS_LIBRARIES}
- ${GAMINGGEAR0_LIBRARY}
- )
-
-diff --git a/ryosmk/libroccatryosmk/CMakeLists.txt b/ryosmk/libroccatryosmk/CMakeLists.txt
-index 0e4243a..69c56e9 100644
---- a/ryosmk/libroccatryosmk/CMakeLists.txt
-+++ b/ryosmk/libroccatryosmk/CMakeLists.txt
-@@ -33,7 +33,7 @@ ADD_LIBRARY(libroccatryosmk SHARED
-
- ADD_DEPENDENCIES(libroccatryosmk
- generated_headers
-- ryos_dbus_bindings
-+ ryosmk_dbus_bindings
- )
-
- TARGET_LINK_LIBRARIES(libroccatryosmk
-diff --git a/ryosmk/libryosmkeventhandler/CMakeLists.txt b/ryosmk/libryosmkeventhandler/CMakeLists.txt
-index ab26de8..ad93376 100644
---- a/ryosmk/libryosmkeventhandler/CMakeLists.txt
-+++ b/ryosmk/libryosmkeventhandler/CMakeLists.txt
-@@ -22,7 +22,7 @@ ADD_LIBRARY(libryosmkeventhandler SHARED ${SOURCES})
-
- ADD_DEPENDENCIES(libryosmkeventhandler
- generated_headers
-- ryos_dbus_bindings
-+ ryosmk_dbus_bindings
- )
-
- SET_TARGET_PROPERTIES(libryosmkeventhandler
diff --git a/udev-compilation-error-fix.patch b/udev-compilation-error-fix.patch
new file mode 100644
index 00000000000..25583848d20
--- /dev/null
+++ b/udev-compilation-error-fix.patch
@@ -0,0 +1,11 @@
+diff --git a/kone/libkoneeventhandler/CMakeLists.txt b/kone/libkoneeventhandler/CMakeLists.txt
+index d460bba..f633e92 100644
+--- a/kone/libkoneeventhandler/CMakeLists.txt
++++ b/kone/libkoneeventhandler/CMakeLists.txt
+@@ -21,6 +21,7 @@ TARGET_LINK_LIBRARIES(libkoneeventhandler
+ libroccathelper
+ ${GAMINGGEAR0_LIBRARY}
+ ${DBUS-GLIB_LIBRARIES}
++ ${GUDEV_LIBRARIES}
+ ${GLIB2_LIBRARIES}
+ )