Files

Merge lp:~tintou/pantheon-files/fix-1270091 into lp:~elementary-apps/pantheon-files/trunk

  1. fix-1270091
  2. Merge into trunk
Proposed by Corentin Noël
Status: Merged
Merged at revision: 1433
Proposed branch: lp:~tintou/pantheon-files/fix-1270091
Merge into: lp:~elementary-apps/pantheon-files/trunk
Diff against target: 300 lines (+31/-32)
12 files modified
libcore/CMakeLists.txt (+3/-3)
libcore/marlincore.deps (+1/-1)
libcore/marlincore.pc.cmake (+1/-2)
libwidgets/CMakeLists.txt (+3/-3)
libwidgets/tests/CMakeLists.txt (+3/-3)
marlin-daemon/CMakeLists.txt (+3/-3)
plugins/contractor/CMakeLists.txt (+3/-3)
plugins/marlin-ctags/CMakeLists.txt (+3/-3)
plugins/marlin-trash/CMakeLists.txt (+3/-3)
plugins/network-places/CMakeLists.txt (+3/-3)
src/CMakeLists.txt (+4/-4)
src/View/PropertiesWindow.vala (+1/-1)
To merge this branch: bzr merge lp:~tintou/pantheon-files/fix-1270091
Reviewer Review Type Date Requested Status
Cody Garver (community) Needs Information
Review via email: mp+203154@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Corentin Noël (tintou) wrote :

Needs this branch lp:~tintou/libunity/fix-gee to be merged and packaged first.

Revision history for this message
Cody Garver (codygarver) wrote :

What happened to the branch in your comment?

review: Needs Information
Revision history for this message
Corentin Noël (tintou) wrote :

Dit did change lp:~tintou/libunity/removed-gee and got merged, it only needs tout be packaged.

Revision history for this message
Cody Garver (codygarver) wrote :

Does this compile for you when building with Granite from trunk with lp:~smndtrl/granite/fix-1270091 and Files trunk with this branch?

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'libcore/CMakeLists.txt'
2--- libcore/CMakeLists.txt 2013-12-11 21:30:46 +0000
3+++ libcore/CMakeLists.txt 2014-01-24 18:38:58 +0000
4@@ -23,7 +23,7 @@
5 granite
6 gtk+-3.0
7 gio-2.0
8- gee-1.0
9+ gee-0.8
10 gmodule-2.0
11 marlincore-C
12 OPTIONS
13@@ -115,7 +115,7 @@
14 pango>=1.1.2
15 gtk+-3.0>=3.4.0
16 gail-3.0
17- gee-1.0
18+ gee-0.8
19 sqlite3
20 libnotify>=0.7.2)
21 # Link all
22@@ -151,4 +151,4 @@
23 add_test (core marlincore_tests)
24
25 target_link_libraries (marlincore_tests marlincore ${DEPS_LIBRARIES})
26-add_dependencies (marlincore_tests marlincore)
27+add_dependencies (marlincore_tests marlincore)
28\ No newline at end of file
29
30=== modified file 'libcore/marlincore.deps'
31--- libcore/marlincore.deps 2012-05-08 20:16:38 +0000
32+++ libcore/marlincore.deps 2014-01-24 18:38:58 +0000
33@@ -1,2 +1,2 @@
34 marlincore-C
35-gee-1.0
36\ No newline at end of file
37+gee-0.8
38\ No newline at end of file
39
40=== modified file 'libcore/marlincore.pc.cmake'
41--- libcore/marlincore.pc.cmake 2011-08-10 20:43:00 +0000
42+++ libcore/marlincore.pc.cmake 2014-01-24 18:38:58 +0000
43@@ -8,5 +8,4 @@
44 Version: 0.1
45 Libs: -L@DOLLAR@{libdir} -lmarlincore
46 Cflags: -I@DOLLAR@{includedir}/${PKGNAME}
47-Requires: gtk+-3.0 glib-2.0 gio-2.0 gee-1.0
48-
49+Requires: gtk+-3.0 glib-2.0 gio-2.0 gee-0.8
50
51=== modified file 'libwidgets/CMakeLists.txt'
52--- libwidgets/CMakeLists.txt 2013-06-01 18:27:00 +0000
53+++ libwidgets/CMakeLists.txt 2014-01-24 18:38:58 +0000
54@@ -13,7 +13,7 @@
55 # Check for the deps
56
57 find_package(PkgConfig)
58-pkg_check_modules(DEPS REQUIRED gtk+-3.0 gee-1.0)
59+pkg_check_modules(DEPS REQUIRED gtk+-3.0 gee-0.8)
60
61 pkg_check_modules (GRANITE REQUIRED "granite")
62 add_definitions (${GRANITE_CFLAGS})
63@@ -41,7 +41,7 @@
64 PACKAGES
65 gtk+-3.0
66 granite
67- gee-1.0
68+ gee-0.8
69 posix
70 OPTIONS
71 --thread
72@@ -58,4 +58,4 @@
73
74 install (TARGETS ${PKGNAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/)
75 target_link_libraries(${PKGNAME} ${DEPS_LIBRARIES})
76-add_subdirectory(tests)
77+add_subdirectory(tests)
78\ No newline at end of file
79
80=== modified file 'libwidgets/tests/CMakeLists.txt'
81--- libwidgets/tests/CMakeLists.txt 2013-12-11 21:30:46 +0000
82+++ libwidgets/tests/CMakeLists.txt 2014-01-24 18:38:58 +0000
83@@ -5,7 +5,7 @@
84 tests-pathbar.vala
85 PACKAGES
86 gtk+-3.0
87- gee-1.0
88+ gee-0.8
89 posix
90 marlinwidgets
91 OPTIONS
92@@ -15,7 +15,7 @@
93 )
94
95 find_package(PkgConfig)
96-pkg_check_modules(DEPS REQUIRED gtk+-3.0 gee-1.0)
97+pkg_check_modules(DEPS REQUIRED gtk+-3.0 gee-0.8)
98
99 add_definitions(${DEPS_CFLAGS} ${DEPS_CFLAGS_OTHER})
100
101@@ -24,4 +24,4 @@
102 link_directories(${DEPS_LIBRARY_DIRS})
103 target_link_libraries(widgets-test marlinwidgets ${DEPS_LIBRARIES})
104 add_dependencies(widgets-test marlinwidgets)
105-add_test_executable(widgets-test)
106+add_test_executable(widgets-test)
107\ No newline at end of file
108
109=== modified file 'marlin-daemon/CMakeLists.txt'
110--- marlin-daemon/CMakeLists.txt 2013-05-19 09:53:35 +0000
111+++ marlin-daemon/CMakeLists.txt 2014-01-24 18:38:58 +0000
112@@ -13,7 +13,7 @@
113 pango>=1.1.2
114 gtk+-3.0>=3.0.3
115 gail-3.0
116- gee-1.0
117+ gee-0.8
118 sqlite3
119 dbus-glib-1
120 libnotify>=0.7.2)
121@@ -31,11 +31,11 @@
122 PACKAGES
123 gtk+-3.0
124 gio-2.0
125- gee-1.0
126+ gee-0.8
127 sqlite3
128 OPTIONS
129 --thread)
130 add_executable(marlin-daemon
131 ${VALA_C} )
132 target_link_libraries(marlin-daemon ${DEPS_LIBRARIES})
133-install(TARGETS marlin-daemon RUNTIME DESTINATION bin)
134+install(TARGETS marlin-daemon RUNTIME DESTINATION bin)
135\ No newline at end of file
136
137=== modified file 'plugins/contractor/CMakeLists.txt'
138--- plugins/contractor/CMakeLists.txt 2013-12-05 12:27:37 +0000
139+++ plugins/contractor/CMakeLists.txt 2014-01-24 18:38:58 +0000
140@@ -1,7 +1,7 @@
141 find_package(PkgConfig)
142 pkg_check_modules(DEPS REQUIRED
143 gtk+-3.0
144- gee-1.0
145+ gee-0.8
146 glib-2.0
147 granite)
148 set(CFLAGS
149@@ -15,7 +15,7 @@
150 plugin.vala
151 PACKAGES
152 gtk+-3.0
153- gee-1.0
154+ gee-0.8
155 granite
156 marlincore-C
157 marlincore
158@@ -31,4 +31,4 @@
159 target_link_libraries(marlin-contractor marlincore marlinwidgets)
160 add_dependencies(marlin-contractor marlincore marlinwidgets)
161 install(TARGETS marlin-contractor DESTINATION lib/pantheon-files/plugins/core/)
162-install(FILES contractor.plug DESTINATION lib/pantheon-files/plugins/core/)
163+install(FILES contractor.plug DESTINATION lib/pantheon-files/plugins/core/)
164\ No newline at end of file
165
166=== modified file 'plugins/marlin-ctags/CMakeLists.txt'
167--- plugins/marlin-ctags/CMakeLists.txt 2013-12-05 12:27:37 +0000
168+++ plugins/marlin-ctags/CMakeLists.txt 2014-01-24 18:38:58 +0000
169@@ -4,7 +4,7 @@
170 pkg_check_modules(DEPS REQUIRED
171 gtk+-3.0
172 gio-2.0
173- gee-1.0
174+ gee-0.8
175 )
176 set(CFLAGS
177 ${DEPS_CFLAGS} ${DEPS_CFLAGS_OTHER}
178@@ -16,7 +16,7 @@
179 plugin.vala
180 PACKAGES
181 gtk+-3.0
182- gee-1.0
183+ gee-0.8
184 posix
185 marlincore-C
186 marlincore
187@@ -33,4 +33,4 @@
188 add_dependencies(marlinctags marlincore)
189 install(TARGETS marlinctags DESTINATION lib/pantheon-files/plugins/core/)
190 install(FILES marlinctags.plug DESTINATION lib/pantheon-files/plugins/core/)
191-include_directories(${CMAKE_BINARY_DIR}/plugins/)
192+include_directories(${CMAKE_BINARY_DIR}/plugins/)
193\ No newline at end of file
194
195=== modified file 'plugins/marlin-trash/CMakeLists.txt'
196--- plugins/marlin-trash/CMakeLists.txt 2013-12-05 12:27:37 +0000
197+++ plugins/marlin-trash/CMakeLists.txt 2014-01-24 18:38:58 +0000
198@@ -3,7 +3,7 @@
199 find_package(PkgConfig)
200 pkg_check_modules(DEPS REQUIRED
201 gtk+-3.0
202- gee-1.0
203+ gee-0.8
204 )
205 set(CFLAGS
206 ${DEPS_CFLAGS} ${DEPS_CFLAGS_OTHER}
207@@ -15,7 +15,7 @@
208 plugin.vala
209 PACKAGES
210 gtk+-3.0
211- gee-1.0
212+ gee-0.8
213 marlincore-C
214 marlincore
215 OPTIONS
216@@ -31,4 +31,4 @@
217 add_dependencies(marlintrash marlincore)
218 install(TARGETS marlintrash DESTINATION lib/pantheon-files/plugins/core/)
219 install(FILES marlintrash.plug DESTINATION lib/pantheon-files/plugins/core/)
220-include_directories(${CMAKE_BINARY_DIR}/plugins/)
221+include_directories(${CMAKE_BINARY_DIR}/plugins/)
222\ No newline at end of file
223
224=== modified file 'plugins/network-places/CMakeLists.txt'
225--- plugins/network-places/CMakeLists.txt 2013-12-05 12:27:37 +0000
226+++ plugins/network-places/CMakeLists.txt 2014-01-24 18:38:58 +0000
227@@ -5,7 +5,7 @@
228 find_package(PkgConfig)
229 pkg_check_modules(DEPS REQUIRED
230 gtk+-3.0
231- gee-1.0
232+ gee-0.8
233 )
234
235 set(CFLAGS ${DEPS_CFLAGS} ${DEPS_CFLAGS_OTHER})
236@@ -18,7 +18,7 @@
237 plugin.vala
238 PACKAGES
239 gtk+-3.0
240- gee-1.0
241+ gee-0.8
242 marlincore-C
243 marlincore
244 OPTIONS
245@@ -35,4 +35,4 @@
246 add_dependencies(${PLUGIN_LIB_NAME} marlincore)
247 install(TARGETS ${PLUGIN_LIB_NAME} DESTINATION lib/pantheon-files/plugins/core/)
248 install(FILES ${PLUGIN_LIB_NAME}.plug DESTINATION lib/pantheon-files/plugins/core/)
249-include_directories(${CMAKE_BINARY_DIR}/plugins/)
250+include_directories(${CMAKE_BINARY_DIR}/plugins/)
251\ No newline at end of file
252
253=== modified file 'src/CMakeLists.txt'
254--- src/CMakeLists.txt 2013-12-23 20:47:22 +0000
255+++ src/CMakeLists.txt 2014-01-24 18:38:58 +0000
256@@ -21,7 +21,7 @@
257 pango>=1.1.2
258 gtk+-3.0>=3.0.3
259 gail-3.0
260- gee-1.0
261+ gee-0.8
262 sqlite3
263 dbus-glib-1
264 libnotify>=0.7.2)
265@@ -70,7 +70,7 @@
266 gtk+-3.0
267 gio-2.0
268 posix
269- gee-1.0
270+ gee-0.8
271 granite
272 libnotify
273 unity
274@@ -117,7 +117,7 @@
275 gtk+-3.0
276 gio-2.0
277 posix
278- gee-1.0
279+ gee-0.8
280 granite
281 libnotify
282 marlincore
283@@ -170,4 +170,4 @@
284
285 install (TARGETS ../pantheon-files RUNTIME DESTINATION bin)
286 install (FILES pantheon-files-ui.xml fm-directory-view-ui.xml fm-icon-view-ui.xml DESTINATION ${UI_DIR})
287-include (Tests)
288+include (Tests)
289\ No newline at end of file
290
291=== modified file 'src/View/PropertiesWindow.vala'
292--- src/View/PropertiesWindow.vala 2013-12-16 10:41:59 +0000
293+++ src/View/PropertiesWindow.vala 2014-01-24 18:38:58 +0000
294@@ -1213,4 +1213,4 @@
295 }
296 }
297 }
298-}
299+}
300\ No newline at end of file

Subscribers

People subscribed via source and target branches

to all changes: