Author: baggins Date: Wed Nov 10 10:39:13 2010 GMT Module: packages Tag: HEAD ---- Log message: - rel 3 - added obvious, self-explanatory fixes from debian
---- Files affected: packages/xfce4-quicklauncher-plugin: xfce4-quicklauncher-plugin.spec (1.12 -> 1.13) , xfce4-quicklauncher-plugin-missing-english-translation.patch (NONE -> 1.1) (NEW), xfce4-quicklauncher-plugin-multiscreen.patch (NONE -> 1.1) (NEW), xfce4-quicklauncher-plugin-parameters-launcher.patch (NONE -> 1.1) (NEW), xfce4-quicklauncher-plugin-save-settings.patch (NONE -> 1.1) (NEW), xfce4-quicklauncher-plugin-startup.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin.spec diff -u packages/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin.spec:1.12 packages/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin.spec:1.13 --- packages/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin.spec:1.12 Mon Feb 4 18:23:38 2008 +++ packages/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin.spec Wed Nov 10 11:39:07 2010 @@ -3,11 +3,16 @@ Summary(pl.UTF-8): Wieloliniowa wtyczka do uruchamiania dla panelu Xfce Name: xfce4-quicklauncher-plugin Version: 1.9.4 -Release: 2 +Release: 3 License: GPL v2+ Group: X11/Applications Source0: http://goodies.xfce.org/releases/xfce4-quicklauncher-plugin/%{name}-%{version}.tar.bz2 # Source0-md5: 299e17f196ecfa5fb018cf65abb19b56 +Patch0: %{name}-missing-english-translation.patch +Patch1: %{name}-multiscreen.patch +Patch2: %{name}-parameters-launcher.patch +Patch3: %{name}-save-settings.patch +Patch4: %{name}-startup.patch URL: http://goodies.xfce.org/projects/panel-plugins/xfce4-quicklauncher-plugin BuildRequires: autoconf BuildRequires: automake @@ -30,6 +35,11 @@ %prep %setup -q +%patch0 -p1 +%patch1 -p0 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 %build %{__intltoolize} @@ -68,6 +78,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.13 2010/11/10 10:39:07 baggins +- rel 3 +- added obvious, self-explanatory fixes from debian + Revision 1.12 2008/02/04 17:23:38 qboosh - BR: intltool ================================================================ Index: packages/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-missing-english-translation.patch diff -u /dev/null packages/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-missing-english-translation.patch:1.1 --- /dev/null Wed Nov 10 11:39:13 2010 +++ packages/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-missing-english-translation.patch Wed Nov 10 11:39:07 2010 @@ -0,0 +1,103 @@ +diff -Nur -x '*.orig' -x '*~' xfce4-quicklauncher-plugin-1.9.4/configure xfce4-quicklauncher-plugin-1.9.4.new/configure +--- xfce4-quicklauncher-plugin-1.9.4/configure 2007-06-27 21:07:14.000000000 +0200 ++++ xfce4-quicklauncher-plugin-1.9.4.new/configure 2008-03-04 22:11:23.000000000 +0100 +@@ -21181,7 +21181,7 @@ + + + +- ALL_LINGUAS="cs el eu fr gl hu ja pl ru vi" ++ ALL_LINGUAS="cs el en eu fr gl hu ja pl ru vi" + + + for ac_header in locale.h +diff -Nur -x '*.orig' -x '*~' xfce4-quicklauncher-plugin-1.9.4/po/en.po xfce4-quicklauncher-plugin-1.9.4.new/po/en.po +--- xfce4-quicklauncher-plugin-1.9.4/po/en.po 1970-01-01 01:00:00.000000000 +0100 ++++ xfce4-quicklauncher-plugin-1.9.4.new/po/en.po 2008-03-04 22:10:58.000000000 +0100 +@@ -0,0 +1,87 @@ ++# English translation of xfce4-quicklauncher-plugin. ++# Copyright (C) 2007 THE xfce4-quicklauncher-plugin'S COPYRIGHT HOLDER ++# This file is distributed under the same license as the xfce4-quicklauncher-plugin package. ++# Jeff Bailes <[email protected]>, 2007. ++# , fuzzy ++# ++# ++msgid "" ++msgstr "" ++"Project-Id-Version: xfce4-quicklauncher-plugin\n" ++"Report-Msgid-Bugs-To: \n" ++"POT-Creation-Date: 2007-05-17 21:37+0200\n" ++"PO-Revision-Date: 2007-03-31 10:17+1000\n" ++"Last-Translator: Jeff Bailes <[email protected]>\n" ++"Language-Team: English\n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Content-Transfer-Encoding: 8bit" ++ ++#: ../panel-plugin/callbacks.c:79 ++msgid "Configure Quicklauncher" ++msgstr "Configure Quicklauncher" ++ ++#: ../panel-plugin/callbacks.c:93 ++msgid "Lines: " ++msgstr "Lines: " ++ ++#: ../panel-plugin/callbacks.c:123 ++msgid "Espace entre les lanceurs :" ++msgstr "Space between launchers" ++ ++#: ../panel-plugin/callbacks.c:131 ++msgid "afficher les tooltips" ++msgstr "Show tooltips" ++ ++#: ../panel-plugin/callbacks.c:135 ++msgid "afficher les labels" ++msgstr "Show labels" ++ ++#: ../panel-plugin/callbacks.c:216 ++msgid "icone" ++msgstr "icon" ++ ++#: ../panel-plugin/callbacks.c:222 ++msgid "commande" ++msgstr "command" ++ ++#: ../panel-plugin/callbacks.c:228 ++msgid "nom" ++msgstr "name" ++ ++#: ../panel-plugin/callbacks.c:327 ++msgid "Open icon" ++msgstr "Open icon" ++ ++#: ../panel-plugin/main.c:163 ../panel-plugin/quicklauncher.desktop.in.in.h:2 ++msgid "Quicklauncher" ++msgstr "Quicklauncher" ++ ++#: ../panel-plugin/main.c:166 ++msgid "Allows you to add launchers easily and display them on many lines." ++msgstr "Allows you to add launchers easily and display them on many lines." ++ ++#: ../panel-plugin/main.c:168 ++msgid "Other plugins available here" ++msgstr "Other plugins available here" ++ ++#: ../panel-plugin/main.c:320 ++msgid "Lock" ++msgstr "Lock" ++ ++#: ../panel-plugin/main.c:323 ++msgid "Parameters" ++msgstr "Parameters" ++ ++#: ../panel-plugin/main.c:326 ++msgid "Applications" ++msgstr "Applications" ++ ++#: ../panel-plugin/main.c:329 ++msgid "Help" ++msgstr "Help" ++ ++#: ../panel-plugin/quicklauncher.desktop.in.in.h:1 ++msgid "Program with several launchers" ++msgstr "Program with several launchers" ++ ================================================================ Index: packages/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-multiscreen.patch diff -u /dev/null packages/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-multiscreen.patch:1.1 --- /dev/null Wed Nov 10 11:39:13 2010 +++ packages/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-multiscreen.patch Wed Nov 10 11:39:07 2010 @@ -0,0 +1,27 @@ +--- panel-plugin/main.c.org 2008-05-13 09:29:29.000000000 -0600 ++++ panel-plugin/main.c 2008-05-13 09:29:33.000000000 -0600 +@@ -148,6 +148,7 @@ + t_qck_launcher_opt_dlg* dlg; + xfce_panel_plugin_block_menu(plugin); + dlg = create_qck_launcher_dlg(); ++ gtk_window_set_screen (GTK_WINDOW (dlg->dialog), gtk_widget_get_screen (plugin)); + qck_launcher_opt_dlg_set_quicklauncher(quicklauncher); + gtk_dialog_run(GTK_DIALOG(dlg->dialog)); + xfce_panel_plugin_unblock_menu(plugin); +@@ -160,6 +161,7 @@ + GtkWidget *about; + const gchar* authors[2] = {"Bountykiller <[email protected]>", NULL}; + about = gtk_about_dialog_new(); ++ gtk_window_set_screen (GTK_WINDOW (about), gtk_widget_get_screen (plugin)); + gtk_about_dialog_set_name(GTK_ABOUT_DIALOG(about), _("Quicklauncher")); + gtk_about_dialog_set_logo(GTK_ABOUT_DIALOG(about), NULL); + gtk_about_dialog_set_authors(GTK_ABOUT_DIALOG(about), (const gchar**) authors); +@@ -461,7 +463,7 @@ + if(launcher->quicklauncher->_last_zoomed_launcher == launcher) + { + g_return_val_if_fail(launcher->clicked_img, FALSE); +- xfce_exec(launcher->command, FALSE, FALSE, NULL); ++ xfce_exec_on_screen(gtk_widget_get_screen (box), launcher->command, FALSE, FALSE, NULL); + gtk_image_set_from_pixbuf (GTK_IMAGE(launcher->image), launcher->def_img); + } + else ================================================================ Index: packages/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-parameters-launcher.patch diff -u /dev/null packages/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-parameters-launcher.patch:1.1 --- /dev/null Wed Nov 10 11:39:13 2010 +++ packages/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-parameters-launcher.patch Wed Nov 10 11:39:07 2010 @@ -0,0 +1,13 @@ +diff --git a/panel-plugin/main.c b/panel-plugin/main.c +index 191124e..1ad7222 100644 +--- a/panel-plugin/main.c ++++ b/panel-plugin/main.c +@@ -321,7 +321,7 @@ quicklauncher_load_default(t_quicklauncher *quicklauncher) + launcher = launcher_new(_("Lock"), "xflock4", XFCE_ICON_CATEGORY_SYSTEM, + NULL, quicklauncher); + quicklauncher_add_element(quicklauncher, launcher); +- launcher = launcher_new(_("Parameters"),"xfce-setting-show", XFCE_ICON_CATEGORY_SETTINGS, ++ launcher = launcher_new(_("Parameters"),"xfce4-settings-manager", XFCE_ICON_CATEGORY_SETTINGS, + NULL, quicklauncher); + quicklauncher_add_element(quicklauncher, launcher); + launcher = launcher_new(_("Applications"), "xfce4-appfinder", XFCE_ICON_CATEGORY_UTILITY, ================================================================ Index: packages/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-save-settings.patch diff -u /dev/null packages/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-save-settings.patch:1.1 --- /dev/null Wed Nov 10 11:39:13 2010 +++ packages/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-save-settings.patch Wed Nov 10 11:39:07 2010 @@ -0,0 +1,12 @@ +Index: xfce4-quicklauncher-plugin-1.9.4/panel-plugin/main.c +=================================================================== +--- xfce4-quicklauncher-plugin-1.9.4/panel-plugin/main.c (révision 3779) ++++ xfce4-quicklauncher-plugin-1.9.4/panel-plugin/main.c (révision 3780) +@@ -150,6 +150,7 @@ + dlg = create_qck_launcher_dlg(); + qck_launcher_opt_dlg_set_quicklauncher(quicklauncher); + gtk_dialog_run(GTK_DIALOG(dlg->dialog)); ++ quicklauncher_save(plugin, quicklauncher); + xfce_panel_plugin_unblock_menu(plugin); + } + ================================================================ Index: packages/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-startup.patch diff -u /dev/null packages/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-startup.patch:1.1 --- /dev/null Wed Nov 10 11:39:13 2010 +++ packages/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-startup.patch Wed Nov 10 11:39:07 2010 @@ -0,0 +1,11 @@ +Index: xfce4-quicklauncher-plugin-1.9.4/panel-plugin/quicklauncher.desktop.in.in +=================================================================== +--- xfce4-quicklauncher-plugin-1.9.4.orig/panel-plugin/quicklauncher.desktop.in.in 2009-03-06 10:24:24.000000000 +0100 ++++ xfce4-quicklauncher-plugin-1.9.4/panel-plugin/quicklauncher.desktop.in.in 2009-03-06 10:24:40.000000000 +0100 +@@ -4,4 +4,5 @@ + _Name=Quicklauncher + _Comment=Program with several launchers + Icon=gnome-fs-executable +-x-xfce-modu...@internal_plugin_path@/libquicklauncher.so ++X-XFCE-Module=quicklauncher ++x-xfce-module-pa...@internal_plugin_path@ ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin.spec?r1=1.12&r2=1.13&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
