diff options
| author | Carsten Teibes | 2016-04-10 21:22:27 +0200 |
|---|---|---|
| committer | Carsten Teibes | 2016-04-10 21:23:06 +0200 |
| commit | 0896699796817b70c67e498fb7a2072b317deb40 (patch) | |
| tree | 899fc094623f9c8d97127c7d77fddcf452b6d4c6 | |
| parent | 6ce0a4805c3b3e20f16a3ab85317e7adf30e4d30 (diff) | |
| download | aur-0896699796817b70c67e498fb7a2072b317deb40.tar.gz | |
[fix] remove dbus version check
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | PKGBUILD | 14 | ||||
| -rw-r--r-- | volti-remove-dbus-version-check.patch | 35 |
3 files changed, 49 insertions, 4 deletions
@@ -1,7 +1,7 @@ pkgbase = volti pkgdesc = GTK+ mixer application for controlling alsa audio volume from system tray pkgver = 0.2.3 - pkgrel = 4 + pkgrel = 5 url = https://github.com/gen2brain/volti arch = any license = GPL3 @@ -10,7 +10,9 @@ pkgbase = volti depends = python2-dbus optdepends = python2-xlib: Multimedia keys support source = volti-0.2.3.tar.gz::https://github.com/gen2brain/volti/archive/0.2.3.tar.gz + source = volti-remove-dbus-version-check.patch sha256sums = b0d614d720510261696401b87452a30a490dc34e1023fa42fbab8b2ef3989ed6 + sha256sums = b50851956121fd37af46d3304d58fde58dc8d000b25e11c28d9f17b36591da4b pkgname = volti @@ -4,15 +4,23 @@ pkgname=volti pkgver=0.2.3 -pkgrel=4 +pkgrel=5 pkgdesc="GTK+ mixer application for controlling alsa audio volume from system tray" arch=('any') url="https://github.com/gen2brain/volti" license=('GPL3') depends=('pygtk' 'python2-pyalsaaudio' 'python2-dbus') optdepends=('python2-xlib: Multimedia keys support') -source=(volti-$pkgver.tar.gz::"https://github.com/gen2brain/volti/archive/$pkgver.tar.gz") -sha256sums=('b0d614d720510261696401b87452a30a490dc34e1023fa42fbab8b2ef3989ed6') +source=(volti-$pkgver.tar.gz::"https://github.com/gen2brain/volti/archive/$pkgver.tar.gz" + volti-remove-dbus-version-check.patch) +sha256sums=('b0d614d720510261696401b87452a30a490dc34e1023fa42fbab8b2ef3989ed6' + 'b50851956121fd37af46d3304d58fde58dc8d000b25e11c28d9f17b36591da4b') + +prepare() { + cd volti-$pkgver + + patch -Np1 <../volti-remove-dbus-version-check.patch +} build() { cd volti-$pkgver diff --git a/volti-remove-dbus-version-check.patch b/volti-remove-dbus-version-check.patch new file mode 100644 index 000000000000..86854d1ac320 --- /dev/null +++ b/volti-remove-dbus-version-check.patch @@ -0,0 +1,35 @@ +From 62216b36bdae69559a8db8693deed1306e75fe23 Mon Sep 17 00:00:00 2001 +From: Tom Swartz <tom.swartz07@gmail.com> +Date: Thu, 7 Apr 2016 07:59:39 -0400 +Subject: [PATCH] Fix DBus issue + +Related to #53 and #54 + +As mentioned in #54, the check can be removed. +Using the plain imports allows the program to work as expected. +--- + volti | 11 ++--------- + 1 file changed, 2 insertions(+), 9 deletions(-) + +diff --git a/volti b/volti +index d8f06bd..25d7ca9 100755 +--- a/volti ++++ b/volti +@@ -19,15 +19,8 @@ + + import os + import sys +- +-try: +- import dbus +- import dbus._version +- from dbus.mainloop.glib import DBusGMainLoop +- assert dbus.version >= (0, 80, 0) +-except ImportError, AssertionError: +- sys.stderr.write("This program needs dbus-python 0.80.0 or higher\nExiting\n") +- sys.exit(1) ++import dbus ++from dbus.mainloop.glib import DBusGMainLoop + + if os.path.isdir(os.path.join(".","src")) and os.path.isfile( + os.path.join(".","setup.py")): |