[arch-commits] Commit in xfce4-xkb-plugin/repos (8 files)
Eric Bélanger
eric at archlinux.org
Wed Feb 1 04:56:04 UTC 2012
Date: Tuesday, January 31, 2012 @ 23:56:04
Author: eric
Revision: 148450
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
xfce4-xkb-plugin/repos/extra-i686/PKGBUILD
(from rev 148449, xfce4-xkb-plugin/trunk/PKGBUILD)
xfce4-xkb-plugin/repos/extra-x86_64/PKGBUILD
(from rev 148449, xfce4-xkb-plugin/trunk/PKGBUILD)
Deleted:
xfce4-xkb-plugin/repos/extra-i686/PKGBUILD
xfce4-xkb-plugin/repos/extra-i686/crashfix.diff
xfce4-xkb-plugin/repos/extra-i686/xfce4-xkb-plugin-0.5.3.3-libxklavier.patch
xfce4-xkb-plugin/repos/extra-x86_64/PKGBUILD
xfce4-xkb-plugin/repos/extra-x86_64/crashfix.diff
xfce4-xkb-plugin/repos/extra-x86_64/xfce4-xkb-plugin-0.5.3.3-libxklavier.patch
---------------------------------------------------------+
extra-i686/PKGBUILD | 68 +++++++-------
extra-i686/crashfix.diff | 34 -------
extra-i686/xfce4-xkb-plugin-0.5.3.3-libxklavier.patch | 30 ------
extra-x86_64/PKGBUILD | 68 +++++++-------
extra-x86_64/crashfix.diff | 34 -------
extra-x86_64/xfce4-xkb-plugin-0.5.3.3-libxklavier.patch | 30 ------
6 files changed, 68 insertions(+), 196 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2012-02-01 04:55:45 UTC (rev 148449)
+++ extra-i686/PKGBUILD 2012-02-01 04:56:04 UTC (rev 148450)
@@ -1,34 +0,0 @@
-# $Id$
-# Maintainer: AndyRTR <andyrtr at archlinux.org>
-# Contributor: Tobias Kieslich <tobias (at) archlinux.org>
-
-pkgname=xfce4-xkb-plugin
-pkgver=0.5.4.2
-pkgrel=1
-pkgdesc="plugin to switch keyboard layouts for the Xfce4 panel"
-arch=('i686' 'x86_64')
-license=('custom')
-url="http://goodies.xfce.org/projects/panel-plugins/xfce4-xkb-plugin"
-groups=('xfce4-goodies')
-depends=('xfce4-panel' 'libxklavier>=5.0' 'librsvg')
-makedepends=('intltool')
-options=('!libtool')
-source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/0.5/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('b79f7c65f8155cb77d99dcf9716bb38b')
-
-build() {
- cd ${srcdir}/${pkgname}-${pkgver}
- ./configure --prefix=/usr \
- --sysconfdir=/etc \
- --libexecdir=/usr/lib \
- --localstatedir=/var \
- --disable-static \
- --disable-debug
- make
-}
-
-package() {
- cd ${srcdir}/${pkgname}-${pkgver}
- make DESTDIR=${pkgdir} install
- install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING
-}
Copied: xfce4-xkb-plugin/repos/extra-i686/PKGBUILD (from rev 148449, xfce4-xkb-plugin/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-02-01 04:56:04 UTC (rev 148450)
@@ -0,0 +1,34 @@
+# $Id$
+# Maintainer: AndyRTR <andyrtr at archlinux.org>
+# Contributor: Tobias Kieslich <tobias (at) archlinux.org>
+
+pkgname=xfce4-xkb-plugin
+pkgver=0.5.4.3
+pkgrel=1
+pkgdesc="Plugin to switch keyboard layouts for the Xfce4 panel"
+arch=('i686' 'x86_64')
+license=('custom')
+url="http://goodies.xfce.org/projects/panel-plugins/xfce4-xkb-plugin"
+groups=('xfce4-goodies')
+depends=('xfce4-panel' 'libxklavier>=5.0' 'librsvg')
+makedepends=('intltool')
+options=('!libtool')
+source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/${pkgver%.*.*}/${pkgname}-${pkgver}.tar.bz2)
+sha1sums=('4dc42f96dc16a3bd78f86454ea3a931464e18497')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ ./configure --prefix=/usr \
+ --sysconfdir=/etc \
+ --libexecdir=/usr/lib \
+ --localstatedir=/var \
+ --disable-static \
+ --disable-debug
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+ install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
+}
Deleted: extra-i686/crashfix.diff
===================================================================
--- extra-i686/crashfix.diff 2012-02-01 04:55:45 UTC (rev 148449)
+++ extra-i686/crashfix.diff 2012-02-01 04:56:04 UTC (rev 148450)
@@ -1,34 +0,0 @@
-From 52dc725bf5e44a0ab0064daebffe7ff139da0f78 Mon Sep 17 00:00:00 2001
-From: Lionel Le Folgoc <mrpouit at gmail.com>
-Date: Fri, 24 Sep 2010 21:28:49 +0200
-Subject: Handle cases when the keyboard model is empty
-
-gtk_combo_box_get_active_iter () does not set the iter, and a call to
-gtk_tree_model_get () using this iter will crash. Thus, check the return value
-of gtk_combo_box_get_active_iter () before using the iter.
----
- panel-plugin/xkb-settings-dialog.c | 8 +++++---
- 1 files changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/panel-plugin/xkb-settings-dialog.c b/panel-plugin/xkb-settings-dialog.c
-index 178ec5f..37a0a9a 100644
---- a/panel-plugin/xkb-settings-dialog.c
-+++ b/panel-plugin/xkb-settings-dialog.c
-@@ -831,9 +831,11 @@ xkb_settings_update_from_ui (t_xkb *xkb)
- gint i = 0;
-
- model = GTK_TREE_MODEL (xkb->combo_store);
-- gtk_combo_box_get_active_iter (GTK_COMBO_BOX (xkb->kbd_model_combo), &iter);
-- gtk_tree_model_get (model, &iter, NOM, &kbdmodel, -1);
-- kbd_config->model = kbdmodel;
-+ if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (xkb->kbd_model_combo), &iter))
-+ {
-+ gtk_tree_model_get (model, &iter, NOM, &kbdmodel, -1);
-+ kbd_config->model = kbdmodel;
-+ }
-
- model = GTK_TREE_MODEL (xkb->toggle_options_store);
- if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (xkb->toggle_options_combo), &iter))
---
-1.7.1
-
Deleted: extra-i686/xfce4-xkb-plugin-0.5.3.3-libxklavier.patch
===================================================================
--- extra-i686/xfce4-xkb-plugin-0.5.3.3-libxklavier.patch 2012-02-01 04:55:45 UTC (rev 148449)
+++ extra-i686/xfce4-xkb-plugin-0.5.3.3-libxklavier.patch 2012-02-01 04:56:04 UTC (rev 148450)
@@ -1,30 +0,0 @@
-diff -ur xfce4-xkb-plugin-0.5.3.3.orig/panel-plugin/xkb-config.c xfce4-xkb-plugin-0.5.3.3/panel-plugin/xkb-config.c
---- xfce4-xkb-plugin-0.5.3.3.orig/panel-plugin/xkb-config.c 2009-03-06 15:16:03.000000000 +0200
-+++ xfce4-xkb-plugin-0.5.3.3/panel-plugin/xkb-config.c 2009-07-20 18:40:34.000000000 +0300
-@@ -150,7 +150,7 @@
- config->application_map = g_hash_table_new (g_direct_hash, NULL);
-
- registry = xkl_config_registry_get_instance (config->engine);
-- xkl_config_registry_load (registry);
-+ xkl_config_registry_load (registry, FALSE);
-
- config_item = xkl_config_item_new ();
-
-@@ -214,7 +214,7 @@
-
- gdk_window_remove_filter (NULL, (GdkFilterFunc) handle_xevent, NULL);
-
-- xkl_engine_stop_listen (config->engine);
-+ xkl_engine_stop_listen (config->engine, XKLL_TRACK_KEYBOARD_STATE);
- }
-
- gint
-@@ -547,7 +547,7 @@
- if (!config) return NULL;
-
- registry = xkl_config_registry_get_instance (config->engine);
-- xkl_config_registry_load (registry);
-+ xkl_config_registry_load (registry, FALSE);
-
- return registry;
- }
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2012-02-01 04:55:45 UTC (rev 148449)
+++ extra-x86_64/PKGBUILD 2012-02-01 04:56:04 UTC (rev 148450)
@@ -1,34 +0,0 @@
-# $Id$
-# Maintainer: AndyRTR <andyrtr at archlinux.org>
-# Contributor: Tobias Kieslich <tobias (at) archlinux.org>
-
-pkgname=xfce4-xkb-plugin
-pkgver=0.5.4.2
-pkgrel=1
-pkgdesc="plugin to switch keyboard layouts for the Xfce4 panel"
-arch=('i686' 'x86_64')
-license=('custom')
-url="http://goodies.xfce.org/projects/panel-plugins/xfce4-xkb-plugin"
-groups=('xfce4-goodies')
-depends=('xfce4-panel' 'libxklavier>=5.0' 'librsvg')
-makedepends=('intltool')
-options=('!libtool')
-source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/0.5/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('b79f7c65f8155cb77d99dcf9716bb38b')
-
-build() {
- cd ${srcdir}/${pkgname}-${pkgver}
- ./configure --prefix=/usr \
- --sysconfdir=/etc \
- --libexecdir=/usr/lib \
- --localstatedir=/var \
- --disable-static \
- --disable-debug
- make
-}
-
-package() {
- cd ${srcdir}/${pkgname}-${pkgver}
- make DESTDIR=${pkgdir} install
- install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING
-}
Copied: xfce4-xkb-plugin/repos/extra-x86_64/PKGBUILD (from rev 148449, xfce4-xkb-plugin/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2012-02-01 04:56:04 UTC (rev 148450)
@@ -0,0 +1,34 @@
+# $Id$
+# Maintainer: AndyRTR <andyrtr at archlinux.org>
+# Contributor: Tobias Kieslich <tobias (at) archlinux.org>
+
+pkgname=xfce4-xkb-plugin
+pkgver=0.5.4.3
+pkgrel=1
+pkgdesc="Plugin to switch keyboard layouts for the Xfce4 panel"
+arch=('i686' 'x86_64')
+license=('custom')
+url="http://goodies.xfce.org/projects/panel-plugins/xfce4-xkb-plugin"
+groups=('xfce4-goodies')
+depends=('xfce4-panel' 'libxklavier>=5.0' 'librsvg')
+makedepends=('intltool')
+options=('!libtool')
+source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/${pkgver%.*.*}/${pkgname}-${pkgver}.tar.bz2)
+sha1sums=('4dc42f96dc16a3bd78f86454ea3a931464e18497')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ ./configure --prefix=/usr \
+ --sysconfdir=/etc \
+ --libexecdir=/usr/lib \
+ --localstatedir=/var \
+ --disable-static \
+ --disable-debug
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+ install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
+}
Deleted: extra-x86_64/crashfix.diff
===================================================================
--- extra-x86_64/crashfix.diff 2012-02-01 04:55:45 UTC (rev 148449)
+++ extra-x86_64/crashfix.diff 2012-02-01 04:56:04 UTC (rev 148450)
@@ -1,34 +0,0 @@
-From 52dc725bf5e44a0ab0064daebffe7ff139da0f78 Mon Sep 17 00:00:00 2001
-From: Lionel Le Folgoc <mrpouit at gmail.com>
-Date: Fri, 24 Sep 2010 21:28:49 +0200
-Subject: Handle cases when the keyboard model is empty
-
-gtk_combo_box_get_active_iter () does not set the iter, and a call to
-gtk_tree_model_get () using this iter will crash. Thus, check the return value
-of gtk_combo_box_get_active_iter () before using the iter.
----
- panel-plugin/xkb-settings-dialog.c | 8 +++++---
- 1 files changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/panel-plugin/xkb-settings-dialog.c b/panel-plugin/xkb-settings-dialog.c
-index 178ec5f..37a0a9a 100644
---- a/panel-plugin/xkb-settings-dialog.c
-+++ b/panel-plugin/xkb-settings-dialog.c
-@@ -831,9 +831,11 @@ xkb_settings_update_from_ui (t_xkb *xkb)
- gint i = 0;
-
- model = GTK_TREE_MODEL (xkb->combo_store);
-- gtk_combo_box_get_active_iter (GTK_COMBO_BOX (xkb->kbd_model_combo), &iter);
-- gtk_tree_model_get (model, &iter, NOM, &kbdmodel, -1);
-- kbd_config->model = kbdmodel;
-+ if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (xkb->kbd_model_combo), &iter))
-+ {
-+ gtk_tree_model_get (model, &iter, NOM, &kbdmodel, -1);
-+ kbd_config->model = kbdmodel;
-+ }
-
- model = GTK_TREE_MODEL (xkb->toggle_options_store);
- if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (xkb->toggle_options_combo), &iter))
---
-1.7.1
-
Deleted: extra-x86_64/xfce4-xkb-plugin-0.5.3.3-libxklavier.patch
===================================================================
--- extra-x86_64/xfce4-xkb-plugin-0.5.3.3-libxklavier.patch 2012-02-01 04:55:45 UTC (rev 148449)
+++ extra-x86_64/xfce4-xkb-plugin-0.5.3.3-libxklavier.patch 2012-02-01 04:56:04 UTC (rev 148450)
@@ -1,30 +0,0 @@
-diff -ur xfce4-xkb-plugin-0.5.3.3.orig/panel-plugin/xkb-config.c xfce4-xkb-plugin-0.5.3.3/panel-plugin/xkb-config.c
---- xfce4-xkb-plugin-0.5.3.3.orig/panel-plugin/xkb-config.c 2009-03-06 15:16:03.000000000 +0200
-+++ xfce4-xkb-plugin-0.5.3.3/panel-plugin/xkb-config.c 2009-07-20 18:40:34.000000000 +0300
-@@ -150,7 +150,7 @@
- config->application_map = g_hash_table_new (g_direct_hash, NULL);
-
- registry = xkl_config_registry_get_instance (config->engine);
-- xkl_config_registry_load (registry);
-+ xkl_config_registry_load (registry, FALSE);
-
- config_item = xkl_config_item_new ();
-
-@@ -214,7 +214,7 @@
-
- gdk_window_remove_filter (NULL, (GdkFilterFunc) handle_xevent, NULL);
-
-- xkl_engine_stop_listen (config->engine);
-+ xkl_engine_stop_listen (config->engine, XKLL_TRACK_KEYBOARD_STATE);
- }
-
- gint
-@@ -547,7 +547,7 @@
- if (!config) return NULL;
-
- registry = xkl_config_registry_get_instance (config->engine);
-- xkl_config_registry_load (registry);
-+ xkl_config_registry_load (registry, FALSE);
-
- return registry;
- }
More information about the arch-commits
mailing list