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