| 1 |
hasufell 14/02/02 00:36:51 |
| 2 |
|
| 3 |
Added: geary-0.5.1-vapigen.patch geary-0.5.1-cflags.patch |
| 4 |
geary-0.5.1-unity.patch |
| 5 |
Log: |
| 6 |
version bump |
| 7 |
|
| 8 |
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key E73C35B3) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 mail-client/geary/files/geary-0.5.1-vapigen.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/geary/files/geary-0.5.1-vapigen.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/geary/files/geary-0.5.1-vapigen.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: geary-0.5.1-vapigen.patch |
| 17 |
=================================================================== |
| 18 |
From: Julian Ospald <hasufell@g.o> |
| 19 |
Date: Sun Feb 2 00:17:18 UTC 2014 |
| 20 |
Subject: gentoo specific |
| 21 |
|
| 22 |
--- geary-0.5.1.tar.xz/src/CMakeLists.txt |
| 23 |
+++ geary-0.5.1.tar.xz/src/CMakeLists.txt |
| 24 |
@@ -399,12 +399,7 @@ |
| 25 |
include(ValaPrecompile) |
| 26 |
|
| 27 |
# Vapigen |
| 28 |
-find_program(VAPIGEN vapigen) |
| 29 |
-if (VAPIGEN STREQUAL "VAPIGEN-NOTFOUND") |
| 30 |
- message(FATAL_ERROR "vapigen must be installed to build Geary.") |
| 31 |
-else () |
| 32 |
- message(STATUS "Found vapigen: " ${VAPIGEN}) |
| 33 |
-endif () |
| 34 |
+set(VAPIGEN $ENV{VAPIGEN}) |
| 35 |
|
| 36 |
# Packages |
| 37 |
if (LIBMESSAGINGMENU_FOUND) |
| 38 |
@@ -615,7 +610,7 @@ |
| 39 |
WORKING_DIRECTORY |
| 40 |
${CMAKE_SOURCE_DIR}/bindings/metadata |
| 41 |
COMMAND |
| 42 |
- 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 |
| 43 |
+ $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 |
| 44 |
) |
| 45 |
|
| 46 |
# Geary client app |
| 47 |
|
| 48 |
|
| 49 |
|
| 50 |
1.1 mail-client/geary/files/geary-0.5.1-cflags.patch |
| 51 |
|
| 52 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/geary/files/geary-0.5.1-cflags.patch?rev=1.1&view=markup |
| 53 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/geary/files/geary-0.5.1-cflags.patch?rev=1.1&content-type=text/plain |
| 54 |
|
| 55 |
Index: geary-0.5.1-cflags.patch |
| 56 |
=================================================================== |
| 57 |
commit e41cf68206eb16be678eeaa1dc998d94d2f93d57 |
| 58 |
Author: hasufell <hasufell@g.o> |
| 59 |
Date: Tue Aug 27 01:40:58 2013 +0200 |
| 60 |
|
| 61 |
respect system CFLAGS |
| 62 |
|
| 63 |
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt |
| 64 |
index 5202b99..949d494 100644 |
| 65 |
--- a/src/CMakeLists.txt |
| 66 |
+++ b/src/CMakeLists.txt |
| 67 |
@@ -471,16 +471,8 @@ set(CFLAGS |
| 68 |
-D_GSETTINGS_DIR=\"${CMAKE_BINARY_DIR}/gsettings\" |
| 69 |
-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\" |
| 70 |
-DLANGUAGE_SUPPORT_DIRECTORY=\"${LANGUAGE_SUPPORT_DIRECTORY}\" |
| 71 |
- -g |
| 72 |
) |
| 73 |
|
| 74 |
-if (NOT DEBUG) |
| 75 |
- set(CFLAGS |
| 76 |
- ${CFLAGS} |
| 77 |
- -O2 |
| 78 |
- ) |
| 79 |
-endif () |
| 80 |
- |
| 81 |
if (REF_TRACKING) |
| 82 |
message(STATUS "Reference tracking: ON") |
| 83 |
set(EXTRA_VALA_OPTIONS |
| 84 |
|
| 85 |
|
| 86 |
|
| 87 |
1.1 mail-client/geary/files/geary-0.5.1-unity.patch |
| 88 |
|
| 89 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/geary/files/geary-0.5.1-unity.patch?rev=1.1&view=markup |
| 90 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/geary/files/geary-0.5.1-unity.patch?rev=1.1&content-type=text/plain |
| 91 |
|
| 92 |
Index: geary-0.5.1-unity.patch |
| 93 |
=================================================================== |
| 94 |
commit 1f875e8a629a54748eb46237fd854359aa5edbc8 |
| 95 |
Author: hasufell <hasufell@g.o> |
| 96 |
Date: Tue Aug 27 01:40:45 2013 +0200 |
| 97 |
|
| 98 |
provide option for unity |
| 99 |
|
| 100 |
diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 101 |
index 66145c9..5d4464c 100644 |
| 102 |
--- a/CMakeLists.txt |
| 103 |
+++ b/CMakeLists.txt |
| 104 |
@@ -28,6 +28,7 @@ |
| 105 |
option(ICON_UPDATE "Run gtk-update-icon-cache after the install." ON) |
| 106 |
option(DESKTOP_UPDATE "Run update-desktop-database after the install." ON) |
| 107 |
option(DESKTOP_VALIDATE "Check generated desktop file for errors during build." ON) |
| 108 |
+option(WITH_UNITY "Add unity support." OFF) |
| 109 |
|
| 110 |
if (DEBUG) |
| 111 |
message(STATUS "Debug build") |
| 112 |
@@ -46,8 +47,10 @@ |
| 113 |
endif () |
| 114 |
|
| 115 |
find_package(PkgConfig) |
| 116 |
-pkg_check_modules(LIBUNITY QUIET unity>=5.12.0) |
| 117 |
-pkg_check_modules(LIBMESSAGINGMENU QUIET messaging-menu>=12.10.2) |
| 118 |
+if (WITH_UNITY) |
| 119 |
+ pkg_check_modules(LIBUNITY QUIET unity>=5.12.0) |
| 120 |
+ pkg_check_modules(LIBMESSAGINGMENU QUIET messaging-menu>=12.10.2) |
| 121 |
+endif () |
| 122 |
|
| 123 |
# CMake's range-checking syntax doesn't allow for a bare less-than, so using |
| 124 |
# improbably high version numbers to indicate maximum |
Archives