[arch-commits] Commit in solaar/repos/community-any (4 files)
Jan Steffens
heftig at archlinux.org
Mon Jul 29 08:25:25 UTC 2019
Date: Monday, July 29, 2019 @ 08:25:25
Author: heftig
Revision: 494440
archrelease: copy trunk to community-any
Added:
solaar/repos/community-any/PKGBUILD
(from rev 494439, solaar/trunk/PKGBUILD)
solaar/repos/community-any/py37-compatibility.patch
(from rev 494439, solaar/trunk/py37-compatibility.patch)
Deleted:
solaar/repos/community-any/PKGBUILD
solaar/repos/community-any/py37-compatibility.patch
--------------------------+
PKGBUILD | 72 ++++++++++----------
py37-compatibility.patch | 162 ++++++++++++++++++++++-----------------------
2 files changed, 118 insertions(+), 116 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2019-07-29 08:25:07 UTC (rev 494439)
+++ PKGBUILD 2019-07-29 08:25:25 UTC (rev 494440)
@@ -1,35 +0,0 @@
-# Maintainer: David Runge <dave at sleepmap.de>
-# Contributor: Arnaud Taffanel <dev at taffanel.org>
-# Contributor: Victor Häggqvist <aur a snilius d com>
-
-_name=Solaar
-pkgname=solaar
-pkgver=1.0.1
-pkgrel=1
-pkgdesc="Linux device manager for a wide range of Logitech devices"
-url="https://pwr-solaar.github.io/Solaar/"
-license=('GPL2')
-arch=('any')
-depends=('gtk3' 'libnotify' 'python-dbus' 'python-gobject' 'python-pyudev')
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/pwr/${_name}/archive/${pkgver}.tar.gz")
-sha512sums=('e0b2bbfd97d9650d94f1a4b47e4e70f09c75f684e7e1d3e67d2cf6dd197109084e941b98333e173fb205d5c9464dd07e17390d9c2d5b46393fee2efdb20429ac')
-
-build() {
- cd "${_name}-${pkgver}"
- python setup.py build
-}
-
-package() {
- cd "${_name}-${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:
Copied: solaar/repos/community-any/PKGBUILD (from rev 494439, solaar/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2019-07-29 08:25:25 UTC (rev 494440)
@@ -0,0 +1,37 @@
+# Maintainer: David Runge <dave at sleepmap.de>
+# Contributor: Arnaud Taffanel <dev at taffanel.org>
+# Contributor: Victor Häggqvist <aur a snilius d com>
+
+_name=Solaar
+pkgname=solaar
+pkgver=1.0.1
+pkgrel=2
+pkgdesc="Linux device manager for a wide range of Logitech devices"
+url="https://pwr-solaar.github.io/Solaar/"
+license=('GPL2')
+arch=('any')
+depends=('gtk3' 'libnotify' 'python-dbus' 'python-gobject' 'python-pyudev')
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/pwr/${_name}/archive/${pkgver}.tar.gz")
+sha512sums=('e0b2bbfd97d9650d94f1a4b47e4e70f09c75f684e7e1d3e67d2cf6dd197109084e941b98333e173fb205d5c9464dd07e17390d9c2d5b46393fee2efdb20429ac')
+
+build() {
+ cd "${_name}-${pkgver}"
+ python setup.py build
+}
+
+package() {
+ cd "${_name}-${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}/"
+ # install fix
+ mv "${pkgdir}/usr/etc" "${pkgdir}/etc"
+}
+# vim:set ts=2 sw=2 et:
Deleted: py37-compatibility.patch
===================================================================
--- py37-compatibility.patch 2019-07-29 08:25:07 UTC (rev 494439)
+++ py37-compatibility.patch 2019-07-29 08:25:25 UTC (rev 494440)
@@ -1,81 +0,0 @@
-From f5ce94cf87cfe247adc2cc61368f9990b6a54372 Mon Sep 17 00:00:00 2001
-From: Jason Tibbitts <tibbs at 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 <tibbs at 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
-
Copied: solaar/repos/community-any/py37-compatibility.patch (from rev 494439, solaar/trunk/py37-compatibility.patch)
===================================================================
--- py37-compatibility.patch (rev 0)
+++ py37-compatibility.patch 2019-07-29 08:25:25 UTC (rev 494440)
@@ -0,0 +1,81 @@
+From f5ce94cf87cfe247adc2cc61368f9990b6a54372 Mon Sep 17 00:00:00 2001
+From: Jason Tibbitts <tibbs at 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 <tibbs at 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
+
More information about the arch-commits
mailing list