diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /mail-client/geary/files | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.xz |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'mail-client/geary/files')
-rw-r--r-- | mail-client/geary/files/geary-0.5.3-unity.patch | 31 | ||||
-rw-r--r-- | mail-client/geary/files/geary-0.5.3-vapigen.patch | 29 | ||||
-rw-r--r-- | mail-client/geary/files/geary-0.6.0-desktopfile.patch | 12 | ||||
-rw-r--r-- | mail-client/geary/files/geary-0.6.3-cflags.patch | 27 | ||||
-rw-r--r-- | mail-client/geary/files/geary-0.7.2-cflags.patch | 27 |
5 files changed, 126 insertions, 0 deletions
diff --git a/mail-client/geary/files/geary-0.5.3-unity.patch b/mail-client/geary/files/geary-0.5.3-unity.patch new file mode 100644 index 00000000000..7bf28296356 --- /dev/null +++ b/mail-client/geary/files/geary-0.5.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 +@@ -28,6 +28,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") +@@ -46,8 +47,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 () + + # CMake's range-checking syntax doesn't allow for a bare less-than, so using + # improbably high version numbers to indicate maximum diff --git a/mail-client/geary/files/geary-0.5.3-vapigen.patch b/mail-client/geary/files/geary-0.5.3-vapigen.patch new file mode 100644 index 00000000000..18b3c8049b4 --- /dev/null +++ b/mail-client/geary/files/geary-0.5.3-vapigen.patch @@ -0,0 +1,29 @@ +From: Julian Ospald <hasufell@gentoo.org> +Date: Sun Feb 2 00:17:18 UTC 2014 +Subject: gentoo specific + +--- geary-0.5.1.tar.xz/src/CMakeLists.txt ++++ geary-0.5.1.tar.xz/src/CMakeLists.txt +@@ -399,12 +399,7 @@ + include(ValaPrecompile) + + # Vapigen +-find_program(VAPIGEN vapigen) +-if (VAPIGEN STREQUAL "VAPIGEN-NOTFOUND") +- message(FATAL_ERROR "vapigen must be installed to build Geary.") +-else () +- message(STATUS "Found vapigen: " ${VAPIGEN}) +-endif () ++set(VAPIGEN $ENV{VAPIGEN}) + + # Packages + if (LIBMESSAGINGMENU_FOUND) +@@ -615,7 +610,7 @@ + WORKING_DIRECTORY + ${CMAKE_SOURCE_DIR}/bindings/metadata + COMMAND +- vapigen --pkg=gio-2.0 --pkg=gtk+-3.0 --pkg=libsoup-2.4 --metadatadir=. --metadatadir=${WEBKITGTK_METADATA_DIR} --library=webkitgtk-3.0 --directory=${CMAKE_BINARY_DIR}/src ${WEBKITGTK_CUSTOM_VALA} `pkg-config --variable=girdir gobject-introspection-1.0`/WebKit-3.0.gir ++ $ENV{VAPIGEN} --pkg=gio-2.0 --pkg=gtk+-3.0 --pkg=libsoup-2.4 --metadatadir=. --metadatadir=${WEBKITGTK_METADATA_DIR} --library=webkitgtk-3.0 --directory=${CMAKE_BINARY_DIR}/src ${WEBKITGTK_CUSTOM_VALA} `pkg-config --variable=girdir gobject-introspection-1.0`/WebKit-3.0.gir + ) + + # Geary client app diff --git a/mail-client/geary/files/geary-0.6.0-desktopfile.patch b/mail-client/geary/files/geary-0.6.0-desktopfile.patch new file mode 100644 index 00000000000..3ba892f0bb3 --- /dev/null +++ b/mail-client/geary/files/geary-0.6.0-desktopfile.patch @@ -0,0 +1,12 @@ +From: Julian Ospald <hasufell@gentoo.org> +Date: Sun Mar 23 22:56:46 UTC 2014 +Subject: fix desktop file + +--- a/desktop/geary.desktop.in ++++ b/desktop/geary.desktop.in +@@ -17,5 +17,3 @@ + [Desktop Action Compose] + _Name=Compose Message + Exec=geary mailto: +-OnlyShowIn=X-Messaging Menu;Unity; +- diff --git a/mail-client/geary/files/geary-0.6.3-cflags.patch b/mail-client/geary/files/geary-0.6.3-cflags.patch new file mode 100644 index 00000000000..959ae4b1f34 --- /dev/null +++ b/mail-client/geary/files/geary-0.6.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 + -DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\" + -DLANGUAGE_SUPPORT_DIRECTORY=\"${LANGUAGE_SUPPORT_DIRECTORY}\" + -DGCR_API_SUBJECT_TO_CHANGE +- -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.7.2-cflags.patch b/mail-client/geary/files/geary-0.7.2-cflags.patch new file mode 100644 index 00000000000..959ae4b1f34 --- /dev/null +++ b/mail-client/geary/files/geary-0.7.2-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 + -DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\" + -DLANGUAGE_SUPPORT_DIRECTORY=\"${LANGUAGE_SUPPORT_DIRECTORY}\" + -DGCR_API_SUBJECT_TO_CHANGE +- -g + ) + +-if (NOT DEBUG) +- set(CFLAGS +- ${CFLAGS} +- -O2 +- ) +-endif () +- + if (REF_TRACKING) + message(STATUS "Reference tracking: ON") + set(EXTRA_VALA_OPTIONS |