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

2018-12-30 Thread Balló György via arch-commits
Date: Sunday, December 30, 2018 @ 12:59:30
  Author: bgyorgy
Revision: 419164

upgpkg: driconf 0.9.1-14

Update to new version

Modified:
  driconf/trunk/PKGBUILD

--+
 PKGBUILD |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-12-30 12:58:54 UTC (rev 419163)
+++ PKGBUILD2018-12-30 12:59:30 UTC (rev 419164)
@@ -4,12 +4,13 @@
 
 pkgname=driconf
 pkgver=0.9.1
-pkgrel=13
+pkgrel=14
 pkgdesc="Graphical configuration tool for the Direct Rendering Infrastructure"
 arch=('any')
 url="https://dri.freedesktop.org/wiki/DriConf/";
 license=('GPL')
 depends=('mesa-demos' 'pygtk' 'xorg-xdriinfo')
+makedepends=('imagemagick')
 
source=(http://ftp.debian.org/debian/pool/main/d/$pkgname/${pkgname}_$pkgver.orig.tar.gz
 driconf_simpleui.patch)
 sha256sums=('4849a43f6324498e943c03777bce571229b5446985b1cec596b365505e76f73f'
@@ -36,5 +37,6 @@
   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
+  install -dm755 "$pkgdir"/usr/share/pixmaps/
+  convert drilogo.jpg +set date:create +set date:modify 
"$pkgdir"/usr/share/pixmaps/drilogo.png
 }


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

2018-12-29 Thread Balló György via arch-commits
Date: Saturday, December 29, 2018 @ 22:03:35
  Author: bgyorgy
Revision: 418938

upgpkg: driconf 0.9.1-13

Use larger icon, remove invalid category

Modified:
  driconf/trunk/PKGBUILD

--+
 PKGBUILD |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-12-29 22:01:39 UTC (rev 418937)
+++ PKGBUILD2018-12-29 22:03:35 UTC (rev 418938)
@@ -4,7 +4,7 @@
 
 pkgname=driconf
 pkgver=0.9.1
-pkgrel=12
+pkgrel=13
 pkgdesc="Graphical configuration tool for the Direct Rendering Infrastructure"
 arch=('any')
 url="https://dri.freedesktop.org/wiki/DriConf/";
@@ -22,7 +22,9 @@
   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
+  sed -i 's|/usr/local|/usr|' *.py driconf setup.cfg
+  sed -i 's/^Icon=.*/Icon=drilogo/
+  s/AdvancedSettings;//' driconf.desktop
 }
 
 build() {


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

2018-01-14 Thread Balló György via arch-commits
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
===
--- PKGBUILD2018-01-14 20:34:01 UTC (rev 282271)
+++ PKGBUILD2018-01-14 21:15:59 UTC (rev 282272)
@@ -1,33 +1,39 @@
 # $Id$
-# Maintainer: Sergej Pupykin 
+# Maintainer: Balló György 
+# Contributor: Sergej Pupykin 
 # Contributor: Giovanni Scafora 
 
 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.py2013-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
+ 


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

2013-11-08 Thread Sergej Pupykin
Date: Friday, November 8, 2013 @ 17:15:06
  Author: spupykin
Revision: 100690

upgpkg: driconf 0.9.1-11

upd

Modified:
  driconf/trunk/PKGBUILD

--+
 PKGBUILD |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-11-08 11:01:34 UTC (rev 100689)
+++ PKGBUILD2013-11-08 16:15:06 UTC (rev 100690)
@@ -4,7 +4,7 @@
 
 pkgname=driconf
 pkgver=0.9.1
-pkgrel=10
+pkgrel=11
 pkgdesc="A graphical configuration tool for the Direct Rendering 
Infrastructure"
 arch=('any')
 url="http://dri.freedesktop.org/wiki/DriConf";
@@ -22,6 +22,7 @@
   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
 }
 
 package() {



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

2013-10-10 Thread Sergej Pupykin
Date: Thursday, October 10, 2013 @ 15:30:37
  Author: spupykin
Revision: 98435

upgpkg: driconf 0.9.1-10

upd

Modified:
  driconf/trunk/PKGBUILD

--+
 PKGBUILD |9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-10-10 11:32:25 UTC (rev 98434)
+++ PKGBUILD2013-10-10 13:30:37 UTC (rev 98435)
@@ -4,17 +4,20 @@
 
 pkgname=driconf
 pkgver=0.9.1
-pkgrel=9
+pkgrel=10
 pkgdesc="A graphical configuration tool for the Direct Rendering 
Infrastructure"
 arch=('any')
 url="http://dri.freedesktop.org/wiki/DriConf";
 license=('GPL')
 depends=('pygtk' 'expat' 'xorg-xdriinfo' 'mesa-demos')
-source=(ftp://ftp.archlinux.org/other/community/driconf/driconf-$pkgver.tar.gz)
-md5sums=('76d610bcd56aa5e8a489debb5081178a')
+source=("ftp://ftp.archlinux.org/other/community/driconf/driconf-$pkgver.tar.gz";
+   
"driconf_simpleui.patch::https://bugs.archlinux.org/task/36934?getfile=10983";)
+md5sums=('76d610bcd56aa5e8a489debb5081178a'
+ '66e249ff813c47811c4e8edf2e007e42')
 
 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



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

2013-10-10 Thread Sergej Pupykin
Date: Thursday, October 10, 2013 @ 13:31:48
  Author: spupykin
Revision: 98431

upgpkg: driconf 0.9.1-9

upd

Modified:
  driconf/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-10-10 08:00:04 UTC (rev 98430)
+++ PKGBUILD2013-10-10 11:31:48 UTC (rev 98431)
@@ -4,12 +4,12 @@
 
 pkgname=driconf
 pkgver=0.9.1
-pkgrel=8
+pkgrel=9
 pkgdesc="A graphical configuration tool for the Direct Rendering 
Infrastructure"
 arch=('any')
 url="http://dri.freedesktop.org/wiki/DriConf";
 license=('GPL')
-depends=('pygtk' 'pyxml' 'expat' 'xorg-xdriinfo' 'mesa-demos')
+depends=('pygtk' 'expat' 'xorg-xdriinfo' 'mesa-demos')
 source=(ftp://ftp.archlinux.org/other/community/driconf/driconf-$pkgver.tar.gz)
 md5sums=('76d610bcd56aa5e8a489debb5081178a')
 



[arch-commits] Commit in driconf/trunk (PKGBUILD driconf.desktop drilogo.png)

2013-09-12 Thread Sergej Pupykin
Date: Thursday, September 12, 2013 @ 12:10:41
  Author: spupykin
Revision: 97069

upgpkg: driconf 0.9.1-8

upd

Modified:
  driconf/trunk/PKGBUILD
Deleted:
  driconf/trunk/driconf.desktop
  driconf/trunk/drilogo.png

-+
 PKGBUILD|   16 ++--
 driconf.desktop |   10 --
 2 files changed, 6 insertions(+), 20 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-09-12 10:10:36 UTC (rev 97068)
+++ PKGBUILD2013-09-12 10:10:41 UTC (rev 97069)
@@ -4,20 +4,16 @@
 
 pkgname=driconf
 pkgver=0.9.1
-pkgrel=7
+pkgrel=8
 pkgdesc="A graphical configuration tool for the Direct Rendering 
Infrastructure"
 arch=('any')
 url="http://dri.freedesktop.org/wiki/DriConf";
 license=('GPL')
 depends=('pygtk' 'pyxml' 'expat' 'xorg-xdriinfo' 'mesa-demos')
-source=(ftp://ftp.archlinux.org/other/community/driconf/driconf-$pkgver.tar.gz
-   driconf.desktop
-   drilogo.png)
-md5sums=('76d610bcd56aa5e8a489debb5081178a'
- 'd621b89ad6a623fa5828c05ab585dcb1'
- 'b34317c8c3b70fa278c9992b8077092d')
+source=(ftp://ftp.archlinux.org/other/community/driconf/driconf-$pkgver.tar.gz)
+md5sums=('76d610bcd56aa5e8a489debb5081178a')
 
-build() {
+prepare() {
   cd $srcdir/$pkgname-$pkgver
   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
@@ -28,6 +24,6 @@
 package() {
   cd $srcdir/$pkgname-$pkgver
   python2 setup.py install
-  install -Dm644 ../$pkgname.desktop 
$pkgdir/usr/share/applications/$pkgname.desktop
-  install -Dm644 ../drilogo.png $pkgdir/usr/share/pixmaps/drilogo.png
+  install -Dm644 $pkgname.desktop 
$pkgdir/usr/share/applications/$pkgname.desktop
+  install -Dm644 drilogo.jpg $pkgdir/usr/share/pixmaps/drilogo.jpg
 }

Deleted: driconf.desktop
===
--- driconf.desktop 2013-09-12 10:10:36 UTC (rev 97068)
+++ driconf.desktop 2013-09-12 10:10:41 UTC (rev 97069)
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=DriConf
-Comment=Configuration tool for the DRI
-Exec=driconf
-Icon=/usr/share/pixmaps/drilogo.png
-Terminal=false
-Type=Application
-X-MultipleArgs=false
-Categories=Application;Settings;System;

Deleted: drilogo.png
===
(Binary files differ)