[arch-commits] Commit in driconf/trunk (PKGBUILD driconf_simpleui.patch)

[Balló György]

    Date: Sunday, January 14, 2018 @ 21:15:59
  Author: bgyorgy
Revision: 282272

upgpkg: driconf 0.9.1-12

Adopt the package, various fixes

Added:
  driconf/trunk/driconf_simpleui.patch
Modified:
  driconf/trunk/PKGBUILD

------------------------+
 PKGBUILD               |   42 ++++++++++++++++++++++++------------------
 driconf_simpleui.patch |   13 +++++++++++++
 2 files changed, 37 insertions(+), 18 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-01-14 20:34:01 UTC (rev 282271)
+++ PKGBUILD	2018-01-14 21:15:59 UTC (rev 282272)
@@ -1,33 +1,39 @@
 # $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
 # Contributor: Giovanni Scafora <linuxmania at gmail.com>
 
 pkgname=driconf
 pkgver=0.9.1
-pkgrel=11
-pkgdesc="A graphical configuration tool for the Direct Rendering Infrastructure"
+pkgrel=12
+pkgdesc="Graphical configuration tool for the Direct Rendering Infrastructure"
 arch=('any')
-url="http://dri.freedesktop.org/wiki/DriConf"
+url="https://dri.freedesktop.org/wiki/DriConf/"
 license=('GPL')
-depends=('pygtk' 'expat' 'xorg-xdriinfo' 'mesa-demos')
-source=("https://sources.archlinux.org/other/community/driconf/driconf-$pkgver.tar.gz"
-	"driconf_simpleui.patch::https://bugs.archlinux.org/task/36934?getfile=10983")
-md5sums=('76d610bcd56aa5e8a489debb5081178a'
-         '66e249ff813c47811c4e8edf2e007e42')
+depends=('mesa-demos' 'pygtk' 'xorg-xdriinfo')
+source=(http://ftp.debian.org/debian/pool/main/d/$pkgname/${pkgname}_$pkgver.orig.tar.gz
+        driconf_simpleui.patch)
+sha256sums=('4849a43f6324498e943c03777bce571229b5446985b1cec596b365505e76f73f'
+            'a2f9c4fd50cb694cc743cdde0f4efe310cb11fbef347c1a1d5fbec9a99d3499b')
 
 prepare() {
-  cd "$srcdir"/$pkgname-$pkgver
-  patch -p0 < "$srcdir"/driconf_simpleui.patch
-  sed -i -e "s:/usr/local/lib/driconf:"$pkgdir"/usr/lib/driconf:g" -e "s:/usr/local:"$pkgdir"/usr:g" setup.cfg
-  sed -i -e "s:local/::" driconf
-  sed -i -e "s:/usr/local:/usr:g" setup.py
-  sed -i -e "s:/usr/local:/usr:g" driconf_commonui.py
-  sed -i -e "s:/usr/local:/usr:g" driconf.desktop
+  cd $pkgname-$pkgver
+
+  # Fix uninitialized variable (FS#36934)
+  patch -Np0 -i ../driconf_simpleui.patch
+
+  # Install into /usr instead of /usr/local
+  sed -i 's|/usr/local|/usr|' *.py driconf driconf.desktop setup.cfg
 }
 
+build() {
+  cd $pkgname-$pkgver
+  python2 setup.py build
+}
+
 package() {
-  cd "$srcdir"/$pkgname-$pkgver
-  python2 setup.py install
+  cd $pkgname-$pkgver
+  python2 setup.py install --root "$pkgdir" --optimize=1
   install -Dm644 $pkgname.desktop "$pkgdir"/usr/share/applications/$pkgname.desktop
   install -Dm644 drilogo.jpg "$pkgdir"/usr/share/pixmaps/drilogo.jpg
 }

Added: driconf_simpleui.patch
===================================================================
--- driconf_simpleui.patch	                        (rev 0)
+++ driconf_simpleui.patch	2018-01-14 21:15:59 UTC (rev 282272)
@@ -0,0 +1,13 @@
+--- driconf_simpleui-original.py	2013-09-14 18:28:51.783220606 -0600
++++ driconf_simpleui.py	2013-09-14 18:31:01.143223727 -0600
+@@ -266,8 +266,8 @@
+                     j = i
+                     break
+                 i = i - 1
+-            if i < chars/3:
+-                i = chars
++            else:
++                i = j = chars
+             head, tail = head + tail[:i] + '\n', tail[j:]
+     return head
+