Date: Thursday, February 18, 2016 @ 00:23:20 Author: bgyorgy Revision: 162147
archrelease: copy trunk to community-i686, community-x86_64 Added: lxinput/repos/community-i686/PKGBUILD (from rev 162146, lxinput/trunk/PKGBUILD) lxinput/repos/community-i686/gtk3.patch (from rev 162146, lxinput/trunk/gtk3.patch) lxinput/repos/community-x86_64/PKGBUILD (from rev 162146, lxinput/trunk/PKGBUILD) lxinput/repos/community-x86_64/gtk3.patch (from rev 162146, lxinput/trunk/gtk3.patch) Deleted: lxinput/repos/community-i686/PKGBUILD lxinput/repos/community-x86_64/PKGBUILD -----------------------------+ /PKGBUILD | 116 ++++++++++++++++++++++++++++++++++++++++++ community-i686/PKGBUILD | 28 ---------- community-i686/gtk3.patch | 108 +++++++++++++++++++++++++++++++++++++++ community-x86_64/PKGBUILD | 28 ---------- community-x86_64/gtk3.patch | 108 +++++++++++++++++++++++++++++++++++++++ 5 files changed, 332 insertions(+), 56 deletions(-) Deleted: community-i686/PKGBUILD =================================================================== --- community-i686/PKGBUILD 2016-02-17 23:23:13 UTC (rev 162146) +++ community-i686/PKGBUILD 2016-02-17 23:23:20 UTC (rev 162147) @@ -1,28 +0,0 @@ -# $Id$ -# Contributor: Bartłomiej Piotrowski <bpiotrow...@archlinux.org> -# Contributor: Filipp "Scorp" Andjelo <sc...@mailueberfall.de> - -pkgname=lxinput -pkgver=0.3.4 -pkgrel=1 -pkgdesc="A 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') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr - make -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install -} - Copied: lxinput/repos/community-i686/PKGBUILD (from rev 162146, lxinput/trunk/PKGBUILD) =================================================================== --- community-i686/PKGBUILD (rev 0) +++ community-i686/PKGBUILD 2016-02-17 23:23:20 UTC (rev 162147) @@ -0,0 +1,58 @@ +# $Id$ +# Maintainer: Balló György <ballogyor+arch at gmail dot com> +# Contributor: Bartłomiej Piotrowski <bpiotrow...@archlinux.org> +# Contributor: Filipp "Scorp" Andjelo <sc...@mailueberfall.de> + +pkgbase=lxinput +pkgname=(lxinput lxinput-gtk3) +pkgver=0.3.4 +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' '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() { + # 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_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 +} Copied: lxinput/repos/community-i686/gtk3.patch (from rev 162146, lxinput/trunk/gtk3.patch) =================================================================== --- community-i686/gtk3.patch (rev 0) +++ community-i686/gtk3.patch 2016-02-17 23:23:20 UTC (rev 162147) @@ -0,0 +1,108 @@ +From 2c29bf2b3d68f4897d708a9fa215277e1c40d2e8 Mon Sep 17 00:00:00 2001 +From: =?utf8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballog...@gmail.com> +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 @@ + <property name="width_request">100</property> + <property name="visible">True</property> + <property name="can_focus">True</property> +- <property name="update_policy">discontinuous</property> + <property name="adjustment">mouse_accel_adj</property> + <property name="digits">1</property> + <property name="value_pos">right</property> +@@ -123,7 +122,6 @@ + <property name="width_request">100</property> + <property name="visible">True</property> + <property name="can_focus">True</property> +- <property name="update_policy">discontinuous</property> + <property name="adjustment">mouse_threshold_adj</property> + <property name="digits">0</property> + <property name="value_pos">right</property> +@@ -247,6 +245,19 @@ + <property name="can_focus">False</property> + <property name="spacing">6</property> + <child> ++ <object class="GtkImage" id="image1"> ++ <property name="visible">True</property> ++ <property name="can_focus">False</property> ++ <property name="pixel_size">16</property> ++ <property name="icon_name">input-mouse</property> ++ </object> ++ <packing> ++ <property name="expand">True</property> ++ <property name="fill">True</property> ++ <property name="position">0</property> ++ </packing> ++ </child> ++ <child> + <object class="GtkLabel" id="label1"> + <property name="visible">True</property> + <property name="can_focus">False</property> +@@ -312,7 +323,6 @@ + <property name="width_request">100</property> + <property name="visible">True</property> + <property name="can_focus">True</property> +- <property name="update_policy">discontinuous</property> + <property name="adjustment">kb_daley_adj</property> + <property name="digits">0</property> + <property name="value_pos">right</property> +@@ -329,7 +339,6 @@ + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="tooltip_text" translatable="yes">Interval between each key repeat</property> +- <property name="update_policy">discontinuous</property> + <property name="adjustment">kb_interval_adj</property> + <property name="digits">0</property> + <property name="value_pos">right</property> +@@ -624,16 +633,6 @@ + <action-widget response="-5">ok</action-widget> + </action-widgets> + </object> +- <object class="GtkImage" id="image1"> +- <property name="visible">True</property> +- <property name="can_focus">False</property> +- <property name="icon_name">input-keyboard</property> +- </object> +- <object class="GtkImage" id="image10"> +- <property name="visible">True</property> +- <property name="can_focus">False</property> +- <property name="icon_name">input-keyboard</property> +- </object> + <object class="GtkAdjustment" id="kb_daley_adj"> + <property name="lower">100</property> + <property name="upper">1100</property> +-- +2.1.4 + +From 2b52f014c63cca1581612ea7777a6d552187bdee Mon Sep 17 00:00:00 2001 +From: =?utf8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballog...@gmail.com> +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 + Deleted: community-x86_64/PKGBUILD =================================================================== --- community-x86_64/PKGBUILD 2016-02-17 23:23:13 UTC (rev 162146) +++ community-x86_64/PKGBUILD 2016-02-17 23:23:20 UTC (rev 162147) @@ -1,28 +0,0 @@ -# $Id$ -# Contributor: Bartłomiej Piotrowski <bpiotrow...@archlinux.org> -# Contributor: Filipp "Scorp" Andjelo <sc...@mailueberfall.de> - -pkgname=lxinput -pkgver=0.3.4 -pkgrel=1 -pkgdesc="A 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') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr - make -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install -} - Copied: lxinput/repos/community-x86_64/PKGBUILD (from rev 162146, lxinput/trunk/PKGBUILD) =================================================================== --- community-x86_64/PKGBUILD (rev 0) +++ community-x86_64/PKGBUILD 2016-02-17 23:23:20 UTC (rev 162147) @@ -0,0 +1,58 @@ +# $Id$ +# Maintainer: Balló György <ballogyor+arch at gmail dot com> +# Contributor: Bartłomiej Piotrowski <bpiotrow...@archlinux.org> +# Contributor: Filipp "Scorp" Andjelo <sc...@mailueberfall.de> + +pkgbase=lxinput +pkgname=(lxinput lxinput-gtk3) +pkgver=0.3.4 +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' '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() { + # 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_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 +} Copied: lxinput/repos/community-x86_64/gtk3.patch (from rev 162146, lxinput/trunk/gtk3.patch) =================================================================== --- community-x86_64/gtk3.patch (rev 0) +++ community-x86_64/gtk3.patch 2016-02-17 23:23:20 UTC (rev 162147) @@ -0,0 +1,108 @@ +From 2c29bf2b3d68f4897d708a9fa215277e1c40d2e8 Mon Sep 17 00:00:00 2001 +From: =?utf8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballog...@gmail.com> +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 @@ + <property name="width_request">100</property> + <property name="visible">True</property> + <property name="can_focus">True</property> +- <property name="update_policy">discontinuous</property> + <property name="adjustment">mouse_accel_adj</property> + <property name="digits">1</property> + <property name="value_pos">right</property> +@@ -123,7 +122,6 @@ + <property name="width_request">100</property> + <property name="visible">True</property> + <property name="can_focus">True</property> +- <property name="update_policy">discontinuous</property> + <property name="adjustment">mouse_threshold_adj</property> + <property name="digits">0</property> + <property name="value_pos">right</property> +@@ -247,6 +245,19 @@ + <property name="can_focus">False</property> + <property name="spacing">6</property> + <child> ++ <object class="GtkImage" id="image1"> ++ <property name="visible">True</property> ++ <property name="can_focus">False</property> ++ <property name="pixel_size">16</property> ++ <property name="icon_name">input-mouse</property> ++ </object> ++ <packing> ++ <property name="expand">True</property> ++ <property name="fill">True</property> ++ <property name="position">0</property> ++ </packing> ++ </child> ++ <child> + <object class="GtkLabel" id="label1"> + <property name="visible">True</property> + <property name="can_focus">False</property> +@@ -312,7 +323,6 @@ + <property name="width_request">100</property> + <property name="visible">True</property> + <property name="can_focus">True</property> +- <property name="update_policy">discontinuous</property> + <property name="adjustment">kb_daley_adj</property> + <property name="digits">0</property> + <property name="value_pos">right</property> +@@ -329,7 +339,6 @@ + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="tooltip_text" translatable="yes">Interval between each key repeat</property> +- <property name="update_policy">discontinuous</property> + <property name="adjustment">kb_interval_adj</property> + <property name="digits">0</property> + <property name="value_pos">right</property> +@@ -624,16 +633,6 @@ + <action-widget response="-5">ok</action-widget> + </action-widgets> + </object> +- <object class="GtkImage" id="image1"> +- <property name="visible">True</property> +- <property name="can_focus">False</property> +- <property name="icon_name">input-keyboard</property> +- </object> +- <object class="GtkImage" id="image10"> +- <property name="visible">True</property> +- <property name="can_focus">False</property> +- <property name="icon_name">input-keyboard</property> +- </object> + <object class="GtkAdjustment" id="kb_daley_adj"> + <property name="lower">100</property> + <property name="upper">1100</property> +-- +2.1.4 + +From 2b52f014c63cca1581612ea7777a6d552187bdee Mon Sep 17 00:00:00 2001 +From: =?utf8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballog...@gmail.com> +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 +