diff --git a/mumble-lib64.diff b/mumble-lib64.diff deleted file mode 100644 index 02f6d7f..0000000 --- a/mumble-lib64.diff +++ /dev/null @@ -1,63 +0,0 @@ -automagically choose correct preload library on biarch systems - -Uses "file" to check whether called program is a 32bit or 64bit ELF -file. If that cannot be determined it checks the uname. - -Signed-off-by: Ludwig Nussel - -Index: mumble-1.1.3/scripts/mumble-overlay -=================================================================== ---- mumble-1.1.3.orig/scripts/mumble-overlay -+++ mumble-1.1.3/scripts/mumble-overlay -@@ -1,9 +1,47 @@ --#! /bin/sh -+#!/bin/bash - --if [ -d /usr/lib/mumble ]; then -- MUMBLE_OVERLAY_PATH=/usr/lib/mumble -+libdir=/usr/lib -+if [ -z "$1" -o "$1" = '--help' ]; then -+ echo "USAGE: $0 [args...]" -+ exit 1 -+fi -+ -+# biarch system? -+if [ -d /usr/lib64 ]; then -+ binary="$1" -+ # no slashes? search in $PATH -+ if [ "${binary/\/}" = "$binary" ]; then -+ found= -+ for i in ${PATH//:/ }; do -+ if [ -x "$i/$binary" ]; then -+ found="$i/$binary" -+ break -+ fi -+ done -+ binary="$found" -+ fi -+ if [ -z "$binary" ]; then -+ echo "$1 not found" >&2 -+ exit 1 -+ fi -+ case `file "$binary"` in -+ *64-bit*) libdir=/usr/lib64 ;; -+ *32-bit*) ;; -+ *) -+ # target is no ELF binary, fall back to machine -+ # architecture. User has to use e.g. linux32 or -+ # setarch to change to 32bit on 64bit archs then -+ case "`uname -m`" in -+ x86_64|s390x|ppc64) libdir=/usr/lib64 ;; -+ esac -+ ;; -+ esac -+fi -+ -+if [ -d $libdir/mumble ]; then -+ MUMBLE_OVERLAY_PATH=$libdir/mumble - else -- MUMBLE_OVERLAY_PATH=/usr/lib -+ MUMBLE_OVERLAY_PATH=$libdir - fi - - if [ -f /etc/sysconfig/mumble ]; then diff --git a/mumble.rpmlintrc b/mumble.rpmlintrc deleted file mode 100644 index 0bf5fd9..0000000 --- a/mumble.rpmlintrc +++ /dev/null @@ -1 +0,0 @@ -setBadness('suse-dbus-unauthorized-service', 0) diff --git a/mumble_shortcut_keyboard.cpp b/mumble_shortcut_keyboard.cpp deleted file mode 100644 index c8d6384..0000000 --- a/mumble_shortcut_keyboard.cpp +++ /dev/null @@ -1,20 +0,0 @@ -Index: mumble-1.1.6/src/mumble/GlobalShortcut_unix.cpp -=================================================================== ---- mumble-1.1.6.orig/src/mumble/GlobalShortcut_unix.cpp -+++ mumble-1.1.6/src/mumble/GlobalShortcut_unix.cpp -@@ -264,7 +264,14 @@ void GlobalShortcutX::directoryChanged(c - char name[256]; - uint8_t events[EV_MAX/8 + 1]; - memset(events, 0, sizeof(events)); -- if ((ioctl(fd, EVIOCGVERSION, &version) >= 0) && (ioctl(fd, EVIOCGNAME(sizeof(name)), name)>=0) && (ioctl(fd, EVIOCGBIT(0,sizeof(events)), &events) >= 0) && test_bit(EV_KEY, events) && (((version >> 16) & 0xFF) > 0)) { -+ if ((ioctl(fd, EVIOCGVERSION, &version) >= 0) -+ && (ioctl(fd, EVIOCGNAME(sizeof(name)), name)>=0) -+ && (ioctl(fd, EVIOCGBIT(0,sizeof(events)), &events) >= 0) -+ && test_bit(EV_KEY, events) -+ // we assume it's a keyboard if it has a space bar -+ && (ioctl(fd, EVIOCGBIT(EV_KEY,sizeof(events)), &events) >= 0) -+ && test_bit(KEY_SPACE, events) -+ && (((version >> 16) & 0xFF) > 0)) { - name[255]=0; - qWarning("GlobalShortcutX: %s: %s", qPrintable(f->fileName()), name); - fcntl(f->handle(), F_SETFL, O_NONBLOCK);