[arch-commits] Commit in lxinput/trunk (PKGBUILD gtk3.patch)

2016-02-20 Thread Balló György 
Date: Sunday, February 21, 2016 @ 02:10:22
  Author: bgyorgy
Revision: 162920

upgpkg: lxinput 0.3.5-1

Update to new version

Modified:
  lxinput/trunk/PKGBUILD
Deleted:
  lxinput/trunk/gtk3.patch

+
 PKGBUILD   |   15 ++--
 gtk3.patch |  108 ---
 2 files changed, 4 insertions(+), 119 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-02-21 01:06:55 UTC (rev 162919)
+++ PKGBUILD2016-02-21 01:10:22 UTC (rev 162920)
@@ -5,8 +5,8 @@
 
 pkgbase=lxinput
 pkgname=(lxinput lxinput-gtk3)
-pkgver=0.3.4
-pkgrel=2
+pkgver=0.3.5
+pkgrel=1
 pkgdesc="Small program to configure keyboard and mouse for LXDE"
 arch=('i686' 'x86_64')
 url="http://lxde.org/;
@@ -14,16 +14,9 @@
 groups=('lxde')
 depends=('gtk2' 'gtk3')
 makedepends=('intltool')
-source=(http://downloads.sourceforge.net/lxde/$pkgbase-$pkgver.tar.xz
-gtk3.patch)
-sha256sums=('6e37074e406a05792f6eaac029638bd02fe88926f20736d73dcb5113da825c24'
-'73504c8bebf946f9806f9d72a79691357d1b705ca4798f5597538b9ece06e7f3')
+source=(http://downloads.sourceforge.net/lxde/$pkgbase-$pkgver.tar.xz)
+sha256sums=('4e8f778a65a4afe2365b47e7899358aa4fab535343aa62c72a3cdc4cac1f6e88')
 
-prepare() {
-  cd $pkgbase-$pkgver
-  patch -Np1 -i ../gtk3.patch
-}
-
 build() {
   # GTK+ 2 version
   [ -d gtk2 ] || cp -r $pkgbase-$pkgver gtk2

Deleted: gtk3.patch
===
--- gtk3.patch  2016-02-21 01:06:55 UTC (rev 162919)
+++ gtk3.patch  2016-02-21 01:10:22 UTC (rev 162920)
@@ -1,108 +0,0 @@
-From 2c29bf2b3d68f4897d708a9fa215277e1c40d2e8 Mon Sep 17 00:00:00 2001
-From: =?utf8?q?Ball=C3=B3=20Gy=C3=B6rgy?= 
-Date: Thu, 18 Dec 2014 04:29:17 +0100
-Subject: [PATCH] Fix GtkBuilder UI file for GTK+ 3, add mouse icon to mouse
- tab
-

- data/lxinput.ui | 27 +--
- 1 file changed, 13 insertions(+), 14 deletions(-)
-
-diff --git a/data/lxinput.ui b/data/lxinput.ui
-index a61cb8e..a3a4175 100644
 a/data/lxinput.ui
-+++ b/data/lxinput.ui
-@@ -107,7 +107,6 @@
- 100
- True
- True
--discontinuous
- mouse_accel_adj
- 1
- right
-@@ -123,7 +122,6 @@
- 100
- True
- True
--discontinuous
- mouse_threshold_adj
- 0
- right
-@@ -247,6 +245,19 @@
- False
- 6
- 
-+  
-+True
-+False
-+16
-+input-mouse
-+  
-+  
-+True
-+True
-+0
-+  
-+
-+
-   
- True
- False
-@@ -312,7 +323,6 @@
- 100
- True
- True
--discontinuous
- kb_daley_adj
- 0
- right
-@@ -329,7 +339,6 @@
- True
- True
- Interval between each key repeat
--discontinuous
- kb_interval_adj
- 0
- right
-@@ -624,16 +633,6 @@
-   ok
- 
-   
--  
--True
--False
--input-keyboard
--  
--  
--True
--False
--input-keyboard
--  
-   
- 100
- 1100
--- 
-2.1.4
-
-From 2b52f014c63cca1581612eaa6d552187bdee Mon Sep 17 00:00:00 2001
-From: =?utf8?q?Ball=C3=B3=20Gy=C3=B6rgy?= 
-Date: Sun, 2 Aug 2015 00:45:47 +0200
-Subject: [PATCH] Add MATE to NotShowIn in desktop entries
-

- data/lxinput.desktop.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/data/lxinput.desktop.in b/data/lxinput.desktop.in
-index 0587227..83d29b6 100644
 a/data/lxinput.desktop.in
-+++ b/data/lxinput.desktop.in
-@@ -7,4 +7,4 @@ _Comment=Configure keyboard, mouse, and other input devices
- StartupNotify=true
- Terminal=false
- Categories=GTK;Settings;HardwareSettings;X-LXDE-Settings;
--NotShowIn=GNOME;KDE;XFCE;
-+NotShowIn=GNOME;KDE;XFCE;MATE;
--- 
-2.1.4
-

[arch-commits] Commit in lxinput/trunk (PKGBUILD gtk3.patch)

2016-02-17 Thread Balló György 
Date: Thursday, February 18, 2016 @ 00:23:13
  Author: bgyorgy
Revision: 162146

upgpkg: lxinput 0.3.4-2

Add GTK+ 3 version

Added:
  lxinput/trunk/gtk3.patch
Modified:
  lxinput/trunk/PKGBUILD

+
 PKGBUILD   |   52 ++--
 gtk3.patch |  108 +++
 2 files changed, 149 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-02-17 23:19:07 UTC (rev 162145)
+++ PKGBUILD2016-02-17 23:23:13 UTC (rev 162146)
@@ -1,28 +1,58 @@
 # $Id$
+# Maintainer: Balló György 
 # Contributor: Bartłomiej Piotrowski 
 # Contributor: Filipp "Scorp" Andjelo 
 
-pkgname=lxinput
+pkgbase=lxinput
+pkgname=(lxinput lxinput-gtk3)
 pkgver=0.3.4
-pkgrel=1
-pkgdesc="A small program to configure keyboard and mouse for LXDE."
+pkgrel=2
+pkgdesc="Small program to configure keyboard and mouse for LXDE"
 arch=('i686' 'x86_64')
 url="http://lxde.org/;
 license=('GPL')
 groups=('lxde')
-depends=('gtk2>=2.12.0')
-makedepends=('pkgconfig' 'intltool')
-source=(http://sourceforge.net/projects/lxde/files/LXInput%20%28Kbd%20and%20amp_%20mouse%20config%29/LXInput%200.3.x/${pkgname}-${pkgver}.tar.xz/download)
-sha256sums=('6e37074e406a05792f6eaac029638bd02fe88926f20736d73dcb5113da825c24')
+depends=('gtk2' 'gtk3')
+makedepends=('intltool')
+source=(http://downloads.sourceforge.net/lxde/$pkgbase-$pkgver.tar.xz
+gtk3.patch)
+sha256sums=('6e37074e406a05792f6eaac029638bd02fe88926f20736d73dcb5113da825c24'
+'73504c8bebf946f9806f9d72a79691357d1b705ca4798f5597538b9ece06e7f3')
 
+prepare() {
+  cd $pkgbase-$pkgver
+  patch -Np1 -i ../gtk3.patch
+}
+
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  # GTK+ 2 version
+  [ -d gtk2 ] || cp -r $pkgbase-$pkgver gtk2
+  cd gtk2
   ./configure --prefix=/usr
   make
+
+  cd "$srcdir"
+  # GTK+ 3 version
+  [ -d gtk3 ] || cp -r $pkgbase-$pkgver gtk3
+  cd gtk3
+  ./configure --prefix=/usr --enable-gtk3
+  make
 }
 
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
+package_lxinput() {
+  groups=('lxde')
+  depends=('gtk2')
+
+  cd gtk2
+  make DESTDIR="$pkgdir" install
 }
 
+package_lxinput-gtk3() {
+  groups=('lxde-gtk3')
+  pkgdesc+=' (GTK+ 3 version)'
+  depends=('gtk3')
+  conflicts=('lxinput')
+
+  cd gtk3
+  make DESTDIR="$pkgdir" install
+}

Added: gtk3.patch
===
--- gtk3.patch  (rev 0)
+++ gtk3.patch  2016-02-17 23:23:13 UTC (rev 162146)
@@ -0,0 +1,108 @@
+From 2c29bf2b3d68f4897d708a9fa215277e1c40d2e8 Mon Sep 17 00:00:00 2001
+From: =?utf8?q?Ball=C3=B3=20Gy=C3=B6rgy?= 
+Date: Thu, 18 Dec 2014 04:29:17 +0100
+Subject: [PATCH] Fix GtkBuilder UI file for GTK+ 3, add mouse icon to mouse
+ tab
+
+---
+ data/lxinput.ui | 27 +--
+ 1 file changed, 13 insertions(+), 14 deletions(-)
+
+diff --git a/data/lxinput.ui b/data/lxinput.ui
+index a61cb8e..a3a4175 100644
+--- a/data/lxinput.ui
 b/data/lxinput.ui
+@@ -107,7 +107,6 @@
+ 100
+ True
+ True
+-discontinuous
+ mouse_accel_adj
+ 1
+ right
+@@ -123,7 +122,6 @@
+ 100
+ True
+ True
+-discontinuous
+ mouse_threshold_adj
+ 0
+ right
+@@ -247,6 +245,19 @@
+ False
+ 6
+ 
++  
++True
++False
++16
++input-mouse
++  
++  
++True
++True
++0
++  
++
++
+   
+ True
+ False
+@@ -312,7 +323,6 @@
+ 100
+ True
+ True
+-discontinuous
+ kb_daley_adj
+ 0
+ right
+@@ -329,7 +339,6 @@
+ True
+ True
+ Interval between each key repeat
+-discontinuous
+ kb_interval_adj
+ 0
+ right