summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Ospald <hasufell@gentoo.org>2014-01-08 16:13:27 +0000
committerJulian Ospald <hasufell@gentoo.org>2014-01-08 16:13:27 +0000
commit8c1c516098bc66a14ed0709fe0fdf0ad5a860e02 (patch)
treeee9dee09016c31745bf1263e1c15d67e9c5e695b /mail-client/geary/files
parentmasked for removal 08/Feb/2014, outdated, not maintained (diff)
downloadgentoo-2-8c1c516098bc66a14ed0709fe0fdf0ad5a860e02.tar.gz
gentoo-2-8c1c516098bc66a14ed0709fe0fdf0ad5a860e02.tar.bz2
gentoo-2-8c1c516098bc66a14ed0709fe0fdf0ad5a860e02.zip
version bump wrt #496958
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key E73C35B3)
Diffstat (limited to 'mail-client/geary/files')
-rw-r--r--mail-client/geary/files/geary-0.4.3-cflags.patch27
-rw-r--r--mail-client/geary/files/geary-0.4.3-unity.patch31
2 files changed, 58 insertions, 0 deletions
diff --git a/mail-client/geary/files/geary-0.4.3-cflags.patch b/mail-client/geary/files/geary-0.4.3-cflags.patch
new file mode 100644
index 000000000000..7a7666b2c4f8
--- /dev/null
+++ b/mail-client/geary/files/geary-0.4.3-cflags.patch
@@ -0,0 +1,27 @@
+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
diff --git a/mail-client/geary/files/geary-0.4.3-unity.patch b/mail-client/geary/files/geary-0.4.3-unity.patch
new file mode 100644
index 000000000000..837b37f372ad
--- /dev/null
+++ b/mail-client/geary/files/geary-0.4.3-unity.patch
@@ -0,0 +1,31 @@
+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(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 @@
+ 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 ()
+ pkg_check_modules(WEBKITGTK110X QUIET webkitgtk-3.0<=1.10.2)
+ pkg_check_modules(WEBKITGTK22X QUIET webkitgtk-3.0>=2.2.0)
+