diff options
author | Julian Ospald <hasufell@gentoo.org> | 2014-03-05 23:50:06 +0000 |
---|---|---|
committer | Julian Ospald <hasufell@gentoo.org> | 2014-03-05 23:50:06 +0000 |
commit | 7d2bf6a969f0c86ef5b635adbf7cb5d6a146426d (patch) | |
tree | 5b65e473f04b4f1c757330ada05293d3b985df3b | |
parent | version bump wrt #503486, remove old (diff) | |
download | gentoo-2-7d2bf6a969f0c86ef5b635adbf7cb5d6a146426d.tar.gz gentoo-2-7d2bf6a969f0c86ef5b635adbf7cb5d6a146426d.tar.bz2 gentoo-2-7d2bf6a969f0c86ef5b635adbf7cb5d6a146426d.zip |
rm obsolete patches
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key BDEED020)
-rw-r--r-- | mail-client/geary/ChangeLog | 11 | ||||
-rw-r--r-- | mail-client/geary/files/geary-0.3.1-ayatana.patch | 44 | ||||
-rw-r--r-- | mail-client/geary/files/geary-0.3.1-cflags.patch | 23 | ||||
-rw-r--r-- | mail-client/geary/files/geary-0.4.0-cflags.patch | 27 | ||||
-rw-r--r-- | mail-client/geary/files/geary-0.4.0-unity.patch | 31 | ||||
-rw-r--r-- | mail-client/geary/files/geary-0.4.2-cflags.patch | 27 | ||||
-rw-r--r-- | mail-client/geary/files/geary-0.4.2-unity.patch | 31 | ||||
-rw-r--r-- | mail-client/geary/files/geary-0.5.0-cflags.patch | 27 | ||||
-rw-r--r-- | mail-client/geary/files/geary-0.5.0-unity.patch | 31 | ||||
-rw-r--r-- | mail-client/geary/files/geary-0.5.1-cflags.patch | 27 | ||||
-rw-r--r-- | mail-client/geary/files/geary-0.5.1-unity.patch | 31 | ||||
-rw-r--r-- | mail-client/geary/files/geary-0.5.1-vapigen.patch | 29 |
12 files changed, 10 insertions, 329 deletions
diff --git a/mail-client/geary/ChangeLog b/mail-client/geary/ChangeLog index d86f2a019717..c6f00b1001da 100644 --- a/mail-client/geary/ChangeLog +++ b/mail-client/geary/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for mail-client/geary # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/mail-client/geary/ChangeLog,v 1.13 2014/03/05 23:48:05 hasufell Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-client/geary/ChangeLog,v 1.14 2014/03/05 23:50:06 hasufell Exp $ + + 05 Mar 2014; Julian Ospald <hasufell@gentoo.org> + -files/geary-0.3.1-ayatana.patch, -files/geary-0.3.1-cflags.patch, + -files/geary-0.4.0-cflags.patch, -files/geary-0.4.0-unity.patch, + -files/geary-0.4.2-cflags.patch, -files/geary-0.4.2-unity.patch, + -files/geary-0.5.0-cflags.patch, -files/geary-0.5.0-unity.patch, + -files/geary-0.5.1-cflags.patch, -files/geary-0.5.1-unity.patch, + -files/geary-0.5.1-vapigen.patch: + rm obsolete patches *geary-0.5.3 (05 Mar 2014) diff --git a/mail-client/geary/files/geary-0.3.1-ayatana.patch b/mail-client/geary/files/geary-0.3.1-ayatana.patch deleted file mode 100644 index 276569c55111..000000000000 --- a/mail-client/geary/files/geary-0.3.1-ayatana.patch +++ /dev/null @@ -1,44 +0,0 @@ -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) diff --git a/mail-client/geary/files/geary-0.3.1-cflags.patch b/mail-client/geary/files/geary-0.3.1-cflags.patch deleted file mode 100644 index 8290695b6644..000000000000 --- a/mail-client/geary/files/geary-0.3.1-cflags.patch +++ /dev/null @@ -1,23 +0,0 @@ -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 diff --git a/mail-client/geary/files/geary-0.4.0-cflags.patch b/mail-client/geary/files/geary-0.4.0-cflags.patch deleted file mode 100644 index 7a7666b2c4f8..000000000000 --- a/mail-client/geary/files/geary-0.4.0-cflags.patch +++ /dev/null @@ -1,27 +0,0 @@ -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.0-unity.patch b/mail-client/geary/files/geary-0.4.0-unity.patch deleted file mode 100644 index c2657dbe5889..000000000000 --- a/mail-client/geary/files/geary-0.4.0-unity.patch +++ /dev/null @@ -1,31 +0,0 @@ -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) diff --git a/mail-client/geary/files/geary-0.4.2-cflags.patch b/mail-client/geary/files/geary-0.4.2-cflags.patch deleted file mode 100644 index 7a7666b2c4f8..000000000000 --- a/mail-client/geary/files/geary-0.4.2-cflags.patch +++ /dev/null @@ -1,27 +0,0 @@ -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.2-unity.patch b/mail-client/geary/files/geary-0.4.2-unity.patch deleted file mode 100644 index eeb61139ab93..000000000000 --- a/mail-client/geary/files/geary-0.4.2-unity.patch +++ /dev/null @@ -1,31 +0,0 @@ -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(WEBKITGTK22X QUIET webkitgtk-3.0>=2.2.0) - - # intl diff --git a/mail-client/geary/files/geary-0.5.0-cflags.patch b/mail-client/geary/files/geary-0.5.0-cflags.patch deleted file mode 100644 index 7a7666b2c4f8..000000000000 --- a/mail-client/geary/files/geary-0.5.0-cflags.patch +++ /dev/null @@ -1,27 +0,0 @@ -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.5.0-unity.patch b/mail-client/geary/files/geary-0.5.0-unity.patch deleted file mode 100644 index 837b37f372ad..000000000000 --- a/mail-client/geary/files/geary-0.5.0-unity.patch +++ /dev/null @@ -1,31 +0,0 @@ -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) - diff --git a/mail-client/geary/files/geary-0.5.1-cflags.patch b/mail-client/geary/files/geary-0.5.1-cflags.patch deleted file mode 100644 index 7a7666b2c4f8..000000000000 --- a/mail-client/geary/files/geary-0.5.1-cflags.patch +++ /dev/null @@ -1,27 +0,0 @@ -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.5.1-unity.patch b/mail-client/geary/files/geary-0.5.1-unity.patch deleted file mode 100644 index 7bf282963564..000000000000 --- a/mail-client/geary/files/geary-0.5.1-unity.patch +++ /dev/null @@ -1,31 +0,0 @@ -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.1-vapigen.patch b/mail-client/geary/files/geary-0.5.1-vapigen.patch deleted file mode 100644 index 18b3c8049b4b..000000000000 --- a/mail-client/geary/files/geary-0.5.1-vapigen.patch +++ /dev/null @@ -1,29 +0,0 @@ -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 |