diff --git a/desktop/xfce4-xkb-plugin/rename_bs_to_ba_dot_svg.diff b/desktop/xfce4-xkb-plugin/rename_bs_to_ba_dot_svg.diff deleted file mode 100644 index 6429937a6a..0000000000 --- a/desktop/xfce4-xkb-plugin/rename_bs_to_ba_dot_svg.diff +++ /dev/null @@ -1,278 +0,0 @@ -diff -Nur xfce4-xkb-plugin-0.5.3.3.orig//flags/Makefile.am xfce4-xkb-plugin-0.5.3.3/flags/Makefile.am ---- xfce4-xkb-plugin-0.5.3.3.orig//flags/Makefile.am 2009-03-06 07:16:06.000000000 -0600 -+++ xfce4-xkb-plugin-0.5.3.3/flags/Makefile.am 2011-06-20 12:43:15.982508648 -0500 -@@ -11,7 +11,7 @@ - bg.svg \ - bh.svg \ - br.svg \ -- bs.svg \ -+ ba.svg \ - by.svg \ - ca.svg \ - ch.svg \ -diff -Nur xfce4-xkb-plugin-0.5.3.3.orig//flags/Makefile.in xfce4-xkb-plugin-0.5.3.3/flags/Makefile.in ---- xfce4-xkb-plugin-0.5.3.3.orig//flags/Makefile.in 2009-03-06 07:16:29.000000000 -0600 -+++ xfce4-xkb-plugin-0.5.3.3/flags/Makefile.in 2011-06-20 12:43:15.983508640 -0500 -@@ -259,7 +259,7 @@ - bg.svg \ - bh.svg \ - br.svg \ -- bs.svg \ -+ ba.svg \ - by.svg \ - ca.svg \ - ch.svg \ -diff -Nur xfce4-xkb-plugin-0.5.3.3.orig//flags/ba.svg xfce4-xkb-plugin-0.5.3.3/flags/ba.svg ---- xfce4-xkb-plugin-0.5.3.3.orig//flags/ba.svg 1969-12-31 18:00:00.000000000 -0600 -+++ xfce4-xkb-plugin-0.5.3.3/flags/ba.svg 2011-06-20 12:43:05.472594747 -0500 -@@ -0,0 +1,123 @@ -+ -+ -+ -+ -+ -+ -+ -+ -+ image/svg+xml -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -diff -Nur xfce4-xkb-plugin-0.5.3.3.orig//flags/bs.svg xfce4-xkb-plugin-0.5.3.3/flags/bs.svg ---- xfce4-xkb-plugin-0.5.3.3.orig//flags/bs.svg 2009-03-06 07:16:06.000000000 -0600 -+++ xfce4-xkb-plugin-0.5.3.3/flags/bs.svg 1969-12-31 18:00:00.000000000 -0600 -@@ -1,123 +0,0 @@ -- -- -- -- -- -- -- -- -- image/svg+xml -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- diff --git a/desktop/xfce4-xkb-plugin/xfce4-xkb-plugin-gtk.patch b/desktop/xfce4-xkb-plugin/xfce4-xkb-plugin-gtk.patch deleted file mode 100644 index d7075b596e..0000000000 --- a/desktop/xfce4-xkb-plugin/xfce4-xkb-plugin-gtk.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff -Naur xfce4-xkb-plugin-0.5.3.3.orig//panel-plugin/xkb-settings-dialog.c xfce4-xkb-plugin-0.5.3.3//panel-plugin/xkb-settings-dialog.c ---- xfce4-xkb-plugin-0.5.3.3.orig//panel-plugin/xkb-settings-dialog.c 2010-10-04 21:14:05.000000000 +0300 -+++ xfce4-xkb-plugin-0.5.3.3//panel-plugin/xkb-settings-dialog.c 2010-10-04 21:13:49.000000000 +0300 -@@ -31,8 +31,11 @@ - #include - #include - -+#undef XFCE_DISABLE_DEPRECATED -+ - #include - #include -+#include - - #include "xfce4-xkb-plugin.h" - #include "xfce4-xkb-plugin-private.h" -@@ -678,7 +681,7 @@ - xfce_xkb_about (XfcePanelPlugin *plugin) - { - GtkWidget *about; -- const gchar* authors[2] = { -+ const gchar* authors[] = { - "Alexander Iliev ", - "Gauvain Pocentek ", - NULL -@@ -825,15 +828,17 @@ - xkb_settings_update_from_ui (t_xkb *xkb) - { - gchar *layouts, *variants, *kbdmodel, *toggle_option, -- *compose_key_position, *tmp; -+ *compose_key_position; - t_xkb_kbd_config *kbd_config = xkb->settings->kbd_config; - gboolean is_default; - 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)) diff --git a/desktop/xfce4-xkb-plugin/xfce4-xkb-plugin-libxklavier_api_chance.diff b/desktop/xfce4-xkb-plugin/xfce4-xkb-plugin-libxklavier_api_chance.diff deleted file mode 100644 index f7be125dc8..0000000000 --- a/desktop/xfce4-xkb-plugin/xfce4-xkb-plugin-libxklavier_api_chance.diff +++ /dev/null @@ -1,30 +0,0 @@ -diff -Nur 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 07:16:03.000000000 -0600 -+++ xfce4-xkb-plugin-0.5.3.3/panel-plugin/xkb-config.c 2010-05-23 16:34:51.141676108 -0500 -@@ -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; - } diff --git a/desktop/xfce4-xkb-plugin/xfce4-xkb-plugin.SlackBuild b/desktop/xfce4-xkb-plugin/xfce4-xkb-plugin.SlackBuild index b74787faed..7c5f41fecf 100644 --- a/desktop/xfce4-xkb-plugin/xfce4-xkb-plugin.SlackBuild +++ b/desktop/xfce4-xkb-plugin/xfce4-xkb-plugin.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for xfce4-xkb-plugin -# Copyright 2006-2011 Robby Workman, Northport, Alabama, USA +# Copyright 2006-2012 Robby Workman, Northport, Alabama, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,8 +23,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=xfce4-xkb-plugin -VERSION=0.5.3.3 -BUILD=${BUILD:-3} +VERSION=${VERSION:-0.5.4.3} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -60,7 +60,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz +tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 cd $PRGNAM-$VERSION chown -R root:root . find . \ @@ -69,20 +69,6 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# Fixup the plugin for newer libxklavier api -# Thanks to Christoph Wickert of the Fedora project :-) -# http://lists.fedoraproject.org/pipermail/scm-commits/2010-January/384437.html -patch -p1 < $CWD/xfce4-xkb-plugin-libxklavier_api_chance.diff - -# Fixup for some gtk-related crashes -# Thanks to Andreas Radke (AndyRTR) or the Arch Linux project :) -# https://bugs.archlinux.org/task/21067?project=1&string=xfce4-xkb-plugin -patch -p1 < $CWD/xfce4-xkb-plugin-gtk.patch - -# Fix display of Bosnia/Herzegovina flag -# Thanks to Armin Besirovic for the report -patch -p1 < $CWD/rename_bs_to_ba_dot_svg.diff - CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/desktop/xfce4-xkb-plugin/xfce4-xkb-plugin.info b/desktop/xfce4-xkb-plugin/xfce4-xkb-plugin.info index 6220b61cd5..883d96f385 100644 --- a/desktop/xfce4-xkb-plugin/xfce4-xkb-plugin.info +++ b/desktop/xfce4-xkb-plugin/xfce4-xkb-plugin.info @@ -1,8 +1,8 @@ PRGNAM="xfce4-xkb-plugin" -VERSION="0.5.3.3" +VERSION="0.5.4.3" HOMEPAGE="http://goodies.xfce.org/" -DOWNLOAD="http://archive.xfce.org/src/panel-plugins/xfce4-xkb-plugin/0.5/xfce4-xkb-plugin-0.5.3.3.tar.gz" -MD5SUM="b233cc9de1cbace075eaf6e2c9a8e685" +DOWNLOAD="http://archive.xfce.org/src/panel-plugins/xfce4-xkb-plugin/0.5/xfce4-xkb-plugin-0.5.4.3.tar.bz2" +MD5SUM="b31144bd50875ec73f0b3101456c97fd" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES=""