From 3567a49f79d2dbf828b723ab54982fa6c7ea1c80 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 4 Oct 2011 23:14:30 +0000 Subject: Tue Oct 4 23:14:30 UTC 2011 --- extra/mail-notification/PKGBUILD | 14 ++--- ...il-notification-5.4-evolution-3-0-support.patch | 54 ++++++++++++++++++- .../mail-notification-5.4-gtk3-support.patch | 60 +++++++++++++++++----- 3 files changed, 107 insertions(+), 21 deletions(-) (limited to 'extra/mail-notification') diff --git a/extra/mail-notification/PKGBUILD b/extra/mail-notification/PKGBUILD index b5b1deeff..edb5a8d03 100644 --- a/extra/mail-notification/PKGBUILD +++ b/extra/mail-notification/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 119734 2011-04-14 10:44:43Z jgc $ +# $Id: PKGBUILD 139560 2011-10-03 13:09:05Z jgc $ # Maintainer: Roman Kyrylych pkgname=mail-notification pkgver=5.4 -pkgrel=8 +pkgrel=9 pkgdesc="Tray icon application that informs you if you have new mail" arch=('i686' 'x86_64') url="http://www.nongnu.org/mailnotify/" license=('GPL3' 'FDL') -depends=('cyrus-sasl-plugins' 'gmime' 'libnotify>=0.7.1' 'gnome-keyring' 'hicolor-icon-theme' 'notification-daemon' 'libgnome') -makedepends=('gob2' 'intltool' 'evolution' 'gnome-doc-utils') +depends=('gmime' 'libnotify>=0.7.1' 'gnome-keyring' 'hicolor-icon-theme' 'notification-daemon' 'libgnome') +makedepends=('gob2' 'intltool' 'evolution' 'gnome-doc-utils' 'gtk2') options=('!libtool' '!emptydirs') install=mail-notification.install -source=(http://savannah.nongnu.org/download/mailnotify/${pkgname}-${pkgver}.tar.bz2 +source=(http://savannah.nongnu.org/download/mailnotify-orig/${pkgname}-${pkgver}.tar.bz2 dont-update-cache.patch remove-ubuntu-special-case.patch mail-notification-5.4-evolution.patch @@ -39,8 +39,8 @@ md5sums=('c8dc33a61251acb5474e56eab6b18f43' '31bde95dfd39449959d8b3316f91429c' 'cdead6a88d1779f69a5f40dc75d5cb84' 'c7991b831834724eddc1c6802c3e06a6' - '49fe910f68393b0f6a1f1bcb7a8bdcd3' - '55ed1aeb56ca053cc1a0a6062761c2b4' + 'b370b1085ebb2814bd5d345a6d2b45ea' + '1ba948759110787dd57097cff157b75a' '09df61b4dc29c676ac81ff9054e840ac') build() { diff --git a/extra/mail-notification/mail-notification-5.4-evolution-3-0-support.patch b/extra/mail-notification/mail-notification-5.4-evolution-3-0-support.patch index 51a0eb519..51938b5fa 100644 --- a/extra/mail-notification/mail-notification-5.4-evolution-3-0-support.patch +++ b/extra/mail-notification/mail-notification-5.4-evolution-3-0-support.patch @@ -28,6 +28,18 @@ #include #include #include "mn-evolution.h" +@@ -240,7 +241,11 @@ + EMEventTargetFolder *folder) + { + if (evo_server) ++#if EDS_CHECK_VERSION(3,1,0) ++ mn_evolution_server_folder_changed(evo_server, e_mail_folder_uri_build(folder->store, folder->folder_name)); ++#else + mn_evolution_server_folder_changed(evo_server, folder->uri); ++#endif + } + + void @@ -249,10 +250,16 @@ { if (evo_server) @@ -38,7 +50,7 @@ +#else + char *url = mail_tools_folder_to_url(message->folder); +#endif - + - url = mail_tools_folder_to_url(message->folder); mn_evolution_server_message_reading(evo_server, url); + @@ -68,3 +80,43 @@ if (folder) self_cache_folder(uri, folder); else +@@ -677,7 +681,12 @@ + folder = self_lookup_folder(folder_uri, err); + if (folder) + { ++#if EDS_CHECK_VERSION(3,1,0) ++ *ret = g_strdup(camel_folder_get_display_name(folder)); ++#else + *ret = g_strdup(camel_folder_get_name(folder)); ++#endif ++ + #if EDS_CHECK_VERSION(2,31,0) + g_object_unref(folder); + #else +@@ -725,8 +734,12 @@ + shell = e_shell_get_default (); + shell_backend = e_shell_get_backend_by_name (shell, "mail"); + +- browser = e_mail_browser_new (shell_backend); ++ browser = e_mail_browser_new (E_MAIL_BACKEND(shell_backend)); ++#if EDS_CHECK_VERSION(3,1,0) ++ e_mail_reader_set_folder (E_MAIL_READER (browser), folder); ++#else + e_mail_reader_set_folder (E_MAIL_READER (browser), folder, folder_uri); ++#endif + e_mail_reader_set_message (E_MAIL_READER (browser), message_uid); + gtk_widget_show (browser); + #else +--- build/src/mn-evolution-folder-tree-server.c.orig 2011-06-17 22:01:49.226886994 +0200 ++++ build/src/mn-evolution-folder-tree-server.c 2011-06-18 00:34:23.046889847 +0200 +@@ -444,7 +444,9 @@ + { + #line 61 "src/mn-evolution-folder-tree-server.gob" + +-#if EDS_CHECK_VERSION(2,91,0) ++#if EDS_CHECK_VERSION(3,1,0) ++ selfp->tree = em_folder_tree_new(NULL, NULL); ++#elif EDS_CHECK_VERSION(2,91,0) + selfp->session = e_mail_session_new(); + selfp->tree = em_folder_tree_new(selfp->session); + #elif EDS_CHECK_VERSION(2,29,0) diff --git a/extra/mail-notification/mail-notification-5.4-gtk3-support.patch b/extra/mail-notification/mail-notification-5.4-gtk3-support.patch index cd19c2e84..6a29f8622 100644 --- a/extra/mail-notification/mail-notification-5.4-gtk3-support.patch +++ b/extra/mail-notification/mail-notification-5.4-gtk3-support.patch @@ -20,7 +20,7 @@ + jb_require_packages("GNOME", "gnome", "glib-2.0 >= 2.14 gthread-2.0 gconf-2.0 >= 2.4.0 gtk+-3.0 libgnome-2.0 >= 2.14.0 gnome-vfs-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.4", + jb_check_packages_for_options("GMime", "gmime", "gmime-2.6", --- build/src/mn-file-chooser-button.c.orig 2011-02-02 23:38:01.503049512 +0100 +++ build/src/mn-file-chooser-button.c 2011-02-02 23:38:16.988222034 +0100 @@ -358,7 +358,7 @@ @@ -545,7 +545,7 @@ + int y; + + gtk_widget_get_allocation(widget, &allocation); -+ y = allocation.y; ++ y = 0; - if (! GTK_WIDGET_DRAWABLE(widget)) + if (! gtk_widget_is_drawable(widget)) @@ -557,7 +557,7 @@ Row *row = g_ptr_array_index(selfp->rows, i); int j; - int x = widget->allocation.x; -+ int x = allocation.x; ++ int x = 0; int column = 0; MN_ARRAY_FOREACH(j, row->cells) @@ -587,6 +587,20 @@ #line 109 "mn-tooltips.c" #line 308 "src/mn-tooltips.gob" static void mn_tooltips_draw_tips (MNTooltips * self); +@@ -422,7 +422,13 @@ + + if (! selfp->window) + { ++ GtkStyleContext *ctx; ++ + selfp->window = gtk_window_new(GTK_WINDOW_POPUP); ++ ++ ctx = gtk_widget_get_style_context(GTK_WIDGET(selfp->window)); ++ gtk_style_context_add_class(ctx, "tooltip"); ++ + self_update_screen(self, TRUE); + gtk_widget_set_app_paintable(selfp->window, TRUE); + gtk_window_set_resizable(GTK_WINDOW(selfp->window), FALSE); @@ -430,7 +430,7 @@ gtk_container_set_border_width(GTK_CONTAINER(selfp->window), selfp->border_width); @@ -614,23 +628,32 @@ { #line 600 "mn-tooltips.c" #define __GOB_FUNCTION__ "MN:Tooltips::paint_window" -@@ -608,13 +608,12 @@ +@@ -608,18 +608,13 @@ GtkRequisition req; - gtk_widget_size_request(selfp->window, &req); - gtk_paint_flat_box(selfp->window->style, - selfp->window->window, -+ gtk_widget_size_request(GTK_WIDGET(selfp), &req); -+ gtk_paint_flat_box(gtk_widget_get_style(GTK_WIDGET(selfp)), -+ cr, - GTK_STATE_NORMAL, - GTK_SHADOW_OUT, - NULL, +- GTK_STATE_NORMAL, +- GTK_SHADOW_OUT, +- NULL, - selfp->window, - "tooltip", - 0, - 0, +- "tooltip", +- 0, +- 0, +- req.width, +- req.height); ++ gtk_widget_size_request(GTK_WIDGET(selfp->window), &req); ++ gtk_render_background(gtk_widget_get_style_context(GTK_WIDGET(selfp->window)), ++ cr, ++ 0, ++ 0, ++ req.width, ++ req.height); + + return FALSE; + }} @@ -651,10 +650,11 @@ gint monitor_num, px, py; GdkRectangle monitor; @@ -1380,3 +1403,14 @@ #include "mn-util.h" #include "mn-conf.h" #include "mn-shell.h" +--- data/mail-notification.desktop.in.orig 2011-07-08 13:46:52.327548264 +0200 ++++ data/mail-notification.desktop.in 2011-07-08 13:47:00.732704467 +0200 +@@ -5,7 +5,7 @@ + _Comment=Get notified when new mail arrives + Type=Application + Categories=GNOME;GTK;Network;Email; +-Exec=mail-notification --sm-disable ++Exec=mail-notification + Terminal=false + StartupNotify=true + X-GNOME-DocPath=mail-notification/mail-notification.xml -- cgit v1.2.3-54-g00ecf