diff options
author | Pacho Ramos <pacho@gentoo.org> | 2014-12-11 11:28:50 +0000 |
---|---|---|
committer | Pacho Ramos <pacho@gentoo.org> | 2014-12-11 11:28:50 +0000 |
commit | 5e5a20138f9b7564a1e17f94652aa47f958150bd (patch) | |
tree | c706a1b0887b110849680c1938368f4ba4e13177 /mail-client | |
parent | m68k/s390/sh stable (diff) | |
download | gentoo-2-5e5a20138f9b7564a1e17f94652aa47f958150bd.tar.gz gentoo-2-5e5a20138f9b7564a1e17f94652aa47f958150bd.tar.bz2 gentoo-2-5e5a20138f9b7564a1e17f94652aa47f958150bd.zip |
Fix building (#512206), drop evolution support as it requires a ton of different patches on nearly every evolution bump
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)
Diffstat (limited to 'mail-client')
12 files changed, 139 insertions, 348 deletions
diff --git a/mail-client/mail-notification/ChangeLog b/mail-client/mail-notification/ChangeLog index 315e9a939a47..bc1c44efa084 100644 --- a/mail-client/mail-notification/ChangeLog +++ b/mail-client/mail-notification/ChangeLog @@ -1,6 +1,22 @@ # ChangeLog for mail-client/mail-notification # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/mail-client/mail-notification/ChangeLog,v 1.121 2014/06/08 19:23:21 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-client/mail-notification/ChangeLog,v 1.122 2014/12/11 11:28:50 pacho Exp $ + +*mail-notification-5.4-r8 (11 Dec 2014) + + 11 Dec 2014; Pacho Ramos <pacho@gentoo.org> + +files/mail-notification-dont-link-against-bsd-compat.patch, + +mail-notification-5.4-r8.ebuild, -files/mail-notification-5.4-asneeded.patch, + -files/mail-notification-5.4-dont-update-cache.patch, + -files/mail-notification-5.4-e-d-s-2.24.patch, + -files/mail-notification-5.4-e-d-s.patch, + -files/mail-notification-5.4-evolution-gtkhtml.patch, + -files/mail-notification-5.4-fix-markup.patch, + -files/mail-notification-5.4-gmime.patch, + -files/mail-notification-5.4-icons.patch, + -files/mail-notification-5.4-sasl_encode64.patch: + Fix building (#512206), drop evolution support as it requires a ton of + different patches on nearly every evolution bump 08 Jun 2014; Pacho Ramos <pacho@gentoo.org> metadata.xml: Move to maintainer needed as I am no longer taking care of it and noone from diff --git a/mail-client/mail-notification/files/mail-notification-5.4-asneeded.patch b/mail-client/mail-notification/files/mail-notification-5.4-asneeded.patch deleted file mode 100644 index 30d53002b08a..000000000000 --- a/mail-client/mail-notification/files/mail-notification-5.4-asneeded.patch +++ /dev/null @@ -1,39 +0,0 @@ -Fixing as-needed issues - -http://bugs.gentoo.org/show_bug.cgi?id=317905 - -Patch written by Kacper Kowalik <xarthisius.kk@gmail.com> - ---- jb -+++ jb -@@ -89,10 +89,11 @@ - - mkdir -p build/jbsrc || exit 1 - -- if ! gobject_cflags_libs=`pkg-config --cflags --libs 'gobject-2.0 >= 2.8.0' 2>/dev/null`; then -+ if ! gobject_cflags=`pkg-config --cflags 'gobject-2.0 >= 2.8.0' 2>/dev/null`; then - echo "ERROR: the GLib library was not found" >&2 - exit 1 - fi -+ gobject_libs=`pkg-config --libs 'gobject-2.0 >= 2.8.0' 2>/dev/null` - - sed -e 's|^#jb_include ["<]\(.*\)[">]|#include "\1.h"|' \ - jbsrc/jb.c > build/jbsrc/jb.c || exit 1 -@@ -103,14 +104,15 @@ - -DG_LOG_DOMAIN="\"jb\"" \ - -DJB_SOURCES="\"$jb_c_sources $jb_h_sources\"" \ - -DJB_PACKAGE_SOURCES="\"$jb_c_package_sources $jb_h_package_sources\"" \ -- $gobject_cflags_libs \ -+ $gobject_cflags \ - $jb_cflags \ - $jb_cppflags \ - $jb_ldflags \ - build/jbsrc/jb.c \ - $jb_c_sources \ - $jb_c_package_sources \ -- $jb_libs; then -+ $jb_libs \ -+ $gobject_libs; then - echo "ERROR: cannot build jb" >&2 - exit 1 - fi diff --git a/mail-client/mail-notification/files/mail-notification-5.4-dont-update-cache.patch b/mail-client/mail-notification/files/mail-notification-5.4-dont-update-cache.patch deleted file mode 100644 index 6cdade158a71..000000000000 --- a/mail-client/mail-notification/files/mail-notification-5.4-dont-update-cache.patch +++ /dev/null @@ -1,25 +0,0 @@ -Our gnome2 eclass takes care of proper rebuilding on the icon -cache. We have to remove this also because it causes access -violations. ---- jbsrc/jb.c.~1~ 2008-03-20 16:53:02.000000000 +0100 -+++ jbsrc/jb.c 2008-03-26 20:51:45.641363619 +0100 -@@ -327,7 +327,6 @@ - jb_package_add_resources (void) - { - JBGroup *group; -- JBRule *rule; - JBObject *object; - - if (jb_variable_get_bool("compile-warnings")) -@@ -362,11 +361,6 @@ - if (jb_variable_get_bool("hotmail")) - jb_group_add_data_file(group, "hotmail.png", "$pkgdatadir"); - -- rule = jb_rule_new(); -- jb_rule_set_install_message(rule, "updating the GTK+ icon cache"); -- jb_rule_add_install_command(rule, "-gtk-update-icon-cache -f -t $datadir/icons/hicolor"); -- jb_group_add_resource(group, JB_GROUP_RESOURCE(rule)); -- - jb_group_add(group); - - /*** data ******************************************************************/ diff --git a/mail-client/mail-notification/files/mail-notification-5.4-e-d-s-2.24.patch b/mail-client/mail-notification/files/mail-notification-5.4-e-d-s-2.24.patch deleted file mode 100644 index ed40d4457b77..000000000000 --- a/mail-client/mail-notification/files/mail-notification-5.4-e-d-s-2.24.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- build/src/mn-evolution-server.c.~1~ 2008-05-22 17:47:48.000000000 +0200 -+++ build/src/mn-evolution-server.c 2009-03-30 20:02:17.936196624 +0200 -@@ -595,7 +595,8 @@ - - for (i = 0; i < summary->len; i++) - { -- CamelMessageInfo *info = summary->pdata[i]; -+ char *uid = summary->pdata[i]; -+ CamelMessageInfo *info = camel_folder_get_message_info(folder, uid); - - if ((camel_message_info_flags(info) & CAMEL_MESSAGE_SEEN) == 0) - g_ptr_array_add(*ret, self_camel_message_info_to_dbus_struct(info)); diff --git a/mail-client/mail-notification/files/mail-notification-5.4-e-d-s.patch b/mail-client/mail-notification/files/mail-notification-5.4-e-d-s.patch deleted file mode 100644 index 073818afed2d..000000000000 --- a/mail-client/mail-notification/files/mail-notification-5.4-e-d-s.patch +++ /dev/null @@ -1,102 +0,0 @@ ---- build/src/mn-evolution-server.c.orig 2008-09-30 15:30:07.756216978 +0200 -+++ build/src/mn-evolution-server.c 2008-09-30 15:30:49.950220711 +0200 -@@ -27,6 +27,7 @@ - #include <stdio.h> - #include <libintl.h> - #include <gobject/gvaluecollector.h> -+#include <libedataserver/eds-version.h> - #include <camel/camel-folder.h> - #include <mail/em-folder-view.h> - #include <mail/em-format.h> -@@ -595,7 +596,12 @@ - - for (i = 0; i < summary->len; i++) - { -+#if EDS_CHECK_VERSION(2,23,5) -+ char *uid = summary->pdata[i]; -+ CamelMessageInfo *info = camel_folder_get_message_info(folder, uid); -+#else - CamelMessageInfo *info = summary->pdata[i]; -+#endif - - if ((camel_message_info_flags(info) & CAMEL_MESSAGE_SEEN) == 0) - g_ptr_array_add(*ret, self_camel_message_info_to_dbus_struct(info)); ---- build/src/mn-evolution-folder-tree-server.c.evolution 2010-02-01 10:00:12.128683776 -0500 -+++ build/src/mn-evolution-folder-tree-server.c 2010-02-01 10:02:32.809697243 -0500 -@@ -26,5 +26,8 @@ - #include <dbus/dbus.h> -+#include <libedataserver/eds-version.h> -+#if !EDS_CHECK_VERSION(2,29,0) - #include <mail/mail-component.h> -+#endif - #include <mail/em-folder-tree.h> - #include "mn-evolution-plugin.h" - #include "mn-evolution.h" -@@ -396,7 +399,11 @@ mn_evolution_folder_tree_server_construc - -+#if EDS_CHECK_VERSION(2,29,0) -+ selfp->tree = em_folder_tree_new(); -+#else - EMFolderTreeModel *model; - - model = mail_component_peek_tree_model(mail_component_peek()); - selfp->tree = em_folder_tree_new_with_model(model); -+#endif - - selfp->plug = gtk_plug_new((GdkNativeWindow) selfp->id); ---- build/src/mn-evolution-server.c.evolution 2010-02-01 10:06:36.484698060 -0500 -+++ build/src/mn-evolution-server.c 2010-02-01 10:09:01.946682081 -0500 -@@ -28,9 +28,14 @@ - #include <gobject/gvaluecollector.h> - #include <libedataserver/eds-version.h> - #include <camel/camel-folder.h> -+#if EDS_CHECK_VERSION(2,29,0) -+#include <shell/e-shell.h> -+#include <mail/e-mail-browser.h> -+#else - #include <mail/em-folder-view.h> - #include <mail/em-format.h> - #include <mail/em-message-browser.h> -+#endif - #include <mail/em-utils.h> - #include <mail/mail-session.h> - #include <mail/mail-tools.h> -@@ -568,6 +573,19 @@ mn_evolution_server_open_message (MNEvol - folder = self_lookup_folder(folder_uri, err); - if (folder) - { -+#if EDS_CHECK_VERSION(2,29,0) -+ EShell *shell; -+ EShellBackend *shell_backend; -+ GtkWidget *browser; -+ -+ shell = e_shell_get_default (); -+ shell_backend = e_shell_get_backend_by_name (shell, "mail"); -+ -+ browser = e_mail_browser_new (shell_backend); -+ e_mail_reader_set_folder (E_MAIL_READER (browser), folder, folder_uri); -+ e_mail_reader_set_message (E_MAIL_READER (browser), message_uid); -+ gtk_widget_show (browser); -+#else - GtkWidget *browser; - - /* modelled after Evolution's handleuri_got_folder() */ -@@ -578,6 +596,7 @@ mn_evolution_server_open_message (MNEvol - em_folder_view_set_folder((EMFolderView *) browser, folder, folder_uri); - em_folder_view_set_message((EMFolderView *) browser, message_uid, FALSE); - gtk_widget_show(((EMMessageBrowser *) browser)->window); -+#endif - - camel_object_unref(folder); - } ---- src/mn-evolution-plugin.c.evolution 2008-05-22 11:45:35.000000000 -0400 -+++ src/mn-evolution-plugin.c 2010-02-01 11:52:06.141664757 -0500 -@@ -204,7 +204,7 @@ connect_to_session_bus (void) - } - - int --e_plugin_lib_enable (EPluginLib *ep, int enable) -+e_plugin_lib_enable (EPlugin *ep, int enable) - { - static gboolean enabled = FALSE; - GError *err = NULL; diff --git a/mail-client/mail-notification/files/mail-notification-5.4-evolution-gtkhtml.patch b/mail-client/mail-notification/files/mail-notification-5.4-evolution-gtkhtml.patch deleted file mode 100644 index 1e7fa2b5305a..000000000000 --- a/mail-client/mail-notification/files/mail-notification-5.4-evolution-gtkhtml.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nrbu mail-notification-5.4/jbsrc/lib/src/extras/jb-evolution-plugin.c mail-notification-5.4-OK/jbsrc/lib/src/extras/jb-evolution-plugin.c ---- mail-notification-5.4/jbsrc/lib/src/extras/jb-evolution-plugin.c 2008-04-27 18:47:43.000000000 +0400 -+++ mail-notification-5.4-OK/jbsrc/lib/src/extras/jb-evolution-plugin.c 2009-08-21 19:48:22.000000000 +0400 -@@ -41,7 +41,7 @@ - if (! minversion) - minversion = "2.12"; - -- packages = g_strdup_printf("evolution-plugin >= %s", minversion); -+ packages = g_strdup_printf("evolution-plugin >= %s libgtkhtml-3.14 gtkhtml-editor", minversion); - result = jb_check_packages("Evolution", "evolution-plugin", packages); - g_free(packages); - diff --git a/mail-client/mail-notification/files/mail-notification-5.4-fix-markup.patch b/mail-client/mail-notification/files/mail-notification-5.4-fix-markup.patch deleted file mode 100644 index b5d826eb2808..000000000000 --- a/mail-client/mail-notification/files/mail-notification-5.4-fix-markup.patch +++ /dev/null @@ -1,34 +0,0 @@ -Fix markup to a format that is also supported by newer -notification-daemon versions, e.g. the one used in Gnome 3. - -https://bugs.gentoo.org/show_bug.cgi?id=392599 - -diff -urp mail-notification-5.4.orig/src/mn-popup.gob mail-notification-5.4/src/mn-popup.gob ---- mail-notification-5.4.orig/src/mn-popup.gob 2008-05-22 16:45:36.000000000 +0100 -+++ mail-notification-5.4/src/mn-popup.gob 2011-11-30 13:34:40.000000000 +0000 -@@ -136,7 +136,7 @@ class MN:Popup from Notify:Notification - if (*body->str) - g_string_append_c(body, '\n'); - -- g_string_append_printf(body, "<span weight=\"bold\">%s</span>", name); -+ g_string_append_printf(body, "<b>%s</b>", name); - - escaped = g_markup_escape_text(value, -1); - g_string_append_printf(body, " %s", escaped); -diff -urp mail-notification-5.4.orig/build/src/mn-popup.c mail-notification-5.4/build/src/mn-popup.c ---- mail-notification-5.4.orig/build/src/mn-popup.c 2008-05-22 16:47:49.000000000 +0100 -+++ mail-notification-5.4/build/src/mn-popup.c 2011-11-30 13:35:37.000000000 +0000 -@@ -434,7 +434,7 @@ mn_popup_append_row (GString * body, con - if (*body->str) - g_string_append_c(body, '\n'); - -- g_string_append_printf(body, "<span weight=\"bold\">%s</span>", name); -+ g_string_append_printf(body, "<b>%s</b>", name); - - escaped = g_markup_escape_text(value, -1); - g_string_append_printf(body, " %s", escaped); -diff -urp mail-notification-5.4.orig/build/src/mn-popup.gob.stamp mail-notification-5.4/build/src/mn-popup.gob.stamp ---- mail-notification-5.4.orig/build/src/mn-popup.gob.stamp 2008-05-22 16:47:49.000000000 +0100 -+++ mail-notification-5.4/build/src/mn-popup.gob.stamp 2011-11-30 13:38:09.000000000 +0000 -@@ -0,0 +1 @@ -+ diff --git a/mail-client/mail-notification/files/mail-notification-5.4-gmime.patch b/mail-client/mail-notification/files/mail-notification-5.4-gmime.patch deleted file mode 100644 index 0d16357fbb6b..000000000000 --- a/mail-client/mail-notification/files/mail-notification-5.4-gmime.patch +++ /dev/null @@ -1,63 +0,0 @@ -diff -Nrbu mail-notification-5.4/build/src/mn-base-mbox-mailbox-backend.c mail-notification-5.4-OK/build/src/mn-base-mbox-mailbox-backend.c ---- mail-notification-5.4/build/src/mn-base-mbox-mailbox-backend.c 2008-12-23 14:48:49.000000000 +0300 -+++ mail-notification-5.4-OK/build/src/mn-base-mbox-mailbox-backend.c 2008-12-23 14:48:28.000000000 +0300 -@@ -265,7 +265,7 @@ - mime_message = g_mime_parser_construct_message(parser); - if (mime_message) - { -- if (g_mime_message_get_header(mime_message, "X-Mozilla-Status")) -+ if (g_mime_object_get_header(mime_message, "X-Mozilla-Status")) - { - #if WITH_MOZILLA - type = MN_TYPE_MOZILLA_MAILBOX_BACKEND; -diff -Nrbu mail-notification-5.4/build/src/mn-mozilla-mailbox-backend.c mail-notification-5.4-OK/build/src/mn-mozilla-mailbox-backend.c ---- mail-notification-5.4/build/src/mn-mozilla-mailbox-backend.c 2008-12-23 14:48:49.000000000 +0300 -+++ mail-notification-5.4-OK/build/src/mn-mozilla-mailbox-backend.c 2008-12-23 14:46:47.000000000 +0300 -@@ -167,7 +167,7 @@ - - const char *header; - -- header = g_mime_message_get_header(mime_message, header_name); -+ header = g_mime_object_get_header(mime_message, header_name); - if (header && mn_str_ishex(header)) - return strtol(header, NULL, 16); - else -diff -Nrbu mail-notification-5.4/jbsrc/jb.c mail-notification-5.4-OK/jbsrc/jb.c ---- mail-notification-5.4/jbsrc/jb.c 2008-05-22 19:47:04.000000000 +0400 -+++ mail-notification-5.4-OK/jbsrc/jb.c 2008-12-23 14:43:09.000000000 +0300 -@@ -166,7 +166,7 @@ - jb_require_packages("GNOME", "gnome", "glib-2.0 >= 2.14 gthread-2.0 gconf-2.0 >= 2.4.0 gtk+-2.0 >= 2.12 libgnomeui-2.0 >= 2.14.0 gnome-vfs-2.0 libglade-2.0 libxml-2.0 libnotify >= 0.4.1"); - jb_require_packages("D-Bus", "dbus", "dbus-glib-1"); - -- jb_check_packages_for_options("GMime", "gmime", "gmime-2.0 >= 2.2.7", -+ jb_check_packages_for_options("GMime", "gmime", "gmime-2.4", - "hotmail", - "imap", - "maildir", -diff -Nrbu mail-notification-5.4/src/mn-message-mime.c mail-notification-5.4-OK/src/mn-message-mime.c ---- mail-notification-5.4/src/mn-message-mime.c 2008-05-22 19:45:35.000000000 +0400 -+++ mail-notification-5.4-OK/src/mn-message-mime.c 2008-12-23 14:46:35.000000000 +0300 -@@ -33,12 +33,12 @@ - g_return_val_if_fail(GMIME_IS_MESSAGE(mime_message), FALSE); - - /* SpamAssassin */ -- spam = g_mime_message_get_header(mime_message, "X-Spam-Status"); -+ spam = g_mime_object_get_header(mime_message, "X-Spam-Status"); - if (spam && mn_ascii_str_case_has_prefix(spam, "yes")) - return TRUE; - - /* bogofilter */ -- spam = g_mime_message_get_header(mime_message, "X-Bogosity"); -+ spam = g_mime_object_get_header(mime_message, "X-Bogosity"); - if (spam && mn_ascii_str_case_has_prefix(spam, "yes")) - return TRUE; - -@@ -89,7 +89,7 @@ - { - const char *status; - -- status = g_mime_message_get_header(mime_message, "Status"); -+ status = g_mime_object_get_header(mime_message, "Status"); - if (status && strchr(status, 'R')) - return NULL; /* the message was read */ - else if (status && strchr(status, 'O')) diff --git a/mail-client/mail-notification/files/mail-notification-5.4-icons.patch b/mail-client/mail-notification/files/mail-notification-5.4-icons.patch deleted file mode 100644 index 66e09b2aa33e..000000000000 --- a/mail-client/mail-notification/files/mail-notification-5.4-icons.patch +++ /dev/null @@ -1,36 +0,0 @@ -Patch by Fedora to use icons that are available in Gnome 2.30+ - -https://bugzilla.redhat.com/show_bug.cgi?id=573809 - ---- src/mn-stock.c.icons 2008-05-22 16:45:35.000000000 +0100 -+++ src/mn-stock.c 2010-05-20 21:53:20.306859177 +0100 -@@ -32,11 +32,11 @@ - const char *icon_name; - const char *source_stock_id; - } icons[] = { -- { MN_STOCK_MAIL, NULL, "stock_mail" }, -- { MN_STOCK_NO_MAIL, NULL, "stock_inbox" }, -+ { MN_STOCK_MAIL, NULL, "mail-notification" }, -+ { MN_STOCK_NO_MAIL, NULL, "mail-notification" }, - { MN_STOCK_LOCAL, NULL, "stock_folder" }, - { MN_STOCK_REMOTE, NULL, "stock_internet" }, -- { MN_STOCK_UNKNOWN, NULL, "stock_unknown" }, -+ { MN_STOCK_UNKNOWN, NULL, "unknown" }, - { MN_STOCK_ERROR, NULL, NULL, GTK_STOCK_DIALOG_ERROR }, - #if WITH_GMAIL - { MN_STOCK_GMAIL, PKGDATADIR G_DIR_SEPARATOR_S "gmail.png" }, -@@ -51,11 +51,11 @@ - { MN_STOCK_SYSTEM_MAILBOX, NULL, "system" }, - #endif - #if WITH_EVOLUTION -- { MN_STOCK_EVOLUTION_MAILBOX, NULL, "evolution" }, -+ { MN_STOCK_EVOLUTION_MAILBOX, NULL, "stock_mail-unread" }, - #endif -- { MN_STOCK_MAIL_READER, NULL, "stock_mail-handling" }, -+ { MN_STOCK_MAIL_READER, NULL, "stock_mail-compose" }, - { MN_STOCK_OPEN_MESSAGE, NULL, "stock_mail-open" }, -- { MN_STOCK_CONSIDER_NEW_MAIL_AS_READ, NULL, "stock_mark" } -+ { MN_STOCK_CONSIDER_NEW_MAIL_AS_READ, NULL, "mail-mark-read" } - }; - GtkIconFactory *factory; - GtkIconTheme *icon_theme; diff --git a/mail-client/mail-notification/files/mail-notification-5.4-sasl_encode64.patch b/mail-client/mail-notification/files/mail-notification-5.4-sasl_encode64.patch deleted file mode 100644 index 80a7304d10d1..000000000000 --- a/mail-client/mail-notification/files/mail-notification-5.4-sasl_encode64.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -up mail-notification-5.4/build/src/mn-pop3-mailbox.c mail-notification-5.4-OK/build/src/mn-pop3-mailbox.c ---- mail-notification-5.4/build/src/mn-pop3-mailbox.c 2009-05-19 10:29:58.448201837 +0200 -+++ mail-notification-5.4-OK/build/src/mn-pop3-mailbox.c 2009-05-19 10:23:29.356204287 +0200 -@@ -619,7 +619,7 @@ mn_pop3_mailbox_enter_auth_cb (MNClientS - - if (initial_clientoutlen > 0) - { -- char buf64[initial_clientoutlen * 2]; /* Base64 is 33% larger than the data it encodes */ -+ char buf64[initial_clientoutlen * 2 + 1]; /* Base64 is 33% larger than the data it encodes */ - unsigned int outlen; - int result; - char *str; -diff -up mail-notification-5.4/src/mn-client-session.c mail-notification-5.4-OK/src/mn-client-session.c ---- mail-notification-5.4/src/mn-client-session.c 2008-05-22 17:45:35.000000000 +0200 -+++ mail-notification-5.4-OK/src/mn-client-session.c 2009-05-19 10:29:09.112211055 +0200 -@@ -1030,7 +1030,7 @@ mn_client_session_write (MNClientSession - static int - write_base64 (MNClientSession *session, const char *buf, unsigned int len) - { -- char buf64[len * 2]; /* Base64 is 33% larger than the data it encodes */ -+ char buf64[len * 2 + 1]; /* Base64 is 33% larger than the data it encodes */ - unsigned int outlen; - int result; - char *str; diff --git a/mail-client/mail-notification/files/mail-notification-dont-link-against-bsd-compat.patch b/mail-client/mail-notification/files/mail-notification-dont-link-against-bsd-compat.patch new file mode 100644 index 000000000000..e246a8cc9389 --- /dev/null +++ b/mail-client/mail-notification/files/mail-notification-dont-link-against-bsd-compat.patch @@ -0,0 +1,10 @@ +--- jbsrc/jb.c.orig 2014-01-19 20:06:48.525462981 +0100 ++++ jbsrc/jb.c 2014-01-19 20:07:36.087934897 +0100 +@@ -425,7 +425,6 @@ + */ + jb_compile_options_add_cflags(object->compile_options, "-std=c99"); + jb_compile_options_add_cppflags(object->compile_options, "-D_BSD_SOURCE -D_POSIX_C_SOURCE=199309L"); +- jb_compile_options_add_libs(object->compile_options, "-lbsd-compat"); + } + + jb_compile_options_add_string_defines(object->compile_options, diff --git a/mail-client/mail-notification/mail-notification-5.4-r8.ebuild b/mail-client/mail-notification/mail-notification-5.4-r8.ebuild new file mode 100644 index 000000000000..a4621680f8d3 --- /dev/null +++ b/mail-client/mail-notification/mail-notification-5.4-r8.ebuild @@ -0,0 +1,112 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/mail-client/mail-notification/mail-notification-5.4-r8.ebuild,v 1.1 2014/12/11 11:28:49 pacho Exp $ + +EAPI=5 +GCONF_DEBUG="no" + +inherit gnome2 eutils multilib flag-o-matic toolchain-funcs + +DESCRIPTION="Status icon informing about new mail" +HOMEPAGE="http://www.nongnu.org/mailnotify/ https://github.com/epienbroek/mail-notification" + +GIT_REVISION="eab5c13" # Same as Fedora +SRC_URI="https://github.com/epienbroek/${PN}/tarball/${GIT_REVISION} -> ${PN}-${GIT_REVISION}.tar.gz" +S="${WORKDIR}/epienbroek-${PN}-${GIT_REVISION}" + +KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-linux" +SLOT="0" +LICENSE="GPL-3" +IUSE="+gnome-keyring sasl +sound ssl sylpheed" + +LANGS="bg ca cs de es fr ja nl pl pt pt_BR ru sr sr@Latn sv" +for lang in ${LANGS}; do + IUSE+=" linguas_${lang}" +done + +# gmime is actually optional, but it's used by so much of the package +# it's pointless making it optional. gnome-keyring is required for +# several specific access methods, and thus linked to those USE flags +# instead of adding a keyring USE flag. +RDEPEND=" + x11-libs/gtk+:3 + >=dev-libs/glib-2.14:2 + >=gnome-base/gconf-2.6 + >=gnome-base/libgnomeui-2.14 + dev-libs/dbus-glib + dev-libs/gmime:2.6 + >=x11-libs/libnotify-0.4.1 + gnome-keyring? ( gnome-base/libgnome-keyring ) + ssl? ( >=dev-libs/openssl-0.9.6 ) + sasl? ( >=dev-libs/cyrus-sasl-2 ) + sound? ( media-libs/gstreamer:0.10 ) + sylpheed? ( mail-client/sylpheed ) +" +DEPEND="${RDEPEND} + app-text/scrollkeeper + dev-util/gob + sys-devel/gettext + virtual/pkgconfig + >=dev-util/intltool-0.35.0 +" +# this now uses JB (the Jean-Yves Lefort's Build System) as a build system +# instead of autotools, this is a little helper function that basically does +# the same thing as use_enable +use_var() { + echo "${2:-$1}=$(usex $1)" +} + +src_prepare() { + sed -i -e '/jb_rule_set_install_message/d' \ + -e '/jb_rule_add_install_command/d' \ + jbsrc/jb.c || die + + # Ensure we never append -Werror + sed -i -e 's/ -Werror//' jb jbsrc/jb.c || die + + # We are not Ubuntu, and this could be the cause of #215281 + epatch "${FILESDIR}/${P}-remove-ubuntu-special-case.patch" + + # Apply Fedora patches + # Fix gcc warning + epatch "${FILESDIR}/${PN}-jb-gcc-format.patch" + # Support aarch64 + epatch "${FILESDIR}/${PN}-aarch64.patch" + # Fix build with latest libc + epatch "${FILESDIR}/${PN}-dont-link-against-bsd-compat.patch" +} + +src_configure() { + set -- \ + ./jb configure destdir="${D}" prefix="${EPREFIX}/usr" libdir="${EPREFIX}/usr/$(get_libdir)" \ + sysconfdir="${EPREFIX}/etc" localstatedir="${EPREFIX}/var" cc="$(tc-getCC)" \ + cflags="${CFLAGS}" cppflags="${CXXFLAGS}" ldflags="${LDFLAGS}" \ + scrollkeeper-dir="${EPREFIX}/var/lib/scrollkeeper" \ + $(use_var gnome-keyring gmail) \ + $(use_var gnome-keyring imap) \ + $(use_var gnome-keyring pop3) \ + $(use_var sasl) \ + $(use_var ssl) \ + $(use_var sylpheed) + echo "$@" + "$@" || die +} + +src_compile() { + ./jb build || die +} + +src_install() { + GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL="1" ./jb install || die + dodoc NEWS README AUTHORS TODO TRANSLATING + rm -rf "${ED}/var/lib/scrollkeeper" + + einfo "Cleaning up locales..." + for lang in ${LANGS}; do + use "linguas_${lang}" && { + einfo "- keeping ${lang}" + continue + } + rm -Rf "${D}"/usr/share/locale/"${lang}" || die + done +} |