Date: Sunday, July 22, 2018 @ 16:10:51 Author: dvzrv Revision: 362842
Adding solaar from AUR. Added: solaar/ solaar/repos/ solaar/trunk/ solaar/trunk/PKGBUILD solaar/trunk/py37-compatibility.patch --------------------------+ PKGBUILD | 49 +++++++++++++++++++++++++++ py37-compatibility.patch | 81 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 130 insertions(+) Added: solaar/trunk/PKGBUILD =================================================================== --- solaar/trunk/PKGBUILD (rev 0) +++ solaar/trunk/PKGBUILD 2018-07-22 16:10:51 UTC (rev 362842) @@ -0,0 +1,49 @@ +# $Id$ +# Maintainer: David Runge <d...@sleepmap.de> +# Contributor: Arnaud Taffanel <d...@taffanel.org> +# Contributor: Victor Häggqvist <aur a snilius d com> + +_name=Solaar +pkgname=solaar +pkgver=0.9.2 +pkgrel=10 +pkgdesc="Device manager for Logitech's Unifying receiver peripherals" +url="https://pwr.github.com/Solaar/" +license=('GPL2') +arch=('any') +depends=('hicolor-icon-theme' 'python-pyudev' 'python-gobject' 'python-six') +optdepends=('libappindicator3: Integration with Unity') +makedepends=('python-setuptools') +provides=('solaar') +conflicts=('solaar') +options=(!emptydirs) +source=("${pkgname}-${pkgver}.tar.gz::https://github.com/pwr/${_name}/archive/${pkgver}.tar.gz" + 'py37-compatibility.patch') +sha512sums=('13f469df753cc8fab55f5259ccc3e62b6e44471d277d240cd56ce0580144d2b1f95d731268176648663dd15e5607bfb512f477362f4f100aa0a653b001dfe04b' + '4b8830898cb4debd5d7c6174a0372559d2a438ddde0e0ceb9582eed0d876ee28c955fda72742326b171641ca213f8cddf97d90d5f21524493d8511964905ef76') + +prepare() { + mv -v "${_name}-${pkgver}" "${pkgname}-${pkgver}" + cd "${pkgname}-${pkgver}" + patch -Np1 -i ../0001-Python-3.7-compatibility-fixes.patch +} + +build() { + cd "${pkgname}-${pkgver}" + python setup.py build +} + +package() { + cd "${pkgname}-${pkgver}" + python setup.py install --skip-build \ + --optimize=1 \ + --prefix=/usr \ + --root="${pkgdir}/" + # udev + install -vDm 644 rules.d/42-logitech-unify-permissions.rules \ + "${pkgdir}/usr/lib/udev/rules.d/42-logitech-unify-permissions.rules" + # docs + install -vDm 644 {ChangeLog,README.md} \ + -t "${pkgdir}/usr/share/doc/${pkgname}/" +} +# vim:set ts=2 sw=2 et: Property changes on: solaar/trunk/PKGBUILD ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Added: solaar/trunk/py37-compatibility.patch =================================================================== --- solaar/trunk/py37-compatibility.patch (rev 0) +++ solaar/trunk/py37-compatibility.patch 2018-07-22 16:10:51 UTC (rev 362842) @@ -0,0 +1,81 @@ +From f5ce94cf87cfe247adc2cc61368f9990b6a54372 Mon Sep 17 00:00:00 2001 +From: Jason Tibbitts <ti...@math.uh.edu> +Date: Fri, 20 Jul 2018 19:21:09 -0500 +Subject: [PATCH] Python 3.7 compatibility fixes + +This fixes the python 3.7 incompatibilities arising from 'async' +becoming a reserved word. + +The file lib/solaar/async.py is renamed to asks.py. I picked the name +because it defines the TaskRunner class and it's the best I could come +up in fifteen seconds. + +The async function in solar/ui/__init__.py is renamed to ui_async, and +the various imports of that function are changed to match. + +Without this patch it doesn't build at all. I am running with this +patch applied and everything appears to work as expected. + +Signed-off-by: Jason Tibbitts <ti...@math.uh.edu> +--- + lib/solaar/{async.py => tasks.py} | 0 + lib/solaar/ui/__init__.py | 4 ++-- + lib/solaar/ui/config_panel.py | 2 +- + lib/solaar/ui/window.py | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + rename lib/solaar/{async.py => tasks.py} (100%) + +diff --git a/lib/solaar/async.py b/lib/solaar/tasks.py +similarity index 100% +rename from lib/solaar/async.py +rename to lib/solaar/tasks.py +diff -ruN Solaar-0.9.2/lib/solaar/ui/__init__.py Solaar-0.9.2-b/lib/solaar/ui/__init__.py +--- Solaar-0.9.2/lib/solaar/ui/__init__.py 2013-07-24 11:40:54.000000000 +0200 ++++ Solaar-0.9.2-b/lib/solaar/ui/__init__.py 2018-07-22 17:47:09.739229236 +0200 +@@ -123,7 +123,7 @@ + + del Thread + +-def async(function, *args, **kwargs): ++def ui_async(function, *args, **kwargs): + task = (function, args, kwargs) + _task_queue.put(task) + +@@ -149,7 +149,7 @@ + def _shutdown(app): + # stop the async UI processor + _queue_processor.alive = False +- async(None) ++ ui_async(None) + + tray.destroy() + notify.uninit() +diff --git a/lib/solaar/ui/config_panel.py b/lib/solaar/ui/config_panel.py +index 75f9a2c..151b61c 100644 +--- a/lib/solaar/ui/config_panel.py ++++ b/lib/solaar/ui/config_panel.py +@@ -23,7 +23,7 @@ from gi.repository import Gtk, GLib + from threading import Timer as _Timer + + from solaar.i18n import _ +-from solaar.ui import async as _ui_async ++from solaar.ui import ui_async as _ui_async + from logitech_receiver.settings import KIND as _SETTING_KIND + + # +diff --git a/lib/solaar/ui/window.py b/lib/solaar/ui/window.py +index 6e27e09..8697fc7 100644 +--- a/lib/solaar/ui/window.py ++++ b/lib/solaar/ui/window.py +@@ -31,7 +31,7 @@ from solaar import NAME + from solaar.i18n import _ + from gettext import ngettext + # from solaar import __version__ as VERSION +-from solaar.ui import async as _ui_async ++from solaar.ui import ui_async as _ui_async + from logitech_receiver import hidpp10 as _hidpp10 + from logitech_receiver.common import NamedInts as _NamedInts, NamedInt as _NamedInt + from logitech_receiver.status import KEYS as _K +-- +2.18.0 +