Midori Web Browser

Merge lp:~kalikiana/midori/havealot into lp:midori

  1. havealot
  2. Merge into trunk
Proposed by Cris Dywan
Status: Merged
Approved by: Paweł Forysiuk
Approved revision: 6394
Merged at revision: 6391
Proposed branch: lp:~kalikiana/midori/havealot
Merge into: lp:midori
Diff against target: 229 lines (+59/-29)
5 files modified
CMakeLists.txt (+44/-22)
extensions/CMakeLists.txt (+1/-1)
midori/CMakeLists.txt (+13/-3)
po/CMakeLists.txt (+0/-1)
tests/CMakeLists.txt (+1/-2)
To merge this branch: bzr merge lp:~kalikiana/midori/havealot
Reviewer Review Type Date Requested Status
Paweł Forysiuk Approve
Review via email: mp+184488@code.launchpad.net

Commit message

Separate CFLAGS for C and add missing HAVE_

To post a comment you must log in.
lp:~kalikiana/midori/havealot updated
6394. By Cris Dywan

Fix missing closing quote in GCR_VERSION

Revision history for this message
Paweł Forysiuk (tuxator) :
review: Approve

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 2013-09-08 17:20:49 +0000
3+++ CMakeLists.txt 2013-09-08 22:23:12 +0000
4@@ -36,7 +36,12 @@
5 add_definitions("-DSYSCONFDIR=\"${CMAKE_INSTALL_FULL_SYSCONFDIR}\"")
6 add_definitions("-DLIBDIR=\"${CMAKE_INSTALL_FULL_LIBDIR}\"")
7 add_definitions("-DDOCDIR=\"${CMAKE_INSTALL_FULL_DOCDIR}\"")
8+
9+add_definitions("-DENABLE_NLS=1")
10+add_definitions("-DLOCALEDIR=\"${CMAKE_INSTALL_LOCALEDIR}\"")
11+
12 file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/config.h" "/* # generated file (stub) */")
13+add_definitions("-DHAVE_CONFIG_H=1")
14
15 find_file (UNISTD unistd.h)
16 if (UNISTD)
17@@ -62,16 +67,19 @@
18 endif ()
19
20 if (WIN32)
21- set(VALAFLAGS ${VALAFLAGS} "-D;HAVE_WIN32")
22+ set(VALAFLAGS ${VALAFLAGS} -D HAVE_WIN32)
23 endif ()
24
25 string(FIND ${CMAKE_SYSTEM_NAME} "FreeBSD" FREEBSD)
26 if (FREEBSD GREATER -1)
27- set(VALAFLAGS ${VALAFLAGS} "-D;HAVE_FREEBSD")
28+ set(VALAFLAGS ${VALAFLAGS} -D HAVE_FREEBSD)
29 endif ()
30
31 if (APPLE)
32- set(VALAFLAGS ${VALAFLAGS} "-D;HAVE_OSX")
33+ add_definitions("-DHAVE_OSX=1")
34+ set(VALAFLAGS ${VALAFLAGS} -D HAVE_OSX)
35+else ()
36+ add_definitions("-DHAVE_OSX=0")
37 endif ()
38
39 find_package(PkgConfig)
40@@ -86,8 +94,18 @@
41 add_definitions("-DGIO_VERSION=\"${DEPS_gio-2.0_VERSION}\"")
42 add_definitions("-DLIBSOUP_VERSION=\"${DEPS_libsoup-gnome-2.4_VERSION}\"")
43 set(PKGS posix linux libxml-2.0 sqlite3 gmodule-2.0 gio-2.0 libsoup-2.4)
44+if (${DEPS_libsoup-gnome-2.4_VERSION} VERSION_GREATER "2.29.91")
45+ add_definitions("-DHAVE_LIBSOUP_2_29_91")
46+endif ()
47 if (${DEPS_libsoup-gnome-2.4_VERSION} VERSION_GREATER "2.34.0")
48- set(VALAFLAGS ${VALAFLAGS} "-D;HAVE_LIBSOUP_2_34_0")
49+ add_definitions("-DHAVE_LIBSOUP_2_34_0")
50+ set(VALAFLAGS ${VALAFLAGS} -D HAVE_LIBSOUP_2_34_0)
51+endif ()
52+if (${DEPS_libsoup-gnome-2.4_VERSION} VERSION_GREATER "2.37.1")
53+ add_definitions("-DHAVE_LIBSOUP_2_37_1")
54+endif ()
55+if (${DEPS_libsoup-gnome-2.4_VERSION} VERSION_GREATER "2.40.0")
56+ add_definitions("-DHAVE_LIBSOUP_2_40_0")
57 endif ()
58
59 if (WIN32)
60@@ -116,6 +134,7 @@
61 set(OPTS_LIBRARIES "${OPTS_LIBRARIES};${GRANITE_LIBRARIES}")
62 add_definitions("-DHAVE_GRANITE")
63 add_definitions("-DGRANITE_VERSION=\"${GRANITE_VERSION}\"")
64+ set(VALAFLAGS ${VALAFLAGS} -D HAVE_GRANITE)
65 set(PKGS ${PKGS} granite)
66 else ()
67 add_definitions("-DGRANITE_VERSION=\"No\"")
68@@ -129,6 +148,21 @@
69 set(PKGS ${PKGS} zeitgeist-1.0)
70 endif()
71
72+if (USE_GTK3 OR HALF_BRO_INCOM_WEBKIT2)
73+ pkg_check_modules(GCR gcr-3>=2.32)
74+ if (GCR_VERSION)
75+ set(OPTS_INCLUDE_DIRS "${OPTS_INCLUDE_DIRS};${GCR_INCLUDE_DIRS}")
76+ set(OPTS_LIBRARIES "${OPTS_LIBRARIES};${GCR_LIBRARIES}")
77+ add_definitions("-DGCR_VERSION=\"${GCR_VERSION}\"")
78+ add_definitions("-DHAVE_GCR")
79+ set(VALAFLAGS ${VALAFLAGS} -D HAVE_GCR)
80+ else ()
81+ add_definitions("-DGCR_VERSION=\"No\"")
82+ endif ()
83+else ()
84+ add_definitions("-DGCR_VERSION=\"No\"")
85+endif ()
86+
87 if (USE_GTK3)
88 pkg_check_modules(DEPS_GTK REQUIRED
89 gtk+-3.0>=3.0.0
90@@ -139,13 +173,7 @@
91 add_definitions("-DWEBKIT_VERSION=\"${DEPS_GTK_webkitgtk-3.0_VERSION}\"")
92 set(PKGS ${PKGS} gtk+-3.0)
93 set(EXTRA_VAPIS ${EXTRA_VAPIS} "${CMAKE_SOURCE_DIR}/midori/webkitgtk-3.0.vapi")
94- # Always pass >1 module, otherwise we get different variable names
95- pkg_check_modules(OPTS_GTK
96- gio-2.0
97- gcr-3>=2.32
98- )
99- add_definitions("-DGCR_VERSION=\"${OPTS_GTK_gcr-3_VERSION}\"")
100- set(VALAFLAGS ${VALAFLAGS} "-D;HAVE_GTK3")
101+ set(VALAFLAGS ${VALAFLAGS} -D HAVE_GTK3)
102 elseif (HALF_BRO_INCOM_WEBKIT2)
103 # Note: WebKitGTK+ 2.0.0 matches 1.11.91; 1.11.92 > 2.0.0
104 pkg_check_modules(DEPS_GTK REQUIRED
105@@ -153,19 +181,13 @@
106 webkit2gtk-3.0>=1.11.91
107 javascriptcoregtk-3.0
108 )
109- add_definitions("-DHAVE_WEBKIT2")
110+ add_definitions("-DHAVE_WEBKIT2")
111 add_definitions("-DGTK_VERSION=\"${DEPS_GTK_gtk+-3.0_VERSION}\"")
112 add_definitions("-DWEBKIT_VERSION=\"${DEPS_GTK_webkit2gtk-3.0_VERSION}\"")
113 set(PKGS ${PKGS} gtk+-3.0)
114 set(EXTRA_VAPIS ${EXTRA_VAPIS} "${CMAKE_SOURCE_DIR}/midori/webkit2gtk-3.0.vapi")
115- # Always pass >1 module, otherwise we get different variable names
116- pkg_check_modules(OPTS_GTK
117- gio-2.0
118- gcr-3>=2.32
119- )
120- add_definitions("-DGCR_VERSION=\"${OPTS_GTK_gcr-3_VERSION}\"")
121- set(VALAFLAGS ${VALAFLAGS} "-D;HAVE_GTK3")
122- set(VALAFLAGS ${VALAFLAGS} "-D;HAVE_WEBKIT2")
123+ set(VALAFLAGS ${VALAFLAGS} -D HAVE_GTK3)
124+ set(VALAFLAGS ${VALAFLAGS} -D HAVE_WEBKIT2)
125 else ()
126 pkg_check_modules(DEPS_GTK REQUIRED
127 gtk+-2.0>=2.24.0
128@@ -176,7 +198,6 @@
129 add_definitions("-DWEBKIT_VERSION=\"${DEPS_GTK_webkit-1.0_VERSION}\"")
130 set(PKGS ${PKGS} gtk+-2.0)
131 set(EXTRA_VAPIS ${EXTRA_VAPIS} "${CMAKE_SOURCE_DIR}/midori/webkitgtk-3.0.vapi")
132- add_definitions("-DGCR_VERSION=\"No\"")
133 endif ()
134
135 find_package(Vala REQUIRED)
136@@ -190,7 +211,8 @@
137 set (GETTEXT_PACKAGE "midori")
138 add_definitions("-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\"")
139
140-set(CFLAGS "-w -Wno-deprecated-declarations -g")
141+set(CFLAGS "-Wall -Wundef -Wno-deprecated-declarations -g")
142+set(VALA_CFLAGS "-w -g")
143 set(LIBMIDORI "${CMAKE_PROJECT_NAME}-core")
144
145 # CMake provides no uninstall target by design
146
147=== modified file 'extensions/CMakeLists.txt'
148--- extensions/CMakeLists.txt 2013-08-21 19:50:09 +0000
149+++ extensions/CMakeLists.txt 2013-09-08 22:23:12 +0000
150@@ -83,7 +83,7 @@
151 ${LIBMIDORI}
152 )
153 set_target_properties(${UNIT} PROPERTIES
154- COMPILE_FLAGS ${CFLAGS}
155+ COMPILE_FLAGS "${VALA_CFLAGS}"
156 )
157 install(TARGETS ${UNIT}
158 LIBRARY DESTINATION ${EXTENSIONDIR}
159
160=== modified file 'midori/CMakeLists.txt'
161--- midori/CMakeLists.txt 2013-09-01 21:07:05 +0000
162+++ midori/CMakeLists.txt 2013-09-08 22:23:12 +0000
163@@ -26,7 +26,18 @@
164 "${CMAKE_PROJECT_NAME}-core"
165 )
166
167-add_library(${LIBMIDORI} SHARED ${LIBMIDORI_SOURCE_C} ${LIBMIDORI_SOURCE})
168+add_library("${LIBMIDORI}-vala" STATIC ${LIBMIDORI_SOURCE_C})
169+target_link_libraries("${LIBMIDORI}-vala"
170+ ${DEPS_LIBRARIES}
171+ ${OPTS_LIBRARIES}
172+ ${DEPS_GTK_LIBRARIES}
173+ )
174+set_target_properties("${LIBMIDORI}-vala" PROPERTIES
175+ COMPILE_FLAGS "${VALA_CFLAGS}"
176+ POSITION_INDEPENDENT_CODE ON
177+ )
178+
179+add_library(${LIBMIDORI} SHARED ${LIBMIDORI_SOURCE})
180 include_directories(
181 ${CMAKE_SOURCE_DIR}
182 ${CMAKE_CURRENT_SOURCE_DIR}
183@@ -36,13 +47,12 @@
184 ${DEPS_INCLUDE_DIRS}
185 ${OPTS_INCLUDE_DIRS}
186 ${DEPS_GTK_INCLUDE_DIRS}
187- ${OPTS_GTK_INCLUDE_DIRS}
188 )
189 target_link_libraries(${LIBMIDORI}
190+ "${LIBMIDORI}-vala"
191 ${DEPS_LIBRARIES}
192 ${OPTS_LIBRARIES}
193 ${DEPS_GTK_LIBRARIES}
194- ${OPTS_GTK_LIBRARIES}
195 )
196 set_target_properties(${LIBMIDORI} PROPERTIES
197 COMPILE_FLAGS ${CFLAGS}
198
199=== modified file 'po/CMakeLists.txt'
200--- po/CMakeLists.txt 2013-08-19 20:16:41 +0000
201+++ po/CMakeLists.txt 2013-09-08 22:23:12 +0000
202@@ -2,7 +2,6 @@
203
204 include(FindGettext)
205 if (GETTEXT_FOUND)
206- add_definitions("-DENABLE_NLS")
207 set(LANGUAGES $ENV{LINGUAS})
208 if (NOT LANGUAGES)
209 file(GLOB POTFILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.po")
210
211=== modified file 'tests/CMakeLists.txt'
212--- tests/CMakeLists.txt 2013-09-08 00:02:47 +0000
213+++ tests/CMakeLists.txt 2013-09-08 22:23:12 +0000
214@@ -9,7 +9,6 @@
215 ${DEPS_INCLUDE_DIRS}
216 ${OPTS_INCLUDE_DIRS}
217 ${DEPS_GTK_INCLUDE_DIRS}
218- ${OPTS_GTK_INCLUDE_DIRS}
219 ${CMAKE_BINARY_DIR}
220 "${CMAKE_BINARY_DIR}/midori"
221 )
222@@ -50,7 +49,7 @@
223 ${LIBMIDORI}
224 )
225 set_target_properties(${UNIT} PROPERTIES
226- COMPILE_FLAGS ${CFLAGS}
227+ COMPILE_FLAGS "${VALA_CFLAGS}"
228 )
229 endforeach ()
230

Subscribers

People subscribed via source and target branches

to all changes: