[gentoo-commits] gentoo-x86 commit in mail-client/geary/files: geary-0.4.0_pre2-cflags.patch geary-0.4.0_pre2-unity.patch geary-0.4.0_pre1-unity.patch geary-0.4.0_pre1-cflags.patch

[gentoo-commits] gentoo-x86 commit in mail-client/geary/files: geary-0.4.0_pre2-cflags.patch geary-0.4.0_pre2-unity.patch geary-0.4.0_pre1-unity.patch geary-0.4.0_pre1-cflags.patch

[Julian Ospald (hasufell)]

hasufell    13/09/22 13:06:15

  Added:                geary-0.4.0_pre2-cflags.patch
                        geary-0.4.0_pre2-unity.patch
  Removed:              geary-0.4.0_pre1-unity.patch
                        geary-0.4.0_pre1-cflags.patch
  Log:
  version bump, remove old
  
  (Portage version: 2.2.6/cvs/Linux x86_64, signed Manifest commit with key E73C35B3)

Revision  Changes    Path
1.1                  mail-client/geary/files/geary-0.4.0_pre2-cflags.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/geary/files/geary-0.4.0_pre2-cflags.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/geary/files/geary-0.4.0_pre2-cflags.patch?rev=1.1&content-type=text/plain

Index: geary-0.4.0_pre2-cflags.patch
===================================================================
commit e41cf68206eb16be678eeaa1dc998d94d2f93d57
Author: hasufell <hasufell@gentoo.org>
Date:   Tue Aug 27 01:40:58 2013 +0200

    respect system CFLAGS

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5202b99..949d494 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -471,16 +471,8 @@ set(CFLAGS
     -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



1.1                  mail-client/geary/files/geary-0.4.0_pre2-unity.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/geary/files/geary-0.4.0_pre2-unity.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/geary/files/geary-0.4.0_pre2-unity.patch?rev=1.1&content-type=text/plain

Index: geary-0.4.0_pre2-unity.patch
===================================================================
commit 1f875e8a629a54748eb46237fd854359aa5edbc8
Author: hasufell <hasufell@gentoo.org>
Date:   Tue Aug 27 01:40:45 2013 +0200

    provide option for unity

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 66145c9..5d4464c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -32,6 +32,7 @@ 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(DESKTOP_VALIDATE "Check generated desktop file for errors during build." ON)
+option(WITH_UNITY "Add unity support." OFF)
 
 if (DEBUG)
     message(STATUS "Debug build")
@@ -50,8 +51,10 @@ if (DESKTOP_VALIDATE)
 endif ()
 
 find_package(PkgConfig)
-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(LIBUNITY QUIET unity>=5.12.0)
+    pkg_check_modules(LIBMESSAGINGMENU QUIET messaging-menu>=12.10.2)
+endif()
 
 # intl
 include(Gettext)