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

[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
===================================================================
--- PKGBUILD	2016-02-21 01:06:55 UTC (rev 162919)
+++ PKGBUILD	2016-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?= <ballogyor at 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?= <ballogyor at 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
-