Nuvola Apps Runtime (Nuvola Player)

Merge lp:nuvola-player/releases-1.x into lp:nuvola-player/2.5.x

  1. releases-1.x
  2. Merge into trunk
Proposed by StefanL
Status: Rejected
Rejected by: Jiří Janoušek
Proposed branch: lp:nuvola-player/releases-1.x
Merge into: lp:nuvola-player/2.5.x
Diff against target: 625 lines (+329/-0) (has conflicts)
9 files modified
README (+19/-0)
README.Fedora (+4/-0)
README.Ubuntu (+16/-0)
src/core/settings.vala (+31/-0)
src/gui/actions.vala (+85/-0)
src/gui/preferences.vala (+38/-0)
src/gui/windows.vala (+41/-0)
src/plugins/trayicon.vala (+37/-0)
wscript (+58/-0)
Text conflict in README
Text conflict in README.Fedora
Text conflict in README.Ubuntu
Text conflict in src/core/settings.vala
Text conflict in src/gui/actions.vala
Text conflict in src/gui/preferences.vala
Text conflict in src/gui/windows.vala
Text conflict in src/plugins/trayicon.vala
Text conflict in wscript
To merge this branch: bzr merge lp:nuvola-player/releases-1.x
Reviewer Review Type Date Requested Status
Jiří Janoušek Disapprove
Review via email: mp+97412@code.launchpad.net

Description of the change

Added rdio support. Supports new and old layout.

To post a comment you must log in.
Revision history for this message
Jiří Janoušek (fenryxo) wrote :

Unfortunately, you have proposed wrong branch for merge (lp:nuvola-player/releases-1.x). To propose your branch, open page with your branch - probably lp:~stefan-lohmaier/nuvola-player/rdio - and click on the link "Propose for merging". Select lp:nuvola-player as a target branch.

Revision history for this message
Jiří Janoušek (fenryxo) :
review: Disapprove

Unmerged revisions

231. By Jiří Janoušek

[trunk:351] Removed link to blueprints, bug tracker will be used for feature requests.

230. By Jiří Janoušek

Implemented blacklist for services. Default blacklist includes Pandora and Rdio if WebKitGTK+ 1.8 is detected.

229. By Jiří Janoušek

[trunk:350] Updated copyright and credits.

228. By Jiří Janoušek

[trunk:349] Added service support for Amazon Cloud Player by Michael Mims.

227. By Jiří Janoušek

[trunk:348] Album art is saved by a hash of the URI to avoid name conflicts. Patch by Michael Mims. LP:987464.

226. By Jiří Janoušek

1.0.6~unstable

225. By Jiří Janoušek

Release 1.0.5

224. By Jiří Janoušek

Updated changelog.

223. By Jiří Janoušek

Modified workaround for WebKit rendering bug: changed default window size, added ui_state.conf options bug958154_window_w and bug958154_window_h. LP:958154

222. By Jiří Janoušek

Let's start 1.0.5~unstable

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'README'
2--- README 2012-02-12 14:40:38 +0000
3+++ README 2012-03-14 14:39:21 +0000
4@@ -46,6 +46,7 @@
5
6 libglib (>= 2.26), libgee (>= 0.5), libsoup (>= 2.30),
7 libgtk (>= 2.20), libwebkitgtk (>= 1.2), python (>= 2.6), valac (>= 0.12),
8+<<<<<<< TREE
9 libnotify (>= 0.4), libx11, libunique (>= 0.9), intltool, librsvg-bin,
10 json-glib-1.0 (>= 0.7)
11
12@@ -63,6 +64,24 @@
13
14 python-scour
15 enables optimization of SVG icon (reduced size)
16+=======
17+ libnotify (>= 0.4), libx11, libunique (>= 0.9), intltool, librsvg-bin
18+
19+
20+There are some optional dependencies:
21+ libsoup >= 2.34
22+ enables browser cache for remote objects (images, etc.)
23+
24+ libunity, libdbusmenu-glib
25+ enables integration with Unity Quick List
26+
27+ libindicate, libdbusmenu-glib
28+ needed for integration with Maverick version of Ubuntu Sound menu,
29+ see --with-indicator-sound-maverick build flag
30+
31+ python-scour
32+ enables optimization of SVG icon (reduced size)
33+>>>>>>> MERGE-SOURCE
34
35 3) Clean the build environment
36
37
38=== modified file 'README.Fedora'
39--- README.Fedora 2012-02-12 14:40:38 +0000
40+++ README.Fedora 2012-03-14 14:39:21 +0000
41@@ -11,7 +11,11 @@
42
43 # yum install gcc glib2-devel libgee-devel libsoup-devel \
44 gtk2-devel webkitgtk-devel python vala libnotify-devel \
45+<<<<<<< TREE
46 libX11-devel unique-devel intltool librsvg2 libjson-glib-devel
47+=======
48+ libX11-devel unique-devel intltool librsvg2
49+>>>>>>> MERGE-SOURCE
50
51 2.) Compilation
52
53
54=== modified file 'README.Ubuntu'
55--- README.Ubuntu 2012-02-12 14:40:38 +0000
56+++ README.Ubuntu 2012-03-14 14:39:21 +0000
57@@ -31,7 +31,11 @@
58 # apt-get install libglib2.0-dev libgee-dev libsoup2.4-dev \
59 libgtk2.0-dev libwebkitgtk-dev python valac libnotify-dev \
60 libx11-dev libunique-dev libdbusmenu-glib-dev libunity-dev \
61+<<<<<<< TREE
62 intltool librsvg2-bin python-scour libjson-glib-dev
63+=======
64+ intltool librsvg2-bin python-scour
65+>>>>>>> MERGE-SOURCE
66
67 2.) Compilation
68
69@@ -57,7 +61,11 @@
70 # apt-get install libglib2.0-dev libgee-dev libsoup2.4-dev \
71 libgtk2.0-dev libwebkitgtk-dev python valac libnotify-dev \
72 libx11-dev libunique-dev libdbusmenu-glib-dev libunity-dev \
73+<<<<<<< TREE
74 intltool librsvg2-bin libjson-glib-dev
75+=======
76+ intltool librsvg2-bin
77+>>>>>>> MERGE-SOURCE
78
79 2.) Compilation
80
81@@ -86,7 +94,11 @@
82 # apt-get install libglib2.0-dev libgee-dev libsoup2.4-dev \
83 libgtk2.0-dev libwebkit-dev python valac libnotify-dev \
84 libx11-dev libunique-dev libdbusmenu-glib-dev libindicate-dev \
85+<<<<<<< TREE
86 intltool librsvg2-bin libjson-glib-dev
87+=======
88+ intltool librsvg2-bin
89+>>>>>>> MERGE-SOURCE
90
91 2.) Compilation
92
93@@ -113,7 +125,11 @@
94 # apt-get update
95 # apt-get install libglib2.0-dev libgee-dev libsoup2.4-dev \
96 libgtk2.0-dev libwebkit-dev python valac libnotify-dev \
97+<<<<<<< TREE
98 libx11-dev libunique-dev intltool librsvg2-bin libjson-glib-dev
99+=======
100+ libx11-dev libunique-dev intltool librsvg2-bin
101+>>>>>>> MERGE-SOURCE
102
103 2.) Compilation
104
105
106=== modified file 'libfenryxo/app.vala'
107=== modified file 'libfenryxo/config.vala'
108=== modified file 'libfenryxo/connection.vala'
109=== modified file 'libfenryxo/system.vala'
110=== modified file 'src/core/application.vala'
111=== modified file 'src/core/settings.vala'
112--- src/core/settings.vala 2012-03-03 21:44:20 +0000
113+++ src/core/settings.vala 2012-03-14 14:39:21 +0000
114@@ -38,6 +38,7 @@
115 private const string NOTIFICATIONS = "notifications";
116 private const string DOCK_MANAGER = "dock_manager";
117 private const string UNITY_QUICK_LIST = "unity_quick_list";
118+<<<<<<< TREE
119 private const string PAGE_CACHE = "page_cache";
120 private const string DATA_CACHE = "data_cache";
121 private const string DATA_CACHE_SIZE = "data_cache_size";
122@@ -45,6 +46,10 @@
123 private const string WEB_PLUGINS = "web_plugins";
124 private const string SPACE_KEY = "space_key";
125 private const string SONG_LYRICS = "song_lyrics";
126+=======
127+ #endif
128+ private const string SPACE_KEY = "space_key";
129+>>>>>>> MERGE-SOURCE
130 }
131
132
133@@ -75,6 +80,7 @@
134 public abstract bool dock_manager{ get; set; }
135 [Description(nick = "Unity Quick List", blurb = "Enables or disables dynamic quick list of Unity Launcher.")]
136 public abstract bool unity_quick_list{ get; set; }
137+<<<<<<< TREE
138 [Description(nick = "Auto play", blurb = "Whether automatically start playback (if possible).")]
139 public abstract bool auto_play{ get; set; }
140 [Description(nick = "Web plugins", blurb = "Whether web plugins are enabled.")]
141@@ -89,6 +95,11 @@
142 public abstract bool space_key{ get; set; }
143 [Description(nick = "Fetch song lyrics", blurb = "Whether it is allowed to fetch song lyrics.")]
144 public abstract bool song_lyrics{ get; set; }
145+=======
146+ #endif
147+ [Description(nick = "Use space key", blurb = "Whether it is allowed to use space key in keybindings.")]
148+ public abstract bool space_key{ get; set; }
149+>>>>>>> MERGE-SOURCE
150 }
151
152 /**
153@@ -210,6 +221,7 @@
154
155 public bool unity_quick_list{
156 get{
157+<<<<<<< TREE
158 return get_bool(UNITY_QUICK_LIST, true);
159 }
160 set{
161@@ -285,5 +297,24 @@
162 set_bool(SONG_LYRICS, value);
163 }
164 }
165+=======
166+ return this.get_bool(UNITY_QUICK_LIST, true);
167+ }
168+ set{
169+ this.set_bool(UNITY_QUICK_LIST, value);
170+ }
171+ }
172+ #endif
173+
174+ public bool space_key{
175+ get{
176+ return get_bool(SPACE_KEY, true);
177+ }
178+
179+ set{
180+ set_bool(SPACE_KEY, value);
181+ }
182+ }
183+>>>>>>> MERGE-SOURCE
184 }
185 }
186
187=== modified file 'src/gui/actions.vala'
188--- src/gui/actions.vala 2012-03-01 20:54:53 +0000
189+++ src/gui/actions.vala 2012-03-14 14:39:21 +0000
190@@ -31,6 +31,7 @@
191 TOOLBAR;
192 }
193
194+<<<<<<< TREE
195 public class UIActions : Gtk.UIManager{
196 private weak Application app;
197 public UIActionsMode mode{
198@@ -43,6 +44,25 @@
199
200 private bool _has_data_cache = true;
201 public bool has_data_cache{
202+=======
203+ public class Actions : GLib.Object{
204+ private Application app;
205+ private Player player;
206+ private MainView frame;
207+ private ActionsMode mode = ActionsMode.MENUBAR;
208+ public Toolbar toolbar;
209+ public MenuBar menubar;
210+ private Gtk.Menu? menu;
211+ private Gtk.Action pp_action;
212+ private Gtk.Action action_next;
213+ private Gtk.Action action_prev;
214+ public Gtk.ActionGroup actions { get; private set;}
215+ private static Gtk.ActionEntry[] normal_entries;
216+ private static RadioActionEntry[] radio_entries;
217+ private Gtk.Window window;
218+ private bool _enable_navigation = true;
219+ public bool enable_navigation{
220+>>>>>>> MERGE-SOURCE
221 get{
222 return this._has_data_cache;
223 }
224@@ -66,10 +86,37 @@
225 create_actions();
226 insert_action_group(actions, 0);
227
228+ app.config.notify["space-key"].connect_after(() => {
229+ uint key;
230+ Gdk.ModifierType mods;
231+ Gtk.accelerator_parse(get_pp_accel(), out key, out mods);
232+ Gtk.AccelMap.change_entry(
233+ "<Actions>/nuvola/toggle-play", key, mods, false);
234+ });
235 }
236
237+<<<<<<< TREE
238
239 private void create_actions(){
240+=======
241+ public void set_mode(ActionsMode mode){
242+ if(this.mode == mode) return;
243+ this.mode = mode;
244+ this.create();
245+ }
246+
247+ private string get_pp_accel(){
248+ return app.config.space_key ? "<ctrl>space" : "<ctrl>P";
249+ }
250+
251+ private void update_navigation(){
252+ this.actions.get_action("home").sensitive = this._enable_navigation;
253+ this.actions.get_action("back").sensitive = this._enable_navigation && this.frame.can_go_back();
254+ this.actions.get_action("forward").sensitive = this._enable_navigation && this.frame.can_go_forward();
255+ }
256+
257+ private void create(){
258+>>>>>>> MERGE-SOURCE
259 /*
260 * NOTE: Vala supports easy creation of constant array of struct:
261
262@@ -89,6 +136,13 @@
263 int i = 0;
264
265 /* Normal items. Name, stock id, label, accelerator, tooltip, callback */
266+<<<<<<< TREE
267+=======
268+ normal_entries = new Gtk.ActionEntry[29];
269+ int i = 0;
270+ void* self = this;
271+
272+>>>>>>> MERGE-SOURCE
273 // Service
274 /// Menu Service
275 normal_entries[i++] = {"service", null, _("_Service"), null, null, null};
276@@ -99,6 +153,11 @@
277 // Control
278 /// Menu Control
279 normal_entries[i++] = {"control", null, _("_Control"), null, null, null};
280+<<<<<<< TREE
281+=======
282+ normal_entries[i++] = {"prev", Stock.MEDIA_PREVIOUS, null, "<alt>Left", null, this.cb};
283+ normal_entries[i++] = {"next", Stock.MEDIA_NEXT, null, "<alt>Right", null, this.cb};
284+>>>>>>> MERGE-SOURCE
285
286 // View
287 /// Menu View
288@@ -158,6 +217,7 @@
289 action = new Gtk.Action("website", _("About release %s").printf(RELEASE), null, Gtk.Stock.INFO);
290 action.activate.connect(this.cb);
291 actions.add_action(action);
292+<<<<<<< TREE
293 }
294
295
296@@ -172,6 +232,19 @@
297 ui_merge_id = 0;
298 }
299
300+=======
301+
302+ var manager = new UIManager();
303+
304+ Gtk.Action play_pause_action;
305+ play_pause_action = new Gtk.Action("toggle-play", null, null, Gtk.Stock.MEDIA_PLAY);
306+ play_pause_action.activate.connect(this.cb);
307+ actions.add_action_with_accel(play_pause_action, get_pp_accel());
308+
309+ manager.insert_action_group(actions, 0);
310+ var accels = manager.get_accel_group();
311+ window.add_accel_group(accels);
312+>>>>>>> MERGE-SOURCE
313 string ui_file;
314 switch(this.mode){
315 case UIActionsMode.BOTH: ui_file = "/ui/actions_mode_both.xml"; break;
316@@ -198,6 +271,7 @@
317 add_ui_request();
318
319 switch(this.mode){
320+<<<<<<< TREE
321 case UIActionsMode.BOTH:
322 menubar = get_widget("/menubar") as Gtk.MenuBar;
323 toolbar = get_widget("/toolbar") as Gtk.Toolbar;
324@@ -213,6 +287,17 @@
325 var nuvola_item = get_widget("/menubar/nuvola") as Gtk.MenuItem;
326 menubar.remove(nuvola_item);
327 menubar = null;
328+=======
329+ case ActionsMode.BOTH:
330+ this.menubar.show_all();
331+ this.toolbar.show_all();
332+ break;
333+ case ActionsMode.TOOLBAR:
334+ this.menubar.hide();
335+ this.toolbar.show_all();
336+ var nuvola_item = manager.get_widget("/menubar/nuvola") as Gtk.MenuItem;
337+ this.menubar.remove(nuvola_item);
338+>>>>>>> MERGE-SOURCE
339 this.menu = nuvola_item.submenu;
340 nuvola_item.submenu = null;
341 toolbar = get_widget("/toolbar") as Gtk.Toolbar;
342
343=== modified file 'src/gui/preferences.vala'
344--- src/gui/preferences.vala 2012-03-03 21:44:20 +0000
345+++ src/gui/preferences.vala 2012-03-14 14:39:21 +0000
346@@ -155,6 +155,7 @@
347 this.hide_window_buttons[2].toggled.connect(this.hide_window_toggled);
348
349 /// Settings dialog - tab General
350+<<<<<<< TREE
351 var space_key = new Gtk.CheckButton.with_label(_("Enable keybindings with Space key."));
352 space_key.active = app.config.space_key;
353 space_key.toggled.connect(() => {
354@@ -163,6 +164,43 @@
355 box.pack_start(space_key, false, false, 10);
356
357
358+=======
359+ label = new Label(_("Show tray icon"));
360+ label.xalign = 0.0f;
361+ box.pack_start(label, false, false, 10);
362+ this.tray_buttons = new RadioButton[3];
363+ /// Settings dialog - tab General, always show tray icon
364+ this.tray_buttons[0] = new RadioButton.with_label(null, _("Always"));
365+ box.pack_start(this.tray_buttons[0], false, false, 0);
366+ /// Settings dialog - tab General, show tray icon if needed
367+ this.tray_buttons[1] = new RadioButton.with_label(this.tray_buttons[0].get_group(), _("If needed"));
368+ box.pack_start(this.tray_buttons[1], false, false, 0);
369+ /// Settings dialog - tab General, never show tray icon
370+ this.tray_buttons[2] = new RadioButton.with_label(this.tray_buttons[0].get_group(), _("Never"));
371+ box.pack_start(this.tray_buttons[2], false, false, 0);
372+
373+
374+ switch(this.app.config.tray_icon){
375+ case TrayIconMode.ALWAYS: this.tray_buttons[0].active = true; break;
376+ case TrayIconMode.NEVER: this.tray_buttons[2].active = true; break;
377+ default: this.tray_buttons[1].active = true; break;
378+ }
379+
380+ this.tray_buttons[0].toggled.connect(this.tray_toggled);
381+ this.tray_buttons[1].toggled.connect(this.tray_toggled);
382+ this.tray_buttons[2].toggled.connect(this.tray_toggled);
383+
384+ var space_key = new Gtk.CheckButton.with_label(_("Enable keybindings with Space key."));
385+ space_key.active = app.config.space_key;
386+ space_key.toggled.connect(() => {
387+ app.config.space_key = space_key.active;
388+ });
389+ box.pack_start(space_key, false, false, 10);
390+
391+
392+
393+
394+>>>>>>> MERGE-SOURCE
395 box = new Gtk.VBox(false, 2);
396 box.border_width = 10;
397 /// Settings dialog tab
398
399=== modified file 'src/gui/windows.vala'
400--- src/gui/windows.vala 2012-03-03 23:57:17 +0000
401+++ src/gui/windows.vala 2012-03-14 14:39:21 +0000
402@@ -63,8 +63,13 @@
403
404 if(DEV_CHANNEL == "unstable"){
405 /// Warning for unstable builds, %1$s = version, %2$s and %3$s = links
406+<<<<<<< TREE
407 var dev_label = new Gtk.Label(_("You are running <b>unstable build %1$s</b>. <a href='%2$s'>Report a problem</a>. <a href='%3$s'>See changelog</a>. <i>This bar is not shown in <a href='%4$s'>stable and beta builds</a>.</i>")
408 .printf(app.version, "http://goo.gl/SvtXK", "http://l.fenryxo.cz/nuvolachangelog", "http://projects.fenryxo.cz/Nuvola_Player/Download/"));
409+=======
410+ var dev_label = new Label(_("You are running <b>unstable build %1$s</b>. <a href='%2$s'>Report a problem</a>. <a href='%3$s'>See changelog</a>. <i>This bar is not shown in <a href='%4$s'>stable and beta builds</a>.</i>")
411+ .printf(app.version, "http://goo.gl/SvtXK", "http://l.fenryxo.cz/nuvolachangelog", "http://projects.fenryxo.cz/Nuvola_Player/Download/"));
412+>>>>>>> MERGE-SOURCE
413 dev_label.selectable = true;
414 dev_label.use_markup = true;
415 dev_label.can_focus = false;
416@@ -245,11 +250,19 @@
417 }
418
419 public class CrashDialog: Gtk.Dialog{
420+<<<<<<< TREE
421 public Gtk.CheckButton reset_config;
422 public Gtk.CheckButton reset_ui_state;
423 public Gtk.CheckButton purge_cookies;
424 public Gtk.CheckButton? disable_proxy;
425 public Gtk.CheckButton disable_check;
426+=======
427+ public CheckButton reset_config;
428+ public CheckButton reset_ui_state;
429+ public CheckButton purge_cookies;
430+ public CheckButton? disable_proxy;
431+ public CheckButton disable_check;
432+>>>>>>> MERGE-SOURCE
433
434 #if LIBSOUP_CACHE
435 public Gtk.CheckButton purge_browser;
436@@ -327,6 +340,7 @@
437 label.use_markup = true;
438 label.wrap_mode = Pango.WrapMode.WORD;
439 label.wrap = true;
440+<<<<<<< TREE
441 label.justify = Gtk.Justification.FILL;
442
443 content.pack_start(label, true, true, 0);
444@@ -352,6 +366,33 @@
445 /// Crash dialog
446 this.disable_check = new Gtk.CheckButton.with_label(_("Do not show crash dialog again."));
447 box.pack_start(this.disable_check, false, false, 0);
448+=======
449+ label.justify = Justification.FILL;
450+
451+ content.pack_start(label, true, true, 0);
452+
453+ label = new Label(
454+ /// Crash dialog
455+ _("Another cause may be session/login manager, if it doesn't notify Nuvola Player to quit properly when user is about to logout.")
456+ );
457+ label.xalign = 0;
458+ label.xpad = 15;
459+ label.ypad = 0;
460+ label.use_markup = true;
461+ label.wrap_mode = Pango.WrapMode.WORD;
462+ label.wrap = true;
463+ label.justify = Justification.FILL;
464+
465+ content.pack_start(label, true, true, 0);
466+
467+ box = new VBox(false, 0);
468+ box.border_width = 15;
469+ content.pack_start(box, false, false, 0);
470+
471+ /// Crash dialog
472+ this.disable_check = new CheckButton.with_label(_("Do not show crash dialog again."));
473+ box.pack_start(this.disable_check, false, false, 0);
474+>>>>>>> MERGE-SOURCE
475 content.show_all();
476
477 }
478
479=== modified file 'src/plugins/mpris.vala'
480=== modified file 'src/plugins/trayicon.vala'
481--- src/plugins/trayicon.vala 2012-02-19 17:19:24 +0000
482+++ src/plugins/trayicon.vala 2012-03-14 14:39:21 +0000
483@@ -55,6 +55,7 @@
484 *
485 * The tray icon is shown only if Ubuntu Sound menu is not detected.
486 */
487+<<<<<<< TREE
488 public class Plugin: Object, Nuvola.Plugin{
489 private string id = "trayicon";
490 private weak Nuvola.Application app;
491@@ -65,6 +66,42 @@
492 public string get_id(){
493 return id;
494 }
495+=======
496+ public class TrayIcon: BaseHelper{
497+ [Description(nick = "Availibility of hide action.", blurb = "If true the main window can be hidden to a tray icon or Ubuntu Sound menu.")]
498+ public bool can_hide{
499+ get{
500+#if GLIB_DBUS
501+ return this.ubuntu_sound_menu.visible || this.icon != null;
502+#else
503+ return this.icon != null;
504+#endif
505+
506+ }
507+ }
508+
509+ private TrayIconMode _mode;
510+ [Description(nick = "TrayIcon mode.", blurb = "Specifies visibility ob the tray icon")]
511+ public TrayIconMode mode{
512+ get{
513+ return this._mode;
514+ }
515+ set{
516+ this._mode = value;
517+ this.update();
518+ }
519+ }
520+
521+ private Gtk.Menu? menu;
522+ private StatusIcon? icon;
523+#if GLIB_DBUS
524+ private UbuntuSoundMenu ubuntu_sound_menu;
525+ // It will be set to false if Ubuntu Sound Menu is not found
526+ private bool icon_needed = false;
527+#else
528+ private bool icon_needed = true;
529+#endif
530+>>>>>>> MERGE-SOURCE
531
532 /**
533 * Loads Tray icon
534
535=== modified file 'wscript'
536--- wscript 2012-03-01 21:18:43 +0000
537+++ wscript 2012-03-14 14:39:21 +0000
538@@ -11,7 +11,11 @@
539 RELEASE = "1.1"
540
541 # format "x.y.z~foo"
542+<<<<<<< TREE
543 VERSION = '1.1~unstable'
544+=======
545+VERSION = '1.0.3~unstable'
546+>>>>>>> MERGE-SOURCE
547
548 # "unstable", "stable"
549 CHANNEL = "unstable"
550@@ -93,7 +97,10 @@
551 ctx.add_option('--without-glib-dbus', action='store_false', default=True, dest="glib_dbus", help='Build without native DBus support in GLib/GIO (>= 2.26)')
552 ctx.add_option('--with-indicator-sound-maverick', action='store_true', default=False, dest="indicator_sound_maverick", help='Build with support for Indicator Sound (Ubuntu Maverick version)')
553 ctx.add_option('--with-debug-symbols', action='store_true', default=False, dest="debug_symbols", help='Build with debug symbols')
554+<<<<<<< TREE
555 ctx.add_option('--enable-experimental', action='store_true', default=False, dest="experimental", help='Enable experimental features')
556+=======
557+>>>>>>> MERGE-SOURCE
558
559 def configure(conf):
560
561@@ -246,6 +253,7 @@
562
563
564 def build(ctx):
565+<<<<<<< TREE
566 # build graphics
567 size = 16
568 ctx(
569@@ -294,6 +302,56 @@
570 packages += " gee-1.0"
571 else:
572 packages += " gee-when-lt-0.6"
573+=======
574+ # build graphics
575+ size = 16
576+ ctx(
577+ rule='%s -w %s -h %s ${SRC} -o ${TGT}' % (ctx.env["RSVG-CONVERT"], size, size),
578+ source='graphics/nuvola-player.bigger-cloud-and-play.svg',
579+ target='data/icons/hicolor/%sx%s/apps/nuvolaplayer.png' % (size, size)
580+ )
581+ for size in 22, 24:
582+ ctx(
583+ rule='%s -w %s -h %s ${SRC} -o ${TGT}' % (ctx.env["RSVG-CONVERT"], size, size),
584+ source='graphics/nuvola-player.bigger-cloud.svg',
585+ target='data/icons/hicolor/%sx%s/apps/nuvolaplayer.png' % (size, size)
586+ )
587+ for size in 32, 48:
588+ ctx(
589+ rule='%s -w %s -h %s ${SRC} -o ${TGT}' % (ctx.env["RSVG-CONVERT"], size, size),
590+ source='graphics/nuvola-player.orig.svg',
591+ target='data/icons/hicolor/%sx%s/apps/nuvolaplayer.png' % (size, size)
592+ )
593+
594+ if ctx.env.SCOUR:
595+ ctx(
596+ rule='%s -i ${SRC} -o ${TGT}' % ctx.env.SCOUR,
597+ source='graphics/nuvola-player.orig.svg',
598+ target='data/icons/hicolor/scalable/apps/nuvolaplayer.svg'
599+ )
600+ else:
601+ ctx(
602+ rule='cp ${SRC} ${TGT}',
603+ source='graphics/nuvola-player.orig.svg',
604+ target='data/icons/hicolor/scalable/apps/nuvolaplayer.svg'
605+ )
606+
607+ ctx(
608+ rule='%s -w 35 -h 26 ${SRC} -o ${TGT}' % ctx.env["RSVG-CONVERT"],
609+ source='graphics/cloud.orig.svg',
610+ target='data/nuvolaplayer/selector/arrow.png'
611+ )
612+
613+ # build binaries
614+ packages = 'glib-2.0 gio-2.0 libsoup-2.4 config'
615+ packages += ' x11 unique-1.0 javascriptcore libfenryxo posix'
616+ uselib = 'DL GLIB GTK+ GDK GEE SOUP ATK UNIQUE WEBKIT NOTIFY XLIB'
617+>>>>>>> MERGE-SOURCE
618+
619+ if ctx.env.GEE_GTE_0_6:
620+ packages += " gee-1.0"
621+ else:
622+ packages += " gee-when-lt-0.6"
623
624 bld = ctx
625 vala_defines = ctx.env.VALA_DEFINES

Subscribers

People subscribed via source and target branches