diff options
Diffstat (limited to 'community/onboard')
-rw-r--r-- | community/onboard/1012_1011.diff | 17 | ||||
-rw-r--r-- | community/onboard/1013_1012.diff | 22 | ||||
-rw-r--r-- | community/onboard/PKGBUILD | 17 |
3 files changed, 50 insertions, 6 deletions
diff --git a/community/onboard/1012_1011.diff b/community/onboard/1012_1011.diff new file mode 100644 index 000000000..233478ac9 --- /dev/null +++ b/community/onboard/1012_1011.diff @@ -0,0 +1,17 @@ +=== modified file 'setup.py' +--- setup.py 2012-08-09 13:21:31 +0000 ++++ setup.py 2012-10-18 17:17:38 +0000 +@@ -11,12 +11,6 @@ + from distutils.core import Extension, Command + from distutils import version + +-# Work around encoding error in python3-distutils-extra +-# when building in pbuilder with LANG=C (LP# 1017468). +-if sys.version_info.major == 3: +- import locale +- locale.getpreferredencoding = lambda: 'UTF-8' +- + try: + import DistUtilsExtra.auto + except ImportError: + diff --git a/community/onboard/1013_1012.diff b/community/onboard/1013_1012.diff new file mode 100644 index 000000000..a00b4ecf9 --- /dev/null +++ b/community/onboard/1013_1012.diff @@ -0,0 +1,22 @@ +=== modified file 'Onboard/Config.py' +--- Onboard/Config.py 2012-10-18 16:17:12 +0000 ++++ Onboard/Config.py 2012-10-18 17:19:00 +0000 +@@ -73,7 +73,7 @@ + DEFAULT_RESIZE_HANDLES = list(Handle.RESIZERS) + + SCHEMA_VERSION_0_97 = Version(1, 0) # Onboard 0.97 +-SCHEMA_VERSION_0_98 = Version(2, 0) # Onboard 0.97.1 ++SCHEMA_VERSION_0_98 = Version(2, 0) # Onboard 0.97.1 + SCHEMA_VERSION = SCHEMA_VERSION_0_98 + + +@@ -145,7 +145,7 @@ + Singleton magic. + """ + if not hasattr(cls, "self"): +- cls.self = object.__new__(cls, args, kwargs) ++ cls.self = object.__new__(cls, *args, **kwargs) + cls.self.construct() + return cls.self + + diff --git a/community/onboard/PKGBUILD b/community/onboard/PKGBUILD index 1571a4dc7..a62c64743 100644 --- a/community/onboard/PKGBUILD +++ b/community/onboard/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 78206 2012-10-17 10:25:00Z allan $ +# $Id: PKGBUILD 78453 2012-10-18 21:14:21Z bgyorgy $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> pkgname=onboard pkgver=0.98.1 -pkgrel=1 +pkgrel=2 pkgdesc="On-screen keyboard useful on tablet PCs or for mobility impaired users" arch=('i686' 'x86_64') url="https://launchpad.net/onboard" @@ -14,14 +14,19 @@ optdepends=('at-spi2-atk: auto-show when editing text' 'mousetweaks: hover click with mouse') options=('!emptydirs') install=$pkgname.install -source=(http://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.gz) -md5sums=('107e031b429329b71deb67c9b90195d6') +source=(http://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.gz + 1012_1011.diff + 1013_1012.diff) +md5sums=('107e031b429329b71deb67c9b90195d6' + '4323f43510003850e127cd0fefdd3e4c' + '6c7751ecd92532844ecb7e65e4f4746b') package() { cd "$srcdir/$pkgname-$pkgver" - # Do not set getpreferredencoding, because it breaks getstatusoutput() in the setup script - sed -i '/getpreferredencoding =/ d' setup.py + # Python 3.3 compatibility fixes + patch -Np0 -i "$srcdir/1012_1011.diff" + patch -Np0 -i "$srcdir/1013_1012.diff" python3 setup.py install --root=$pkgdir/ --optimize=1 } |