packages: xfce4-fsguard-plugin/xfce4-fsguard-plugin.spec, xfce4-fsguard-plu...

baggins baggins at pld-linux.org
Tue Mar 1 12:59:04 CET 2011 

Author: baggins                      Date: Tue Mar  1 11:59:04 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 2
- port to libxfce4ui

---- Files affected:
packages/xfce4-fsguard-plugin:
   xfce4-fsguard-plugin.spec (1.6 -> 1.7) , xfce4-fsguard-plugin-ui.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/xfce4-fsguard-plugin/xfce4-fsguard-plugin.spec
diff -u packages/xfce4-fsguard-plugin/xfce4-fsguard-plugin.spec:1.6 packages/xfce4-fsguard-plugin/xfce4-fsguard-plugin.spec:1.7
--- packages/xfce4-fsguard-plugin/xfce4-fsguard-plugin.spec:1.6	Tue Feb 15 11:36:19 2011
+++ packages/xfce4-fsguard-plugin/xfce4-fsguard-plugin.spec	Tue Mar  1 12:58:59 2011
@@ -3,16 +3,17 @@
 Summary(pl.UTF-8):	Wtyczka fsguard dla panelu Xfce
 Name:		xfce4-fsguard-plugin
 Version:	1.0.0
-Release:	1
+Release:	2
 License:	BSD
 Group:		X11/Applications
 Source0:	http://archive.xfce.org/src/panel-plugins/xfce4-fsguard-plugin/1.0/%{name}-%{version}.tar.bz2
 # Source0-md5:	8378f922b59a0d5a378af5e45a18c4a3
+Patch0:		%{name}-ui.patch
 URL:		http://goodies.xfce.org/projects/panel-plugins/xfce4-fsguard-plugin
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	intltool >= 0.35.5
-BuildRequires:	libxfcegui4-devel >= 4.4.0
+BuildRequires:	libxfce4ui-devel
 BuildRequires:	rpmbuild(macros) >= 1.601
 BuildRequires:	xfce4-dev-tools >= 4.4.0
 BuildRequires:	xfce4-panel-devel >= 4.4.0
@@ -33,6 +34,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %{__intltoolize}
@@ -76,6 +78,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.7  2011/03/01 11:58:59  baggins
+- rel 2
+- port to libxfce4ui
+
 Revision 1.6  2011/02/15 10:36:19  megabajt
 - updated to 1.0.0
 

================================================================
Index: packages/xfce4-fsguard-plugin/xfce4-fsguard-plugin-ui.patch
diff -u /dev/null packages/xfce4-fsguard-plugin/xfce4-fsguard-plugin-ui.patch:1.1
--- /dev/null	Tue Mar  1 12:59:04 2011
+++ packages/xfce4-fsguard-plugin/xfce4-fsguard-plugin-ui.patch	Tue Mar  1 12:58:59 2011
@@ -0,0 +1,87 @@
+diff -ur xfce4-fsguard-plugin-1.0.0-orig/configure.ac xfce4-fsguard-plugin-1.0.0/configure.ac
+--- xfce4-fsguard-plugin-1.0.0-orig/configure.ac	2010-12-15 14:21:36.000000000 +0100
++++ xfce4-fsguard-plugin-1.0.0/configure.ac	2011-03-01 12:55:57.995889237 +0100
+@@ -49,7 +49,7 @@
+ 
+ dnl configure the panel plugin
+ XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.6.0])
+-XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.4.0])
++XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.8.0])
+ XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.4.0])
+ XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.4.0])
+ 
+diff -ur xfce4-fsguard-plugin-1.0.0-orig/panel-plugin/fsguard.c xfce4-fsguard-plugin-1.0.0/panel-plugin/fsguard.c
+--- xfce4-fsguard-plugin-1.0.0-orig/panel-plugin/fsguard.c	2010-12-14 16:32:01.000000000 +0100
++++ xfce4-fsguard-plugin-1.0.0/panel-plugin/fsguard.c	2011-03-01 12:57:33.323889238 +0100
+@@ -47,10 +47,8 @@
+ 
+ #include <gtk/gtk.h>
+ #include <libxfce4util/libxfce4util.h>
+-#include <libxfcegui4/libxfcegui4.h>
+-#include <libxfce4panel/xfce-panel-plugin.h>
+-#include <libxfce4panel/xfce-panel-convenience.h>
+-#include <libxfce4panel/xfce-hvbox.h>
++#include <libxfce4ui/libxfce4ui.h>
++#include <libxfce4panel/libxfce4panel.h>
+ 
+ #define ICON_NORMAL             0
+ #define ICON_WARNING            1
+@@ -218,7 +216,7 @@
+     gchar *path_quoted;
+     path_quoted = g_shell_quote (path);
+     cmd = g_strdup_printf ("%s %s", command, path_quoted);
+-    res = xfce_exec (cmd, FALSE, FALSE, NULL);
++    res = xfce_spawn_command_line_on_screen(gdk_screen_get_default(), cmd, FALSE, FALSE, NULL);
+     g_free (path_quoted);
+     g_free (cmd);
+     return res;
+@@ -308,10 +306,10 @@
+     if (err != -1 && !fsguard->seen && icon_id == ICON_URGENT) {
+         fsguard->seen = TRUE;
+         if (*(fsguard->name) != '\0' && strcmp(fsguard->path, fsguard->name)) {
+-            xfce_warn (_("Only %s space left on %s (%s)!"),
++            xfce_dialog_show_warning(NULL, NULL, _("Only %s space left on %s (%s)!"),
+                        msg_size, fsguard->path, fsguard->name);
+         } else {
+-            xfce_warn (_("Only %s space left on %s!"),
++            xfce_dialog_show_warning(NULL, NULL, _("Only %s space left on %s!"),
+                        msg_size, fsguard->path);
+         }
+     }
+@@ -580,7 +578,7 @@
+ 
+     /* Configuration frame */
+     GtkWidget *table1 = gtk_table_new (2, 3, FALSE);
+-    GtkWidget *frame1 = xfce_create_framebox_with_content (_("Configuration"), table1);
++    GtkWidget *frame1 = xfce_gtk_frame_box_new_with_content (_("Configuration"), table1);
+     gtk_table_set_row_spacings (GTK_TABLE (table1), BORDER);
+     gtk_table_set_col_spacings (GTK_TABLE (table1), BORDER);
+     gtk_container_set_border_width (GTK_CONTAINER (frame1), BORDER);
+@@ -618,7 +616,7 @@
+ 
+     /* Display frame */
+     GtkWidget *table2 = gtk_table_new (2, 4, FALSE);
+-    GtkWidget *frame2 = xfce_create_framebox_with_content (_("User Interface"), table2);
++    GtkWidget *frame2 = xfce_gtk_frame_box_new_with_content (_("User Interface"), table2);
+     gtk_table_set_row_spacings (GTK_TABLE (table2), BORDER);
+     gtk_table_set_col_spacings (GTK_TABLE (table2), BORDER);
+     gtk_container_set_border_width (GTK_CONTAINER (frame2), BORDER);
+diff -ur xfce4-fsguard-plugin-1.0.0-orig/panel-plugin/Makefile.am xfce4-fsguard-plugin-1.0.0/panel-plugin/Makefile.am
+--- xfce4-fsguard-plugin-1.0.0-orig/panel-plugin/Makefile.am	2010-12-12 03:46:39.000000000 +0100
++++ xfce4-fsguard-plugin-1.0.0/panel-plugin/Makefile.am	2011-03-01 12:55:57.999889237 +0100
+@@ -6,13 +6,13 @@
+ 
+ xfce4_fsguard_plugin_CFLAGS =									\
+ 	-I$(top_srcdir)												\
+-	@LIBXFCEGUI4_CFLAGS@										\
++	@LIBXFCE4UI_CFLAGS@										\
+ 	@LIBXFCE4UTIL_CFLAGS@										\
+ 	@LIBXFCE4PANEL_CFLAGS@										\
+ 	-DPACKAGE_LOCALE_DIR=\"$(localedir)\"
+ 
+ xfce4_fsguard_plugin_LDADD =									\
+-	@LIBXFCEGUI4_LIBS@											\
++	@LIBXFCE4UI_LIBS@											\
+ 	@LIBXFCE4UTIL_LIBS@											\
+ 	@LIBXFCE4PANEL_LIBS@
+ 
================================================================

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

More information about the pld-cvs-commit mailing list