packages: xfce4-xkb-plugin/xfce4-xkb-plugin.spec, xfce4-xkb-plugin/xfce4-xk...

baggins baggins at pld-linux.org
Sat Feb 19 18:34:52 CET 2011 

Author: baggins                      Date: Sat Feb 19 17:34:52 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 7
- libxfce4ui support

---- Files affected:
packages/xfce4-xkb-plugin:
   xfce4-xkb-plugin.spec (1.17 -> 1.18) , xfce4-xkb-plugin-ui.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/xfce4-xkb-plugin/xfce4-xkb-plugin.spec
diff -u packages/xfce4-xkb-plugin/xfce4-xkb-plugin.spec:1.17 packages/xfce4-xkb-plugin/xfce4-xkb-plugin.spec:1.18
--- packages/xfce4-xkb-plugin/xfce4-xkb-plugin.spec:1.17	Thu Feb 17 00:10:49 2011
+++ packages/xfce4-xkb-plugin/xfce4-xkb-plugin.spec	Sat Feb 19 18:34:47 2011
@@ -3,13 +3,14 @@
 Summary(pl.UTF-8):	Wyświetlanie i przełączanie bieżącego układu klawiatury
 Name:		xfce4-xkb-plugin
 Version:	0.5.3.3
-Release:	6
+Release:	7
 License:	BSD-like
 Group:		X11/Applications
 Source0:	http://goodies.xfce.org/releases/xfce4-xkb-plugin/%{name}-%{version}.tar.gz
 # Source0-md5:	b233cc9de1cbace075eaf6e2c9a8e685
 Patch0:		%{name}-xklavier-api.patch
 Patch1:		%{name}-libxklavier5.patch
+Patch2:		%{name}-ui.patch
 URL:		http://goodies.xfce.org/projects/panel-plugins/xfce4-xkb-plugin
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake >= 1:1.8
@@ -39,6 +40,7 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p0
 
 %build
 %{__intltoolize}
@@ -58,8 +60,6 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-rm -f $RPM_BUILD_ROOT%{_libdir}/xfce4/panel-plugins/*.la
-
 %find_lang %{name}
 
 %clean
@@ -78,6 +78,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.18  2011/02/19 17:34:47  baggins
+- rel 7
+- libxfce4ui support
+
 Revision 1.17  2011/02/16 23:10:49  megabajt
 - release 6
 

================================================================
Index: packages/xfce4-xkb-plugin/xfce4-xkb-plugin-ui.patch
diff -u /dev/null packages/xfce4-xkb-plugin/xfce4-xkb-plugin-ui.patch:1.1
--- /dev/null	Sat Feb 19 18:34:52 2011
+++ packages/xfce4-xkb-plugin/xfce4-xkb-plugin-ui.patch	Sat Feb 19 18:34:47 2011
@@ -0,0 +1,162 @@
+http://bugzilla.xfce.org/show_bug.cgi?id=6396
+
+--- configure.in
++++ configure.in
+@@ -63,7 +63,7 @@
+ dnl ***********************************
+ XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.6.0])
+ XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.3.90.2])
+-XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.3.90.2])
++XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.7.0])
+ XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.20])
+ XDT_CHECK_PACKAGE([LIBXKLAVIER], [libxklavier], [3.2])
+ XDT_CHECK_PACKAGE([LIBRSVG], [librsvg-2.0], [2.18])
+--- panel-plugin/Makefile.am
++++ panel-plugin/Makefile.am
+@@ -23,7 +23,7 @@
+ xfce4_xkb_plugin_CFLAGS =								\
+ 	@LIBXFCE4PANEL_CFLAGS@								\
+ 	@GTK_CFLAGS@									\
+-	@LIBXFCEGUI4_CFLAGS@								\
++	@LIBXFCE4UI_CFLAGS@								\
+ 	@LIBXFCE4UTIL_CFLAGS@								\
+ 	@LIBXKLAVIER_CFLAGS@								\
+ 	@LIBRSVG_CFLAGS@								\
+@@ -36,7 +36,7 @@
+ xfce4_xkb_plugin_LDADD = 								\
+ 	@LIBXFCE4PANEL_LIBS@								\
+ 	@GTK_LIBS@									\
+-	@LIBXFCEGUI4_LIBS@								\
++	@LIBXFCE4UI_LIBS@								\
+ 	@LIBXFCE4UTIL_LIBS@								\
+ 	@LIBXKLAVIER_LIBS@								\
+ 	@LIBWNCK_LIBS@									\
+--- panel-plugin/xfce4-xkb-plugin.h
++++ panel-plugin/xfce4-xkb-plugin.h
+@@ -29,7 +29,7 @@
+ #include "xkb-config.h"
+ 
+ #include <libxfce4util/libxfce4util.h>
+-#include <libxfcegui4/libxfcegui4.h>
++#include <libxfce4ui/libxfce4ui.h>
+ #include <libxfce4panel/xfce-panel-plugin.h>
+ 
+ #include <X11/Xlib.h>
+--- panel-plugin/xkb-settings-dialog.c
++++ panel-plugin/xkb-settings-dialog.c
+@@ -32,7 +32,7 @@
+ #include <gtk/gtk.h>
+ 
+ #include <libxfce4panel/xfce-panel-plugin.h>
+-#include <libxfcegui4/libxfcegui4.h>
++#include <libxfce4ui/libxfce4ui.h>
+ 
+ #include "xfce4-xkb-plugin.h"
+ #include "xfce4-xkb-plugin-private.h"
+@@ -447,7 +447,7 @@
+                     t_xkb *xkb)
+ {
+     GtkWidget *display_type_optmenu, *group_policy_combo;
+-    GtkWidget *vbox, *display_type_frame, *group_policy_frame;
++    GtkWidget *vbox, *display_type_frame, *group_policy_frame, *bin;
+           
+ 
+     GtkCellRenderer *renderer, *renderer2;
+@@ -480,14 +480,14 @@
+     gtk_container_add (GTK_CONTAINER (vbox), vbox1);
+     gtk_widget_show (vbox1);
+ 
+-    frame = xfce_framebox_new (_("Keyboard model:"), TRUE);
++    frame = xfce_gtk_frame_box_new (_("Keyboard model:"), &bin);
+     gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_NONE);
+-    gtk_widget_show (frame);
++    gtk_widget_show ((frame));
+     gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 0);
+ 
+     xkb->kbd_model_combo = gtk_combo_box_new_with_model (GTK_TREE_MODEL (xkb->combo_store));
+     gtk_widget_set_size_request (xkb->kbd_model_combo, 230, -1);
+-    xfce_framebox_add (XFCE_FRAMEBOX (frame), xkb->kbd_model_combo);
++    gtk_container_add (GTK_CONTAINER (bin), xkb->kbd_model_combo);
+     gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (xkb->kbd_model_combo), renderer, TRUE);
+     gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (xkb->kbd_model_combo), renderer, "text", 0);
+     
+@@ -505,14 +505,14 @@
+     g_signal_connect (xkb->kbd_model_combo, "query-tooltip", G_CALLBACK (xkb_settings_config_modification_disabled_tooltip), xkb);
+     
+     /* toggle layout option */
+-    frame = xfce_framebox_new (_("Change layout option:"), TRUE);
++    frame = xfce_gtk_frame_box_new (_("Change layout option:"), &bin);
+     gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_NONE);
+     gtk_widget_show (frame);
+     gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 0);
+ 
+     xkb->toggle_options_combo = gtk_combo_box_new_with_model (GTK_TREE_MODEL (xkb->toggle_options_store));
+     gtk_widget_set_size_request (xkb->toggle_options_combo, 230, -1);
+-    xfce_framebox_add (XFCE_FRAMEBOX (frame), xkb->toggle_options_combo);
++    gtk_container_add (GTK_CONTAINER (bin), xkb->toggle_options_combo);
+     gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (xkb->toggle_options_combo), renderer, TRUE);
+     gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (xkb->toggle_options_combo), renderer, "text", 0);
+     xkb_settings_add_toggle_options_to_list (NULL, NULL, xkb);
+@@ -531,14 +531,14 @@
+     g_signal_connect (xkb->toggle_options_combo, "query-tooltip", G_CALLBACK (xkb_settings_config_modification_disabled_tooltip), xkb);
+ 
+     /* compose key position option */
+-    frame = xfce_framebox_new (_("Compose key position:"), TRUE);
++    frame = xfce_gtk_frame_box_new (_("Compose key position:"), &bin);
+     gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_NONE);
+     gtk_widget_show (frame);
+     gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 0);
+ 
+     xkb->compose_key_options_combo = gtk_combo_box_new_with_model (GTK_TREE_MODEL (xkb->compose_key_options_store));
+     gtk_widget_set_size_request (xkb->compose_key_options_combo, 230, -1);
+-    xfce_framebox_add (XFCE_FRAMEBOX (frame), xkb->compose_key_options_combo);
++    gtk_container_add (GTK_CONTAINER (bin), xkb->compose_key_options_combo);
+     gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (xkb->compose_key_options_combo), renderer, TRUE);
+     gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (xkb->compose_key_options_combo), renderer, "text", 0);
+     xkb_settings_add_compose_key_position_options_to_list (NULL, NULL, xkb);
+@@ -558,13 +558,13 @@
+ 
+     
+     /* the actual layouts */
+-    frame = xfce_framebox_new (_("Keyboard layouts:"), TRUE);
++    frame = xfce_gtk_frame_box_new (_("Keyboard layouts:"), &bin);
+     gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_NONE);
+     gtk_widget_show (frame);
+     gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 0);
+     
+     hbox = gtk_hbox_new (FALSE, 5);
+-    xfce_framebox_add (XFCE_FRAMEBOX (frame), hbox);
++    gtk_container_add (GTK_CONTAINER (bin), hbox);
+     gtk_widget_show (hbox);
+     
+     // TreeView
+@@ -630,7 +630,7 @@
+     xkb_settings_edit_layout_btn_show (GTK_TREE_VIEW (xkb->layout_tree_view), xkb);
+ 
+     /*****/
+-    display_type_frame = xfce_framebox_new (_("Show layout as:"), TRUE);
++    display_type_frame = xfce_gtk_frame_box_new (_("Show layout as:"), &bin);
+     gtk_widget_show (display_type_frame);
+     gtk_box_pack_start (GTK_BOX (vbox), display_type_frame, TRUE, TRUE, 2);
+ 
+@@ -638,9 +638,9 @@
+     gtk_combo_box_append_text (GTK_COMBO_BOX (display_type_optmenu), _("image"));
+     gtk_combo_box_append_text (GTK_COMBO_BOX (display_type_optmenu), _("text"));
+     gtk_widget_set_size_request (display_type_optmenu, 230, -1);
+-    xfce_framebox_add (XFCE_FRAMEBOX (display_type_frame), display_type_optmenu);
++    gtk_container_add (GTK_CONTAINER (bin), display_type_optmenu);
+ 
+-    group_policy_frame = xfce_framebox_new (_("Manage layout:"), TRUE);
++    group_policy_frame = xfce_gtk_frame_box_new (_("Manage layout:"), &bin);
+     gtk_widget_show (group_policy_frame);
+     gtk_box_pack_start (GTK_BOX (vbox), group_policy_frame, TRUE, TRUE, 2);
+ 
+@@ -649,7 +649,7 @@
+     gtk_combo_box_append_text (GTK_COMBO_BOX (group_policy_combo), _("per window"));
+     gtk_combo_box_append_text (GTK_COMBO_BOX (group_policy_combo), _("per application"));
+     gtk_widget_set_size_request (group_policy_combo, 230, -1);
+-    xfce_framebox_add (XFCE_FRAMEBOX (group_policy_frame), group_policy_combo);
++    gtk_container_add (GTK_CONTAINER (bin), group_policy_combo);
+     gtk_widget_show (group_policy_combo);
+ 
+     gtk_widget_show_all (vbox);
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xfce4-xkb-plugin/xfce4-xkb-plugin.spec?r1=1.17&r2=1.18&f=u

More information about the pld-cvs-commit mailing list