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.4.0_pre1-cflags.patch geary-0.4.0_pre1-unity.patch |
Date: | Tue, 27 Aug 2013 00:53:30 |
Message-Id: | 20130827005324.BE0932004C@flycatcher.gentoo.org |
1 | hasufell 13/08/27 00:53:24 |
2 | |
3 | Added: geary-0.4.0_pre1-cflags.patch |
4 | geary-0.4.0_pre1-unity.patch |
5 | Log: |
6 | version bump |
7 | |
8 | (Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key E73C35B3) |
9 | |
10 | Revision Changes Path |
11 | 1.1 mail-client/geary/files/geary-0.4.0_pre1-cflags.patch |
12 | |
13 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/geary/files/geary-0.4.0_pre1-cflags.patch?rev=1.1&view=markup |
14 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/geary/files/geary-0.4.0_pre1-cflags.patch?rev=1.1&content-type=text/plain |
15 | |
16 | Index: geary-0.4.0_pre1-cflags.patch |
17 | =================================================================== |
18 | commit e41cf68206eb16be678eeaa1dc998d94d2f93d57 |
19 | Author: hasufell <hasufell@g.o> |
20 | Date: Tue Aug 27 01:40:58 2013 +0200 |
21 | |
22 | respect system CFLAGS |
23 | |
24 | diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt |
25 | index 5202b99..949d494 100644 |
26 | --- a/src/CMakeLists.txt |
27 | +++ b/src/CMakeLists.txt |
28 | @@ -471,16 +471,8 @@ set(CFLAGS |
29 | -D_GSETTINGS_DIR=\"${CMAKE_BINARY_DIR}/gsettings\" |
30 | -DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\" |
31 | -DLANGUAGE_SUPPORT_DIRECTORY=\"${LANGUAGE_SUPPORT_DIRECTORY}\" |
32 | - -g |
33 | ) |
34 | |
35 | -if (NOT DEBUG) |
36 | - set(CFLAGS |
37 | - ${CFLAGS} |
38 | - -O2 |
39 | - ) |
40 | -endif () |
41 | - |
42 | if (REF_TRACKING) |
43 | message(STATUS "Reference tracking: ON") |
44 | set(EXTRA_VALA_OPTIONS |
45 | |
46 | |
47 | |
48 | 1.1 mail-client/geary/files/geary-0.4.0_pre1-unity.patch |
49 | |
50 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/geary/files/geary-0.4.0_pre1-unity.patch?rev=1.1&view=markup |
51 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/geary/files/geary-0.4.0_pre1-unity.patch?rev=1.1&content-type=text/plain |
52 | |
53 | Index: geary-0.4.0_pre1-unity.patch |
54 | =================================================================== |
55 | commit 1f875e8a629a54748eb46237fd854359aa5edbc8 |
56 | Author: hasufell <hasufell@g.o> |
57 | Date: Tue Aug 27 01:40:45 2013 +0200 |
58 | |
59 | provide option for unity |
60 | |
61 | diff --git a/CMakeLists.txt b/CMakeLists.txt |
62 | index 66145c9..5d4464c 100644 |
63 | --- a/CMakeLists.txt |
64 | +++ b/CMakeLists.txt |
65 | @@ -32,6 +32,7 @@ option(DEBUG "Build for debugging." OFF) |
66 | option(ICON_UPDATE "Run gtk-update-icon-cache after the install." ON) |
67 | option(DESKTOP_UPDATE "Run update-desktop-database after the install." ON) |
68 | option(DESKTOP_VALIDATE "Check generated desktop file for errors during build." ON) |
69 | +option(WITH_UNITY "Add unity support." OFF) |
70 | |
71 | if (DEBUG) |
72 | message(STATUS "Debug build") |
73 | @@ -50,8 +51,10 @@ if (DESKTOP_VALIDATE) |
74 | endif () |
75 | |
76 | find_package(PkgConfig) |
77 | -pkg_check_modules(LIBUNITY QUIET unity>=5.12.0) |
78 | -pkg_check_modules(LIBMESSAGINGMENU QUIET messaging-menu>=12.10.2) |
79 | +if(WITH_UNITY) |
80 | + pkg_check_modules(LIBUNITY QUIET unity>=5.12.0) |
81 | + pkg_check_modules(LIBMESSAGINGMENU QUIET messaging-menu>=12.10.2) |
82 | +endif() |
83 | |
84 | # intl |
85 | include(Gettext) |