attachment:0001-Changes-to-allow-compilation-with-local-webkit-on-12.patch of Apps/Geary/BuildingOnUbuntu12.04

Attachment '0001-Changes-to-allow-compilation-with-local-webkit-on-12.patch'

   1 From a830af9efe4bb49f8d055caae41e077774d84cc1 Mon Sep 17 00:00:00 2001
   2 From: Robert Schroll <rschroll@gmail.com>
   3 Date: Sat, 20 Apr 2013 02:33:59 -0300
   4 Subject: [PATCH] Changes to allow compilation with local webkit on 12.04
   5 
   6 ---
   7  src/CMakeLists.txt |    6 ++++--
   8  1 file changed, 4 insertions(+), 2 deletions(-)
   9 
  10 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
  11 index 6115f71..9930a37 100644
  12 --- a/src/CMakeLists.txt
  13 +++ b/src/CMakeLists.txt
  14 @@ -581,8 +581,10 @@ add_definitions(${CFLAGS})
  15  
  16  set(VALAC_OPTIONS
  17      --vapidir=${CMAKE_SOURCE_DIR}/bindings/vapi
  18 +    --vapidir=$ENV{HOME}/geary-deps/share/vala/vapi
  19      --metadatadir=${CMAKE_SOURCE_DIR}/bindings/metadata
  20      --metadatadir=${CMAKE_SOURCE_DIR}/bindings/metadata/${WEBKITGTK_METADATA_DIR}
  21 +    --girdir=$ENV{HOME}/geary-deps/share/gir-1.0
  22      --target-glib=${TARGET_GLIB}
  23      --thread
  24      --enable-checking
  25 @@ -615,7 +617,7 @@ add_custom_command(
  26      WORKING_DIRECTORY
  27          ${CMAKE_SOURCE_DIR}/bindings/metadata
  28      COMMAND
  29 -        vapigen --pkg=gio-2.0 --pkg=gtk+-3.0 --pkg=libsoup-2.4 --metadatadir=. --metadatadir=${WEBKITGTK_METADATA_DIR} --library=webkitgtk-3.0 --directory=${CMAKE_BINARY_DIR}/src ${WEBKITGTK_CUSTOM_VALA} `pkg-config --variable=girdir gobject-introspection-1.0`/WebKit-3.0.gir
  30 +        vapigen --pkg=gio-2.0 --pkg=gtk+-3.0 --pkg=libsoup-2.4 --metadatadir=. --metadatadir=${WEBKITGTK_METADATA_DIR} --library=webkitgtk-3.0 --directory=${CMAKE_BINARY_DIR}/src ${WEBKITGTK_CUSTOM_VALA} $ENV{HOME}/geary-deps/share/gir-1.0/WebKit-3.0.gir
  31  )
  32  
  33  # Geary client app
  34 @@ -634,7 +636,7 @@ OPTIONS
  35  )
  36  
  37  add_executable(geary ${GEARY_VALA_C})
  38 -target_link_libraries(geary m ${DEPS_LIBRARIES} gthread-2.0 geary-static)
  39 +target_link_libraries(geary m ${DEPS_LIBRARIES} gthread-2.0 geary-static $ENV{HOME}/geary-deps/lib/libwebkitgtk-3.0.so $ENV{HOME}/webkit/lib/libsoup-2.4.so $ENV{HOME}/geary-deps/lib/libgio-2.0.so)
  40  install(TARGETS geary RUNTIME DESTINATION bin)
  41  add_custom_command(
  42      TARGET
  43 -- 
  44 1.7.9.5

Attached Files

To refer to attachments on a page, use attachment:filename, as shown below in the list of files. Do NOT use the URL of the [get] link, since this is subject to change and can break easily.

You are not allowed to attach a file to this page.