Merge lp:~ricotz/slingshot/plank-0.11 into lp:~elementary-pantheon/slingshot/trunk

Proposed by Rico Tzschichholz on 2015-11-03
Status: Merged
Merged at revision: 595
Proposed branch: lp:~ricotz/slingshot/plank-0.11
Merge into: lp:~elementary-pantheon/slingshot/trunk
Diff against target: 46 lines (+17/-3)
2 files modified
CMakeLists.txt (+9/-3)
src/Widgets/AppEntry.vala (+8/-0)
To merge this branch: bzr merge lp:~ricotz/slingshot/plank-0.11
Reviewer Review Type Date Requested Status
xapantu (community) 2015-11-03 Needs Information on 2015-11-03
Review via email: mp+276553@code.launchpad.net

Description of the change

This should be merged/pushed after plank 0.10.9 hit the daily PPA

To post a comment you must log in.
xapantu (xapantu) wrote :

Why? What is the conditional build system for then?

review: Needs Information
Rico Tzschichholz (ricotz) wrote :

> Why? What is the conditional build system for then?

Just to avoid tampering with the recipe to force a rebuild. So this merge actually triggers the needed rebuild.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2015-08-20 05:36:12 +0000
3+++ CMakeLists.txt 2015-11-03 15:37:46 +0000
4@@ -56,10 +56,16 @@
5
6 find_package (PkgConfig)
7
8-pkg_check_modules(PLANK QUIET plank>=0.8.1.1197)
9-if (PLANK_FOUND)
10+pkg_check_modules(PLANK011 QUIET plank>=0.10.9)
11+if (PLANK011_FOUND)
12 set (PLANK_DEPS plank)
13- set (PLANK_OPTIONS --define=HAS_PLANK)
14+ set (PLANK_OPTIONS --define=HAS_PLANK --define=HAS_PLANK_0_11)
15+else ()
16+ pkg_check_modules(PLANK QUIET plank>=0.9.0)
17+ if (PLANK_FOUND)
18+ set (PLANK_DEPS plank)
19+ set (PLANK_OPTIONS --define=HAS_PLANK)
20+ endif ()
21 endif ()
22
23 set (CORE_DEPS "gobject-2.0;glib-2.0;gio-2.0;gio-unix-2.0;libsoup-2.4;gee-0.8;libgnome-menu-3.0;json-glib-1.0;${UNITY_DEPS};${PLANK_DEPS};")
24
25=== modified file 'src/Widgets/AppEntry.vala'
26--- src/Widgets/AppEntry.vala 2015-03-26 21:42:32 +0000
27+++ src/Widgets/AppEntry.vala 2015-11-03 15:37:46 +0000
28@@ -37,10 +37,18 @@
29
30 #if HAS_PLANK
31 static construct {
32+#if HAS_PLANK_0_11
33+ plank_client = Plank.DBusClient.get_instance ();
34+#else
35 plank_client = Plank.DBus.Client.get_instance ();
36+#endif
37 }
38
39+#if HAS_PLANK_0_11
40+ private static Plank.DBusClient plank_client;
41+#else
42 private static Plank.DBus.Client plank_client;
43+#endif
44 private bool docked = false;
45 private string desktop_uri;
46 #endif

Subscribers

People subscribed via source and target branches