[gentoo-commits] gentoo-x86 commit in mail-client/geary/files: geary-0.3.1-ayatana.patch geary-0.3.1-cflags.patch

[gentoo-commits] gentoo-x86 commit in mail-client/geary/files: geary-0.3.1-ayatana.patch geary-0.3.1-cflags.patch

[Julian Ospald (hasufell)]

hasufell    13/05/30 13:41:22

  Added:                geary-0.3.1-ayatana.patch geary-0.3.1-cflags.patch
  Log:
  initial import wrt #436976
  
  (Portage version: 2.2.0_alpha177/cvs/Linux x86_64, signed Manifest commit with key E73C35B3)

Revision  Changes    Path
1.1                  mail-client/geary/files/geary-0.3.1-ayatana.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/geary/files/geary-0.3.1-ayatana.patch?rev=1.1&view=markup
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

Index: geary-0.3.1-ayatana.patch
===================================================================
From: Julian Ospald <hasufell@gentoo.org>
Date: Thu May 30 12:45:36 UTC 2013
Subject: provide options for unity/ayatana

--- geary-0.3.0/CMakeLists.txt
+++ geary-0.3.0/CMakeLists.txt
@@ -10,6 +10,8 @@
 
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake )
 
+include( CMakeDependentOption )
+
 #
 # Base bits
 #
@@ -31,6 +33,8 @@
 option(DEBUG "Build for debugging." OFF)
 option(ICON_UPDATE "Run gtk-update-icon-cache after the install." ON)
 option(DESKTOP_UPDATE "Run update-desktop-database after the install." ON)
+option(WITH_UNITY "Add unity support." OFF)
+cmake_dependent_option(WITH_LIBINDICATE "Enable minimal ayatana support through libappindicate" OFF "NOT WITH_UNITY" OFF)
 
 if (DEBUG)
     message(STATUS "Debug build")
@@ -45,9 +49,16 @@
 endif ()
 
 find_package(PkgConfig)
-pkg_check_modules(LIBINDICATE QUIET indicate-0.7>=0.6.1)
-pkg_check_modules(LIBUNITY QUIET unity>=5.12.0)
-pkg_check_modules(LIBMESSAGINGMENU QUIET messaging-menu>=12.10.2)
+
+if(WITH_UNITY)
+    pkg_check_modules(LIBINDICATE QUIET indicate-0.7>=0.6.1)
+    pkg_check_modules(LIBUNITY QUIET unity>=5.12.0)
+    pkg_check_modules(LIBMESSAGINGMENU QUIET messaging-menu>=12.10.2)
+endif()
+
+if(WITH_LIBINDICATE)
+    pkg_check_modules(LIBINDICATE QUIET indicate-0.7>=0.6.1)
+endif()
 
 # intl
 include(Gettext)



1.1                  mail-client/geary/files/geary-0.3.1-cflags.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/geary/files/geary-0.3.1-cflags.patch?rev=1.1&view=markup
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

Index: geary-0.3.1-cflags.patch
===================================================================
From: Julian Ospald <hasufell@gentoo.org>
Date: Thu May 30 11:56:51 UTC 2013
Subject: respect system cflags

--- geary-0.3.0/src/CMakeLists.txt
+++ geary-0.3.0/src/CMakeLists.txt
@@ -407,16 +407,8 @@
     -D_GSETTINGS_DIR=\"${CMAKE_BINARY_DIR}/gsettings\"
     -DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\"
     -DLANGUAGE_SUPPORT_DIRECTORY=\"${LANGUAGE_SUPPORT_DIRECTORY}\"
-    -g
 )
 
-if (NOT DEBUG)
-    set(CFLAGS
-        ${CFLAGS}
-        -O2
-    )    
-endif ()
-
 if (REF_TRACKING)
     message(STATUS "Reference tracking: ON")
     set(EXTRA_VALA_OPTIONS