Make markup in notifications compatible with newer notification-daemon implementations. Thansk to Ian Abbott in bug 392599 for finding and preparing the patch.

Package-Manager: portage-2.1.10.11/cvs/Linux x86_64

4 files changed, 160 insertions, 5 deletions

diff --git a/mail-client/mail-notification/ChangeLog b/mail-client/mail-notification/ChangeLog
index 3485b0e4f433..2151d7e598e4 100644
--- a/mail-client/mail-notification/ChangeLog
+++ b/mail-client/mail-notification/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for mail-client/mail-notification
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mail-notification/ChangeLog,v 1.107 2011/03/06 07:37:29 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mail-notification/ChangeLog,v 1.108 2011/12/04 11:46:10 graaff Exp $
+
+*mail-notification-5.4-r5 (04 Dec 2011)
+
+  04 Dec 2011; Hans de Graaff <graaff@gentoo.org>
+  +mail-notification-5.4-r5.ebuild,
+  +files/mail-notification-5.4-fix-markup.patch:
+  Make markup in notifications compatible with newer notification-daemon
+  implementations. Thansk to Ian Abbott in bug 392599 for finding and preparing
+  the patch.
 
   06 Mar 2011; Hans de Graaff <graaff@gentoo.org>
   mail-notification-5.4-r4.ebuild:
diff --git a/mail-client/mail-notification/Manifest b/mail-client/mail-notification/Manifest
index d79f5720d957..5c871596d7bf 100644
--- a/mail-client/mail-notification/Manifest
+++ b/mail-client/mail-notification/Manifest
@@ -6,18 +6,20 @@ AUX mail-notification-5.4-dont-update-cache.patch 888 RMD160 e600c756d045b4f26cc
 AUX mail-notification-5.4-e-d-s-2.24.patch 521 RMD160 db3ae8438d054d3434605fb5d7cf90a965f806ff SHA1 75fac93f173f715bc4c7cbedf9c553e522785274 SHA256 e8bde8df77a51b1b06846ac37e7df2b3f0d1ee28716ce171b21150bcfd75094b
 AUX mail-notification-5.4-e-d-s.patch 3525 RMD160 840a3e684b87dc98ba617b7083a4ee1b7b8ffa54 SHA1 3f7074851b6539a3b499fd02d6b39f0aaa1961dd SHA256 95f506b595966609e35ba9db6a17631f8f3e31b82736f0dff16cdbae506cd96e
 AUX mail-notification-5.4-evolution-gtkhtml.patch 690 RMD160 50b8670fdb02b80b2d9789dc2f28ef4e1c013780 SHA1 a93ec8ac04f361473ddce2fda24362edf3c10c46 SHA256 5c3d9004d03688e663c78045c101366ddc6e9f246947f7ab955a341d5693cb78
+AUX mail-notification-5.4-fix-markup.patch 1727 RMD160 003aad9a68164e11c4e926dfce1096c4fab4c3d2 SHA1 fa1401147d32dfe6dd1004e7bf21495d07ccfb8c SHA256 c25984396bfa769aa437d0e912fd5a072a138d91206b312d02b2b9a28fa4f707
 AUX mail-notification-5.4-gmime.patch 3110 RMD160 8b26994250689c2962f7a7a5b8f77b4b59a21f0d SHA1 9e3de8a7a0a01effc2236826bf83bed20e52fdbf SHA256 9d7d5b8d72023138f00050baaecf2cbdd3e9ba372c45b275ba0677d7118ed784
 AUX mail-notification-5.4-icons.patch 1484 RMD160 29206aa19c701d92bd8e0535f3ee429bb9234061 SHA1 23369d518ab5935f44d86776feb47306381701ff SHA256 63e1c80a6bddf7381c1f490be61948455727bb4ea6b33009f32f2d02aaecfe7d
 AUX mail-notification-5.4-remove-ubuntu-special-case.patch 948 RMD160 0d6eeb7f3fee7a799b391c9195f9e94610ac40ff SHA1 50c7e4ae43dbf7542862f38b85ed8567d7f556c3 SHA256 0b05f41072a859254b6dfb672f6654c630f116c80b86eac6fe1f39318a4a6050
 AUX mail-notification-5.4-sasl_encode64.patch 1298 RMD160 c1fec77994de9c4c58807b66882da4ecb92a80f2 SHA1 f371d9fec4b6e1a1e2be13b4b578c40ab8223313 SHA256 2d7b8132d6498d75d57cd44b1586ff9a9df74048a5e7724d96c05ed5c3cb079e
 DIST mail-notification-5.4.tar.bz2 570008 RMD160 64946509ef99fdeba8ff547ffac3830c36131484 SHA1 c148449c5d2fd0a75571e4e42932da1f1ae013f6 SHA256 5dec5f3852437e7735269697c77a29a24ea230987c764523fe66dabdca815af5
 EBUILD mail-notification-5.4-r4.ebuild 3261 RMD160 5789b9dcda6f91c7299d0fe28eb9514569e5f81a SHA1 dc9839d503c544da850f05e2990789820087315c SHA256 296b069bd0d9eed495abac7d4ae8aa0e8e6032d5de821ba73e4258ef0a80ef6a
-MISC ChangeLog 20151 RMD160 ba79fde13945607cdc6f8e24aac28ecec2b8c96e SHA1 5f32fc1c14522d99561c69136ed3499533bf141c SHA256 b130fc97d952d18117ff83e84017e882fcc66b63aaff1622aa2d70d480262623
+EBUILD mail-notification-5.4-r5.ebuild 3310 RMD160 23a3dc8f029e723b4ece5be6891a088ee5cc071f SHA1 2bef7c5fc5a2037770070c1b2596c0795c5117d6 SHA256 0aac37ba5eced07e39e0e5264cab78dfc814f23353efd1c4d6d47d4ee36a2881
+MISC ChangeLog 20494 RMD160 45d819c2fdb869598276e0429a106395b64275b0 SHA1 f04088e4eb416e7bfe5cea583c654ff9b140a748 SHA256 27232b392ed7fc7b47ff10f507f46e6bbd02ec66726ac67f9ffc53a0f109648e
 MISC metadata.xml 707 RMD160 2ba53e2a8e4eab0cd33e19a637f6a514393c7b33 SHA1 c19133019aba5ee60fa1cbb108c848ffd8df166f SHA256 383502af536e5918f620980c074170430a84e62ca61393c2f01898dd141c0e18
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk1zOcUACgkQrnu0mw69JkqW3AD+O5xKloUd1VYdsJYnsdrYJbNg
-l4XAsrzyGDANV2kB5xcA/3ZQqO99ewGSEFmu1wdQk3jYo+jq6LqjISAtY5MoISCC
-=rCMr
+iF4EAREIAAYFAk7bXYcACgkQiIP6VqMIqNdCTgD/ciE2Sw3x4ZbEKI2XLem1IjKc
+5e83JSbXwovjaodybn4A/0Ga4C7gTxaFnr3jbAkXlVzrq6MneGe5KxuErhGNxKkb
+=7Lwp
 -----END PGP SIGNATURE-----
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
new file mode 100644
index 000000000000..b5d826eb2808
--- /dev/null
+++ b/mail-client/mail-notification/files/mail-notification-5.4-fix-markup.patch
@@ -0,0 +1,34 @@
+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/mail-notification-5.4-r5.ebuild b/mail-client/mail-notification/mail-notification-5.4-r5.ebuild
new file mode 100644
index 000000000000..cfbb9c067532
--- /dev/null
+++ b/mail-client/mail-notification/mail-notification-5.4-r5.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2011 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-r5.ebuild,v 1.1 2011/12/04 11:46:10 graaff Exp $
+
+EAPI=2
+
+inherit gnome2 multilib flag-o-matic toolchain-funcs
+
+DESCRIPTION="A GNOME trayicon which checks for email, with support for many online and offline mailbox formats."
+HOMEPAGE="http://www.nongnu.org/mailnotify/"
+SRC_URI="http://savannah.nongnu.org/download/mailnotify/${P}.tar.bz2"
+
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+SLOT="0"
+LICENSE="GPL-3"
+
+IUSE="evo gmail imap ipv6 maildir mbox mh mozilla pop sasl ssl sylpheed"
+
+# 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+-2.12:2
+	>=dev-libs/glib-2.14
+	>=gnome-base/gconf-2.4.0
+	>=gnome-base/gconf-2.6
+	>=gnome-base/libgnomeui-2.14
+	>=gnome-base/libglade-2.0
+	dev-libs/dbus-glib
+	dev-libs/gmime:2.4
+	>=x11-libs/libnotify-0.4.1
+	pop? ( gnome-base/gnome-keyring )
+	imap? ( gnome-base/gnome-keyring )
+	gmail? ( gnome-base/gnome-keyring )
+	ssl? ( >=dev-libs/openssl-0.9.6 )
+	sasl? ( >=dev-libs/cyrus-sasl-2 )
+	evo? ( >=mail-client/evolution-2.24 )
+	sylpheed? ( mail-client/sylpheed )"
+
+DEPEND="${RDEPEND}
+	app-text/scrollkeeper
+	dev-util/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 -n "${2:-$1}="
+	use "${1}" && echo "yes" || echo "no"
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-dont-update-cache.patch"
+
+	# We are not Ubuntu, and I suspect that this is the cause of #215281
+	epatch "${FILESDIR}/${P}-remove-ubuntu-special-case.patch"
+
+	# Make it work ok with eds-2.24 and 2.29
+	epatch "${FILESDIR}/${P}-e-d-s.patch"
+
+	# Fix gtkhtml depend to solve building against evo-2.28, see bug #293374
+	epatch "${FILESDIR}/${P}-evolution-gtkhtml.patch"
+
+	# Add patch for new cyrus-sasl's ABI, see:
+	# https://bugzilla.redhat.com/501456
+	epatch "${FILESDIR}/${P}-sasl_encode64.patch"
+
+	# Fedora patch to build against dev-libs/gmime:2.4
+	epatch "${FILESDIR}/${P}-gmime.patch"
+
+	# Fix forced --as-needed, bug 317905
+	epatch "${FILESDIR}/${P}-asneeded.patch"
+
+	# Fix icons for gnome 2.30+
+	epatch "${FILESDIR}/${P}-icons.patch"
+
+	epatch "${FILESDIR}/${P}-fix-markup.patch"
+}
+
+src_configure() {
+	./jb configure destdir="${D}" prefix="/usr" libdir=/usr/$(get_libdir) \
+		sysconfdir="/etc" localstatedir="/var" cc="$(tc-getCC)" \
+		cflags="${CFLAGS}" cppflags="${CXXFLAGS}" ldflags="${LDFLAGS}" \
+		scrollkeeper-dir="/var/lib/scrollkeeper" \
+		$(use_var evo evolution) \
+		$(use_var gmail) \
+		$(use_var imap) \
+		$(use_var ipv6) \
+		$(use_var maildir) \
+		$(use_var mbox) \
+		$(use_var mh) \
+		$(use_var mozilla) \
+		$(use_var pop pop3) \
+		$(use_var sasl) \
+		$(use_var ssl) \
+		$(use_var sylpheed) || 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 "${D}/var/lib/scrollkeeper"
+}