| From: Julian Ospald <hasufell@gentoo.org> |
| Date: Sun Feb 2 00:17:18 UTC 2014 |
| Subject: gentoo specific |
| |
| --- geary-0.5.1.tar.xz/src/CMakeLists.txt |
| +++ geary-0.5.1.tar.xz/src/CMakeLists.txt |
| @@ -399,12 +399,7 @@ |
| include(ValaPrecompile) |
| |
| # Vapigen |
| -find_program(VAPIGEN vapigen) |
| -if (VAPIGEN STREQUAL "VAPIGEN-NOTFOUND") |
| - message(FATAL_ERROR "vapigen must be installed to build Geary.") |
| -else () |
| - message(STATUS "Found vapigen: " ${VAPIGEN}) |
| -endif () |
| +set(VAPIGEN $ENV{VAPIGEN}) |
| |
| # Packages |
| if (LIBMESSAGINGMENU_FOUND) |
| @@ -615,7 +610,7 @@ |
| WORKING_DIRECTORY |
| ${CMAKE_SOURCE_DIR}/bindings/metadata |
| COMMAND |
| - 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 |
| + $ENV{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 |
| ) |
| |
| # Geary client app |
