diff options
author | Andreas Müller <schnitzeltony@googlemail.com> | 2012-09-16 17:18:03 +0200 |
---|---|---|
committer | Andreas Müller <schnitzeltony@googlemail.com> | 2012-09-18 15:54:00 +0200 |
commit | 7b4be7fba8c953d62a91d1daa2ccf0b443b328ce (patch) | |
tree | 0f3ab6ad22139a126277224535630729df38c3e8 /meta-xfce | |
parent | e6f73c8740beb90f70b96009f2ab2b5114c8f2a5 (diff) | |
download | meta-openembedded-7b4be7fba8c953d62a91d1daa2ccf0b443b328ce.tar.gz |
exo: update to 0.8.0
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Diffstat (limited to 'meta-xfce')
-rw-r--r-- | meta-xfce/recipes-xfce/exo/exo/exo-no-tests-0.6.patch | 12 | ||||
-rw-r--r-- | meta-xfce/recipes-xfce/exo/exo/exo-no-tests-0.8.patch | 31 | ||||
-rw-r--r-- | meta-xfce/recipes-xfce/exo/exo/fix-qa-desktop-type-error.patch | 531 | ||||
-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 |
4 files changed, 37 insertions, 552 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 cab41a87d..000000000 --- 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 000000000..ac8bca5f3 --- /dev/null +++ b/meta-xfce/recipes-xfce/exo/exo/exo-no-tests-0.8.patch | |||
@@ -0,0 +1,31 @@ | |||
1 | From 5f1e19860d89647488bdd32a02fb332f69434405 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> | ||
3 | Date: Fri, 18 May 2012 21:13:00 +0200 | ||
4 | Subject: [PATCH] Do not run tests at build time | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | Upstream-Status: Not-Applicable | ||
9 | |||
10 | Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> | ||
11 | --- | ||
12 | Makefile.am | 3 +-- | ||
13 | 1 files changed, 1 insertions(+), 2 deletions(-) | ||
14 | |||
15 | diff --git a/Makefile.am b/Makefile.am | ||
16 | index 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 | -- | ||
30 | 1.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 e4ba75ed7..000000000 --- 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 ad8dc59f6..af9103f6c 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 @@ | |||
1 | DESCRIPTION="Application library for the Xfce desktop environment" | 1 | DESCRIPTION="Application library for the Xfce desktop environment" |
2 | SECTION = "x11" | 2 | SECTION = "x11" |
3 | LICENSE = "GPLv2" | 3 | LICENSE = "GPLv2" |
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" | 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" |
5 | DEPENDS = "gtk+ libxfce4util virtual/libx11 perl-native cairo" | 5 | DEPENDS = "gtk+ libxfce4util libxfce4ui virtual/libx11 perl-native cairo" |
6 | |||
7 | PR = "r1" | ||
8 | 6 | ||
9 | inherit xfce pythonnative | 7 | inherit xfce pythonnative |
10 | 8 | ||
11 | # SRC_URI must follow inherited one | 9 | # SRC_URI must follow inherited one |
12 | SRC_URI += " \ | 10 | SRC_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 | ||
16 | SRC_URI[md5sum] = "189bd19210e1d7d8601be1cdf27bf259" | ||
17 | SRC_URI[sha256sum] = "6e21aa30692affcb45fc8283d034da4a02221d26e3e1facb968d04fed4ba05b0" | ||
18 | |||
19 | # see http://wiki.xfce.org/gnomemount-replacement | 19 | # see http://wiki.xfce.org/gnomemount-replacement |
20 | do_install_append () { | 20 | do_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 | ||
31 | FILES_${PN}-dbg += "${libdir}/gio/modules/.debug \ | 31 | FILES_${PN}-dbg += "${libdir}/gio/modules/.debug \ |
32 | " | 32 | " |
33 | |||
34 | SRC_URI[md5sum] = "e25333df350abc30999cd16fe96ab690" | ||
35 | SRC_URI[sha256sum] = "f49cf6a85546f47a1dddb58ce9a5f9364384a6f173cba99deb879e027c811f39" | ||