From a54636ca42d120a8d8f4b82290e7d63037187f30 Mon Sep 17 00:00:00 2001 From: Dimitar Zhekov Date: Sat, 10 Jan 2004 20:28:37 +0000 Subject: [PATCH] Dimitar Zhekov : upgraded xfce4 (4.0.3) andJ fixed the license of xfce4-themes and xffm-icons git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@2176 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/xfce4/dbh/dbh.desc | 2 +- .../gtk-xfce-engine2/gtk-xfce-engine2.desc | 4 +- package/xfce4/libxfce4mcs/libxfce4mcs.desc | 4 +- package/xfce4/libxfce4util/libxfce4util.desc | 4 +- package/xfce4/libxfcegui4/libxfcegui4.desc | 4 +- package/xfce4/xfcalendar/calendar-icon.patch | 48 ------------------- package/xfce4/xfcalendar/xfcalendar.desc | 4 +- .../xfce-mcs-manager/xfce-mcs-manager.desc | 4 +- .../xfce-mcs-plugins/xfce-mcs-plugins.desc | 4 +- package/xfce4/xfce-utils/xfce-utils.desc | 4 +- .../xfce4/xfce4-iconbox/xfce4-iconbox.desc | 4 +- package/xfce4/xfce4-mixer/xfce4-mixer.desc | 4 +- package/xfce4/xfce4-panel/xfce4-panel.desc | 4 +- .../xfce4/xfce4-systray/xfce4-systray.desc | 4 +- package/xfce4/xfce4-themes/xfce4-themes.desc | 6 +-- package/xfce4/xfce4-toys/xfce4-toys.desc | 4 +- .../xfce4-trigger-launcher.desc | 4 +- package/xfce4/xfdesktop/xfdesktop.desc | 4 +- package/xfce4/xffm-icons/xffm-icons.desc | 6 +-- package/xfce4/xffm/xffm.desc | 4 +- package/xfce4/xfprint/xfprint.desc | 4 +- package/xfce4/xfwm4-themes/xfwm4-themes.desc | 4 +- package/xfce4/xfwm4/default-keys.patch | 27 +++++++++++ package/xfce4/xfwm4/xfwm4.desc | 4 +- 24 files changed, 72 insertions(+), 93 deletions(-) delete mode 100644 package/xfce4/xfcalendar/calendar-icon.patch create mode 100644 package/xfce4/xfwm4/default-keys.patch diff --git a/package/xfce4/dbh/dbh.desc b/package/xfce4/dbh/dbh.desc index 79afd32b0..8198d4985 100644 --- a/package/xfce4/dbh/dbh.desc +++ b/package/xfce4/dbh/dbh.desc @@ -35,4 +35,4 @@ [V] 1.0.15 [P] X -----5---9 965.000 -[D] 501329542 dbh-1.0.15.tar.gz http://www.xfce.org/archive/xfce-4.0.0/src/ +[D] 501329542 dbh-1.0.15.tar.gz http://www.xfce.org/archive/xfce-4.0.3/src/ diff --git a/package/xfce4/gtk-xfce-engine2/gtk-xfce-engine2.desc b/package/xfce4/gtk-xfce-engine2/gtk-xfce-engine2.desc index 610560ac3..c2420b7b0 100644 --- a/package/xfce4/gtk-xfce-engine2/gtk-xfce-engine2.desc +++ b/package/xfce4/gtk-xfce-engine2/gtk-xfce-engine2.desc @@ -32,7 +32,7 @@ [L] GPL [S] Stable -[V] 2.1.7 +[V] 2.1.8 [P] X -----5---9 966.000 -[D] 3960371797 gtk-xfce-engine-2.1.7.tar.gz http://www.xfce.org/archive/xfce-4.0.1/src/ +[D] 1196137496 gtk-xfce-engine-2.1.8.tar.gz http://www.xfce.org/archive/xfce-4.0.3/src/ diff --git a/package/xfce4/libxfce4mcs/libxfce4mcs.desc b/package/xfce4/libxfce4mcs/libxfce4mcs.desc index bbb4a13b5..912b8ab3e 100644 --- a/package/xfce4/libxfce4mcs/libxfce4mcs.desc +++ b/package/xfce4/libxfce4mcs/libxfce4mcs.desc @@ -34,7 +34,7 @@ [L] LGPL [S] Stable -[V] 4.0.2 +[V] 4.0.3 [P] X -----5---9 968.000 -[D] 1921646029 libxfce4mcs-4.0.2.tar.gz http://www.xfce.org/archive/xfce-4.0.2/src/ +[D] 1342549606 libxfce4mcs-4.0.3.tar.gz http://www.xfce.org/archive/xfce-4.0.3/src/ diff --git a/package/xfce4/libxfce4util/libxfce4util.desc b/package/xfce4/libxfce4util/libxfce4util.desc index 2bb15fd78..f3ae90a4c 100644 --- a/package/xfce4/libxfce4util/libxfce4util.desc +++ b/package/xfce4/libxfce4util/libxfce4util.desc @@ -32,7 +32,7 @@ [L] BSD [S] Stable -[V] 4.0.2 +[V] 4.0.3 [P] X -----5---9 967.000 -[D] 1875774830 libxfce4util-4.0.2.tar.gz http://www.xfce.org/archive/xfce-4.0.2/src/ +[D] 853561637 libxfce4util-4.0.3.tar.gz http://www.xfce.org/archive/xfce-4.0.3/src/ diff --git a/package/xfce4/libxfcegui4/libxfcegui4.desc b/package/xfce4/libxfcegui4/libxfcegui4.desc index 29634480d..cf58ecd76 100644 --- a/package/xfce4/libxfcegui4/libxfcegui4.desc +++ b/package/xfce4/libxfcegui4/libxfcegui4.desc @@ -33,7 +33,7 @@ [L] LGPL [S] Stable -[V] 4.0.2 +[V] 4.0.3 [P] X -----5---9 969.000 -[D] 3453738120 libxfcegui4-4.0.2.tar.gz http://www.xfce.org/archive/xfce-4.0.2/src/ +[D] 3917379895 libxfcegui4-4.0.3.tar.gz http://www.xfce.org/archive/xfce-4.0.3/src/ diff --git a/package/xfce4/xfcalendar/calendar-icon.patch b/package/xfce4/xfcalendar/calendar-icon.patch deleted file mode 100644 index 95e860064..000000000 --- a/package/xfce4/xfcalendar/calendar-icon.patch +++ /dev/null @@ -1,48 +0,0 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/xfce4/xfcalendar/calendar-icon.patch -# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - ---- ./src/interface.c.orig 2003-09-01 22:50:23.000000000 +0300 -+++ ./src/interface.c 2003-12-26 13:52:08.000000000 +0200 -@@ -21,7 +21,7 @@ - #include "callbacks.h" - #include "interface.h" - #include "support.h" --#include "xfcalendar-icon-inline.h" -+#include "calendar-icon.h" - - #define GLADE_HOOKUP_OBJECT(component,widget,name) \ - g_object_set_data_full (G_OBJECT (component), name, \ -@@ -53,7 +53,7 @@ - GtkAccelGroup *accel_group; - GdkPixbuf *xfcalendar_logo; - -- xfcalendar_logo = inline_icon_at_size(xfcalendar_icon, 48, 48); -+ xfcalendar_logo = inline_icon_at_size(calendar_icon_data, 48, 48); - accel_group = gtk_accel_group_new (); - - XFCalendar = gtk_window_new (GTK_WINDOW_TOPLEVEL); -@@ -342,7 +342,7 @@ - GdkPixbuf *xfcalendar_logo; - gchar *textInfo; - -- xfcalendar_logo = inline_icon_at_size(xfcalendar_icon, 48, 48); -+ xfcalendar_logo = inline_icon_at_size(calendar_icon_data, 48, 48); - - wInfo = gtk_dialog_new (); - gtk_widget_set_size_request (wInfo, 300, 370); diff --git a/package/xfce4/xfcalendar/xfcalendar.desc b/package/xfce4/xfcalendar/xfcalendar.desc index fe7b2dc07..a77c8367f 100644 --- a/package/xfce4/xfcalendar/xfcalendar.desc +++ b/package/xfce4/xfcalendar/xfcalendar.desc @@ -32,7 +32,7 @@ [L] GPL [S] Stable -[V] 0.1.4 +[V] 0.1.5 [P] X -----5---9 982.100 -[D] 1946960047 xfcalendar-0.1.4.tar.gz http://www.xfce.org/archive/xfce-4.0.2/src/ +[D] 2279110515 xfcalendar-0.1.5.tar.gz http://www.xfce.org/archive/xfce-4.0.3/src/ diff --git a/package/xfce4/xfce-mcs-manager/xfce-mcs-manager.desc b/package/xfce4/xfce-mcs-manager/xfce-mcs-manager.desc index dddc74f5a..79549c56c 100644 --- a/package/xfce4/xfce-mcs-manager/xfce-mcs-manager.desc +++ b/package/xfce4/xfce-mcs-manager/xfce-mcs-manager.desc @@ -34,7 +34,7 @@ [L] LGPL [S] Stable -[V] 4.0.2 +[V] 4.0.3 [P] X -----5---9 971.000 -[D] 2619479991 xfce-mcs-manager-4.0.2.tar.gz http://www.xfce.org/archive/xfce-4.0.2/src/ +[D] 2935394199 xfce-mcs-manager-4.0.3.tar.gz http://www.xfce.org/archive/xfce-4.0.3/src/ diff --git a/package/xfce4/xfce-mcs-plugins/xfce-mcs-plugins.desc b/package/xfce4/xfce-mcs-plugins/xfce-mcs-plugins.desc index 6e003a4f4..87f2cbfb6 100644 --- a/package/xfce4/xfce-mcs-plugins/xfce-mcs-plugins.desc +++ b/package/xfce4/xfce-mcs-plugins/xfce-mcs-plugins.desc @@ -33,7 +33,7 @@ [L] GPL [S] Stable -[V] 4.0.2 +[V] 4.0.3 [P] X -----5---9 972.000 -[D] 3193870552 xfce-mcs-plugins-4.0.2.tar.gz http://www.xfce.org/archive/xfce-4.0.2/src/ +[D] 3510469674 xfce-mcs-plugins-4.0.3.tar.gz http://www.xfce.org/archive/xfce-4.0.3/src/ diff --git a/package/xfce4/xfce-utils/xfce-utils.desc b/package/xfce4/xfce-utils/xfce-utils.desc index 1bf11f5d5..cfa3a98b9 100644 --- a/package/xfce4/xfce-utils/xfce-utils.desc +++ b/package/xfce4/xfce-utils/xfce-utils.desc @@ -35,7 +35,7 @@ [L] GPL [S] Stable -[V] 4.0.2 +[V] 4.0.3 [P] X -----5---9 975.000 -[D] 1657928139 xfce-utils-4.0.2.tar.gz http://www.xfce.org/archive/xfce-4.0.2/src/ +[D] 3308428498 xfce-utils-4.0.3.tar.gz http://www.xfce.org/archive/xfce-4.0.3/src/ diff --git a/package/xfce4/xfce4-iconbox/xfce4-iconbox.desc b/package/xfce4/xfce4-iconbox/xfce4-iconbox.desc index a2ea40573..190a7ecc1 100644 --- a/package/xfce4/xfce4-iconbox/xfce4-iconbox.desc +++ b/package/xfce4/xfce4-iconbox/xfce4-iconbox.desc @@ -32,7 +32,7 @@ [L] GPL [S] Stable -[V] 4.0.2 +[V] 4.0.3 [P] X -----5---9 974.000 -[D] 392955335 xfce4-iconbox-4.0.2.tar.gz http://www.xfce.org/archive/xfce-4.0.2/src/ +[D] 3014959968 xfce4-iconbox-4.0.3.tar.gz http://www.xfce.org/archive/xfce-4.0.3/src/ diff --git a/package/xfce4/xfce4-mixer/xfce4-mixer.desc b/package/xfce4/xfce4-mixer/xfce4-mixer.desc index 8e68e4243..30d2a0e34 100644 --- a/package/xfce4/xfce4-mixer/xfce4-mixer.desc +++ b/package/xfce4/xfce4-mixer/xfce4-mixer.desc @@ -33,7 +33,7 @@ [L] BSD [S] Stable -[V] 4.0.2 +[V] 4.0.3 [P] X -----5---9 982.000 -[D] 231754122 xfce4-mixer-4.0.2.tar.gz http://www.xfce.org/archive/xfce-4.0.2/src/ +[D] 405008699 xfce4-mixer-4.0.3.tar.gz http://www.xfce.org/archive/xfce-4.0.3/src/ diff --git a/package/xfce4/xfce4-panel/xfce4-panel.desc b/package/xfce4/xfce4-panel/xfce4-panel.desc index d0ab0230c..1dccf91d3 100644 --- a/package/xfce4/xfce4-panel/xfce4-panel.desc +++ b/package/xfce4/xfce4-panel/xfce4-panel.desc @@ -42,7 +42,7 @@ [L] GPL [S] Stable -[V] 4.0.2 +[V] 4.0.3 [P] X -----5---9 978.000 -[D] 2244206903 xfce4-panel-4.0.2.tar.gz http://www.xfce.org/archive/xfce-4.0.2/src/ +[D] 3201355923 xfce4-panel-4.0.3.tar.gz http://www.xfce.org/archive/xfce-4.0.3/src/ diff --git a/package/xfce4/xfce4-systray/xfce4-systray.desc b/package/xfce4/xfce4-systray/xfce4-systray.desc index 80a8d9898..cc9a68331 100644 --- a/package/xfce4/xfce4-systray/xfce4-systray.desc +++ b/package/xfce4/xfce4-systray/xfce4-systray.desc @@ -32,7 +32,7 @@ [L] BSD [S] Stable -[V] 4.0.2 +[V] 4.0.3 [P] X -----5---9 979.000 -[D] 605697142 xfce4-systray-4.0.2.tar.gz http://www.xfce.org/archive/xfce-4.0.2/src/ +[D] 2471399838 xfce4-systray-4.0.3.tar.gz http://www.xfce.org/archive/xfce-4.0.3/src/ diff --git a/package/xfce4/xfce4-themes/xfce4-themes.desc b/package/xfce4/xfce4-themes/xfce4-themes.desc index 7c5004fd5..92850478a 100644 --- a/package/xfce4/xfce4-themes/xfce4-themes.desc +++ b/package/xfce4/xfce4-themes/xfce4-themes.desc @@ -32,9 +32,9 @@ [C] extra/desktop/xfce -[L] OpenSource +[L] GPL OpenSource [S] Stable -[V] 4.0.0 +[V] 4.0.3 [P] X -----5---9 981.000 -[D] 3288286068 xfce4-themes-4.0.0.tar.gz http://www.xfce.org/archive/xfce-4.0.0/src/ +[D] 3329386159 xfce4-themes-4.0.3.tar.gz http://www.xfce.org/archive/xfce-4.0.3/src/ diff --git a/package/xfce4/xfce4-toys/xfce4-toys.desc b/package/xfce4/xfce4-toys/xfce4-toys.desc index dd01d8cab..882115ece 100644 --- a/package/xfce4/xfce4-toys/xfce4-toys.desc +++ b/package/xfce4/xfce4-toys/xfce4-toys.desc @@ -34,7 +34,7 @@ [L] GPL [S] Stable -[V] 4.0.2 +[V] 4.0.3 [P] X -----5---9 980.000 -[D] 1186958854 xfce4-toys-4.0.2.tar.gz http://www.xfce.org/archive/xfce-4.0.2/src/ +[D] 752789315 xfce4-toys-4.0.3.tar.gz http://www.xfce.org/archive/xfce-4.0.3/src/ diff --git a/package/xfce4/xfce4-trigger-launcher/xfce4-trigger-launcher.desc b/package/xfce4/xfce4-trigger-launcher/xfce4-trigger-launcher.desc index fa7a00ea1..3d743c623 100644 --- a/package/xfce4/xfce4-trigger-launcher/xfce4-trigger-launcher.desc +++ b/package/xfce4/xfce4-trigger-launcher/xfce4-trigger-launcher.desc @@ -33,7 +33,7 @@ [L] BSD [S] Stable -[V] 4.0.2 +[V] 4.0.3 [P] X -----5---9 983.000 -[D] 2717095391 xfce4-trigger-launcher-4.0.2.tar.gz http://www.xfce.org/archive/xfce-4.0.2/src/ +[D] 477579612 xfce4-trigger-launcher-4.0.3.tar.gz http://www.xfce.org/archive/xfce-4.0.3/src/ diff --git a/package/xfce4/xfdesktop/xfdesktop.desc b/package/xfce4/xfdesktop/xfdesktop.desc index d80eb3904..d81c7617d 100644 --- a/package/xfce4/xfdesktop/xfdesktop.desc +++ b/package/xfce4/xfdesktop/xfdesktop.desc @@ -32,7 +32,7 @@ [L] GPL [S] Stable -[V] 4.0.2 +[V] 4.0.3 [P] X -----5---9 973.000 -[D] 1597402947 xfdesktop-4.0.2.tar.gz http://www.xfce.org/archive/xfce-4.0.2/src/ +[D] 714363961 xfdesktop-4.0.3.tar.gz http://www.xfce.org/archive/xfce-4.0.3/src/ diff --git a/package/xfce4/xffm-icons/xffm-icons.desc b/package/xfce4/xffm-icons/xffm-icons.desc index ab7e44c68..1c9192652 100644 --- a/package/xfce4/xffm-icons/xffm-icons.desc +++ b/package/xfce4/xffm-icons/xffm-icons.desc @@ -34,9 +34,9 @@ [C] extra/desktop/xfce -[L] OpenSource +[L] GPL [S] Stable -[V] 4.0.0 +[V] 4.0.3 [P] X -----5---9 985.000 -[D] 984132976 xffm-icons-4.0.0.tar.gz http://www.xfce.org/archive/xfce-4.0.0/src/ +[D] 3891206529 xffm-icons-4.0.3.tar.gz http://www.xfce.org/archive/xfce-4.0.3/src/ diff --git a/package/xfce4/xffm/xffm.desc b/package/xfce4/xffm/xffm.desc index 91588d0e5..811e1055b 100644 --- a/package/xfce4/xffm/xffm.desc +++ b/package/xfce4/xffm/xffm.desc @@ -32,7 +32,7 @@ [L] GPL [S] Stable -[V] 4.0.2 +[V] 4.0.3 [P] X -----5---9 984.000 -[D] 2095788904 xffm-4.0.2.tar.gz http://www.xfce.org/archive/xfce-4.0.2/src/ +[D] 2498501322 xffm-4.0.3.tar.gz http://www.xfce.org/archive/xfce-4.0.3/src/ diff --git a/package/xfce4/xfprint/xfprint.desc b/package/xfce4/xfprint/xfprint.desc index b0845f062..85d9e8093 100644 --- a/package/xfce4/xfprint/xfprint.desc +++ b/package/xfce4/xfprint/xfprint.desc @@ -32,7 +32,7 @@ [L] BSD [S] Stable -[V] 4.0.2 +[V] 4.0.3 [P] X -----5---9 970.000 -[D] 3508192581 xfprint-4.0.2.tar.gz http://www.xfce.org/archive/xfce-4.0.2/src/ +[D] 1464093914 xfprint-4.0.3.tar.gz http://www.xfce.org/archive/xfce-4.0.3/src/ diff --git a/package/xfce4/xfwm4-themes/xfwm4-themes.desc b/package/xfce4/xfwm4-themes/xfwm4-themes.desc index c5618c0b4..8ce724b58 100644 --- a/package/xfce4/xfwm4-themes/xfwm4-themes.desc +++ b/package/xfce4/xfwm4-themes/xfwm4-themes.desc @@ -33,7 +33,7 @@ [L] GPL [S] Stable -[V] 4.0.0 +[V] 4.0.3 [P] X -----5---9 977.000 -[D] 4189618301 xfwm4-themes-4.0.0.tar.gz http://www.xfce.org/archive/xfce-4.0.0/src/ +[D] 279385048 xfwm4-themes-4.0.3.tar.gz http://www.xfce.org/archive/xfce-4.0.3/src/ diff --git a/package/xfce4/xfwm4/default-keys.patch b/package/xfce4/xfwm4/default-keys.patch new file mode 100644 index 000000000..f1d7e0c28 --- /dev/null +++ b/package/xfce4/xfwm4/default-keys.patch @@ -0,0 +1,27 @@ +--- ./themes/default.keys/keythemerc.orig 2003-02-27 23:02:48.000000000 +0200 ++++ ./themes/default.keys/keythemerc 2003-08-30 17:49:47.000000000 +0300 +@@ -29,15 +29,15 @@ + workspace_9_key=Control+F9 + move_window_next_workspace_key=Alt+Control+End + move_window_prev_workspace_key=Alt+Control+Home +-move_window_workspace_1_key=Alt+Control+KP_1 +-move_window_workspace_2_key=Alt+Control+KP_2 +-move_window_workspace_3_key=Alt+Control+KP_3 +-move_window_workspace_4_key=Alt+Control+KP_4 +-move_window_workspace_5_key=Alt+Control+KP_5 +-move_window_workspace_6_key=Alt+Control+KP_6 +-move_window_workspace_7_key=Alt+Control+KP_7 +-move_window_workspace_8_key=Alt+Control+KP_8 +-move_window_workspace_9_key=Alt+Control+KP_9 ++move_window_workspace_1_key=Control+Shift+F1 ++move_window_workspace_2_key=Control+Shift+F2 ++move_window_workspace_3_key=Control+Shift+F3 ++move_window_workspace_4_key=Control+Shift+F4 ++move_window_workspace_5_key=Control+Shift+F5 ++move_window_workspace_6_key=Control+Shift+F6 ++move_window_workspace_7_key=Control+Shift+F7 ++move_window_workspace_8_key=Control+Shift+F8 ++move_window_workspace_9_key=Control+Shift+F9 + shortcut_1_key=Alt+F1 + shortcut_1_exec=xfhelp4 + shortcut_2_key=Alt+F2 diff --git a/package/xfce4/xfwm4/xfwm4.desc b/package/xfce4/xfwm4/xfwm4.desc index 6128c24df..9f3650a94 100644 --- a/package/xfce4/xfwm4/xfwm4.desc +++ b/package/xfce4/xfwm4/xfwm4.desc @@ -32,7 +32,7 @@ [L] GPL [S] Stable -[V] 4.0.2 +[V] 4.0.3 [P] X -----5---9 976.000 -[D] 2646529733 xfwm4-4.0.2.tar.gz http://www.xfce.org/archive/xfce-4.0.2/src/ +[D] 3230302792 xfwm4-4.0.3.tar.gz http://www.xfce.org/archive/xfce-4.0.3/src/