From: | "Julian Ospald (hasufell)" <hasufell@g.o> |
---|---|
To: | gentoo-commits@l.g.o |
Subject: | [gentoo-commits] gentoo-x86 commit in mail-client/geary/files: geary-0.3.1-ayatana.patch geary-0.3.1-cflags.patch |
Date: | Thu, 30 May 2013 13:41:25 |
Message-Id: | 20130530134122.1A5702171E@flycatcher.gentoo.org |
1 | hasufell 13/05/30 13:41:22 |
2 | |
3 | Added: geary-0.3.1-ayatana.patch geary-0.3.1-cflags.patch |
4 | Log: |
5 | initial import wrt #436976 |
6 | |
7 | (Portage version: 2.2.0_alpha177/cvs/Linux x86_64, signed Manifest commit with key E73C35B3) |
8 | |
9 | Revision Changes Path |
10 | 1.1 mail-client/geary/files/geary-0.3.1-ayatana.patch |
11 | |
12 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/geary/files/geary-0.3.1-ayatana.patch?rev=1.1&view=markup |
13 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/geary/files/geary-0.3.1-ayatana.patch?rev=1.1&content-type=text/plain |
14 | |
15 | Index: geary-0.3.1-ayatana.patch |
16 | =================================================================== |
17 | From: Julian Ospald <hasufell@g.o> |
18 | Date: Thu May 30 12:45:36 UTC 2013 |
19 | Subject: provide options for unity/ayatana |
20 | |
21 | --- geary-0.3.0/CMakeLists.txt |
22 | +++ geary-0.3.0/CMakeLists.txt |
23 | @@ -10,6 +10,8 @@ |
24 | |
25 | list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake ) |
26 | |
27 | +include( CMakeDependentOption ) |
28 | + |
29 | # |
30 | # Base bits |
31 | # |
32 | @@ -31,6 +33,8 @@ |
33 | option(DEBUG "Build for debugging." OFF) |
34 | option(ICON_UPDATE "Run gtk-update-icon-cache after the install." ON) |
35 | option(DESKTOP_UPDATE "Run update-desktop-database after the install." ON) |
36 | +option(WITH_UNITY "Add unity support." OFF) |
37 | +cmake_dependent_option(WITH_LIBINDICATE "Enable minimal ayatana support through libappindicate" OFF "NOT WITH_UNITY" OFF) |
38 | |
39 | if (DEBUG) |
40 | message(STATUS "Debug build") |
41 | @@ -45,9 +49,16 @@ |
42 | endif () |
43 | |
44 | find_package(PkgConfig) |
45 | -pkg_check_modules(LIBINDICATE QUIET indicate-0.7>=0.6.1) |
46 | -pkg_check_modules(LIBUNITY QUIET unity>=5.12.0) |
47 | -pkg_check_modules(LIBMESSAGINGMENU QUIET messaging-menu>=12.10.2) |
48 | + |
49 | +if(WITH_UNITY) |
50 | + pkg_check_modules(LIBINDICATE QUIET indicate-0.7>=0.6.1) |
51 | + pkg_check_modules(LIBUNITY QUIET unity>=5.12.0) |
52 | + pkg_check_modules(LIBMESSAGINGMENU QUIET messaging-menu>=12.10.2) |
53 | +endif() |
54 | + |
55 | +if(WITH_LIBINDICATE) |
56 | + pkg_check_modules(LIBINDICATE QUIET indicate-0.7>=0.6.1) |
57 | +endif() |
58 | |
59 | # intl |
60 | include(Gettext) |
61 | |
62 | |
63 | |
64 | 1.1 mail-client/geary/files/geary-0.3.1-cflags.patch |
65 | |
66 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/geary/files/geary-0.3.1-cflags.patch?rev=1.1&view=markup |
67 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/geary/files/geary-0.3.1-cflags.patch?rev=1.1&content-type=text/plain |
68 | |
69 | Index: geary-0.3.1-cflags.patch |
70 | =================================================================== |
71 | From: Julian Ospald <hasufell@g.o> |
72 | Date: Thu May 30 11:56:51 UTC 2013 |
73 | Subject: respect system cflags |
74 | |
75 | --- geary-0.3.0/src/CMakeLists.txt |
76 | +++ geary-0.3.0/src/CMakeLists.txt |
77 | @@ -407,16 +407,8 @@ |
78 | -D_GSETTINGS_DIR=\"${CMAKE_BINARY_DIR}/gsettings\" |
79 | -DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\" |
80 | -DLANGUAGE_SUPPORT_DIRECTORY=\"${LANGUAGE_SUPPORT_DIRECTORY}\" |
81 | - -g |
82 | ) |
83 | |
84 | -if (NOT DEBUG) |
85 | - set(CFLAGS |
86 | - ${CFLAGS} |
87 | - -O2 |
88 | - ) |
89 | -endif () |
90 | - |
91 | if (REF_TRACKING) |
92 | message(STATUS "Reference tracking: ON") |
93 | set(EXTRA_VALA_OPTIONS |