[gentoo-commits] proj/gnome:gnome-next commit in: gnome-extra/evolution-data-server/files/, gnome-extra/evolution-data-server/

[Alexandre Restovtsev]

commit:     18d225b083743ee819ea70b6b43c36a645a81385
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Tue Sep 27 05:27:09 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Tue Sep 27 05:27:09 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=18d225b0

gnome-extra/evolution-data-server: 3.1.90-r1 → 3.2.0

Version bump. Patches were applied upstream.

---
 ...1.ebuild => evolution-data-server-3.2.0.ebuild} |    6 --
 ...volution-data-server-3.1.90-g_unix_signal.patch |   45 ---------------
 ....1.90-introspection-e_source_set_property.patch |   21 -------
 ...ion-data-server-3.1.90-introspection-ecal.patch |   22 -------
 ...ution-data-server-3.1.90-password-in-logs.patch |   60 --------------------
 5 files changed, 0 insertions(+), 154 deletions(-)

diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.1.90-r1.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.2.0.ebuild
similarity index 94%
rename from gnome-extra/evolution-data-server/evolution-data-server-3.1.90-r1.ebuild
rename to gnome-extra/evolution-data-server/evolution-data-server-3.2.0.ebuild
index a835b18..96f7bc4 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.1.90-r1.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.2.0.ebuild
@@ -94,12 +94,6 @@ pkg_setup() {
 src_prepare() {
 	gnome2_src_prepare
 
-	# Important upstream patches, will be in next release
-	epatch "${FILESDIR}/${P}-password-in-logs.patch"
-	epatch "${FILESDIR}/${P}-introspection-ecal.patch"
-	epatch "${FILESDIR}/${P}-introspection-e_source_set_property.patch"
-	epatch "${FILESDIR}/${P}-g_unix_signal.patch"
-
 	# GNOME bug 611353 (skips failing test atm)
 	# XXX: uncomment when there's a proper fix
 	#epatch "${FILESDIR}/e-d-s-camel-skip-failing-test.patch"

diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-3.1.90-g_unix_signal.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-3.1.90-g_unix_signal.patch
deleted file mode 100644
index 6ddd54e..0000000
--- a/gnome-extra/evolution-data-server/files/evolution-data-server-3.1.90-g_unix_signal.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From e318b8164aa52b804057c35ccfea49bfb06ed77c Mon Sep 17 00:00:00 2001
-From: Denis Washington <denisw@××××××.de>
-Date: Wed, 31 Aug 2011 16:27:08 +0000
-Subject: Bug 657836 - Work around g_unix_signal API changes.
-
-Work around GLib API churn with regard to registering UNIX signal
-callbacks on the main loop.  GLib >= 2.29.5 calls the function one
-thing, GLib >= 2.29.19 calls it another.
----
-diff --git a/addressbook/libedata-book/e-data-book-factory.c b/addressbook/libedata-book/e-data-book-factory.c
-index d0a4546..f53ddf8 100644
---- a/addressbook/libedata-book/e-data-book-factory.c
-+++ b/addressbook/libedata-book/e-data-book-factory.c
-@@ -844,7 +844,11 @@ main (gint argc, gchar **argv)
- 	e_data_book_migrate_basedir ();
- 
- #ifdef G_OS_UNIX
--#if GLIB_CHECK_VERSION(2,29,5)
-+#if GLIB_CHECK_VERSION(2,29,19)
-+	g_unix_signal_add_full (
-+		G_PRIORITY_DEFAULT, SIGTERM,
-+		handle_term_signal, NULL, NULL);
-+#elif GLIB_CHECK_VERSION(2,29,5)
- 	g_unix_signal_add_watch_full (
- 		SIGTERM, G_PRIORITY_DEFAULT,
- 		handle_term_signal, NULL, NULL);
-diff --git a/calendar/libedata-cal/e-data-cal-factory.c b/calendar/libedata-cal/e-data-cal-factory.c
-index 32771e1..d1f63b4 100644
---- a/calendar/libedata-cal/e-data-cal-factory.c
-+++ b/calendar/libedata-cal/e-data-cal-factory.c
-@@ -1070,7 +1070,11 @@ main (gint argc, gchar **argv)
- 	e_data_cal_migrate_basedir ();
- 
- #ifdef G_OS_UNIX
--#if GLIB_CHECK_VERSION(2,29,5)
-+#if GLIB_CHECK_VERSION(2,29,19)
-+	g_unix_signal_add_full (
-+		G_PRIORITY_DEFAULT, SIGTERM,
-+		handle_term_signal, NULL, NULL);
-+#elif GLIB_CHECK_VERSION(2,29,5)
- 	g_unix_signal_add_watch_full (
- 		SIGTERM, G_PRIORITY_DEFAULT,
- 		handle_term_signal, NULL, NULL);
---
-cgit v0.9.0.2

diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-3.1.90-introspection-e_source_set_property.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-3.1.90-introspection-e_source_set_property.patch
deleted file mode 100644
index d5f130b..0000000
--- a/gnome-extra/evolution-data-server/files/evolution-data-server-3.1.90-introspection-e_source_set_property.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 1f27a7fb4ccc8b119e60c8281a71f1e3309fd959 Mon Sep 17 00:00:00 2001
-From: Raul Gutierrez Segales <rgs@××××××××××××.uk>
-Date: Thu, 01 Sep 2011 16:19:58 +0000
-Subject: Introspection: e_source_set_proproperty's property_value param can be null
-
----
-diff --git a/libedataserver/e-source.c b/libedataserver/e-source.c
-index bbcaad4..971ec5a 100644
---- a/libedataserver/e-source.c
-+++ b/libedataserver/e-source.c
-@@ -1135,7 +1135,7 @@ e_source_get_duped_property (ESource *source,
-  * e_source_set_property:
-  * @source: an #ESource
-  * @property_name: a custom property name
-- * @property_value: a new value for the property, or %NULL
-+ * @property_value: (allow-none): a new value for the property, or %NULL
-  *
-  * Create a new custom #ESource property or replaces an existing one.  If
-  * @property_value is %NULL, the property is removed from @source.  This
---
-cgit v0.9.0.2

diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-3.1.90-introspection-ecal.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-3.1.90-introspection-ecal.patch
deleted file mode 100644
index ad58f02..0000000
--- a/gnome-extra/evolution-data-server/files/evolution-data-server-3.1.90-introspection-ecal.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From a3ba2ff92fd84d89d0fd97dce77cfad71bef1aa8 Mon Sep 17 00:00:00 2001
-From: Raul Gutierrez Segales <rgs@××××××××××××.uk>
-Date: Wed, 31 Aug 2011 09:49:44 +0000
-Subject: Introspection: add the correct header to libecal's GIR file
-
----
-diff --git a/calendar/libecal/Makefile.am b/calendar/libecal/Makefile.am
-index 1ae10ad..de74a1e 100644
---- a/calendar/libecal/Makefile.am
-+++ b/calendar/libecal/Makefile.am
-@@ -72,7 +72,8 @@ DISTCLEANFILES = $(pkgconfig_DATA)
- 
- -include $(INTROSPECTION_MAKEFILE)
- INTROSPECTION_GIRS =
--INTROSPECTION_SCANNER_ARGS = --add-include-path=$(top_builddir)/libedataserver --identifier-prefix E --pkg-export libecal-1.2
-+INTROSPECTION_SCANNER_ARGS = --add-include-path=$(top_builddir)/libedataserver --identifier-prefix E --pkg-export libecal-1.2 \
-+	--c-include="libecal/e-cal.h"
- INTROSPECTION_COMPILER_ARGS = --includedir=$(top_builddir)/libedataserver
- 
- if HAVE_INTROSPECTION
---
-cgit v0.9.0.2

diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-3.1.90-password-in-logs.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-3.1.90-password-in-logs.patch
deleted file mode 100644
index 455e512..0000000
--- a/gnome-extra/evolution-data-server/files/evolution-data-server-3.1.90-password-in-logs.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From bbe1f6ced61be92019d6d7f85ee765ca3166517d Mon Sep 17 00:00:00 2001
-From: Milan Crha <mcrha@××××××.com>
-Date: Tue, 30 Aug 2011 14:46:56 +0000
-Subject: Do not expose password in imapx log
-
----
-diff --git a/camel/providers/imapx/camel-imapx-server.c b/camel/providers/imapx/camel-imapx-server.c
-index 4a859d8..15ca8ef 100644
---- a/camel/providers/imapx/camel-imapx-server.c
-+++ b/camel/providers/imapx/camel-imapx-server.c
-@@ -629,7 +629,7 @@ imapx_command_addv (CamelIMAPXCommand *ic, const gchar *fmt, va_list ap)
- 					break;
- 				case 's': /* simple string */
- 					s = va_arg (ap, gchar *);
--					c(ic->is->tagprefix, "got string '%s'\n", s);
-+					c(ic->is->tagprefix, "got string '%s'\n", g_str_has_prefix (fmt, "LOGIN") ? "***" : s);
- 				output_string:
- 					if (*s) {
- 						guchar mask = imapx_is_mask (s);
-@@ -832,7 +832,11 @@ camel_imapx_command_close (CamelIMAPXCommand *ic)
- 
- 		byte_array = camel_stream_mem_get_byte_array (ic->mem);
- 
--		c(ic->is->tagprefix, "completing command buffer is [%d] '%.*s'\n", byte_array->len, (gint)byte_array->len, byte_array->data);
-+		if (g_str_has_prefix ((const gchar *) byte_array->data, "LOGIN")) {
-+			c(ic->is->tagprefix, "completing command buffer is [%d] 'LOGIN...'\n", byte_array->len);
-+		} else {
-+			c(ic->is->tagprefix, "completing command buffer is [%d] '%.*s'\n", byte_array->len, (gint)byte_array->len, byte_array->data);
-+		}
- 		if (byte_array->len > 0)
- 			imapx_command_add_part (ic, CAMEL_IMAPX_COMMAND_SIMPLE, NULL);
- 
-@@ -863,7 +867,7 @@ imapx_command_start (CamelIMAPXServer *imap, CamelIMAPXCommand *ic)
- 
- 	g_static_rec_mutex_lock (&imap->ostream_lock);
- 
--	c(imap->tagprefix, "Starting command (active=%d,%s) %c%05u %s\r\n", camel_dlist_length(&imap->active), imap->literal?" literal":"", imap->tagprefix, ic->tag, cp->data);
-+	c(imap->tagprefix, "Starting command (active=%d,%s) %c%05u %s\r\n", camel_dlist_length(&imap->active), imap->literal?" literal":"", imap->tagprefix, ic->tag, cp->data && g_str_has_prefix (cp->data, "LOGIN") ? "LOGIN..." : cp->data);
- 	if (imap->stream != NULL) {
- 		gchar *string;
- 
-diff --git a/camel/providers/imapx/camel-imapx-stream.c b/camel/providers/imapx/camel-imapx-stream.c
-index 72b0888..d3b74e6 100644
---- a/camel/providers/imapx/camel-imapx-stream.c
-+++ b/camel/providers/imapx/camel-imapx-stream.c
-@@ -149,7 +149,11 @@ imapx_stream_write (CamelStream *stream,
- {
- 	CamelIMAPXStream *is = (CamelIMAPXStream *) stream;
- 
--	io(is->tagprefix, "camel_imapx_write: '%.*s'\n", (gint)n, buffer);
-+	if (g_strstr_len (buffer, n, "LOGIN")) {
-+		io(is->tagprefix, "camel_imapx_write: 'LOGIN...'\n");
-+	} else {
-+		io(is->tagprefix, "camel_imapx_write: '%.*s'\n", (gint)n, buffer);
-+	}
- 
- 	return camel_stream_write (is->source, buffer, n, cancellable, error);
- }
---
-cgit v0.9.0.2