Date: Sunday, May 2, 2010 @ 11:18:41
Author: andyrtr
Revision: 79276
upgpkg: xfce4-quicklauncher-plugin 1.9.4-4
fix #17126; apply some upstream patches taken from Fedora
Added:
xfce4-quicklauncher-plugin/trunk/xfce4-quicklauncher-plugin-1.9.4-desktop-file.patch
xfce4-quicklauncher-plugin/trunk/xfce4-quicklauncher-plugin-1.9.4-fix-missing-english-translation.patch
xfce4-quicklauncher-plugin/trunk/xfce4-quicklauncher-plugin-1.9.4-fix-multiscreen.patch
xfce4-quicklauncher-plugin/trunk/xfce4-quicklauncher-plugin-1.9.4-save-settings.patch
xfce4-quicklauncher-plugin/trunk/xfce4-quicklauncher-plugin-1.9.4-xfce4-settings-manager.patch
Modified:
xfce4-quicklauncher-plugin/trunk/PKGBUILD
------------------------------------------------------------------------+
PKGBUILD | 28
++
xfce4-quicklauncher-plugin-1.9.4-desktop-file.patch | 10
xfce4-quicklauncher-plugin-1.9.4-fix-missing-english-translation.patch | 103
++++++++++
xfce4-quicklauncher-plugin-1.9.4-fix-multiscreen.patch | 27
++
xfce4-quicklauncher-plugin-1.9.4-save-settings.patch | 12 +
xfce4-quicklauncher-plugin-1.9.4-xfce4-settings-manager.patch | 11 +
6 files changed, 187 insertions(+), 4 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2010-05-02 14:44:05 UTC (rev 79275)
+++ PKGBUILD 2010-05-02 15:18:41 UTC (rev 79276)
@@ -4,7 +4,7 @@
pkgname=xfce4-quicklauncher-plugin
pkgver=1.9.4
-pkgrel=3
+pkgrel=4
pkgdesc="plugin that creates 4 little application launcher in the Xfce4 panel"
arch=('i686' 'x86_64')
license=('GPL2')
@@ -13,13 +13,33 @@
depends=('xfce4-panel')
makedepends=('pkgconfig' 'perlxml')
options=('!libtool')
-source=(http://goodies.xfce.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('299e17f196ecfa5fb018cf65abb19b56')
+source=(http://goodies.xfce.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.bz2
+ xfce4-quicklauncher-plugin-1.9.4-desktop-file.patch
+ xfce4-quicklauncher-plugin-1.9.4-fix-missing-english-translation.patch
+ xfce4-quicklauncher-plugin-1.9.4-fix-multiscreen.patch
+ xfce4-quicklauncher-plugin-1.9.4-save-settings.patch
+ xfce4-quicklauncher-plugin-1.9.4-xfce4-settings-manager.patch)
+md5sums=('299e17f196ecfa5fb018cf65abb19b56'
+ 'a7826c9f8199a2f1e914fd39b7f9e2bf'
+ '4ea4d06ab7284e78ddc4d60304f02cdf'
+ '5e8126c05def1211fb4a2a65f2812a1b'
+ '474237b205035214df1c723407251ade'
+ '9e7f789129b08c787978c7a72a55fae7')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
+ # Fedora patches
+ patch -Np0 -i ${srcdir}/xfce4-quicklauncher-plugin-1.9.4-desktop-file.patch
|| return 1
+ patch -Np0 -i
${srcdir}/xfce4-quicklauncher-plugin-1.9.4-fix-multiscreen.patch || return 1
+ patch -Np1 -i ${srcdir}/xfce4-quicklauncher-plugin-1.9.4-save-settings.patch
|| return 1
+ patch -Np1 -i
${srcdir}/xfce4-quicklauncher-plugin-1.9.4-fix-missing-english-translation.patch
|| return 1
+ patch -Np0 -i
${srcdir}/xfce4-quicklauncher-plugin-1.9.4-xfce4-settings-manager.patch ||
return 1
./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/xfce4 \
--localstatedir=/var --disable-static
make || return 1
- make DESTDIR=${pkgdir} install
}
+
+package() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ make DESTDIR=${pkgdir} install || return 1
+}
Added: xfce4-quicklauncher-plugin-1.9.4-desktop-file.patch
===================================================================
--- xfce4-quicklauncher-plugin-1.9.4-desktop-file.patch
(rev 0)
+++ xfce4-quicklauncher-plugin-1.9.4-desktop-file.patch 2010-05-02 15:18:41 UTC
(rev 79276)
@@ -0,0 +1,10 @@
+--- panel-plugin/quicklauncher.desktop.in.in.orig 2009-07-04
00:46:34.000000000 +0200
++++ panel-plugin/quicklauncher.desktop.in.in 2009-07-04 00:46:51.000000000
+0200
+@@ -4,4 +4,6 @@
+ _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@
++X-XFCE-Unique=false
Added: xfce4-quicklauncher-plugin-1.9.4-fix-missing-english-translation.patch
===================================================================
--- xfce4-quicklauncher-plugin-1.9.4-fix-missing-english-translation.patch
(rev 0)
+++ xfce4-quicklauncher-plugin-1.9.4-fix-missing-english-translation.patch
2010-05-02 15:18:41 UTC (rev 79276)
@@ -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 <thepizzak...@gmail.com>, 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 <thepizzak...@gmail.com>\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"
++
Added: xfce4-quicklauncher-plugin-1.9.4-fix-multiscreen.patch
===================================================================
--- xfce4-quicklauncher-plugin-1.9.4-fix-multiscreen.patch
(rev 0)
+++ xfce4-quicklauncher-plugin-1.9.4-fix-multiscreen.patch 2010-05-02
15:18:41 UTC (rev 79276)
@@ -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 <masse_nico...@yahoo.fr>",
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
Added: xfce4-quicklauncher-plugin-1.9.4-save-settings.patch
===================================================================
--- xfce4-quicklauncher-plugin-1.9.4-save-settings.patch
(rev 0)
+++ xfce4-quicklauncher-plugin-1.9.4-save-settings.patch 2010-05-02
15:18:41 UTC (rev 79276)
@@ -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)
+@@ -151,6 +151,7 @@
+ 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));
++ quicklauncher_save(plugin, quicklauncher);
+ xfce_panel_plugin_unblock_menu(plugin);
+ }
+
Added: xfce4-quicklauncher-plugin-1.9.4-xfce4-settings-manager.patch
===================================================================
--- xfce4-quicklauncher-plugin-1.9.4-xfce4-settings-manager.patch
(rev 0)
+++ xfce4-quicklauncher-plugin-1.9.4-xfce4-settings-manager.patch
2010-05-02 15:18:41 UTC (rev 79276)
@@ -0,0 +1,11 @@
+--- panel-plugin/main.c.orig 2009-09-09 21:15:01.000000000 +0200
++++ panel-plugin/main.c 2009-09-09 21:23:12.000000000 +0200
+@@ -320,7 +320,7 @@
+ 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,
