Author: baggins Date: Sat Feb 19 16:24:45 2011 GMT Module: packages Tag: HEAD ---- Log message: - rel 5 - port to libxfce4ui - plug some leaks
---- Files affected: packages/xfce4-screenshooter: xfce4-screenshooter.spec (1.6 -> 1.7) , xfce4-screenshooter-leaks.patch (NONE -> 1.1) (NEW), xfce4-screenshooter-ui.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/xfce4-screenshooter/xfce4-screenshooter.spec diff -u packages/xfce4-screenshooter/xfce4-screenshooter.spec:1.6 packages/xfce4-screenshooter/xfce4-screenshooter.spec:1.7 --- packages/xfce4-screenshooter/xfce4-screenshooter.spec:1.6 Thu Feb 17 12:45:10 2011 +++ packages/xfce4-screenshooter/xfce4-screenshooter.spec Sat Feb 19 17:24:40 2011 @@ -3,15 +3,20 @@ Summary(pl.UTF-8): Aplikacja screenshooter i wtyczka dla panelu Xfce Name: xfce4-screenshooter Version: 1.7.9 -Release: 4 +Release: 5 License: GPL Group: X11/Applications Source0: http://archive.xfce.org/src/apps/xfce4-screenshooter/1.7/%{name}-%{version}.tar.bz2 # Source0-md5: c01d1cf3830bf8d60e09c0cdd223034c +Patch0: %{name}-ui.patch +Patch1: %{name}-leaks.patch URL: http://goodies.xfce.org/projects/panel-plugins/xfce4-screenshooter-plugin +BuildRequires: autoconf >= 2.50 +BuildRequires: automake BuildRequires: gettext-devel BuildRequires: intltool BuildRequires: libsoup-devel >= 2.26.0 +BuildRequires: libtool BuildRequires: pkgconfig BuildRequires: xfce4-dev-tools >= 4.4.0 BuildRequires: xfce4-panel-devel >= 4.4.0 @@ -40,8 +45,16 @@ %prep %setup -q +%patch0 -p1 +%patch1 -p1 %build +%{__libtoolize} +%{__aclocal} +%{__autoconf} +%{__autoheader} +%{__automake} + %configure \ --disable-static @@ -102,6 +115,11 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.7 2011/02/19 16:24:40 baggins +- rel 5 +- port to libxfce4ui +- plug some leaks + Revision 1.6 2011/02/17 11:45:10 megabajt - release 4 ================================================================ Index: packages/xfce4-screenshooter/xfce4-screenshooter-leaks.patch diff -u /dev/null packages/xfce4-screenshooter/xfce4-screenshooter-leaks.patch:1.1 --- /dev/null Sat Feb 19 17:24:45 2011 +++ packages/xfce4-screenshooter/xfce4-screenshooter-leaks.patch Sat Feb 19 17:24:40 2011 @@ -0,0 +1,119 @@ +commit d0dbeb2a8d52f50e52201680c10d367b4a28fe93 +Author: Jérôme Guelfucci <jero...@xfce.org> +Date: Fri Dec 17 18:30:35 2010 +0100 + + Plug a bunch of leaks. + +diff --git a/lib/screenshooter-zimagez.c b/lib/screenshooter-zimagez.c +index cbac3ec..142b7a1 100644 +--- a/lib/screenshooter-zimagez.c ++++ b/lib/screenshooter-zimagez.c +@@ -241,7 +241,12 @@ zimagez_upload_job (ScreenshooterJob *job, GValueArray *param_values, GError **e + g_return_val_if_fail (error == NULL || *error == NULL, FALSE); + + if (exo_job_set_error_if_cancelled (EXO_JOB (job), error)) +- return FALSE; ++ { ++ g_free (comment); ++ g_free (password); ++ ++ return FALSE; ++ } + + /* Get the last user */ + last_user = g_value_get_string (g_value_array_get_nth (param_values, 1)); +diff --git a/src/main.c b/src/main.c +index 986a600..1ae982e 100644 +--- a/src/main.c ++++ b/src/main.c +@@ -152,6 +152,7 @@ int main (int argc, char **argv) + PACKAGE, cli_error->message, PACKAGE_NAME); + + g_error_free (cli_error); ++ g_free (sd); + + return EXIT_FAILURE; + } +@@ -161,16 +162,22 @@ int main (int argc, char **argv) + if (window && fullscreen) + { + g_printerr (conflict_error, "window", "fullscreen"); ++ ++ g_free (sd); + return EXIT_FAILURE; + } + else if (window && region) + { + g_printerr (conflict_error, "window", "region"); ++ ++ g_free (sd); + return EXIT_FAILURE; + } + else if (fullscreen && region) + { + g_printerr (conflict_error, "fullscreen", "region"); ++ ++ g_free (sd); + return EXIT_FAILURE; + } + +@@ -178,20 +185,26 @@ int main (int argc, char **argv) + if (upload && (application != NULL)) + { + g_printerr (conflict_error, "upload", "open"); ++ ++ g_free (sd); + return EXIT_FAILURE; + } + else if (upload && (screenshot_dir != NULL)) + { + g_printerr (conflict_error, "upload", "save"); ++ ++ g_free (sd); + return EXIT_FAILURE; + } + else if ((application != NULL) && (screenshot_dir != NULL)) + { + g_printerr (conflict_error, "open", "save"); ++ ++ g_free (sd); + return EXIT_FAILURE; + } + +- /* Warn that action options, mouse and delay will be ignored in ++ /* Warn that action options, mouse and delay will be ignored in + * non-cli mode */ + if ((application != NULL) && !(fullscreen || window || region)) + g_printerr (ignore_error, "open"); +@@ -207,6 +220,16 @@ int main (int argc, char **argv) + if (!g_thread_supported ()) + g_thread_init (NULL); + ++ /* Just print the version if we are in version mode */ ++ if (version) ++ { ++ g_print ("%s\n", PACKAGE_STRING); ++ ++ g_free (sd); ++ ++ return EXIT_SUCCESS; ++ } ++ + /* Read the preferences */ + rc_file = xfce_resource_save_location (XFCE_RESOURCE_CONFIG, "xfce4/xfce4-screenshooter", TRUE); + screenshooter_read_rc_file (rc_file, sd); +@@ -225,14 +248,6 @@ int main (int argc, char **argv) + + g_object_unref (default_save_dir); + +- /* Just print the version if we are in version mode */ +- if (version) +- { +- g_print ("%s\n", PACKAGE_STRING); +- +- return EXIT_SUCCESS; +- } +- + /* If a region cli option is given, take the screenshot accordingly.*/ + if (fullscreen || window || region) + { ================================================================ Index: packages/xfce4-screenshooter/xfce4-screenshooter-ui.patch diff -u /dev/null packages/xfce4-screenshooter/xfce4-screenshooter-ui.patch:1.1 --- /dev/null Sat Feb 19 17:24:45 2011 +++ packages/xfce4-screenshooter/xfce4-screenshooter-ui.patch Sat Feb 19 17:24:40 2011 @@ -0,0 +1,147 @@ +commit 504a9935f3fa900636ae5f8f40e8182b4fc293ec +Author: Jérôme Guelfucci <jero...@xfce.org> +Date: Tue Dec 7 14:41:30 2010 +0100 + + Replace libxfcegui4 by libxfce4ui (bug #6438). + +diff --git a/Makefile.am b/Makefile.am +index 55b06b6..e1e12ed 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -37,7 +37,7 @@ lib_libscreenshooter_la_CFLAGS = \ + @GTK_CFLAGS@ \ + @GLIB_CFLAGS@ \ + @LIBXFCE4UTIL_CFLAGS@ \ +- @LIBXFCEGUI4_CFLAGS@ \ ++ @LIBXFCE4UI_CFLAGS@ \ + @SOUP_CFLAGS@ \ + -DPACKAGE_LOCALE_DIR=\"$(localedir)\" + +@@ -45,7 +45,7 @@ lib_libscreenshooter_la_LIBADD = \ + @EXO_LIBS@ \ + @GTK_LIBS@ \ + @LIBXFCE4UTIL_LIBS@ \ +- @LIBXFCEGUI4_LIBS@ \ ++ @LIBXFCE4UI_LIBS@ \ + @GLIB_LIBS@ \ + @SOUP_LIBS@ + +@@ -78,7 +78,7 @@ src_xfce4_screenshooter_CFLAGS = \ + @GTK_CFLAGS@ \ + @GLIB_CFLAGS@ \ + @LIBXFCE4UTIL_CFLAGS@ \ +- @LIBXFCEGUI4_CFLAGS@ \ ++ @LIBXFCE4UI_CFLAGS@ \ + @GTHREAD_CFLAGS@ \ + @SOUP_CFLAGS@ \ + -DPACKAGE_LOCALE_DIR=\"$(localedir)\" +@@ -90,7 +90,7 @@ src_xfce4_screenshooter_LDFLAGS = \ + @GTHREAD_LIBS@ \ + @SOUP_LIBS@ \ + @LIBXFCE4UTIL_LIBS@ \ +- @LIBXFCEGUI4_LIBS@ ++ @LIBXFCE4UI_LIBS@ + + src_xfce4_screenshooter_LDADD = lib/libscreenshooter.la + +@@ -119,6 +119,7 @@ panel_plugin_xfce4_screenshooter_plugin_CFLAGS = \ + -I$(top_srcdir)/lib/ \ + @EXO_CFLAGS@ \ + @LIBXFCE4PANEL_CFLAGS@ \ ++ @LIBXFCE4UI_CFLAGS@ \ + @GTHREAD_CFLAGS@ \ + @SOUP_CFLAGS@ + +@@ -128,7 +128,8 @@ panel_plugin_xfce4_screenshooter_plugin_LDFLAGS = \ + panel_plugin_xfce4_screenshooter_plugin_LDFLAGS = \ + @LIBXFCE4PANEL_LIBS@ \ + @GTHREAD_LIBS@ \ +- @SOUP_LIBS@ ++ @SOUP_LIBS@ \ ++ @LIBXFCE4UI_LIBS@ + + panel_plugin_xfce4_screenshooter_plugin_LDADD = lib/libscreenshooter.la + +diff --git a/configure.ac b/configure.ac +index 84bffae..3b0e44c 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -48,7 +48,7 @@ dnl *** Check for required packages *** + dnl *********************************** + XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.4.0]) + XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.4.0]) +-XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.4.0]) ++XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.7.0]) + XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.16.0]) + XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.16.0]) + XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.16.0]) +commit 785a32403d5b653ca914f5ce52e76a9de7e5b915 +Author: Jérôme Guelfucci <jero...@xfce.org> +Date: Tue Dec 7 14:50:57 2010 +0100 + + Missing bits... + +diff --git a/lib/screenshooter-dialogs.h b/lib/screenshooter-dialogs.h +index b97b5fa..33121a3 100644 +--- a/lib/screenshooter-dialogs.h ++++ b/lib/screenshooter-dialogs.h +@@ -33,7 +33,7 @@ + + #include <gtk/gtk.h> + #include <libxfce4util/libxfce4util.h> +-#include <libxfcegui4/libxfcegui4.h> ++#include <libxfce4ui/libxfce4ui.h> + + + GtkWidget *screenshooter_actions_dialog_new (ScreenshotData *sd); +diff --git a/lib/screenshooter-utils.h b/lib/screenshooter-utils.h +index f40929a..d1b4fd2 100644 +--- a/lib/screenshooter-utils.h ++++ b/lib/screenshooter-utils.h +@@ -32,7 +32,7 @@ + #include <time.h> + + #include <libxfce4util/libxfce4util.h> +-#include <libxfcegui4/libxfcegui4.h> ++#include <libxfce4ui/libxfce4ui.h> + + + +diff --git a/panel-plugin/screenshooter-plugin.c b/panel-plugin/screenshooter-plugin.c +index 2d69ac5..60ae066 100644 +--- a/panel-plugin/screenshooter-plugin.c ++++ b/panel-plugin/screenshooter-plugin.c +@@ -28,7 +28,7 @@ t */ + #include <gtk/gtk.h> + #include <gdk/gdkx.h> + +-#include <libxfcegui4/libxfcegui4.h> ++#include <libxfce4ui/libxfce4ui.h> + #include <libxfce4panel/xfce-panel-plugin.h> + #include <libxfce4panel/xfce-panel-convenience.h> + +commit e8ab483698caceeae0e436dc7695c068dbfdfa5a +Author: Jérôme Guelfucci <jero...@xfce.org> +Date: Thu Nov 25 22:46:39 2010 +0100 + + Use GtkIconTheme functions instead of xfce_themed_icon. + + This fixes the build with Xfce's git master branch and works the same. + +diff --git a/panel-plugin/screenshooter-plugin.c b/panel-plugin/screenshooter-plugin.c +index b0ac320..2d69ac5 100644 +--- a/panel-plugin/screenshooter-plugin.c ++++ b/panel-plugin/screenshooter-plugin.c +@@ -119,7 +119,11 @@ cb_set_size (XfcePanelPlugin *plugin, int size, PluginData *pd) + pd->button->style->ythickness); + + TRACE ("Get the icon from the theme"); +- pb = xfce_themed_icon_load (SCREENSHOT_ICON_NAME, width); ++ pb = gtk_icon_theme_load_icon (gtk_icon_theme_get_default (), ++ SCREENSHOT_ICON_NAME, ++ width, ++ GTK_ICON_LOOKUP_FORCE_SIZE, ++ NULL); + + TRACE ("Set the new icon"); + gtk_image_set_from_pixbuf (GTK_IMAGE (pd->image), pb); ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xfce4-screenshooter/xfce4-screenshooter.spec?r1=1.6&r2=1.7&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit