summaryrefslogtreecommitdiffstats
path: root/meta-xfce/recipes-xfce
diff options
context:
space:
mode:
Diffstat (limited to 'meta-xfce/recipes-xfce')
-rw-r--r--meta-xfce/recipes-xfce/exo/exo/exo-no-tests-0.6.patch12
-rw-r--r--meta-xfce/recipes-xfce/exo/exo/exo-no-tests-0.8.patch31
-rw-r--r--meta-xfce/recipes-xfce/exo/exo/fix-qa-desktop-type-error.patch531
-rw-r--r--meta-xfce/recipes-xfce/exo/exo_0.8.0.bb (renamed from meta-xfce/recipes-xfce/exo/exo_0.6.2.bb)15
-rw-r--r--meta-xfce/recipes-xfce/garcon/garcon_0.2.0.bb (renamed from meta-xfce/recipes-xfce/garcon/garcon_0.1.10.bb)6
-rw-r--r--meta-xfce/recipes-xfce/gtk-xfce-engine/files/0001-Don-t-leak-a-graduent-pattern-at-each-draw-bug-8521.patch30
-rw-r--r--meta-xfce/recipes-xfce/gtk-xfce-engine/gtk-xfce-engine_2.9.0.bb18
-rw-r--r--meta-xfce/recipes-xfce/gtk-xfce-engine/gtk-xfce-engine_3.0.1.bb23
-rw-r--r--meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.10.0.bb (renamed from meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.8.1.bb)6
-rw-r--r--meta-xfce/recipes-xfce/libxfce4util/libxfce4util_4.10.0.bb (renamed from meta-xfce/recipes-xfce/libxfce4util/libxfce4util_4.8.2.bb)8
-rw-r--r--meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-base.bb4
-rw-r--r--meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb9
-rw-r--r--meta-xfce/recipes-xfce/thunar-volman/thunar-volman_0.8.0.bb (renamed from meta-xfce/recipes-xfce/thunar-volman/thunar-volman_0.6.0.bb)7
-rw-r--r--meta-xfce/recipes-xfce/thunar/thunar_1.4.0.bb (renamed from meta-xfce/recipes-xfce/thunar/thunar_1.2.3.bb)10
-rw-r--r--meta-xfce/recipes-xfce/tumbler/tumbler_0.1.25.bb (renamed from meta-xfce/recipes-xfce/tumbler/tumbler_0.1.23.bb)8
-rw-r--r--meta-xfce/recipes-xfce/xfce-utils/xfce-utils_4.8.3.bb20
-rw-r--r--meta-xfce/recipes-xfce/xfce4-appfinder/xfce4-appfinder_4.10.0.bb10
-rw-r--r--meta-xfce/recipes-xfce/xfce4-appfinder/xfce4-appfinder_4.8.0.bb12
-rw-r--r--meta-xfce/recipes-xfce/xfce4-dev-tools/xfce4-dev-tools_4.10.0.bb (renamed from meta-xfce/recipes-xfce/xfce4-dev-tools/xfce4-dev-tools_4.8.0.bb)11
-rw-r--r--meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.10.0.bb (renamed from meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.8.6.bb)10
-rw-r--r--meta-xfce/recipes-xfce/xfce4-session/files/0001-Handle-multiple-interactive-session-save-bug-5379.patch (renamed from meta-xfce/recipes-xfce/xfce4-session/files/0001-Don-t-loose-xfwm4-when-closing-session-with-multiple.patch)61
-rw-r--r--meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.10.0.bb (renamed from meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.8.3.bb)14
-rw-r--r--meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/0001-xfsettingsd-use-gnome-as-default-icon-theme.patch29
-rw-r--r--meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/0001-xsettings.xml-remove-trouble-causing-comment.patch31
-rw-r--r--meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/0002-xsettings.xml-Set-default-themes.patch32
-rw-r--r--meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.10.0.bb (renamed from meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.8.3.bb)8
-rw-r--r--meta-xfce/recipes-xfce/xfconf/xfconf_4.10.0.bb (renamed from meta-xfce/recipes-xfce/xfconf/xfconf_4.8.0.bb)8
-rw-r--r--meta-xfce/recipes-xfce/xfdesktop/xfdesktop/relative-symlinks-docs.patch31
-rw-r--r--meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.10.0.bb12
-rw-r--r--meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.8.3.bb19
-rw-r--r--meta-xfce/recipes-xfce/xfwm4/xfwm4_4.10.0.bb (renamed from meta-xfce/recipes-xfce/xfwm4/xfwm4_4.8.3.bb)7
31 files changed, 212 insertions, 821 deletions
diff --git a/meta-xfce/recipes-xfce/exo/exo/exo-no-tests-0.6.patch b/meta-xfce/recipes-xfce/exo/exo/exo-no-tests-0.6.patch
deleted file mode 100644
index cab41a87d2..0000000000
--- a/meta-xfce/recipes-xfce/exo/exo/exo-no-tests-0.6.patch
+++ /dev/null
@@ -1,12 +0,0 @@
1--- a/Makefile.am.old 2011-01-16 16:38:21.000000000 +0100
2+++ b/Makefile.am 2011-03-24 22:14:26.000000000 +0100
3@@ -15,8 +15,7 @@
4 icons \
5 pixmaps \
6 po \
7- $(PYTHON_SUBDIR) \
8- tests
9+ $(PYTHON_SUBDIR)
10
11 AUTOMAKE_OPTIONS = \
12 1.8 \
diff --git a/meta-xfce/recipes-xfce/exo/exo/exo-no-tests-0.8.patch b/meta-xfce/recipes-xfce/exo/exo/exo-no-tests-0.8.patch
new file mode 100644
index 0000000000..ac8bca5f3f
--- /dev/null
+++ b/meta-xfce/recipes-xfce/exo/exo/exo-no-tests-0.8.patch
@@ -0,0 +1,31 @@
1From 5f1e19860d89647488bdd32a02fb332f69434405 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
3Date: Fri, 18 May 2012 21:13:00 +0200
4Subject: [PATCH] Do not run tests at build time
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8Upstream-Status: Not-Applicable
9
10Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
11---
12 Makefile.am | 3 +--
13 1 files changed, 1 insertions(+), 2 deletions(-)
14
15diff --git a/Makefile.am b/Makefile.am
16index 0ab3853..3e72391 100644
17--- a/Makefile.am
18+++ b/Makefile.am
19@@ -8,8 +8,7 @@ SUBDIRS = \
20 docs \
21 icons \
22 pixmaps \
23- po \
24- tests
25+ po
26
27 AUTOMAKE_OPTIONS = \
28 1.9 \
29--
301.7.4.4
31
diff --git a/meta-xfce/recipes-xfce/exo/exo/fix-qa-desktop-type-error.patch b/meta-xfce/recipes-xfce/exo/exo/fix-qa-desktop-type-error.patch
deleted file mode 100644
index e4ba75ed78..0000000000
--- a/meta-xfce/recipes-xfce/exo/exo/fix-qa-desktop-type-error.patch
+++ /dev/null
@@ -1,531 +0,0 @@
1--- a/exo-helper/exo-helper.c.old 2011-01-16 16:38:21.000000000 +0100
2+++ b/exo-helper/exo-helper.c 2011-03-07 12:31:49.000000000 +0100
3@@ -172,7 +172,7 @@
4 helper->startup_notify = xfce_rc_read_bool_entry (rc, "StartupNotify", FALSE);
5
6 /* verify the type of the desktop file */
7- str = xfce_rc_read_entry_untranslated (rc, "Type", NULL);
8+ str = xfce_rc_read_entry_untranslated (rc, "X-XFCE-Type", NULL);
9 if (G_UNLIKELY (!exo_str_is_equal (str, "X-XFCE-Helper")))
10 goto failed;
11
12@@ -897,7 +897,8 @@
13 xfce_rc_write_bool_entry (rc, "NoDisplay", TRUE);
14 xfce_rc_write_entry (rc, "Version", "1.0");
15 xfce_rc_write_entry (rc, "Encoding", "UTF-8");
16- xfce_rc_write_entry (rc, "Type", "X-XFCE-Helper");
17+ xfce_rc_write_entry (rc, "Type", "Application");
18+ xfce_rc_write_entry (rc, "X-XFCE-Type", "X-XFCE-Helper");
19 xfce_rc_write_entry (rc, "X-XFCE-Category", category_string);
20
21 /* check if the command includes a parameter */
22--- a/exo-helper/helpers/aterm.desktop.in.in.old 2011-03-07 12:08:30.000000000 +0100
23+++ b/exo-helper/helpers/aterm.desktop.in.in 2011-03-07 12:08:30.000000000 +0100
24@@ -1,10 +1,11 @@
25 [Desktop Entry]
26 Version=1.0
27 Icon=aterm
28-Type=X-XFCE-Helper
29+Type=Application
30 _Name=aterm
31 StartupNotify=false
32 X-XFCE-Binaries=aterm;
33 X-XFCE-Category=TerminalEmulator
34 X-XFCE-Commands=%B;
35 X-XFCE-CommandsWithParameter=%B -e %s;
36+X-XFCE-Type=X-XFCE-Helper
37--- a/exo-helper/helpers/balsa.desktop.in.in.old 2011-03-07 12:08:30.000000000 +0100
38+++ b/exo-helper/helpers/balsa.desktop.in.in 2011-03-07 12:08:30.000000000 +0100
39@@ -1,10 +1,11 @@
40 [Desktop Entry]
41 Version=1.0
42 Icon=gnome-balsa2
43-Type=X-XFCE-Helper
44+Type=Application
45 _Name=Balsa
46 StartupNotify=false
47 X-XFCE-Binaries=balsa;
48 X-XFCE-Category=MailReader
49 X-XFCE-Commands=%B;
50 X-XFCE-CommandsWithParameter=@HELPERDIR@/exo-compose-mail-1 balsa %B "mailto:%s";
51+X-XFCE-Type=X-XFCE-Helper
52--- a/exo-helper/helpers/debian-sensible-browser.desktop.in.in.old 2011-03-07 12:08:30.000000000 +0100
53+++ b/exo-helper/helpers/debian-sensible-browser.desktop.in.in 2011-03-07 12:08:30.000000000 +0100
54@@ -1,10 +1,11 @@
55 [Desktop Entry]
56 Version=1.0
57 Icon=debian
58-Type=X-XFCE-Helper
59+Type=Application
60 _Name=Debian Sensible Browser
61 StartupNotify=false
62 X-XFCE-Binaries=sensible-browser;
63 X-XFCE-Category=WebBrowser
64 X-XFCE-Commands=%B;
65 X-XFCE-CommandsWithParameter=%B "%s";
66+X-XFCE-Type=X-XFCE-Helper
67--- a/exo-helper/helpers/debian-x-terminal-emulator.desktop.in.in.old 2011-03-07 12:08:30.000000000 +0100
68+++ b/exo-helper/helpers/debian-x-terminal-emulator.desktop.in.in 2011-03-07 12:08:30.000000000 +0100
69@@ -1,10 +1,11 @@
70 [Desktop Entry]
71 Version=1.0
72 Icon=debian
73-Type=X-XFCE-Helper
74+Type=Application
75 _Name=Debian X Terminal Emulator
76 StartupNotify=false
77 X-XFCE-Binaries=x-terminal-emulator;
78 X-XFCE-Category=TerminalEmulator
79 X-XFCE-Commands=%B;
80 X-XFCE-CommandsWithParameter=%B -e %s;
81+X-XFCE-Type=X-XFCE-Helper
82--- a/exo-helper/helpers/encompass.desktop.in.in.old 2011-03-07 12:08:30.000000000 +0100
83+++ b/exo-helper/helpers/encompass.desktop.in.in 2011-03-07 12:08:30.000000000 +0100
84@@ -1,10 +1,11 @@
85 [Desktop Entry]
86 Version=1.0
87 Icon=encompass
88-Type=X-XFCE-Helper
89+Type=Application
90 _Name=Encompass
91 StartupNotify=true
92 X-XFCE-Binaries=encompass;
93 X-XFCE-Category=WebBrowser
94 X-XFCE-Commands=%B;
95 X-XFCE-CommandsWithParameter=%B "%s";
96+X-XFCE-Type=X-XFCE-Helper
97--- a/exo-helper/helpers/epiphany.desktop.in.in.old 2011-03-07 12:08:30.000000000 +0100
98+++ b/exo-helper/helpers/epiphany.desktop.in.in 2011-03-07 12:08:30.000000000 +0100
99@@ -1,10 +1,11 @@
100 [Desktop Entry]
101 Version=1.0
102 Icon=web-browser
103-Type=X-XFCE-Helper
104+Type=Application
105 _Name=Epiphany Web Browser
106 StartupNotify=true
107 X-XFCE-Binaries=epiphany;
108 X-XFCE-Category=WebBrowser
109 X-XFCE-Commands=%B;
110 X-XFCE-CommandsWithParameter=%B "%s";
111+X-XFCE-Type=X-XFCE-Helper
112--- a/exo-helper/helpers/eterm.desktop.in.in.old 2011-03-07 12:08:30.000000000 +0100
113+++ b/exo-helper/helpers/eterm.desktop.in.in 2011-03-07 12:08:30.000000000 +0100
114@@ -1,10 +1,11 @@
115 [Desktop Entry]
116 Version=1.0
117 Icon=Eterm
118-Type=X-XFCE-Helper
119+Type=Application
120 _Name=Enlightened Terminal Emulator
121 StartupNotify=false
122 X-XFCE-Binaries=Eterm;
123 X-XFCE-Category=TerminalEmulator
124 X-XFCE-Commands=%B;
125 X-XFCE-CommandsWithParameter=%B --exec "%s";
126+X-XFCE-Type=X-XFCE-Helper
127--- a/exo-helper/helpers/evolution.desktop.in.in.old 2011-03-07 12:08:30.000000000 +0100
128+++ b/exo-helper/helpers/evolution.desktop.in.in 2011-03-07 12:08:30.000000000 +0100
129@@ -1,10 +1,11 @@
130 [Desktop Entry]
131 Version=1.0
132 Icon=evolution
133-Type=X-XFCE-Helper
134+Type=Application
135 _Name=Novell Evolution
136 StartupNotify=false
137 X-XFCE-Binaries=evolution-2.4;evolution-2.3;evolution-2.2;evolution-2.0;evolution-1.6;evolution-1.5;evolution-1.4;evolution;
138 X-XFCE-Category=MailReader
139 X-XFCE-Commands=%B;
140 X-XFCE-CommandsWithParameter=@HELPERDIR@/exo-compose-mail-1 evolution %B "mailto:%s";
141+X-XFCE-Type=X-XFCE-Helper
142--- a/exo-helper/helpers/firefox.desktop.in.in.old 2011-03-07 12:08:30.000000000 +0100
143+++ b/exo-helper/helpers/firefox.desktop.in.in 2011-03-07 12:08:30.000000000 +0100
144@@ -1,10 +1,11 @@
145 [Desktop Entry]
146 Version=1.0
147 Icon=firefox
148-Type=X-XFCE-Helper
149+Type=Application
150 _Name=Mozilla Firefox
151 StartupNotify=false
152 X-XFCE-Binaries=firefox;firefox-gtk2;firefox-gtk;mozilla-firefox;
153 X-XFCE-Category=WebBrowser
154 X-XFCE-Commands=%B -remote "openURL(about:blank,new-window)";%B;
155 X-XFCE-CommandsWithParameter=%B -remote "openURL(%s)";%B %s;
156+X-XFCE-Type=X-XFCE-Helper
157--- a/exo-helper/helpers/galeon.desktop.in.in.old 2011-03-07 12:08:30.000000000 +0100
158+++ b/exo-helper/helpers/galeon.desktop.in.in 2011-03-07 12:08:30.000000000 +0100
159@@ -1,10 +1,11 @@
160 [Desktop Entry]
161 Version=1.0
162 Icon=galeon
163-Type=X-XFCE-Helper
164+Type=Application
165 _Name=Galeon Web Browser
166 StartupNotify=true
167 X-XFCE-Binaries=galeon;
168 X-XFCE-Category=WebBrowser
169 X-XFCE-Commands=%B;
170 X-XFCE-CommandsWithParameter=%B "%s";
171+X-XFCE-Type=X-XFCE-Helper
172--- a/exo-helper/helpers/gnome-terminal.desktop.in.in.old 2011-03-07 12:08:30.000000000 +0100
173+++ b/exo-helper/helpers/gnome-terminal.desktop.in.in 2011-03-07 12:08:30.000000000 +0100
174@@ -1,10 +1,11 @@
175 [Desktop Entry]
176 Version=1.0
177 Icon=gnome-terminal
178-Type=X-XFCE-Helper
179+Type=Application
180 _Name=GNOME Terminal
181 StartupNotify=true
182 X-XFCE-Binaries=gnome-terminal;gnometerminal;
183 X-XFCE-Category=TerminalEmulator
184 X-XFCE-Commands=%B;
185 X-XFCE-CommandsWithParameter=%B -x %s;
186+X-XFCE-Type=X-XFCE-Helper
187--- a/exo-helper/helpers/icedove.desktop.in.in.old 2011-03-07 12:08:30.000000000 +0100
188+++ b/exo-helper/helpers/icedove.desktop.in.in 2011-03-07 12:08:30.000000000 +0100
189@@ -1,10 +1,11 @@
190 [Desktop Entry]
191 Version=1.0
192 Icon=icedove
193-Type=X-XFCE-Helper
194+Type=Application
195 _Name=Icedove
196 StartupNotify=false
197 X-XFCE-Binaries=icedove;
198 X-XFCE-Category=MailReader
199 X-XFCE-Commands=%B;
200 X-XFCE-CommandsWithParameter=@HELPERDIR@/exo-compose-mail-1 mozilla-remote %B "mailto:%s";@HELPERDIR@/exo-compose-mail-1 mozilla %B "mailto:%s";
201+X-XFCE-Type=X-XFCE-Helper
202--- a/exo-helper/helpers/kmail.desktop.in.in.old 2011-03-07 12:08:30.000000000 +0100
203+++ b/exo-helper/helpers/kmail.desktop.in.in 2011-03-07 12:08:30.000000000 +0100
204@@ -1,10 +1,11 @@
205 [Desktop Entry]
206 Version=1.0
207 Icon=kmail
208-Type=X-XFCE-Helper
209+Type=Application
210 _Name=KMail
211 StartupNotify=true
212 X-XFCE-Binaries=kmail;
213 X-XFCE-Category=MailReader
214 X-XFCE-Commands=%B;
215 X-XFCE-CommandsWithParamter=@HELPERDIR@/exo-compose-mail-1 kmail %B "mailto:%s";
216+X-XFCE-Type=X-XFCE-Helper
217--- a/exo-helper/helpers/konqueror.desktop.in.in.old 2011-03-07 12:08:30.000000000 +0100
218+++ b/exo-helper/helpers/konqueror.desktop.in.in 2011-03-07 12:08:30.000000000 +0100
219@@ -1,10 +1,11 @@
220 [Desktop Entry]
221 Version=1.0
222 Icon=konqueror
223-Type=X-XFCE-Helper
224+Type=Application
225 _Name=Konqueror Web Browser
226 StartupNotify=true
227 X-XFCE-Binaries=konqueror;
228 X-XFCE-Category=WebBrowser
229 X-XFCE-Commands=%B;
230 X-XFCE-CommandsWithParameter=%B "%s";
231+X-XFCE-Type=X-XFCE-Helper
232--- a/exo-helper/helpers/links.desktop.in.in.old 2011-03-07 12:08:30.000000000 +0100
233+++ b/exo-helper/helpers/links.desktop.in.in 2011-03-07 12:08:30.000000000 +0100
234@@ -1,10 +1,11 @@
235 [Desktop Entry]
236 Version=1.0
237 Icon=links
238-Type=X-XFCE-Helper
239+Type=Application
240 _Name=Links Text Browser
241 StartupNotify=false
242 X-XFCE-Binaries=links;links-current;
243 X-XFCE-Category=WebBrowser
244 X-XFCE-Commands=exo-open --launch TerminalEmulator %B;
245 X-XFCE-CommandsWithParameter=exo-open --launch TerminalEmulator %B %s;
246+X-XFCE-Type=X-XFCE-Helper
247--- a/exo-helper/helpers/lynx.desktop.in.in.old 2011-03-07 12:08:30.000000000 +0100
248+++ b/exo-helper/helpers/lynx.desktop.in.in 2011-03-07 12:08:30.000000000 +0100
249@@ -1,10 +1,11 @@
250 [Desktop Entry]
251 Version=1.0
252 Icon=aterm
253-Type=X-XFCE-Helper
254+Type=Application
255 _Name=Lynx Text Browser
256 StartupNotify=false
257 X-XFCE-Binaries=lynx;lynx-current;
258 X-XFCE-Category=WebBrowser
259 X-XFCE-Commands=exo-open --launch TerminalEmulator %B;
260 X-XFCE-CommandsWithParameter=exo-open --launch TerminalEmulator %B %s;
261+X-XFCE-Type=X-XFCE-Helper
262--- a/exo-helper/helpers/midori.desktop.in.in.old 2011-03-07 12:08:30.000000000 +0100
263+++ b/exo-helper/helpers/midori.desktop.in.in 2011-03-07 12:08:30.000000000 +0100
264@@ -2,10 +2,11 @@
265 [Desktop Entry]
266 Version=1.0
267 Icon=midori
268-Type=X-XFCE-Helper
269+Type=Application
270 _Name=Midori
271 StartupNotify=true
272 X-XFCE-Binaries=midori;
273 X-XFCE-Category=WebBrowser
274 X-XFCE-Commands=%B;
275 X-XFCE-CommandsWithParameter=%B "%s";
276+X-XFCE-Type=X-XFCE-Helper
277--- a/exo-helper/helpers/mozilla-browser.desktop.in.in.old 2011-03-07 12:08:30.000000000 +0100
278+++ b/exo-helper/helpers/mozilla-browser.desktop.in.in 2011-03-07 12:08:30.000000000 +0100
279@@ -1,10 +1,11 @@
280 [Desktop Entry]
281 Version=1.0
282 Icon=mozilla
283-Type=X-XFCE-Helper
284+Type=Application
285 _Name=Mozilla Browser
286 StartupNotify=false
287 X-XFCE-Binaries=mozilla;mozilla-gtk2;mozilla-gtk;
288 X-XFCE-Category=WebBrowser
289 X-XFCE-Commands=%B -remote "openURL(about:blank,new-window)";%B;
290 X-XFCE-CommandsWithParameter=%B -remote "openURL(%s,new-window)";%B %s;
291+X-XFCE-Type=X-XFCE-Helper
292--- a/exo-helper/helpers/mozilla-mailer.desktop.in.in.old 2011-03-07 12:08:30.000000000 +0100
293+++ b/exo-helper/helpers/mozilla-mailer.desktop.in.in 2011-03-07 12:08:30.000000000 +0100
294@@ -1,10 +1,11 @@
295 [Desktop Entry]
296 Version=1.0
297 Icon=mozilla
298-Type=X-XFCE-Helper
299+Type=Application
300 _Name=Mozilla Mail
301 StartupNotify=false
302 X-XFCE-Binaries=mozilla;mozilla-gtk2;mozilla-gtk;
303 X-XFCE-Category=MailReader
304 X-XFCE-Commands=%B -mail;
305 X-XFCE-CommandsWithParameter=@HELPERDIR@/exo-compose-mail-1 mozilla-remote %B "mailto:%s";@HELPERDIR@/exo-compose-mail-1 mozilla %B "mailto:%s";
306+X-XFCE-Type=X-XFCE-Helper
307--- a/exo-helper/helpers/mutt.desktop.in.in.old 2011-03-07 12:08:30.000000000 +0100
308+++ b/exo-helper/helpers/mutt.desktop.in.in 2011-03-07 12:08:30.000000000 +0100
309@@ -1,10 +1,11 @@
310 [Desktop Entry]
311 Version=1.0
312 Icon=mutt
313-Type=X-XFCE-Helper
314+Type=Application
315 _Name=Mutt
316 StartupNotify=false
317 X-XFCE-Binaries=mutt;
318 X-XFCE-Category=MailReader
319 X-XFCE-Commands=exo-open --launch TerminalEmulator %B;
320 X-XFCE-CommandsWithParameter=exo-open --launch TerminalEmulator @HELPERDIR@/exo-compose-mail-1 mutt %B "mailto:%s";
321+X-XFCE-Type=X-XFCE-Helper
322--- a/exo-helper/helpers/nautilus.desktop.in.in.old 2011-03-07 12:08:30.000000000 +0100
323+++ b/exo-helper/helpers/nautilus.desktop.in.in 2011-03-07 12:08:30.000000000 +0100
324@@ -2,10 +2,11 @@
325 [Desktop Entry]
326 Version=1.0
327 Icon=nautilus
328-Type=X-XFCE-Helper
329+Type=Application
330 _Name=Nautilus
331 StartupNotify=true
332 X-XFCE-Binaries=nautilus;
333 X-XFCE-Category=FileManager
334 X-XFCE-Commands=%B;
335 X-XFCE-CommandsWithParameter=%B "%s";
336+X-XFCE-Type=X-XFCE-Helper
337--- a/exo-helper/helpers/netscape-navigator.desktop.in.in.old 2011-03-07 12:08:30.000000000 +0100
338+++ b/exo-helper/helpers/netscape-navigator.desktop.in.in 2011-03-07 12:08:30.000000000 +0100
339@@ -1,10 +1,11 @@
340 [Desktop Entry]
341 Version=1.0
342 Icon=mozilla
343-Type=X-XFCE-Helper
344+Type=Application
345 _Name=Netscape Navigator
346 StartupNotify=false
347 X-XFCE-Binaries=netscape;
348 X-XFCE-Category=WebBrowser
349 X-XFCE-Commands=%B -remote "openURL(about:blank,new-window)";%B;
350 X-XFCE-CommandsWithParameter=%B -remote "openURL(%s,new-window)";%B %s;
351+X-XFCE-Type=X-XFCE-Helper
352--- a/exo-helper/helpers/nxterm.desktop.in.in.old 2011-03-07 12:08:30.000000000 +0100
353+++ b/exo-helper/helpers/nxterm.desktop.in.in 2011-03-07 12:08:30.000000000 +0100
354@@ -1,10 +1,11 @@
355 [Desktop Entry]
356 Version=1.0
357 Icon=nxterm
358-Type=X-XFCE-Helper
359+Type=Application
360 _Name=NXterm
361 StartupNotify=false
362 X-XFCE-Binaries=nxterm;
363 X-XFCE-Category=TerminalEmulator
364 X-XFCE-Commands=%B;
365 X-XFCE-CommandsWithParameter=%B -e %s;
366+X-XFCE-Type=X-XFCE-Helper
367--- a/exo-helper/helpers/opera-browser.desktop.in.in.old 2011-03-07 12:08:30.000000000 +0100
368+++ b/exo-helper/helpers/opera-browser.desktop.in.in 2011-03-07 12:08:30.000000000 +0100
369@@ -1,10 +1,11 @@
370 [Desktop Entry]
371 Version=1.0
372 Icon=opera
373-Type=X-XFCE-Helper
374+Type=Application
375 _Name=Opera Browser
376 StartupNotify=false
377 X-XFCE-Binaries=opera;
378 X-XFCE-Category=WebBrowser
379 X-XFCE-Commands=%B;
380 X-XFCE-CommandsWithParameter=%B "%s";
381+X-XFCE-Type=X-XFCE-Helper
382--- a/exo-helper/helpers/opera-mailer.desktop.in.in.old 2011-03-07 12:08:30.000000000 +0100
383+++ b/exo-helper/helpers/opera-mailer.desktop.in.in 2011-03-07 12:08:30.000000000 +0100
384@@ -1,10 +1,11 @@
385 [Desktop Entry]
386 Version=1.0
387 Icon=opera
388-Type=X-XFCE-Helper
389+Type=Application
390 _Name=Opera Mail
391 StartupNotify=false
392 X-XFCE-Binaries=opera;
393 X-XFCE-Category=MailReader
394 X-XFCE-Commands=%B;
395 X-XFCE-CommandsWithParameter=%B -remote "openURL(mailto:%s)";%B "mailto:%s";
396+X-XFCE-Type=X-XFCE-Helper
397--- a/exo-helper/helpers/pcmanfm.desktop.in.in.old 2011-03-07 12:08:30.000000000 +0100
398+++ b/exo-helper/helpers/pcmanfm.desktop.in.in 2011-03-07 12:08:30.000000000 +0100
399@@ -2,10 +2,11 @@
400 [Desktop Entry]
401 Version=1.0
402 Icon=pcmanfm
403-Type=X-XFCE-Helper
404+Type=Application
405 _Name=PCMan File Manager
406 StartupNotify=true
407 X-XFCE-Binaries=pcmanfm;
408 X-XFCE-Category=FileManager
409 X-XFCE-Commands=%B;
410 X-XFCE-CommandsWithParameter=%B "%s";
411+X-XFCE-Type=X-XFCE-Helper
412--- a/exo-helper/helpers/sylpheed-claws.desktop.in.in.old 2011-03-07 12:08:30.000000000 +0100
413+++ b/exo-helper/helpers/sylpheed-claws.desktop.in.in 2011-03-07 12:08:30.000000000 +0100
414@@ -1,10 +1,11 @@
415 [Desktop Entry]
416 Version=1.0
417 Icon=claws-mail
418-Type=X-XFCE-Helper
419+Type=Application
420 _Name=Claws Mail
421 StartupNotify=true
422 X-XFCE-Binaries=claws-mail;sylpheed-claws-gtk2;sylpheed-claws
423 X-XFCE-Category=MailReader
424 X-XFCE-Commands=%B;
425 X-XFCE-CommandsWithParameter=@HELPERDIR@/exo-compose-mail-1 sylpheed %B "mailto:%s";
426+X-XFCE-Type=X-XFCE-Helper
427--- a/exo-helper/helpers/sylpheed.desktop.in.in.old 2011-03-07 12:08:30.000000000 +0100
428+++ b/exo-helper/helpers/sylpheed.desktop.in.in 2011-03-07 12:08:30.000000000 +0100
429@@ -1,10 +1,11 @@
430 [Desktop Entry]
431 Version=1.0
432 Icon=sylpheed
433-Type=X-XFCE-Helper
434+Type=Application
435 _Name=Sylpheed
436 StartupNotify=true
437 X-XFCE-Binaries=sylpheed;
438 X-XFCE-Category=MailReader
439 X-XFCE-Commands=%B;
440 X-XFCE-CommandsWithParameter=@HELPERDIR@/exo-compose-mail-1 sylpheed %B "mailto:%s";
441+X-XFCE-Type=X-XFCE-Helper
442--- a/exo-helper/helpers/Terminal.desktop.in.in.old 2011-03-07 12:08:30.000000000 +0100
443+++ b/exo-helper/helpers/Terminal.desktop.in.in 2011-03-07 12:08:30.000000000 +0100
444@@ -1,10 +1,11 @@
445 [Desktop Entry]
446 Version=1.0
447 Icon=Terminal
448-Type=X-XFCE-Helper
449+Type=Application
450 _Name=Xfce Terminal
451 StartupNotify=true
452 X-XFCE-Binaries=Terminal;xterminal;xfce4-terminal;
453 X-XFCE-Category=TerminalEmulator
454 X-XFCE-Commands=%B;
455 X-XFCE-CommandsWithParameter=%B -x %s;
456+X-XFCE-Type=X-XFCE-Helper
457--- a/exo-helper/helpers/Thunar.desktop.in.in.old 2011-03-07 12:08:30.000000000 +0100
458+++ b/exo-helper/helpers/Thunar.desktop.in.in 2011-03-07 12:08:30.000000000 +0100
459@@ -2,10 +2,11 @@
460 [Desktop Entry]
461 Version=1.0
462 Icon=Thunar
463-Type=X-XFCE-Helper
464+Type=Application
465 _Name=Thunar
466 StartupNotify=true
467 X-XFCE-Binaries=Thunar;
468 X-XFCE-Category=FileManager
469 X-XFCE-Commands=%B;
470 X-XFCE-CommandsWithParameter=%B "%s";
471+X-XFCE-Type=X-XFCE-Helper
472--- a/exo-helper/helpers/thunderbird.desktop.in.in.old 2011-03-07 12:08:30.000000000 +0100
473+++ b/exo-helper/helpers/thunderbird.desktop.in.in 2011-03-07 12:08:30.000000000 +0100
474@@ -1,10 +1,11 @@
475 [Desktop Entry]
476 Version=1.0
477 Icon=thunderbird
478-Type=X-XFCE-Helper
479+Type=Application
480 _Name=Mozilla Thunderbird
481 StartupNotify=false
482 X-XFCE-Binaries=thunderbird;thunderbird-gtk2;thunderbird-gtk;mozilla-thunderbird;
483 X-XFCE-Category=MailReader
484 X-XFCE-Commands=%B;
485 X-XFCE-CommandsWithParameter=@HELPERDIR@/exo-compose-mail-1 mozilla-remote %B "mailto:%s";@HELPERDIR@/exo-compose-mail-1 mozilla %B "mailto:%s";
486+X-XFCE-Type=X-XFCE-Helper
487--- a/exo-helper/helpers/urxvt.desktop.in.in.old 2011-03-07 12:08:30.000000000 +0100
488+++ b/exo-helper/helpers/urxvt.desktop.in.in 2011-03-07 12:08:30.000000000 +0100
489@@ -1,10 +1,11 @@
490 [Desktop Entry]
491 Version=1.0
492 Icon=rxvt
493-Type=X-XFCE-Helper
494+Type=Application
495 _Name=RXVT Unicode
496 StartupNotify=false
497 X-XFCE-Binaries=urxvt;
498 X-XFCE-Category=TerminalEmulator
499 X-XFCE-Commands=%B;
500 X-XFCE-CommandsWithParameter=%B -e %s;
501+X-XFCE-Type=X-XFCE-Helper
502--- a/exo-helper/helpers/w3m.desktop.in.in.old 2011-03-07 12:08:30.000000000 +0100
503+++ b/exo-helper/helpers/w3m.desktop.in.in 2011-03-07 12:08:30.000000000 +0100
504@@ -1,10 +1,11 @@
505 [Desktop Entry]
506 Version=1.0
507 Icon=w3m
508-Type=X-XFCE-Helper
509+Type=Application
510 _Name=W3M Text Browser
511 StartupNotify=false
512 X-XFCE-Binaries=w3m;
513 X-XFCE-Category=WebBrowser
514 X-XFCE-Commands=exo-open --launch TerminalEmulator %B;
515 X-XFCE-CommandsWithParameter=exo-open --launch TerminalEmulator %B %s;
516+X-XFCE-Type=X-XFCE-Helper
517--- a/exo-helper/helpers/xterm.desktop.in.in.old 2011-03-07 12:08:30.000000000 +0100
518+++ b/exo-helper/helpers/xterm.desktop.in.in 2011-03-07 12:08:31.000000000 +0100
519@@ -1,10 +1,11 @@
520 [Desktop Entry]
521 Version=1.0
522 Icon=xterm
523-Type=X-XFCE-Helper
524+Type=Application
525 _Name=X Terminal
526 StartupNotify=false
527 X-XFCE-Binaries=xterm;
528 X-XFCE-Category=TerminalEmulator
529 X-XFCE-Commands=%B;
530 X-XFCE-CommandsWithParameter=%B -e %s;
531+X-XFCE-Type=X-XFCE-Helper
diff --git a/meta-xfce/recipes-xfce/exo/exo_0.6.2.bb b/meta-xfce/recipes-xfce/exo/exo_0.8.0.bb
index ad8dc59f6f..af9103f6c8 100644
--- a/meta-xfce/recipes-xfce/exo/exo_0.6.2.bb
+++ b/meta-xfce/recipes-xfce/exo/exo_0.8.0.bb
@@ -1,21 +1,21 @@
1DESCRIPTION="Application library for the Xfce desktop environment" 1DESCRIPTION="Application library for the Xfce desktop environment"
2SECTION = "x11" 2SECTION = "x11"
3LICENSE = "GPLv2" 3LICENSE = "GPLv2"
4LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" 4LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
5DEPENDS = "gtk+ libxfce4util virtual/libx11 perl-native cairo" 5DEPENDS = "gtk+ libxfce4util libxfce4ui virtual/libx11 perl-native cairo"
6
7PR = "r1"
8 6
9inherit xfce pythonnative 7inherit xfce pythonnative
10 8
11# SRC_URI must follow inherited one 9# SRC_URI must follow inherited one
12SRC_URI += " \ 10SRC_URI += " \
13 file://exo-no-tests-0.6.patch \ 11 file://exo-no-tests-0.8.patch \
14 file://configure.patch \ 12 file://configure.patch \
15 file://gnome-mount \ 13 file://gnome-mount \
16 file://fix-qa-desktop-type-error.patch \
17" 14"
18 15
16SRC_URI[md5sum] = "189bd19210e1d7d8601be1cdf27bf259"
17SRC_URI[sha256sum] = "6e21aa30692affcb45fc8283d034da4a02221d26e3e1facb968d04fed4ba05b0"
18
19# see http://wiki.xfce.org/gnomemount-replacement 19# see http://wiki.xfce.org/gnomemount-replacement
20do_install_append () { 20do_install_append () {
21 install -m 755 -d ${D}${bindir}/exo-mount-wrapper 21 install -m 755 -d ${D}${bindir}/exo-mount-wrapper
@@ -30,6 +30,3 @@ FILES_${PN} += "${datadir}/xfce4/ \
30 30
31FILES_${PN}-dbg += "${libdir}/gio/modules/.debug \ 31FILES_${PN}-dbg += "${libdir}/gio/modules/.debug \
32 " 32 "
33
34SRC_URI[md5sum] = "e25333df350abc30999cd16fe96ab690"
35SRC_URI[sha256sum] = "f49cf6a85546f47a1dddb58ce9a5f9364384a6f173cba99deb879e027c811f39"
diff --git a/meta-xfce/recipes-xfce/garcon/garcon_0.1.10.bb b/meta-xfce/recipes-xfce/garcon/garcon_0.2.0.bb
index 2e88b972b3..a384889cc0 100644
--- a/meta-xfce/recipes-xfce/garcon/garcon_0.1.10.bb
+++ b/meta-xfce/recipes-xfce/garcon/garcon_0.2.0.bb
@@ -6,7 +6,7 @@ DEPENDS = "glib-2.0 xfce4-dev-tools-native libxfce4util"
6 6
7inherit xfce 7inherit xfce
8 8
9FILES_${PN} += " ${datadir}/desktop-directories" 9SRC_URI[md5sum] = "301e7b8015060dd30407b68dd8c4bdb7"
10SRC_URI[sha256sum] = "02dea3edb9c0039eca4748e964c61b0e1cc10f2d7f9ce0c837287ac5fa9ef76c"
10 11
11SRC_URI[md5sum] = "e53514e79c4da2631dd74994452d3c96" 12FILES_${PN} += "${datadir}/desktop-directories"
12SRC_URI[sha256sum] = "c2497a2991101fc1e621dc712ef72aba7c238f6e5f5a1733c9572f9b23761316"
diff --git a/meta-xfce/recipes-xfce/gtk-xfce-engine/files/0001-Don-t-leak-a-graduent-pattern-at-each-draw-bug-8521.patch b/meta-xfce/recipes-xfce/gtk-xfce-engine/files/0001-Don-t-leak-a-graduent-pattern-at-each-draw-bug-8521.patch
deleted file mode 100644
index 89fddb301a..0000000000
--- a/meta-xfce/recipes-xfce/gtk-xfce-engine/files/0001-Don-t-leak-a-graduent-pattern-at-each-draw-bug-8521.patch
+++ /dev/null
@@ -1,30 +0,0 @@
1From 868e3fcbb14b836b6f5f1cc73314aebe8453a939 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
3Date: Wed, 29 Aug 2012 19:59:24 +0200
4Subject: [PATCH] Don't leak a graduent pattern at each draw (bug #8521)
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9Upstream-Status: Backport [1]
10[1] http://git.xfce.org/xfce/gtk-xfce-engine/commit/?id=964d4a05896bcb6dfbeec34dccb77e4f381363f1
11
12Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
13---
14 src/gradient_draw.c | 2 ++
15 1 files changed, 2 insertions(+), 0 deletions(-)
16
17diff --git a/src/gradient_draw.c b/src/gradient_draw.c
18index 02deb88..37af559 100644
19--- a/src/gradient_draw.c
20+++ b/src/gradient_draw.c
21@@ -278,4 +278,6 @@ void gradient_draw_shaded(cairo_t *cr, gint x, gint y, gint width, gint height,
22 cairo_fill (cr);
23
24 cairo_restore(cr);
25+
26+ cairo_pattern_destroy(gradient);
27 }
28--
291.7.6.5
30
diff --git a/meta-xfce/recipes-xfce/gtk-xfce-engine/gtk-xfce-engine_2.9.0.bb b/meta-xfce/recipes-xfce/gtk-xfce-engine/gtk-xfce-engine_2.9.0.bb
deleted file mode 100644
index 71310b35e5..0000000000
--- a/meta-xfce/recipes-xfce/gtk-xfce-engine/gtk-xfce-engine_2.9.0.bb
+++ /dev/null
@@ -1,18 +0,0 @@
1DESCRIPTION = "XFCE theme for GTK"
2SECTION = "x11/libs"
3LICENSE = "GPLv2"
4LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
5DEPENDS = "gtk+ xfce4-dev-tools-native"
6
7PR = "r1"
8
9inherit xfce
10
11SRC_URI += "file://0001-Don-t-leak-a-graduent-pattern-at-each-draw-bug-8521.patch"
12SRC_URI[md5sum] = "e2bc76ab5093ff8472e728e6d6ad5da2"
13SRC_URI[sha256sum] = "55604002526c800539f2a8a79e7df3bf23717f45e4bfab31c154c8d01caf3af7"
14
15FILES_${PN} += "${libdir}/gtk-2.0/*/engines \
16 ${datadir}/themes/"
17FILES_${PN}-dbg += "${libdir}/gtk-2.0/*/engines/.debug"
18FILES_${PN}-staticdev += "${libdir}/gtk-2.0/*/engines/*.a"
diff --git a/meta-xfce/recipes-xfce/gtk-xfce-engine/gtk-xfce-engine_3.0.1.bb b/meta-xfce/recipes-xfce/gtk-xfce-engine/gtk-xfce-engine_3.0.1.bb
new file mode 100644
index 0000000000..3ccd2e6281
--- /dev/null
+++ b/meta-xfce/recipes-xfce/gtk-xfce-engine/gtk-xfce-engine_3.0.1.bb
@@ -0,0 +1,23 @@
1DESCRIPTION = "XFCE theme for GTK"
2SECTION = "x11/libs"
3LICENSE = "GPLv2"
4LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
5DEPENDS = "gtk+ gtk+3 xfce4-dev-tools-native"
6
7inherit xfce
8
9SRC_URI[md5sum] = "174e774d0debb052ec457640275f065d"
10SRC_URI[sha256sum] = "eb03cf81da1a91e426a2141c092ed7a1634cab29ea2f3546480e901290a7a06d"
11
12PACKAGES += "${PN}-themes gtk3-xfce-engine"
13FILES_${PN} += "${libdir}/gtk-2.0/*/engines/*.so"
14FILES_gtk3-xfce-engine += "${libdir}/gtk-3.0/*/theming-engines/*.so"
15FILES_${PN}-themes += "${datadir}/themes"
16
17FILES_${PN}-dbg += "${libdir}/gtk-3.0/*/theming-engines/.debug \
18 ${libdir}/gtk-2.0/*/engines/.debug"
19FILES_${PN}-dev += "${libdir}/gtk-2.0/*/engines/*.la \
20 ${libdir}/gtk-3.0/*/theming-engines/*.la"
21
22RDEPENDS_${PN} += "${PN}-themes"
23RDEPENDS_gtk3-xfce-engine += "${PN}-themes"
diff --git a/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.8.1.bb b/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.10.0.bb
index e2bc81ea1e..32505de666 100644
--- a/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.8.1.bb
+++ b/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.10.0.bb
@@ -3,13 +3,11 @@ SECTION = "x11/libs"
3LICENSE = "GPLv2" 3LICENSE = "GPLv2"
4LIC_FILES_CHKSUM = "file://COPYING;md5=252890d9eee26aab7b432e8b8a616475" 4LIC_FILES_CHKSUM = "file://COPYING;md5=252890d9eee26aab7b432e8b8a616475"
5DEPENDS = "gtk+ intltool libxfce4util startup-notification xfconf" 5DEPENDS = "gtk+ intltool libxfce4util startup-notification xfconf"
6PR = "r1"
7 6
8inherit xfce 7inherit xfce
9 8
10SRC_URI += "file://0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch" 9SRC_URI += "file://0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch"
11 10
12FILES_${PN} += "${libdir}/xfce4/modules ${libdir}/libglade/2.0/*.so ${datadir}/xfce4/mime ${datadir}/icons/hicolor" 11SRC_URI[md5sum] = "6df1ce474a3d4885aee31cda9dbc9192"
12SRC_URI[sha256sum] = "a2b9fa288ccb5f16fa13264e507ba3f7b8da0176da259a11239f21538c0ea3e2"
13 13
14SRC_URI[md5sum] = "30bd432dd0f19305e846a122d4c7c6fe"
15SRC_URI[sha256sum] = "39cbed29da06960074014b74abc2ba57db49dc81ab8995fb2160579c51669956"
diff --git a/meta-xfce/recipes-xfce/libxfce4util/libxfce4util_4.8.2.bb b/meta-xfce/recipes-xfce/libxfce4util/libxfce4util_4.10.0.bb
index a9819fbe85..546ee32526 100644
--- a/meta-xfce/recipes-xfce/libxfce4util/libxfce4util_4.8.2.bb
+++ b/meta-xfce/recipes-xfce/libxfce4util/libxfce4util_4.10.0.bb
@@ -4,11 +4,7 @@ LICENSE = "GPLv2"
4LIC_FILES_CHKSUM = "file://COPYING;md5=252890d9eee26aab7b432e8b8a616475" 4LIC_FILES_CHKSUM = "file://COPYING;md5=252890d9eee26aab7b432e8b8a616475"
5DEPENDS = "intltool-native xfce4-dev-tools-native glib-2.0" 5DEPENDS = "intltool-native xfce4-dev-tools-native glib-2.0"
6 6
7PR = "r0"
8
9inherit xfce 7inherit xfce
10 8
11EXTRA_OECONF += "--with-broken-putenv=yes" 9SRC_URI[md5sum] = "2e8defcd40cbf6afedde531b27314511"
12 10SRC_URI[sha256sum] = "0979fee12880bb5f011ab38d6c7cc9afe5fd68eb96ccda895cb56dbc16e7608e"
13SRC_URI[md5sum] = "3376a77637a4292a863027d595548ee2"
14SRC_URI[sha256sum] = "05a149841575cb961588742c8c9795c6f0d09f27d59546dd8a933b010d2ac816"
diff --git a/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-base.bb b/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-base.bb
index 41e1d4a5a9..e42ea3c327 100644
--- a/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-base.bb
+++ b/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-base.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "All packages required for a base installation of XFCE"
2SECTION = "x11/wm" 2SECTION = "x11/wm"
3LICENSE = "MIT" 3LICENSE = "MIT"
4LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" 4LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
5PR = "r3" 5PR = "r4"
6 6
7inherit packagegroup 7inherit packagegroup
8 8
@@ -12,7 +12,6 @@ RCONFLICTS_${PN} += "task-xfce-base"
12 12
13RDEPENDS_${PN} = " \ 13RDEPENDS_${PN} = " \
14 xfwm4 \ 14 xfwm4 \
15 xfwm4-theme-default \
16 xfce4-session \ 15 xfce4-session \
17 xfconf \ 16 xfconf \
18 xfdesktop \ 17 xfdesktop \
@@ -20,7 +19,6 @@ RDEPENDS_${PN} = " \
20 \ 19 \
21 gtk-xfce-engine \ 20 gtk-xfce-engine \
22 \ 21 \
23 xfce-utils \
24 xfce4-panel-plugin-actions \ 22 xfce4-panel-plugin-actions \
25 xfce4-panel-plugin-applicationsmenu \ 23 xfce4-panel-plugin-applicationsmenu \
26 xfce4-panel-plugin-clock \ 24 xfce4-panel-plugin-clock \
diff --git a/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb b/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb
index ebe2dc7bb3..ea4bd1ef2d 100644
--- a/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb
+++ b/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb
@@ -3,7 +3,7 @@ SECTION = "x11/wm"
3LICENSE = "MIT" 3LICENSE = "MIT"
4LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" 4LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
5 5
6PR = "r4" 6PR = "r6"
7 7
8inherit packagegroup 8inherit packagegroup
9 9
@@ -21,11 +21,6 @@ RRECOMMENDS_${PN} = " \
21 xfwm4-theme-daloa \ 21 xfwm4-theme-daloa \
22 xfwm4-theme-kokodi \ 22 xfwm4-theme-kokodi \
23 xfwm4-theme-moheli \ 23 xfwm4-theme-moheli \
24 xfwm4-theme-sassandra \
25 xfwm4-theme-stoneage \
26 xfwm4-theme-therapy \
27 xfwm4-theme-tyrex \
28 xfwm4-theme-wallis \
29 \ 24 \
30 xfce4-cpufreq-plugin \ 25 xfce4-cpufreq-plugin \
31 xfce4-cpugraph-plugin \ 26 xfce4-cpugraph-plugin \
@@ -42,6 +37,8 @@ RRECOMMENDS_${PN} = " \
42 xfce4-time-out-plugin \ 37 xfce4-time-out-plugin \
43 xfce4-embed-plugin \ 38 xfce4-embed-plugin \
44 xfce4-weather-plugin \ 39 xfce4-weather-plugin \
40 xfce4-fsguard-plugin \
41 xfce4-battery-plugin \
45 \ 42 \
46 xfce4-appfinder \ 43 xfce4-appfinder \
47 xfce4-screenshooter \ 44 xfce4-screenshooter \
diff --git a/meta-xfce/recipes-xfce/thunar-volman/thunar-volman_0.6.0.bb b/meta-xfce/recipes-xfce/thunar-volman/thunar-volman_0.8.0.bb
index c7cc0edf89..44448205bc 100644
--- a/meta-xfce/recipes-xfce/thunar-volman/thunar-volman_0.6.0.bb
+++ b/meta-xfce/recipes-xfce/thunar-volman/thunar-volman_0.8.0.bb
@@ -2,12 +2,11 @@ DESCRIPTION = "Automatic management of removable drives and media for thunar"
2SECTION = "x11" 2SECTION = "x11"
3LICENSE = "GPLv2" 3LICENSE = "GPLv2"
4LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" 4LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
5DEPENDS = "exo gtk+ libxfce4ui libxfce4util xfconf libnotify udev" 5DEPENDS = "exo glib-2.0 gtk+ libxfce4ui libxfce4util xfconf libnotify udev"
6PR = "r1"
7 6
8inherit xfce 7inherit xfce
9 8
10SRC_URI[md5sum] = "2f166662dd100d5195da238af417f305" 9SRC_URI[md5sum] = "250af757ea629c7c27f554d17119080c"
11SRC_URI[sha256sum] = "b1afd2b3b285cfcf07c11caa3d37fa5ff1fc06f7dc68fcca07f9a0d70daa694f" 10SRC_URI[sha256sum] = "ff0887c862b578580d05f4cd7db66081382ff143f9cc7ea3c9ba58cf5d02bceb"
12 11
13RDEPENDS_${PN} = "eject" 12RDEPENDS_${PN} = "eject"
diff --git a/meta-xfce/recipes-xfce/thunar/thunar_1.2.3.bb b/meta-xfce/recipes-xfce/thunar/thunar_1.4.0.bb
index 86fcc791ea..39b1254504 100644
--- a/meta-xfce/recipes-xfce/thunar/thunar_1.2.3.bb
+++ b/meta-xfce/recipes-xfce/thunar/thunar_1.4.0.bb
@@ -2,13 +2,12 @@ DESCRIPTION = "File manager for the Xfce Desktop Environment"
2SECTION = "x11" 2SECTION = "x11"
3LICENSE = "GPLv2" 3LICENSE = "GPLv2"
4LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" 4LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
5DEPENDS = "exo gtk+ gdk-pixbuf libxfce4util libxfce4ui libsm dbus-glib startup-notification libnotify" 5DEPENDS = "exo glib-2.0 gtk+ gdk-pixbuf libxfce4util libxfce4ui libsm dbus-glib startup-notification libnotify"
6
7PR = "r1"
8 6
9inherit xfce 7inherit xfce
10 8
11# SRC_URI must follow inherited one 9SRC_URI[md5sum] = "737ad2c36ed36b10fef82e860b9e990a"
10SRC_URI[sha256sum] = "2c11a19e64cef708a264fb4d5d933389899c3d132fe7b1e313dd6e37bfe4c8ba"
12SRC_URI = "http://archive.xfce.org/src/xfce/${PN}/${@'${PV}'[0:3]}/Thunar-${PV}.tar.bz2" 11SRC_URI = "http://archive.xfce.org/src/xfce/${PN}/${@'${PV}'[0:3]}/Thunar-${PV}.tar.bz2"
13 12
14S = "${WORKDIR}/Thunar-${PV}/" 13S = "${WORKDIR}/Thunar-${PV}/"
@@ -23,6 +22,3 @@ FILES_${PN} += "${libdir}/thunarx-2/* \
23FILES_${PN}-dbg += "${libdir}/thunarx-2/.debug/ \ 22FILES_${PN}-dbg += "${libdir}/thunarx-2/.debug/ \
24 ${libdir}/xfce4/panel/plugins/.debug/ \ 23 ${libdir}/xfce4/panel/plugins/.debug/ \
25 ${libdir}/Thunar/.debug/" 24 ${libdir}/Thunar/.debug/"
26
27SRC_URI[md5sum] = "0a2c36cdd3cb3a2ab52cbf6055415b85"
28SRC_URI[sha256sum] = "e66aa9ad61a9202e15cc7c5fffc7b961da9ab3b4428f874c1ec8e46eb4ffaca6"
diff --git a/meta-xfce/recipes-xfce/tumbler/tumbler_0.1.23.bb b/meta-xfce/recipes-xfce/tumbler/tumbler_0.1.25.bb
index cd95a03837..3c2c2b371e 100644
--- a/meta-xfce/recipes-xfce/tumbler/tumbler_0.1.23.bb
+++ b/meta-xfce/recipes-xfce/tumbler/tumbler_0.1.25.bb
@@ -1,11 +1,14 @@
1DESCRIPTION="Thumbnail service implementing the thumbnail management D-Bus specification" 1DESCRIPTION="Thumbnail service implementing the thumbnail management D-Bus specification"
2SECTION = "x11/libs" 2SECTION = "x11/libs"
3LICENSE = "GPLv2" 3LICENSE = "GPLv2"
4LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" 4LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
5DEPENDS = "dbus-glib freetype gdk-pixbuf poppler" 5DEPENDS = "dbus-glib freetype gdk-pixbuf poppler"
6 6
7inherit xfce 7inherit xfce
8 8
9SRC_URI[md5sum] = "d4edc15c172714c7a3eaf3c719b8faf6"
10SRC_URI[sha256sum] = "02d5de508d8c18692a25a832a9280c2043f6b7c90dd3fcbd87f5955337015546"
11
9INSANE_SKIP_${PN} = "dev-so" 12INSANE_SKIP_${PN} = "dev-so"
10 13
11do_install_append() { 14do_install_append() {
@@ -27,6 +30,3 @@ FILES_${PN}-dbg += "${libdir}/tumbler-1/.debug \
27 ${libdir}/tumbler-1/plugins/.debug \ 30 ${libdir}/tumbler-1/plugins/.debug \
28 ${libdir}/tumbler-1/plugins/cache/.debug \ 31 ${libdir}/tumbler-1/plugins/cache/.debug \
29" 32"
30
31SRC_URI[md5sum] = "c6cf6821f5d884cbf2c26f45f2fecc74"
32SRC_URI[sha256sum] = "b3066d17b7e1fee5135eb876a7c2c50a1221bd0d447c3dd7c36efe6d7f3874cb"
diff --git a/meta-xfce/recipes-xfce/xfce-utils/xfce-utils_4.8.3.bb b/meta-xfce/recipes-xfce/xfce-utils/xfce-utils_4.8.3.bb
deleted file mode 100644
index e4b8686252..0000000000
--- a/meta-xfce/recipes-xfce/xfce-utils/xfce-utils_4.8.3.bb
+++ /dev/null
@@ -1,20 +0,0 @@
1DESCRIPTION="Xfce4 Utilities"
2SECTION = "x11"
3LICENSE = "GPLv2"
4LIC_FILES_CHKSUM = "file://COPYING;md5=9ac2e7cff1ddaf48b6eab6028f23ef88"
5DEPENDS = "gtk+ virtual/libx11 dbus libxfce4util libxfce4ui"
6
7inherit xfce
8
9# usually we do not migrate (requires perl on target)
10EXTRA_OECONF += "--disable-xfconf-migration"
11
12FILES_${PN} += " \
13 ${libdir}/xfce4/xfconf-migration \
14 ${datadir}/dbus-1/* \
15 ${datadir}/xsessions/xfce.desktop \
16"
17RDEPENDS_${PN} = "xrdb openssh-misc"
18
19SRC_URI[md5sum] = "03b5fba5f63f4f1a31cc7d3728f3c87e"
20SRC_URI[sha256sum] = "035070d7e608b29dbaeeb6ec541d8c2edbd28152d3ef111316c33871ab02b926"
diff --git a/meta-xfce/recipes-xfce/xfce4-appfinder/xfce4-appfinder_4.10.0.bb b/meta-xfce/recipes-xfce/xfce4-appfinder/xfce4-appfinder_4.10.0.bb
new file mode 100644
index 0000000000..25c2515a1b
--- /dev/null
+++ b/meta-xfce/recipes-xfce/xfce4-appfinder/xfce4-appfinder_4.10.0.bb
@@ -0,0 +1,10 @@
1DESCRIPTION="Xfce4 Application Finder"
2SECTION = "x11"
3LICENSE = "GPLv2"
4LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
5DEPENDS="glib-2.0 gtk+ libxfce4util libxfce4ui garcon dbus-glib xfconf"
6
7inherit xfce
8
9SRC_URI[md5sum] = "799f70a9ad67b450da67810a5107e623"
10SRC_URI[sha256sum] = "042aae7e366428a6a92b6353b3f2727d64823076a7752b8e0a15f1f8f3645439"
diff --git a/meta-xfce/recipes-xfce/xfce4-appfinder/xfce4-appfinder_4.8.0.bb b/meta-xfce/recipes-xfce/xfce4-appfinder/xfce4-appfinder_4.8.0.bb
deleted file mode 100644
index 9187041096..0000000000
--- a/meta-xfce/recipes-xfce/xfce4-appfinder/xfce4-appfinder_4.8.0.bb
+++ /dev/null
@@ -1,12 +0,0 @@
1DESCRIPTION="Xfce4 Application Finder"
2SECTION = "x11"
3LICENSE = "GPLv2"
4LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
5DEPENDS="gtk+ libxfce4util libxfce4ui garcon xfconf"
6
7PR = "r0"
8
9inherit xfce
10
11SRC_URI[md5sum] = "fb4797ef91b90d111b989e98c3e000e0"
12SRC_URI[sha256sum] = "fd74184355e45f8a16cc3cdd32b012b6787a453deb3a8b96af90494c7a8ac77f"
diff --git a/meta-xfce/recipes-xfce/xfce4-dev-tools/xfce4-dev-tools_4.8.0.bb b/meta-xfce/recipes-xfce/xfce4-dev-tools/xfce4-dev-tools_4.10.0.bb
index ce21bf0e9b..1955fccb0e 100644
--- a/meta-xfce/recipes-xfce/xfce4-dev-tools/xfce4-dev-tools_4.8.0.bb
+++ b/meta-xfce/recipes-xfce/xfce4-dev-tools/xfce4-dev-tools_4.10.0.bb
@@ -3,12 +3,15 @@ HOMEPAGE = "http://www.xfce.org"
3SECTION = "x11/libs" 3SECTION = "x11/libs"
4LICENSE = "GPLv2" 4LICENSE = "GPLv2"
5LIC_FILES_CHKSUM = "file://COPYING;md5=9ac2e7cff1ddaf48b6eab6028f23ef88" 5LIC_FILES_CHKSUM = "file://COPYING;md5=9ac2e7cff1ddaf48b6eab6028f23ef88"
6DEPENDS = "glib-2.0"
6 7
7PR = "r2" 8inherit autotools
8 9
9BBCLASSEXTEND = "native" 10BBCLASSEXTEND = "native"
10 11
11inherit autotools 12SRC_URI = "http://archive.xfce.org/src/xfce/${BPN}/${@'${PV}'[0:4]}/${BPN}-${PV}.tar.bz2"
13SRC_URI[md5sum] = "372b74f432e7e02d946c2ea9d3de2805"
14SRC_URI[sha256sum] = "f79649bbfbbf16881494ee9f67035063765aec12e23ab9bac31de2c8a4f32bf8"
12 15
13do_install_append() { 16do_install_append() {
14 install -d ${D}${datadir}/aclocal 17 install -d ${D}${datadir}/aclocal
@@ -16,7 +19,3 @@ do_install_append() {
16} 19}
17 20
18FILES_${PN} += "${datadir}/xfce4/dev-tools/m4macros/*.m4" 21FILES_${PN} += "${datadir}/xfce4/dev-tools/m4macros/*.m4"
19
20SRC_URI = "http://archive.xfce.org/src/xfce/${BPN}/${@'${PV}'[0:3]}/${BPN}-${PV}.tar.bz2"
21SRC_URI[md5sum] = "9591299c49d92d00ba47974c42a735fa"
22SRC_URI[sha256sum] = "7a1457e9dc839cb121a48e5c53c483ce02a3a5dbaf09376794a13bafe4194815"
diff --git a/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.8.6.bb b/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.10.0.bb
index b59fde0a1e..5d034258e6 100644
--- a/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.8.6.bb
+++ b/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.10.0.bb
@@ -4,10 +4,11 @@ LICENSE = "GPLv2"
4LIC_FILES_CHKSUM = "file://COPYING;md5=26a8bd75d8f8498bdbbe64a27791d4ee" 4LIC_FILES_CHKSUM = "file://COPYING;md5=26a8bd75d8f8498bdbbe64a27791d4ee"
5DEPENDS = "libxfce4util garcon libxfce4ui xfconf exo gtk+ dbus cairo virtual/libx11 libxml2 libwnck" 5DEPENDS = "libxfce4util garcon libxfce4ui xfconf exo gtk+ dbus cairo virtual/libx11 libxml2 libwnck"
6 6
7PR = "r3"
8
9inherit xfce 7inherit xfce
10 8
9SRC_URI[md5sum] = "cf7351a4b952dbe3fc5ff509c68def33"
10SRC_URI[sha256sum] = "3321f998af2bbd14ba68654a8881774f6ea2ec4f1a3544598e7f47d3ed0009b9"
11
11python populate_packages_prepend() { 12python populate_packages_prepend() {
12 plugin_dir = bb.data.expand('${libdir}/xfce4/panel/plugins/', d) 13 plugin_dir = bb.data.expand('${libdir}/xfce4/panel/plugins/', d)
13 plugin_name = bb.data.expand('${PN}-plugin-%s', d) 14 plugin_name = bb.data.expand('${PN}-plugin-%s', d)
@@ -18,9 +19,6 @@ python populate_packages_prepend() {
18 '${datadir}/icons/hicolor/48x48/apps/*-%s.png', 19 '${datadir}/icons/hicolor/48x48/apps/*-%s.png',
19 '${bindir}/*%s*']) 20 '${bindir}/*%s*'])
20} 21}
21do_install_append () {
22 find "${D}/${libdir}/xfce4/panel/plugins" -name '*.a' -exec rm -f {} +
23}
24 22
25PACKAGES_DYNAMIC = "${PN}-plugin-*" 23PACKAGES_DYNAMIC = "${PN}-plugin-*"
26 24
@@ -29,5 +27,3 @@ FILES_${PN} += "${libdir}/xfce4/panel/migrate \
29 27
30FILES_${PN}-dbg += "${libdir}/xfce4/panel/plugins/.debug \ 28FILES_${PN}-dbg += "${libdir}/xfce4/panel/plugins/.debug \
31 " 29 "
32SRC_URI[md5sum] = "9d7bf0503d5867c4044cef04bb5845b1"
33SRC_URI[sha256sum] = "66f1266a1242ee5ecada995a4a584dd9802aa24456759b40b0c29227c39bed03"
diff --git a/meta-xfce/recipes-xfce/xfce4-session/files/0001-Don-t-loose-xfwm4-when-closing-session-with-multiple.patch b/meta-xfce/recipes-xfce/xfce4-session/files/0001-Handle-multiple-interactive-session-save-bug-5379.patch
index 50bade87f7..38949a5d73 100644
--- a/meta-xfce/recipes-xfce/xfce4-session/files/0001-Don-t-loose-xfwm4-when-closing-session-with-multiple.patch
+++ b/meta-xfce/recipes-xfce/xfce4-session/files/0001-Handle-multiple-interactive-session-save-bug-5379.patch
@@ -1,56 +1,39 @@
1From 64c0acb072057023870881f9fbac29ce08d357db Mon Sep 17 00:00:00 2001 1From 9f3077be682355e1cd07e9a9463e76307292208c Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> 2From: Dimitar Zhekov <hamster@mbox.contact.bg>
3Date: Wed, 5 Sep 2012 20:14:09 +0200 3Date: Thu, 30 Aug 2012 22:52:14 +0200
4Subject: [PATCH] Don't loose xfwm4 when closing session with multiple windows 4Subject: [PATCH] Handle multiple interactive session save (bug #5379).
5 waiting for user input
6MIME-Version: 1.0
7Content-Type: text/plain; charset=UTF-8
8Content-Transfer-Encoding: 8bit
9 5
10When closing a session with more than one window open and waiting for unsaved 6Additionnaly, we now use SmSaveGlobal on log out / shutdown without
11data to be closed, at the next session xfwm4 was not started properly. 7session save which avoids data loss. Previously clients would not save
8anything on log out without session save.
12 9
13The bug(fix) could be reproduced by 10Based on original work by Chris Bainbridge (chris.bainbridge@gmail.com).
14
15* opening gedit
16* entering some text
17* opening terminal
18* closing session (no YNC-dialog / wait ~1min to close session)
19* reopen session
20
21Bugreport with this patch is found at [1] further discussion at [2].
22
23Upstream-Status: Pending
24
25[1] https://bugzilla.xfce.org/show_bug.cgi?id=5379
26[2] http://mail.xfce.org/pipermail/xfce/2012-August/031174.html
27
28Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
29--- 11---
12Upstream-status: applied
30 xfce4-session/xfsm-manager.c | 81 ++++++++++++++++++++++++----------------- 13 xfce4-session/xfsm-manager.c | 81 ++++++++++++++++++++++++-----------------
31 1 files changed, 47 insertions(+), 34 deletions(-) 14 1 files changed, 47 insertions(+), 34 deletions(-)
32 15
33diff --git a/xfce4-session/xfsm-manager.c b/xfce4-session/xfsm-manager.c 16diff --git a/xfce4-session/xfsm-manager.c b/xfce4-session/xfsm-manager.c
34index 3078d6a..3cc4c89 100644 17index bf6a446..35811c5 100644
35--- a/xfce4-session/xfsm-manager.c 18--- a/xfce4-session/xfsm-manager.c
36+++ b/xfce4-session/xfsm-manager.c 19+++ b/xfce4-session/xfsm-manager.c
37@@ -96,6 +96,7 @@ struct _XfsmManager 20@@ -98,6 +98,7 @@ struct _XfsmManager
38 21
39 XfsmManagerState state; 22 XfsmShutdownType shutdown_type;
40 XfsmShutdownType shutdown_type; 23 XfsmShutdown *shutdown_helper;
41+ gboolean save_session; 24+ gboolean save_session;
42 25
43 gboolean session_chooser; 26 gboolean session_chooser;
44 gchar *session_name; 27 gchar *session_name;
45@@ -225,6 +226,7 @@ xfsm_manager_init (XfsmManager *manager) 28@@ -230,6 +231,7 @@ xfsm_manager_init (XfsmManager *manager)
46 manager->session_chooser = FALSE;
47 manager->failsafe_mode = TRUE; 29 manager->failsafe_mode = TRUE;
48 manager->shutdown_type = XFSM_SHUTDOWN_LOGOUT; 30 manager->shutdown_type = XFSM_SHUTDOWN_LOGOUT;
31 manager->shutdown_helper = xfsm_shutdown_get ();
49+ manager->save_session = TRUE; 32+ manager->save_session = TRUE;
50 33
51 manager->pending_properties = g_queue_new (); 34 manager->pending_properties = g_queue_new ();
52 manager->starting_properties = g_queue_new (); 35 manager->starting_properties = g_queue_new ();
53@@ -981,7 +983,9 @@ xfsm_manager_interact (XfsmManager *manager, 36@@ -989,7 +991,9 @@ xfsm_manager_interact (XfsmManager *manager,
54 XfsmClient *cl = lp->data; 37 XfsmClient *cl = lp->data;
55 if (xfsm_client_get_state (cl) == XFSM_CLIENT_INTERACTING) 38 if (xfsm_client_get_state (cl) == XFSM_CLIENT_INTERACTING)
56 { 39 {
@@ -61,9 +44,9 @@ index 3078d6a..3cc4c89 100644
61 return; 44 return;
62 } 45 }
63 } 46 }
64@@ -1158,44 +1162,47 @@ xfsm_manager_save_yourself_global (XfsmManager *manager, 47@@ -1138,44 +1142,47 @@ xfsm_manager_save_yourself_global (XfsmManager *manager,
48 }
65 } 49 }
66 #endif
67 50
68- if (!shutdown || shutdown_save) 51- if (!shutdown || shutdown_save)
69+ /* don't save the session if shutting down without save */ 52+ /* don't save the session if shutting down without save */
@@ -140,7 +123,7 @@ index 3078d6a..3cc4c89 100644
140 } 123 }
141 } 124 }
142 125
143@@ -1267,7 +1274,12 @@ xfsm_manager_save_yourself_done (XfsmManager *manager, 126@@ -1249,7 +1256,12 @@ xfsm_manager_save_yourself_done (XfsmManager *manager,
144 XfsmClient *client, 127 XfsmClient *client,
145 gboolean success) 128 gboolean success)
146 { 129 {
@@ -154,7 +137,7 @@ index 3078d6a..3cc4c89 100644
154 { 137 {
155 xfsm_verbose ("Client Id = %s send SAVE YOURSELF DONE, while not being " 138 xfsm_verbose ("Client Id = %s send SAVE YOURSELF DONE, while not being "
156 "in save mode. Prepare to be nuked!\n", 139 "in save mode. Prepare to be nuked!\n",
157@@ -1539,7 +1551,8 @@ xfsm_manager_complete_saveyourself (XfsmManager *manager) 140@@ -1521,7 +1533,8 @@ xfsm_manager_complete_saveyourself (XfsmManager *manager)
158 xfsm_verbose ("Manager finished SAVE YOURSELF, session data will be stored now.\n\n"); 141 xfsm_verbose ("Manager finished SAVE YOURSELF, session data will be stored now.\n\n");
159 142
160 /* all clients done, store session data */ 143 /* all clients done, store session data */
@@ -165,5 +148,5 @@ index 3078d6a..3cc4c89 100644
165 if (manager->state == XFSM_MANAGER_CHECKPOINT) 148 if (manager->state == XFSM_MANAGER_CHECKPOINT)
166 { 149 {
167-- 150--
1681.7.6.5 1511.7.4.4
169 152
diff --git a/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.8.3.bb b/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.10.0.bb
index 4b9b32eb78..4df9894951 100644
--- a/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.8.3.bb
+++ b/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.10.0.bb
@@ -2,13 +2,14 @@ DESCRIPTION = "xfce4-session is a session manager for Xfce 4 Desktop Environment
2SECTION = "x11" 2SECTION = "x11"
3LICENSE = "GPLv2" 3LICENSE = "GPLv2"
4LIC_FILES_CHKSUM = "file://COPYING;md5=9ac2e7cff1ddaf48b6eab6028f23ef88" 4LIC_FILES_CHKSUM = "file://COPYING;md5=9ac2e7cff1ddaf48b6eab6028f23ef88"
5DEPENDS = "virtual/libx11 libsm libxfce4util libxfce4ui gtk+ libwnck dbus dbus-glib xfconf xfce4-panel gconf gnome-keyring" 5DEPENDS = "virtual/libx11 libsm libxfce4util libxfce4ui gtk+ libwnck dbus dbus-glib xfconf gnome-keyring"
6RDEPENDS_${PN} = "netbase xinit dbus-x11 iceauth consolekit" 6RDEPENDS_${PN} = "netbase xinit dbus-x11 iceauth consolekit upower"
7PR = "r2"
8 7
9inherit xfce 8inherit xfce
10 9
11SRC_URI += "file://0001-Don-t-loose-xfwm4-when-closing-session-with-multiple.patch" 10SRC_URI[md5sum] = "4768e1a41a0287af6aad18b329a0f230"
11SRC_URI[sha256sum] = "bb8aa9a74c3d382840596fb4875144d66c7f3f47c8e9ee81d31e3428a72c46ce"
12SRC_URI += "file://0001-Handle-multiple-interactive-session-save-bug-5379.patch"
12 13
13# protect from frightening message that xfce might not work correctly 14# protect from frightening message that xfce might not work correctly
14pkg_postinst_${PN} () { 15pkg_postinst_${PN} () {
@@ -17,12 +18,9 @@ pkg_postinst_${PN} () {
17 18
18FILES_${PN} += "${libdir}/xfce4/*/*/*.so \ 19FILES_${PN} += "${libdir}/xfce4/*/*/*.so \
19 ${libdir}/xfce4/session/*-*-* \ 20 ${libdir}/xfce4/session/*-*-* \
20 ${datadir}/xfce4/*/* \ 21 ${datadir}/xsessions \
21 ${datadir}/themes/Default/balou/*" 22 ${datadir}/themes/Default/balou/*"
22 23
23FILES_${PN}-dbg += "${libdir}/xfce4/*/*/.debug" 24FILES_${PN}-dbg += "${libdir}/xfce4/*/*/.debug"
24 25
25FILES_${PN}-staticdev += "${libdir}/xfce4/*/*/*.*a" 26FILES_${PN}-staticdev += "${libdir}/xfce4/*/*/*.*a"
26
27SRC_URI[md5sum] = "461cc38bbd37cab881adbdf943f9a402"
28SRC_URI[sha256sum] = "f0801b8c0ffa7e5d41b29b8df281ac127adf467bf50e8ded8aebe5a02bd99338"
diff --git a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/0001-xfsettingsd-use-gnome-as-default-icon-theme.patch b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/0001-xfsettingsd-use-gnome-as-default-icon-theme.patch
deleted file mode 100644
index d428848293..0000000000
--- a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/0001-xfsettingsd-use-gnome-as-default-icon-theme.patch
+++ /dev/null
@@ -1,29 +0,0 @@
1From 576e7881bdc84390cc51210ee37e5bdd87a170fc Mon Sep 17 00:00:00 2001
2From: Koen Kooi <koen@dominion.thruhere.net>
3Date: Sat, 15 Oct 2011 16:43:09 +0200
4Subject: [PATCH] xfsettingsd: use 'gnome' as default icon theme
5
6Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
7---
8
9Upstream-status: unacceptable (config)
10
11 xfsettingsd/xsettings.xml | 2 +-
12 1 files changed, 1 insertions(+), 1 deletions(-)
13
14diff --git a/xfsettingsd/xsettings.xml b/xfsettingsd/xsettings.xml
15index 049b4ed..d8c6a85 100644
16--- a/xfsettingsd/xsettings.xml
17+++ b/xfsettingsd/xsettings.xml
18@@ -3,7 +3,7 @@
19 <channel name="xsettings" version="1.0">
20 <property name="Net" type="empty">
21 <property name="ThemeName" type="string" value="Xfce"/>
22- <property name="IconThemeName" type="string" value="Rodent"/>
23+ <property name="IconThemeName" type="string" value="gnome"/>
24 </property>
25 <property name="Xft" type="empty">
26 <property name="DPI" type="int" value="-1"/>
27--
281.6.6.1
29
diff --git a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/0001-xsettings.xml-remove-trouble-causing-comment.patch b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/0001-xsettings.xml-remove-trouble-causing-comment.patch
new file mode 100644
index 0000000000..a76fad2aac
--- /dev/null
+++ b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/0001-xsettings.xml-remove-trouble-causing-comment.patch
@@ -0,0 +1,31 @@
1From a84a7a6537544cdf56e1d4cad47a4cf002964039 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
3Date: Sun, 20 May 2012 15:20:08 +0200
4Subject: [PATCH 1/2] xsettings.xml: remove trouble causing comment
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8Upstream-status: Pending
9
10
11Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
12---
13 xfsettingsd/xsettings.xml | 5 -----
14 1 files changed, 0 insertions(+), 5 deletions(-)
15
16diff --git a/xfsettingsd/xsettings.xml b/xfsettingsd/xsettings.xml
17index 8f9e2eb..49a4c1e 100644
18--- a/xfsettingsd/xsettings.xml
19+++ b/xfsettingsd/xsettings.xml
20@@ -1,8 +1,3 @@
21-<!--
22- Default values for the X settings registry as described in
23- http://www.freedesktop.org/wiki/Specifications/XSettingsRegistry
24--->
25-
26 <?xml version="1.0" encoding="UTF-8"?>
27 <channel name="xsettings" version="1.0">
28 <property name="Net" type="empty">
29--
301.7.4.4
31
diff --git a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/0002-xsettings.xml-Set-default-themes.patch b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/0002-xsettings.xml-Set-default-themes.patch
new file mode 100644
index 0000000000..498f8d00d5
--- /dev/null
+++ b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/0002-xsettings.xml-Set-default-themes.patch
@@ -0,0 +1,32 @@
1From 071a390ba09a8a412f73d295be81a805804a1f24 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
3Date: Sun, 20 May 2012 15:22:09 +0200
4Subject: [PATCH 2/2] xsettings.xml: Set default themes
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8Upstram status: Inappropriate [configuration]
9
10Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
11---
12 xfsettingsd/xsettings.xml | 4 ++--
13 1 files changed, 2 insertions(+), 2 deletions(-)
14
15diff --git a/xfsettingsd/xsettings.xml b/xfsettingsd/xsettings.xml
16index 49a4c1e..5ec94e9 100644
17--- a/xfsettingsd/xsettings.xml
18+++ b/xfsettingsd/xsettings.xml
19@@ -1,8 +1,8 @@
20 <?xml version="1.0" encoding="UTF-8"?>
21 <channel name="xsettings" version="1.0">
22 <property name="Net" type="empty">
23- <property name="ThemeName" type="empty"/>
24- <property name="IconThemeName" type="empty"/>
25+ <property name="ThemeName" type="string" value="Xfce"/>
26+ <property name="IconThemeName" type="string" value="gnome"/>
27 <property name="DoubleClickTime" type="int" value="250"/>
28 <property name="DoubleClickDistance" type="int" value="5"/>
29 <property name="DndDragThreshold" type="int" value="8"/>
30--
311.7.4.4
32
diff --git a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.8.3.bb b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.10.0.bb
index c3dd8fdd51..fb9083dfb7 100644
--- a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.8.3.bb
+++ b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.10.0.bb
@@ -6,9 +6,11 @@ DEPENDS = "exo gtk+ libxfce4util libxfce4ui xfconf dbus-glib libxi virtual/libx1
6 6
7inherit xfce 7inherit xfce
8 8
9SRC_URI += "file://0001-xfsettingsd-use-gnome-as-default-icon-theme.patch" 9SRC_URI += "file://0001-xsettings.xml-remove-trouble-causing-comment.patch \
10 file://0002-xsettings.xml-Set-default-themes.patch"
11SRC_URI[md5sum] = "cc4dd9179ead9046c056431f01a12000"
12SRC_URI[sha256sum] = "0843f09ba9673f1d1b5df8dce4a17b63c183a9ba3be75fb6ef99a67fc8c1f77e"
10 13
11SRC_URI[md5sum] = "4669298cc8a4abf0e5a410016b575030" 14FILES_${PN} += "${libdir}/xfce4"
12SRC_URI[sha256sum] = "d878cc474e1e677e9607279b9a1007cb90ed35ff078de180259a8b2b8d06bc2e"
13 15
14RRECOMMENDS_${PN} += "gnome-icon-theme" 16RRECOMMENDS_${PN} += "gnome-icon-theme"
diff --git a/meta-xfce/recipes-xfce/xfconf/xfconf_4.8.0.bb b/meta-xfce/recipes-xfce/xfconf/xfconf_4.10.0.bb
index 65efffd908..5dceb0902a 100644
--- a/meta-xfce/recipes-xfce/xfconf/xfconf_4.8.0.bb
+++ b/meta-xfce/recipes-xfce/xfconf/xfconf_4.10.0.bb
@@ -4,12 +4,10 @@ LICENSE = "GPLv2"
4LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" 4LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
5DEPENDS = "dbus-glib libxfce4util perl-native" 5DEPENDS = "dbus-glib libxfce4util perl-native"
6 6
7PR = "r0"
8
9inherit xfce 7inherit xfce
10 8
9SRC_URI[md5sum] = "4ed48150a03fb5f42b455494307b7f28"
10SRC_URI[sha256sum] = "175219a441cc7d0f210bbd1a3b0abba41598627cd9db27235811400c3e100576"
11
11FILES_${PN} += "${libdir}/xfce4/xfconf/xfconfd \ 12FILES_${PN} += "${libdir}/xfce4/xfconf/xfconfd \
12 ${datadir}/dbus-1/services/org.xfce.Xfconf.service" 13 ${datadir}/dbus-1/services/org.xfce.Xfconf.service"
13
14SRC_URI[md5sum] = "0f11ed1ec7789c5c4c3fcc7cdb3c2940"
15SRC_URI[sha256sum] = "e071d55982238f997a691ff4bb08ef39e4c86bae31cf69b6666bc0cdadd1b85d"
diff --git a/meta-xfce/recipes-xfce/xfdesktop/xfdesktop/relative-symlinks-docs.patch b/meta-xfce/recipes-xfce/xfdesktop/xfdesktop/relative-symlinks-docs.patch
deleted file mode 100644
index 751d7a6381..0000000000
--- a/meta-xfce/recipes-xfce/xfdesktop/xfdesktop/relative-symlinks-docs.patch
+++ /dev/null
@@ -1,31 +0,0 @@
1From 5039e7834fff94f8393963ea8dbad81fa95ef810 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmx.de>
3Date: Fri, 16 Sep 2011 21:09:05 +0200
4Subject: [PATCH] docs: On installation create relative paths in symlinks to
5 images
6MIME-Version: 1.0
7Content-Type: text/plain; charset=UTF-8
8Content-Transfer-Encoding: 8bit
9
10
11Signed-off-by: Andreas Müller <schnitzeltony@gmx.de>
12---
13 doc/manual/Makefile.am | 2 +-
14 1 files changed, 1 insertions(+), 1 deletions(-)
15
16diff --git a/doc/manual/Makefile.am b/doc/manual/Makefile.am
17index 646821d..cbf79e1 100644
18--- a/doc/manual/Makefile.am
19+++ b/doc/manual/Makefile.am
20@@ -20,7 +20,7 @@ install-data-local:
21 done; \
22 if test x"$$lang" != x"C" -a ! -d $(srcdir)/images/$$lang; then \
23 echo "--- Creating symlink to C images for $$lang"; \
24- ln -sf $(docdir)/html/C/images $(DESTDIR)$(docdir)/html/$$lang/images; \
25+ ln -sf ../C/images $(DESTDIR)$(docdir)/html/$$lang/images; \
26 fi \
27 fi \
28 done;
29--
301.7.4.4
31
diff --git a/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.10.0.bb b/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.10.0.bb
new file mode 100644
index 0000000000..c9cd92427d
--- /dev/null
+++ b/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.10.0.bb
@@ -0,0 +1,12 @@
1DESCRIPTION = "Xfce4 Desktop Manager"
2SECTION = "x11/base"
3LICENSE = "GPLv2"
4LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
5DEPENDS = "glib-2.0 gtk+ libxfce4util libxfce4ui libwnck xfconf dbus-glib thunar garcon exo"
6
7inherit xfce
8
9SRC_URI[md5sum] = "d5f6fb9fdde3ddff5804b2a251892936"
10SRC_URI[sha256sum] = "897ae6ee435dcc89809ad70c15c5d15347d1cf4fc8033238b17dcc47836c2d7b"
11
12FILES_${PN} += "${datadir}/backgrounds"
diff --git a/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.8.3.bb b/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.8.3.bb
deleted file mode 100644
index 2866280f63..0000000000
--- a/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.8.3.bb
+++ /dev/null
@@ -1,19 +0,0 @@
1DESCRIPTION = "Xfce4 Desktop Manager"
2SECTION = "x11/base"
3LICENSE = "GPLv2"
4LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
5DEPENDS = "gtk+ libxfce4util libxfce4ui libwnck xfconf dbus-glib thunar garcon exo"
6
7PR = "r0"
8
9inherit xfce
10
11# SRC_URI must follow inherited one
12SRC_URI += " \
13 file://relative-symlinks-docs.patch \
14"
15
16FILES_${PN} += "${datadir}/xfce4/backdrops"
17
18SRC_URI[md5sum] = "617c667c469698e8c974e38412cb484c"
19SRC_URI[sha256sum] = "e58460f52ae96c389402f6db62c46db61cd51cdb550a42bd97c0ab2a5b62f424"
diff --git a/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.8.3.bb b/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.10.0.bb
index 304ff66165..049ac6fb64 100644
--- a/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.8.3.bb
+++ b/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.10.0.bb
@@ -3,14 +3,11 @@ SECTION = "x11/wm"
3LICENSE = "GPLv2" 3LICENSE = "GPLv2"
4LIC_FILES_CHKSUM = "file://COPYING;md5=d791728a073bc009b4ffaf00b7599855" 4LIC_FILES_CHKSUM = "file://COPYING;md5=d791728a073bc009b4ffaf00b7599855"
5DEPENDS = "virtual/libx11 libxpm gtk+ libxfce4util libxfce4ui xfconf libwnck dbus-glib startup-notification" 5DEPENDS = "virtual/libx11 libxpm gtk+ libxfce4util libxfce4ui xfconf libwnck dbus-glib startup-notification"
6PR = "r1"
7 6
8inherit xfce update-alternatives 7inherit xfce update-alternatives
9 8
10SRC_URI[md5sum] = "66cb65797cea8a62563f69b833c7888b" 9SRC_URI[md5sum] = "333e5e25a85411c304e9b4474bf00537"
11SRC_URI[sha256sum] = "0b0e8bea0b257958ad416ab5678cf0cdd7e909943d4d5ab32afc35295a78227e" 10SRC_URI[sha256sum] = "492357bf48121ebffabf2bf0d3b84213d19bf81087321175d687c8a68efe1f9c"
12
13EXTRA_OECONF += " --enable-startup-notification"
14 11
15python populate_packages_prepend () { 12python populate_packages_prepend () {
16 themedir = bb.data.expand('${datadir}/themes', d) 13 themedir = bb.data.expand('${datadir}/themes', d)
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2026-08-13 22:58:34 +0000