[gentoo-commits] proj/gnome:master commit in: mail-client/evolution/, mail-client/evolution/files/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] proj/gnome:master commit in: mail-client/evolution/, mail-client/evolution/files/
@ 2011-02-09 20:13 Nirbheek Chauhan
  0 siblings, 0 replies; 10+ messages in thread
From: Nirbheek Chauhan @ 2011-02-09 20:13 UTC (permalink / raw
  To: gentoo-commits

commit:     ea51285cfdd7d6c5cd55b098e178d30c0d484c71
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Wed Feb  9 12:22:19 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Wed Feb  9 17:06:04 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=ea51285c

mail-client/evolution: 2.91.6 -> 2.91.6.1

* Build fix, that we had already patched in

---
 ...ion-2.91.6.ebuild => evolution-2.91.6.1.ebuild} |    7 +----
 mail-client/evolution/evolution-9999.ebuild        |    2 +-
 .../files/evolution-2.91.6-fix-build-failure.patch |   21 --------------------
 3 files changed, 3 insertions(+), 27 deletions(-)

diff --git a/mail-client/evolution/evolution-2.91.6.ebuild b/mail-client/evolution/evolution-2.91.6.1.ebuild
similarity index 96%
rename from mail-client/evolution/evolution-2.91.6.ebuild
rename to mail-client/evolution/evolution-2.91.6.1.ebuild
index 2524dda..caf648f 100644
--- a/mail-client/evolution/evolution-2.91.6.ebuild
+++ b/mail-client/evolution/evolution-2.91.6.1.ebuild
@@ -34,13 +34,13 @@ PINENTRY_DEPEND="|| ( app-crypt/pinentry[gtk] app-crypt/pinentry-qt app-crypt/pi
 # pst is not mature enough and changes API/ABI frequently
 RDEPEND=">=dev-libs/glib-2.26.0:2
 	>=x11-libs/cairo-1.9.15
-	>=x11-libs/gtk+-2.99.2:3
+	>=x11-libs/gtk+-2.99.3:3
 	>=dev-libs/libunique-2.91.4:3
 	>=gnome-base/gnome-desktop-2.91.3:3
 	>=dev-libs/libgweather-2.90.0:3
 	media-libs/libcanberra[gtk3]
 	>=x11-libs/libnotify-0.7
-	>=gnome-extra/evolution-data-server-${PV}[weather]
+	>=gnome-extra/evolution-data-server-${MY_MAJORV}[weather]
 	>=gnome-extra/gtkhtml-3.31.3:4.0
 	>=gnome-base/gconf-2
 	dev-libs/atk
@@ -140,9 +140,6 @@ src_prepare() {
 	# Fix invalid use of la file in contact-editor, upstream bug #635002
 	epatch "${FILESDIR}/${PN}-2.32.0-wrong-lafile-usage.patch"
 
-	# Fix capplet build failure, from upstream, won't need next release
-	epatch "${FILESDIR}/${PN}-2.91.6-fix-build-failure.patch"
-
 	# Use NSS/NSPR only if 'ssl' is enabled.
 	if use ssl ; then
 		sed -e 's|mozilla-nss|nss|' \

diff --git a/mail-client/evolution/evolution-9999.ebuild b/mail-client/evolution/evolution-9999.ebuild
index 266e282..d07a487 100644
--- a/mail-client/evolution/evolution-9999.ebuild
+++ b/mail-client/evolution/evolution-9999.ebuild
@@ -34,7 +34,7 @@ PINENTRY_DEPEND="|| ( app-crypt/pinentry[gtk] app-crypt/pinentry-qt app-crypt/pi
 # pst is not mature enough and changes API/ABI frequently
 RDEPEND=">=dev-libs/glib-2.26.0:2
 	>=x11-libs/cairo-1.9.15
-	>=x11-libs/gtk+-2.99.2:3
+	>=x11-libs/gtk+-2.99.3:3
 	>=dev-libs/libunique-2.91.4:3
 	>=gnome-base/gnome-desktop-2.91.3:3
 	>=dev-libs/libgweather-2.90.0:3

diff --git a/mail-client/evolution/files/evolution-2.91.6-fix-build-failure.patch b/mail-client/evolution/files/evolution-2.91.6-fix-build-failure.patch
deleted file mode 100644
index a227c17..0000000
--- a/mail-client/evolution/files/evolution-2.91.6-fix-build-failure.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From bd7a0270f0f315197c20bb54397f0ae2bac0715d Mon Sep 17 00:00:00 2001
-From: Vibha Yadav <yvibha@novell.com>
-Date: Mon, 31 Jan 2011 12:58:50 +0000
-Subject: Bug 641003 - Build failure in mail-capplet
-
----
-diff --git a/capplet/settings/mail-capplet-shell.c b/capplet/settings/mail-capplet-shell.c
-index 7a9a4fa..c14af1b 100644
---- a/capplet/settings/mail-capplet-shell.c
-+++ b/capplet/settings/mail-capplet-shell.c
-@@ -26,6 +26,8 @@
- #ifdef HAVE_CONFIG_H
- #  include <config.h>
- #endif
-+
-+#include <gtk/gtkx.h>
- #include <glib/gi18n.h>
- #include <glib/gstdio.h>
- #include <gconf/gconf-client.h>
---
-cgit v0.8.3.1



^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: mail-client/evolution/, mail-client/evolution/files/
@ 2011-10-31  7:35 Alexandre Restovtsev
  0 siblings, 0 replies; 10+ messages in thread
From: Alexandre Restovtsev @ 2011-10-31  7:35 UTC (permalink / raw
  To: gentoo-commits

commit:     177123cffdbca7914cdf75f4b80ed69abd7340c2
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 31 06:59:17 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Mon Oct 31 07:24:31 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=177123cf

mail-client/evolution: qa + fix clutter build

Switch to EAPI4, clean up src_prepare to match gx86, gnome2.eclass will
take care of maintainer mode. Update CPPFLAGS sed for configure.ac
changes (the second " made it fail). Finally add a REQUIRED_USE.

Also, add a patch to fix building with USE=clutter on a system that has
both clutter-gtk:0.10 and clutter-gtk:1.0 installed; submitted upstream
at https://bugzilla.gnome.org/show_bug.cgi?id=663077

---
 mail-client/evolution/evolution-3.2.1.ebuild       |   54 ++++++--------------
 mail-client/evolution/evolution-9999.ebuild        |   54 ++++++--------------
 .../evolution-3.2.1-reorder-mx-clutter-gtk.patch   |   34 ++++++++++++
 3 files changed, 66 insertions(+), 76 deletions(-)

diff --git a/mail-client/evolution/evolution-3.2.1.ebuild b/mail-client/evolution/evolution-3.2.1.ebuild
index 49c720f..d90c2d8 100644
--- a/mail-client/evolution/evolution-3.2.1.ebuild
+++ b/mail-client/evolution/evolution-3.2.1.ebuild
@@ -2,8 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.32.1-r1.ebuild,v 1.3 2011/01/15 19:56:39 nirbheek Exp $
 
-EAPI="3"
-GNOME_TARBALL_SUFFIX="xz"
+EAPI="4"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 PYTHON_DEPEND="python? 2:2.4"
@@ -57,7 +56,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.28:2
 	clutter? (
 		>=media-libs/clutter-1.0.0:1.0
 		>=media-libs/clutter-gtk-0.90:1.0
-		x11-libs/mx )
+		x11-libs/mx:1.0 )
 	connman? ( net-misc/connman )
 	crypt? ( || (
 		( >=app-crypt/gnupg-2.0.1-r2 ${PINENTRY_DEPEND} )
@@ -92,15 +91,17 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}
 	!<gnome-extra/evolution-exchange-2.32"
 
-# Need EAPI=4 support in python eclass
-#REQUIRED_USE="map? ( clutter )"
+# contact maps require clutter
+# NM and connman support cannot coexist
+REQUIRED_USE="map? ( clutter )
+	connman? ( !networkmanager )
+	networkmanager? ( !connman )"
 
 pkg_setup() {
 	ELTCONF="--reverse-deps"
 	DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS* README"
 	# image-inline plugin needs a gtk+:3 gtkimageview, which does not exist yet
 	G2CONF="${G2CONF}
-		--disable-maintainer-mode
 		--without-glade-catalog
 		--without-kde-applnk-path
 		--enable-plugins=experimental
@@ -115,22 +116,12 @@ pkg_setup() {
 		$(use_enable connman)
 		$(use_enable gnome-online-accounts goa)
 		$(use_enable gstreamer audio-inline)
+		$(use_enable map contact-maps)
 		$(use_enable python)
 		$(use_with clutter)
 		$(use_with ldap openldap)
 		$(use_with kerberos krb5 ${EPREFIX}/usr)"
 
-	# workaround for lack of EAPI 4 support in python.eclass
-	local myconf="--disable-contact-maps"
-	if use map; then
-		if use clutter; then
-			myconf="--enable-contact-maps"
-		else
-			ewarn "map plugin auto-disabled due to USE=-clutter"
-		fi
-	fi
-	G2CONF="${G2CONF} ${myconf}"
-
 	# dang - I've changed this to do --enable-plugins=experimental.  This will
 	# autodetect new-mail-notify and exchange, but that cannot be helped for the
 	# moment.  They should be changed to depend on a --enable-<foo> like mono
@@ -147,33 +138,20 @@ pkg_setup() {
 			--without-nss-includes"
 	fi
 
-	# NM and connman support cannot coexist
-	if use networkmanager && use connman ; then
-		ewarn "It is not possible to enable both ConnMan and NetworkManager, disabling connman..."
-		G2CONF="${G2CONF} --disable-connman"
-	fi
-
 	python_set_active_version 2
+	python_pkg_setup
 }
 
 src_prepare() {
-	# Use NSS/NSPR only if 'ssl' is enabled.
-	if use ssl ; then
-		sed -e 's|mozilla-nss|nss|' \
-			-e 's|mozilla-nspr|nspr|' \
-			-i configure.ac || die "sed 2 failed"
-	fi
-
-	# Fix compilation flags crazyness
-	sed -e 's/\(AM_CPPFLAGS="\)$WARNING_FLAGS"/\1/' \
-		-i configure.ac || die "sed 1 failed"
-
-	if [[ ${PV} != 9999 ]]; then
-		intltoolize --force --copy --automake || die "intltoolize failed"
-		eautoreconf
-	fi
+	# https://bugzilla.gnome.org/show_bug.cgi?id=663077, requires eautoreconf
+	epatch "${FILESDIR}/${PN}-3.2.1-reorder-mx-clutter-gtk.patch"
+	[[ ${PV} != 9999 ]] && eautoreconf
 
 	gnome2_src_prepare
+
+	# Fix compilation flags crazyness
+	sed -e 's/\(AM_CPPFLAGS="\)$WARNING_FLAGS/\1/' \
+		-i configure || die "CPPFLAGS sed failed"
 }
 
 pkg_postinst() {

diff --git a/mail-client/evolution/evolution-9999.ebuild b/mail-client/evolution/evolution-9999.ebuild
index 49c720f..d90c2d8 100644
--- a/mail-client/evolution/evolution-9999.ebuild
+++ b/mail-client/evolution/evolution-9999.ebuild
@@ -2,8 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.32.1-r1.ebuild,v 1.3 2011/01/15 19:56:39 nirbheek Exp $
 
-EAPI="3"
-GNOME_TARBALL_SUFFIX="xz"
+EAPI="4"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 PYTHON_DEPEND="python? 2:2.4"
@@ -57,7 +56,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.28:2
 	clutter? (
 		>=media-libs/clutter-1.0.0:1.0
 		>=media-libs/clutter-gtk-0.90:1.0
-		x11-libs/mx )
+		x11-libs/mx:1.0 )
 	connman? ( net-misc/connman )
 	crypt? ( || (
 		( >=app-crypt/gnupg-2.0.1-r2 ${PINENTRY_DEPEND} )
@@ -92,15 +91,17 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}
 	!<gnome-extra/evolution-exchange-2.32"
 
-# Need EAPI=4 support in python eclass
-#REQUIRED_USE="map? ( clutter )"
+# contact maps require clutter
+# NM and connman support cannot coexist
+REQUIRED_USE="map? ( clutter )
+	connman? ( !networkmanager )
+	networkmanager? ( !connman )"
 
 pkg_setup() {
 	ELTCONF="--reverse-deps"
 	DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS* README"
 	# image-inline plugin needs a gtk+:3 gtkimageview, which does not exist yet
 	G2CONF="${G2CONF}
-		--disable-maintainer-mode
 		--without-glade-catalog
 		--without-kde-applnk-path
 		--enable-plugins=experimental
@@ -115,22 +116,12 @@ pkg_setup() {
 		$(use_enable connman)
 		$(use_enable gnome-online-accounts goa)
 		$(use_enable gstreamer audio-inline)
+		$(use_enable map contact-maps)
 		$(use_enable python)
 		$(use_with clutter)
 		$(use_with ldap openldap)
 		$(use_with kerberos krb5 ${EPREFIX}/usr)"
 
-	# workaround for lack of EAPI 4 support in python.eclass
-	local myconf="--disable-contact-maps"
-	if use map; then
-		if use clutter; then
-			myconf="--enable-contact-maps"
-		else
-			ewarn "map plugin auto-disabled due to USE=-clutter"
-		fi
-	fi
-	G2CONF="${G2CONF} ${myconf}"
-
 	# dang - I've changed this to do --enable-plugins=experimental.  This will
 	# autodetect new-mail-notify and exchange, but that cannot be helped for the
 	# moment.  They should be changed to depend on a --enable-<foo> like mono
@@ -147,33 +138,20 @@ pkg_setup() {
 			--without-nss-includes"
 	fi
 
-	# NM and connman support cannot coexist
-	if use networkmanager && use connman ; then
-		ewarn "It is not possible to enable both ConnMan and NetworkManager, disabling connman..."
-		G2CONF="${G2CONF} --disable-connman"
-	fi
-
 	python_set_active_version 2
+	python_pkg_setup
 }
 
 src_prepare() {
-	# Use NSS/NSPR only if 'ssl' is enabled.
-	if use ssl ; then
-		sed -e 's|mozilla-nss|nss|' \
-			-e 's|mozilla-nspr|nspr|' \
-			-i configure.ac || die "sed 2 failed"
-	fi
-
-	# Fix compilation flags crazyness
-	sed -e 's/\(AM_CPPFLAGS="\)$WARNING_FLAGS"/\1/' \
-		-i configure.ac || die "sed 1 failed"
-
-	if [[ ${PV} != 9999 ]]; then
-		intltoolize --force --copy --automake || die "intltoolize failed"
-		eautoreconf
-	fi
+	# https://bugzilla.gnome.org/show_bug.cgi?id=663077, requires eautoreconf
+	epatch "${FILESDIR}/${PN}-3.2.1-reorder-mx-clutter-gtk.patch"
+	[[ ${PV} != 9999 ]] && eautoreconf
 
 	gnome2_src_prepare
+
+	# Fix compilation flags crazyness
+	sed -e 's/\(AM_CPPFLAGS="\)$WARNING_FLAGS/\1/' \
+		-i configure || die "CPPFLAGS sed failed"
 }
 
 pkg_postinst() {

diff --git a/mail-client/evolution/files/evolution-3.2.1-reorder-mx-clutter-gtk.patch b/mail-client/evolution/files/evolution-3.2.1-reorder-mx-clutter-gtk.patch
new file mode 100644
index 0000000..6df8f2b
--- /dev/null
+++ b/mail-client/evolution/files/evolution-3.2.1-reorder-mx-clutter-gtk.patch
@@ -0,0 +1,34 @@
+From 1c036f9a0a922f68fbbf09540a14173465e51a1e Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Mon, 31 Oct 2011 02:15:54 -0400
+Subject: [PATCH] reorder mx-1.0 and clutter-gtk-1.0 in PKG_CHECK_MODULES:q
+
+clutter-gtk-1.0 installs headers in /usr/include/clutter-gtk-1.0/clutter-gtk;
+clutter-gtk-0.10 installs headers in /usr/include/clutter-1.0/clutter-gtk
+
+To ensure that clutter-gtk-1.0's headers (and not 0.10's) are used,
+-I/usr/include/clutter-gtk-1.0 must come before -I/usr/include/clutter-1.0
+in CLUTTER_CFLAGS. And that means clutter-gtk-1.0 must come before mx-1.0
+in PKG_CHECK_MODULES.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=663077
+---
+ configure.ac |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 5c2c5ed..b5c74ee 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -596,7 +596,7 @@ AC_ARG_WITH([clutter],
+ AC_MSG_RESULT($with_clutter)
+ 
+ if test "x$with_clutter" = "xyes"; then
+-   PKG_CHECK_MODULES(CLUTTER, [mx-1.0 clutter-gtk-1.0 >= clutter_gtk_minimum_version clutter-1.0 >= 1.0.0])
++   PKG_CHECK_MODULES(CLUTTER, [clutter-gtk-1.0 >= clutter_gtk_minimum_version mx-1.0 clutter-1.0 >= 1.0.0])
+ 
+    AC_DEFINE(HAVE_CLUTTER, 1, [Clutter available])
+    AM_CONDITIONAL(ENABLE_CLUTTER, true)
+-- 
+1.7.7.1
+



^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: mail-client/evolution/, mail-client/evolution/files/
@ 2012-03-16  2:27 Alexandre Restovtsev
  0 siblings, 0 replies; 10+ messages in thread
From: Alexandre Restovtsev @ 2012-03-16  2:27 UTC (permalink / raw
  To: gentoo-commits

commit:     1507a15ac9348ff4487133ebffae83b08bc38b44
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 16 02:24:57 2012 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Fri Mar 16 02:24:57 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=1507a15a

mail-client/evolution: fix build with USE=map

---
 mail-client/evolution/evolution-3.3.91.ebuild      |    3 +
 .../evolution/files/evolution-3.3.91-map.patch     |   59 ++++++++++++++++++++
 2 files changed, 62 insertions(+), 0 deletions(-)

diff --git a/mail-client/evolution/evolution-3.3.91.ebuild b/mail-client/evolution/evolution-3.3.91.ebuild
index 95c29ce..96ea520 100644
--- a/mail-client/evolution/evolution-3.3.91.ebuild
+++ b/mail-client/evolution/evolution-3.3.91.ebuild
@@ -143,6 +143,9 @@ pkg_setup() {
 }
 
 src_prepare() {
+	# Fix build with USE=map; in next version
+	epatch "${FILESDIR}/${P}-map.patch"
+
 	gnome2_src_prepare
 
 	# Fix compilation flags crazyness

diff --git a/mail-client/evolution/files/evolution-3.3.91-map.patch b/mail-client/evolution/files/evolution-3.3.91-map.patch
new file mode 100644
index 0000000..371d92b
--- /dev/null
+++ b/mail-client/evolution/files/evolution-3.3.91-map.patch
@@ -0,0 +1,59 @@
+From f30355445fd20b6d443d012eb1f1758dbe8d096a Mon Sep 17 00:00:00 2001
+From: Matthew Barnes <mbarnes@redhat.com>
+Date: Fri, 9 Mar 2012 13:38:57 -0500
+Subject: [PATCH] Bug 671716 - Fails to build with --enable-contact-maps
+
+---
+ widgets/misc/e-contact-map-window.c |    4 ++++
+ widgets/misc/e-contact-map.c        |    4 ++++
+ widgets/misc/e-contact-marker.c     |    4 ++++
+ 3 files changed, 12 insertions(+), 0 deletions(-)
+
+diff --git a/widgets/misc/e-contact-map-window.c b/widgets/misc/e-contact-map-window.c
+index 87ce665..d80aa17 100644
+--- a/widgets/misc/e-contact-map-window.c
++++ b/widgets/misc/e-contact-map-window.c
+@@ -39,6 +39,10 @@
+ #include <glib/gi18n.h>
+ #include <glib-object.h>
+ 
++#define E_CONTACT_MAP_WINDOW_GET_PRIVATE(obj) \
++	(G_TYPE_INSTANCE_GET_PRIVATE \
++	((obj), E_TYPE_CONTACT_MAP, EContactMapWindowPrivate))
++
+ G_DEFINE_TYPE (EContactMapWindow, e_contact_map_window, GTK_TYPE_WINDOW)
+ 
+ struct _EContactMapWindowPrivate {
+diff --git a/widgets/misc/e-contact-map.c b/widgets/misc/e-contact-map.c
+index 7158aae..b9c2a99 100644
+--- a/widgets/misc/e-contact-map.c
++++ b/widgets/misc/e-contact-map.c
+@@ -42,6 +42,10 @@
+ #include <glib/gi18n.h>
+ #include <math.h>
+ 
++#define E_CONTACT_MAP_GET_PRIVATE(obj) \
++	(G_TYPE_INSTANCE_GET_PRIVATE \
++	((obj), E_TYPE_CONTACT_MAP, EContactMapPrivate))
++
+ G_DEFINE_TYPE (EContactMap, e_contact_map, GTK_CHAMPLAIN_TYPE_EMBED)
+ 
+ struct _EContactMapPrivate {
+diff --git a/widgets/misc/e-contact-marker.c b/widgets/misc/e-contact-marker.c
+index 2f7c2cb..d7e5ad6 100644
+--- a/widgets/misc/e-contact-marker.c
++++ b/widgets/misc/e-contact-marker.c
+@@ -38,6 +38,10 @@
+ #include <math.h>
+ #include <string.h>
+ 
++#define E_CONTACT_MARKER_GET_PRIVATE(obj) \
++	(G_TYPE_INSTANCE_GET_PRIVATE \
++	((obj), E_TYPE_CONTACT_MARKER, EContactMarkerPrivate))
++
+ G_DEFINE_TYPE (EContactMarker, e_contact_marker, CHAMPLAIN_TYPE_LABEL);
+ 
+ struct _EContactMarkerPrivate
+-- 
+1.7.8.5
+



^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: mail-client/evolution/, mail-client/evolution/files/
@ 2012-03-16  6:09 Alexandre Restovtsev
  0 siblings, 0 replies; 10+ messages in thread
From: Alexandre Restovtsev @ 2012-03-16  6:09 UTC (permalink / raw
  To: gentoo-commits

commit:     d11193f8b7e399157f8520161ac86da71bb6c1dd
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 16 05:59:23 2012 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Fri Mar 16 05:59:23 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=d11193f8

mail-client/evolution: fix Gentoo spamassassin executable paths

Otherwise, evolution assumes spamd is in /usr/bin.

---
 ...on-3.3.91.ebuild => evolution-3.3.91-r1.ebuild} |    6 ++
 mail-client/evolution/evolution-9999.ebuild        |    6 ++
 .../evolution-3.3.91-spamassassin-paths.patch      |   60 ++++++++++++++++++++
 3 files changed, 72 insertions(+), 0 deletions(-)

diff --git a/mail-client/evolution/evolution-3.3.91.ebuild b/mail-client/evolution/evolution-3.3.91-r1.ebuild
similarity index 95%
rename from mail-client/evolution/evolution-3.3.91.ebuild
rename to mail-client/evolution/evolution-3.3.91-r1.ebuild
index 96ea520..f6ea5b4 100644
--- a/mail-client/evolution/evolution-3.3.91.ebuild
+++ b/mail-client/evolution/evolution-3.3.91-r1.ebuild
@@ -146,6 +146,12 @@ src_prepare() {
 	# Fix build with USE=map; in next version
 	epatch "${FILESDIR}/${P}-map.patch"
 
+	# Fix paths for Gentoo spamassassin executables
+	epatch "${FILESDIR}/${PN}-3.3.91-spamassassin-paths.patch"
+	sed -e "s:@EPREFIX@:${EPREFIX}:g" \
+		-i data/org.gnome.evolution.spamassassin.gschema.xml.in \
+		-i modules/spamassassin/evolution-spamassassin.c || die "sed failed"
+
 	gnome2_src_prepare
 
 	# Fix compilation flags crazyness

diff --git a/mail-client/evolution/evolution-9999.ebuild b/mail-client/evolution/evolution-9999.ebuild
index 95c29ce..4c7dac5 100644
--- a/mail-client/evolution/evolution-9999.ebuild
+++ b/mail-client/evolution/evolution-9999.ebuild
@@ -143,6 +143,12 @@ pkg_setup() {
 }
 
 src_prepare() {
+	# Fix paths for Gentoo spamassassin executables
+	epatch "${FILESDIR}/${PN}-3.3.91-spamassassin-paths.patch"
+	sed -e "s:@EPREFIX@:${EPREFIX}:g" \
+		-i data/org.gnome.evolution.spamassassin.gschema.xml.in \
+		-i modules/spamassassin/evolution-spamassassin.c || die "sed failed"
+
 	gnome2_src_prepare
 
 	# Fix compilation flags crazyness

diff --git a/mail-client/evolution/files/evolution-3.3.91-spamassassin-paths.patch b/mail-client/evolution/files/evolution-3.3.91-spamassassin-paths.patch
new file mode 100644
index 0000000..3078fb9
--- /dev/null
+++ b/mail-client/evolution/files/evolution-3.3.91-spamassassin-paths.patch
@@ -0,0 +1,60 @@
+From 2f4ddb9f4d4262afbf8f60dd601a639ae33e05c6 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Fri, 16 Mar 2012 01:56:14 -0400
+Subject: [PATCH] Use correct Gentoo paths for spamassassin executables
+
+---
+ ...org.gnome.evolution.spamassassin.gschema.xml.in |    4 ++--
+ modules/spamassassin/evolution-spamassassin.c      |    8 ++++----
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/data/org.gnome.evolution.spamassassin.gschema.xml.in b/data/org.gnome.evolution.spamassassin.gschema.xml.in
+index 85d43d4..07fabd3 100644
+--- a/data/org.gnome.evolution.spamassassin.gschema.xml.in
++++ b/data/org.gnome.evolution.spamassassin.gschema.xml.in
+@@ -16,12 +16,12 @@
+       <_description>Use SpamAssassin daemon and client (spamc/spamd).</_description>
+     </key>
+     <key name="spamc-binary" type="s">
+-      <default>'/usr/bin/spamc'</default>
++      <default>'@EPREFIX@/usr/bin/spamc'</default>
+       <_summary>SpamAssassin client binary</_summary>
+       <_description>SpamAssassin client binary</_description>
+     </key>
+     <key name="spamd-binary" type="s">
+-      <default>'/usr/bin/spamd'</default>
++      <default>'@EPREFIX@/usr/sbin/spamd'</default>
+       <_summary>SpamAssassin daemon binary</_summary>
+       <_description>SpamAssassin daemon binary</_description>
+     </key>
+diff --git a/modules/spamassassin/evolution-spamassassin.c b/modules/spamassassin/evolution-spamassassin.c
+index 7f595ca..a92e02d 100644
+--- a/modules/spamassassin/evolution-spamassassin.c
++++ b/modules/spamassassin/evolution-spamassassin.c
+@@ -35,19 +35,19 @@
+ 	((obj), E_TYPE_SPAM_ASSASSIN, ESpamAssassin))
+ 
+ #ifndef SPAMASSASSIN_BINARY
+-#define SPAMASSASSIN_BINARY "/usr/bin/spamassassin"
++#define SPAMASSASSIN_BINARY "@EPREFIX@/usr/bin/spamassassin"
+ #endif
+ 
+ #ifndef SA_LEARN_BINARY
+-#define SA_LEARN_BINARY "/usr/bin/sa-learn"
++#define SA_LEARN_BINARY "@EPREFIX@/usr/bin/sa-learn"
+ #endif
+ 
+ #ifndef SPAMC_BINARY
+-#define SPAMC_BINARY "/usr/bin/spamc"
++#define SPAMC_BINARY "@EPREFIX@/usr/bin/spamc"
+ #endif
+ 
+ #ifndef SPAMD_BINARY
+-#define SPAMD_BINARY "/usr/bin/spamd"
++#define SPAMD_BINARY "@EPREFIX@/usr/sbin/spamd"
+ #endif
+ 
+ /* For starting our own daemon. */
+-- 
+1.7.8.5
+



^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: mail-client/evolution/, mail-client/evolution/files/
@ 2012-04-04 14:18 Alexandre Restovtsev
  0 siblings, 0 replies; 10+ messages in thread
From: Alexandre Restovtsev @ 2012-04-04 14:18 UTC (permalink / raw
  To: gentoo-commits

commit:     2d6318e64313f4a27f2517cad384e59563ab03e8
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Wed Apr  4 13:59:30 2012 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Wed Apr  4 13:59:30 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=2d6318e6

mail-client/evolution: fix spam filtering + qa

---
 ...-3.4.0.1.ebuild => evolution-3.4.0.1-r1.ebuild} |    5 +-
 .../files/evolution-3.4.0.1-spam-detection.patch   |   65 ++++++++++++++++++++
 2 files changed, 69 insertions(+), 1 deletions(-)

diff --git a/mail-client/evolution/evolution-3.4.0.1.ebuild b/mail-client/evolution/evolution-3.4.0.1-r1.ebuild
similarity index 97%
rename from mail-client/evolution/evolution-3.4.0.1.ebuild
rename to mail-client/evolution/evolution-3.4.0.1-r1.ebuild
index cebe0ac..2d08333 100644
--- a/mail-client/evolution/evolution-3.4.0.1.ebuild
+++ b/mail-client/evolution/evolution-3.4.0.1-r1.ebuild
@@ -7,7 +7,7 @@ GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 PYTHON_DEPEND="python? 2:2.5"
 
-inherit autotools eutils flag-o-matic gnome2 python
+inherit eutils flag-o-matic gnome2 python
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
@@ -150,6 +150,9 @@ src_prepare() {
 		-i data/org.gnome.evolution.spamassassin.gschema.xml.in \
 		-i modules/spamassassin/evolution-spamassassin.c || die "sed failed"
 
+	# Upstream patch to fix spam auto-detection
+	epatch "${FILESDIR}/${P}-spam-detection.patch"
+
 	gnome2_src_prepare
 
 	# Fix compilation flags crazyness

diff --git a/mail-client/evolution/files/evolution-3.4.0.1-spam-detection.patch b/mail-client/evolution/files/evolution-3.4.0.1-spam-detection.patch
new file mode 100644
index 0000000..7218b24
--- /dev/null
+++ b/mail-client/evolution/files/evolution-3.4.0.1-spam-detection.patch
@@ -0,0 +1,65 @@
+From 1436abc060444cfba9f1d7a9cc050bd6307b5449 Mon Sep 17 00:00:00 2001
+From: Milan Crha <mcrha@redhat.com>
+Date: Mon, 2 Apr 2012 12:40:50 +0200
+Subject: [PATCH] Bug #672916 - Spam is not detected automatically
+
+---
+ libemail-engine/e-mail-session.c |   28 ++++++++++++----------------
+ 1 files changed, 12 insertions(+), 16 deletions(-)
+
+diff --git a/libemail-engine/e-mail-session.c b/libemail-engine/e-mail-session.c
+index 193756f..0b1625f 100644
+--- a/libemail-engine/e-mail-session.c
++++ b/libemail-engine/e-mail-session.c
+@@ -860,6 +860,18 @@ mail_session_constructed (GObject *object)
+ 		settings, "junk-default-plugin",
+ 		object, "junk-filter-name",
+ 		G_SETTINGS_BIND_DEFAULT);
++
++	camel_session_set_check_junk (
++		CAMEL_SESSION (session), g_settings_get_boolean (
++		settings, "junk-check-incoming"));
++	g_signal_connect (
++		settings, "changed",
++		G_CALLBACK (mail_session_check_junk_notify), session);
++
++	mail_config_reload_junk_headers (session);
++
++	e_proxy_setup_proxy (session->priv->proxy);
++
+ 	g_object_unref (settings);
+ }
+ 
+@@ -1545,7 +1557,6 @@ e_mail_session_class_init (EMailSessionClass *class)
+ static void
+ e_mail_session_init (EMailSession *session)
+ {
+-	GSettings *settings;
+ 	GHashTable *junk_filters;
+ 
+ 	junk_filters = g_hash_table_new (
+@@ -1565,21 +1576,6 @@ e_mail_session_init (EMailSession *session)
+ 
+ 	/* Initialize the EAccount setup. */
+ 	e_account_writable (NULL, E_ACCOUNT_SOURCE_SAVE_PASSWD);
+-
+-	settings = g_settings_new ("org.gnome.evolution.mail");
+-
+-	camel_session_set_check_junk (
+-		CAMEL_SESSION (session), g_settings_get_boolean (
+-		settings, "junk-check-incoming"));
+-	g_signal_connect (
+-		settings, "changed",
+-		G_CALLBACK (mail_session_check_junk_notify), session);
+-
+-	mail_config_reload_junk_headers (session);
+-
+-	e_proxy_setup_proxy (session->priv->proxy);
+-
+-	g_object_unref (settings);
+ }
+ 
+ EMailSession *
+-- 
+1.7.8.5
+



^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: mail-client/evolution/, mail-client/evolution/files/
@ 2012-04-20  7:12 Alexandre Restovtsev
  0 siblings, 0 replies; 10+ messages in thread
From: Alexandre Restovtsev @ 2012-04-20  7:12 UTC (permalink / raw
  To: gentoo-commits

commit:     488aa8a8e8a0da5124285c4df250435c76eaa4de
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 20 05:48:04 2012 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Fri Apr 20 07:11:28 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=488aa8a8

mail-client/evolution: 3.4.0 → 3.4.1

---
 ...on-3.4.0.1-r1.ebuild => evolution-3.4.1.ebuild} |    7 +--
 .../files/evolution-3.4.0.1-spam-detection.patch   |   65 --------------------
 2 files changed, 2 insertions(+), 70 deletions(-)

diff --git a/mail-client/evolution/evolution-3.4.0.1-r1.ebuild b/mail-client/evolution/evolution-3.4.1.ebuild
similarity index 96%
rename from mail-client/evolution/evolution-3.4.0.1-r1.ebuild
rename to mail-client/evolution/evolution-3.4.1.ebuild
index 2d08333..b7a1837 100644
--- a/mail-client/evolution/evolution-3.4.0.1-r1.ebuild
+++ b/mail-client/evolution/evolution-3.4.1.ebuild
@@ -7,7 +7,7 @@ GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 PYTHON_DEPEND="python? 2:2.5"
 
-inherit eutils flag-o-matic gnome2 python
+inherit autotools eutils flag-o-matic gnome2 python
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
@@ -39,7 +39,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.30:2
 	>=dev-libs/libgweather-2.90.0:2
 	>=media-libs/libcanberra-0.25[gtk3]
 	>=x11-libs/libnotify-0.7
-	>=gnome-extra/evolution-data-server-3.4[gnome-online-accounts?,weather]
+	>=gnome-extra/evolution-data-server-${PV}[gnome-online-accounts?,weather]
 	>=gnome-extra/gtkhtml-4.1.2:4.0
 	>=gnome-base/gconf-2:2
 	dev-libs/atk
@@ -150,9 +150,6 @@ src_prepare() {
 		-i data/org.gnome.evolution.spamassassin.gschema.xml.in \
 		-i modules/spamassassin/evolution-spamassassin.c || die "sed failed"
 
-	# Upstream patch to fix spam auto-detection
-	epatch "${FILESDIR}/${P}-spam-detection.patch"
-
 	gnome2_src_prepare
 
 	# Fix compilation flags crazyness

diff --git a/mail-client/evolution/files/evolution-3.4.0.1-spam-detection.patch b/mail-client/evolution/files/evolution-3.4.0.1-spam-detection.patch
deleted file mode 100644
index 7218b24..0000000
--- a/mail-client/evolution/files/evolution-3.4.0.1-spam-detection.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 1436abc060444cfba9f1d7a9cc050bd6307b5449 Mon Sep 17 00:00:00 2001
-From: Milan Crha <mcrha@redhat.com>
-Date: Mon, 2 Apr 2012 12:40:50 +0200
-Subject: [PATCH] Bug #672916 - Spam is not detected automatically
-
----
- libemail-engine/e-mail-session.c |   28 ++++++++++++----------------
- 1 files changed, 12 insertions(+), 16 deletions(-)
-
-diff --git a/libemail-engine/e-mail-session.c b/libemail-engine/e-mail-session.c
-index 193756f..0b1625f 100644
---- a/libemail-engine/e-mail-session.c
-+++ b/libemail-engine/e-mail-session.c
-@@ -860,6 +860,18 @@ mail_session_constructed (GObject *object)
- 		settings, "junk-default-plugin",
- 		object, "junk-filter-name",
- 		G_SETTINGS_BIND_DEFAULT);
-+
-+	camel_session_set_check_junk (
-+		CAMEL_SESSION (session), g_settings_get_boolean (
-+		settings, "junk-check-incoming"));
-+	g_signal_connect (
-+		settings, "changed",
-+		G_CALLBACK (mail_session_check_junk_notify), session);
-+
-+	mail_config_reload_junk_headers (session);
-+
-+	e_proxy_setup_proxy (session->priv->proxy);
-+
- 	g_object_unref (settings);
- }
- 
-@@ -1545,7 +1557,6 @@ e_mail_session_class_init (EMailSessionClass *class)
- static void
- e_mail_session_init (EMailSession *session)
- {
--	GSettings *settings;
- 	GHashTable *junk_filters;
- 
- 	junk_filters = g_hash_table_new (
-@@ -1565,21 +1576,6 @@ e_mail_session_init (EMailSession *session)
- 
- 	/* Initialize the EAccount setup. */
- 	e_account_writable (NULL, E_ACCOUNT_SOURCE_SAVE_PASSWD);
--
--	settings = g_settings_new ("org.gnome.evolution.mail");
--
--	camel_session_set_check_junk (
--		CAMEL_SESSION (session), g_settings_get_boolean (
--		settings, "junk-check-incoming"));
--	g_signal_connect (
--		settings, "changed",
--		G_CALLBACK (mail_session_check_junk_notify), session);
--
--	mail_config_reload_junk_headers (session);
--
--	e_proxy_setup_proxy (session->priv->proxy);
--
--	g_object_unref (settings);
- }
- 
- EMailSession *
--- 
-1.7.8.5
-



^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: mail-client/evolution/, mail-client/evolution/files/
@ 2012-08-10 20:40 Priit Laes
  0 siblings, 0 replies; 10+ messages in thread
From: Priit Laes @ 2012-08-10 20:40 UTC (permalink / raw
  To: gentoo-commits

commit:     bfd4a5d0d6c2bdd838672fd1b8bd392e0c78221e
Author:     Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Fri Aug 10 20:34:12 2012 +0000
Commit:     Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Fri Aug 10 20:36:39 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=bfd4a5d0

mail-client/evolution: Fix build with < gcc-4.6

---
 mail-client/evolution/evolution-3.5.5.ebuild       |    3 ++
 ...n-of-typedef-causing-build-error-with-gcc.patch |   26 ++++++++++++++++++++
 2 files changed, 29 insertions(+), 0 deletions(-)

diff --git a/mail-client/evolution/evolution-3.5.5.ebuild b/mail-client/evolution/evolution-3.5.5.ebuild
index f7f5055..c666ed5 100644
--- a/mail-client/evolution/evolution-3.5.5.ebuild
+++ b/mail-client/evolution/evolution-3.5.5.ebuild
@@ -124,6 +124,9 @@ pkg_setup() {
 src_prepare() {
 	# Fix paths for Gentoo spamassassin executables
 	epatch "${FILESDIR}/${PN}-3.3.91-spamassassin-paths.patch"
+
+	epatch "${FILESDIR}/${P}-redefinition-of-typedef-causing-build-error-with-gcc.patch"
+
 	sed -e "s:@EPREFIX@:${EPREFIX}:g" \
 		-i data/org.gnome.evolution.spamassassin.gschema.xml.in \
 		-i modules/spamassassin/evolution-spamassassin.c || die "sed failed"

diff --git a/mail-client/evolution/files/evolution-3.5.5-redefinition-of-typedef-causing-build-error-with-gcc.patch b/mail-client/evolution/files/evolution-3.5.5-redefinition-of-typedef-causing-build-error-with-gcc.patch
new file mode 100644
index 0000000..3b311ac
--- /dev/null
+++ b/mail-client/evolution/files/evolution-3.5.5-redefinition-of-typedef-causing-build-error-with-gcc.patch
@@ -0,0 +1,26 @@
+From 56f34fd99f5c8aed29342cb04f061817ed0d1cb6 Mon Sep 17 00:00:00 2001
+From: Priit Laes <plaes@plaes.org>
+Date: Fri, 10 Aug 2012 23:28:01 +0300
+Subject: [PATCH] Redefinition of typedef causing build error with <=gcc-4.5.x
+
+https://bugzilla.gnome.org/show_bug.cgi?id=681625
+---
+ modules/itip-formatter/e-mail-part-itip.h |    2 --
+ 1 files changed, 0 insertions(+), 2 deletions(-)
+
+diff --git a/modules/itip-formatter/e-mail-part-itip.h b/modules/itip-formatter/e-mail-part-itip.h
+index 4e464e0..525650c 100644
+--- a/modules/itip-formatter/e-mail-part-itip.h
++++ b/modules/itip-formatter/e-mail-part-itip.h
+@@ -33,8 +33,6 @@
+ 
+ G_BEGIN_DECLS
+ 
+-typedef struct _EMailPartItip EMailPartItip;
+-
+ struct _EMailPartItip {
+ 	EMailPart parent;
+ 
+-- 
+1.7.8.6
+


^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: mail-client/evolution/, mail-client/evolution/files/
@ 2012-08-25  8:06 Priit Laes
  0 siblings, 0 replies; 10+ messages in thread
From: Priit Laes @ 2012-08-25  8:06 UTC (permalink / raw
  To: gentoo-commits

commit:     27a6463ee72a3cdca61bb692f74333dd506e5561
Author:     Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Sat Aug 25 08:04:56 2012 +0000
Commit:     Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Sat Aug 25 08:04:56 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=27a6463e

mail-client/evolution: Revbump due to webkit-gtk API/ABI break

---
 ...on-3.5.90.ebuild => evolution-3.5.90-r1.ebuild} |    5 +++-
 mail-client/evolution/evolution-9999.ebuild        |    3 +-
 ...n-of-typedef-causing-build-error-with-gcc.patch |   26 --------------------
 .../evolution-3.5.90-webkit-api-abi-break.patch    |   26 ++++++++++++++++++++
 4 files changed, 32 insertions(+), 28 deletions(-)

diff --git a/mail-client/evolution/evolution-3.5.90.ebuild b/mail-client/evolution/evolution-3.5.90-r1.ebuild
similarity index 97%
rename from mail-client/evolution/evolution-3.5.90.ebuild
rename to mail-client/evolution/evolution-3.5.90-r1.ebuild
index cf8c024..5929eb4 100644
--- a/mail-client/evolution/evolution-3.5.90.ebuild
+++ b/mail-client/evolution/evolution-3.5.90-r1.ebuild
@@ -29,6 +29,7 @@ PINENTRY_DEPEND="|| ( app-crypt/pinentry[gtk] app-crypt/pinentry-qt app-crypt/pi
 
 # glade-3 support is for maintainers only per configure.ac
 # pst is not mature enough and changes API/ABI frequently
+# webkit-gtk-1.9.90 dep is due to ABI/API break
 COMMON_DEPEND=">=dev-libs/glib-2.32:2
 	>=x11-libs/cairo-1.9.15[glib]
 	>=x11-libs/gtk+-3.4.0:3
@@ -46,7 +47,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.32:2
 	>=x11-misc/shared-mime-info-0.22
 	>=x11-themes/gnome-icon-theme-2.30.2.1
 	>=dev-libs/libgdata-0.10
-	>=net-libs/webkit-gtk-1.8.0
+	>=net-libs/webkit-gtk-1.9.90
 
 	x11-libs/libSM
 	x11-libs/libICE
@@ -118,6 +119,8 @@ src_prepare() {
 	# Fix paths for Gentoo spamassassin executables
 	epatch "${FILESDIR}/${PN}-3.3.91-spamassassin-paths.patch"
 
+	epatch "${FILESDIR}/${P}-webkit-api-abi-break.patch"
+
 	sed -e "s:@EPREFIX@:${EPREFIX}:g" \
 		-i data/org.gnome.evolution.spamassassin.gschema.xml.in \
 		-i modules/spamassassin/evolution-spamassassin.c || die "sed failed"

diff --git a/mail-client/evolution/evolution-9999.ebuild b/mail-client/evolution/evolution-9999.ebuild
index cf8c024..16f6f66 100644
--- a/mail-client/evolution/evolution-9999.ebuild
+++ b/mail-client/evolution/evolution-9999.ebuild
@@ -29,6 +29,7 @@ PINENTRY_DEPEND="|| ( app-crypt/pinentry[gtk] app-crypt/pinentry-qt app-crypt/pi
 
 # glade-3 support is for maintainers only per configure.ac
 # pst is not mature enough and changes API/ABI frequently
+# webkit-gtk-1.9.90 dep is due to ABI/API break
 COMMON_DEPEND=">=dev-libs/glib-2.32:2
 	>=x11-libs/cairo-1.9.15[glib]
 	>=x11-libs/gtk+-3.4.0:3
@@ -46,7 +47,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.32:2
 	>=x11-misc/shared-mime-info-0.22
 	>=x11-themes/gnome-icon-theme-2.30.2.1
 	>=dev-libs/libgdata-0.10
-	>=net-libs/webkit-gtk-1.8.0
+	>=net-libs/webkit-gtk-1.9.90
 
 	x11-libs/libSM
 	x11-libs/libICE

diff --git a/mail-client/evolution/files/evolution-3.5.5-redefinition-of-typedef-causing-build-error-with-gcc.patch b/mail-client/evolution/files/evolution-3.5.5-redefinition-of-typedef-causing-build-error-with-gcc.patch
deleted file mode 100644
index 3b311ac..0000000
--- a/mail-client/evolution/files/evolution-3.5.5-redefinition-of-typedef-causing-build-error-with-gcc.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 56f34fd99f5c8aed29342cb04f061817ed0d1cb6 Mon Sep 17 00:00:00 2001
-From: Priit Laes <plaes@plaes.org>
-Date: Fri, 10 Aug 2012 23:28:01 +0300
-Subject: [PATCH] Redefinition of typedef causing build error with <=gcc-4.5.x
-
-https://bugzilla.gnome.org/show_bug.cgi?id=681625
----
- modules/itip-formatter/e-mail-part-itip.h |    2 --
- 1 files changed, 0 insertions(+), 2 deletions(-)
-
-diff --git a/modules/itip-formatter/e-mail-part-itip.h b/modules/itip-formatter/e-mail-part-itip.h
-index 4e464e0..525650c 100644
---- a/modules/itip-formatter/e-mail-part-itip.h
-+++ b/modules/itip-formatter/e-mail-part-itip.h
-@@ -33,8 +33,6 @@
- 
- G_BEGIN_DECLS
- 
--typedef struct _EMailPartItip EMailPartItip;
--
- struct _EMailPartItip {
- 	EMailPart parent;
- 
--- 
-1.7.8.6
-

diff --git a/mail-client/evolution/files/evolution-3.5.90-webkit-api-abi-break.patch b/mail-client/evolution/files/evolution-3.5.90-webkit-api-abi-break.patch
new file mode 100644
index 0000000..c5c61e1
--- /dev/null
+++ b/mail-client/evolution/files/evolution-3.5.90-webkit-api-abi-break.patch
@@ -0,0 +1,26 @@
+From 485704419b11685e4753024dabec53d1668aaa9d Mon Sep 17 00:00:00 2001
+From: Dominique Leuenberger <dimstar@opensuse.org>
+Date: Fri, 24 Aug 2012 20:47:00 +0000
+Subject: Adjust for webkit 1.9.90 API change.
+
+---
+diff --git a/widgets/misc/e-web-view.c b/widgets/misc/e-web-view.c
+index 802e402..6612876 100644
+--- a/widgets/misc/e-web-view.c
++++ b/widgets/misc/e-web-view.c
+@@ -390,8 +390,13 @@ replace_text (WebKitDOMNode *node,
+ 			}
+ 
+ 			split_offset = offset - node_data + text_length;
++			#if WEBKIT_CHECK_VERSION (1, 9, 90)
++			replacement_node =
++				webkit_dom_node_clone_node (replacement, TRUE, NULL);
++			#else
+ 			replacement_node =
+ 				webkit_dom_node_clone_node (replacement, TRUE);
++			#endif
+ 
+ 			data_length = webkit_dom_character_data_get_length (
+ 					(WebKitDOMCharacterData *) node);
+--
+cgit v0.9.0.2


^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: mail-client/evolution/, mail-client/evolution/files/
@ 2012-09-02 10:14 Priit Laes
  0 siblings, 0 replies; 10+ messages in thread
From: Priit Laes @ 2012-09-02 10:14 UTC (permalink / raw
  To: gentoo-commits

commit:     6deb97ac602e74be621d8ec7f459f4a27f335b6d
Author:     Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Sun Sep  2 10:13:56 2012 +0000
Commit:     Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Sun Sep  2 10:13:56 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=6deb97ac

mail-client/evolution: 3.5.90 → 3.5.91

---
 ...on-3.5.90-r1.ebuild => evolution-3.5.91.ebuild} |    3 +-
 mail-client/evolution/evolution-9999.ebuild        |    1 +
 .../evolution-3.5.90-webkit-api-abi-break.patch    |   26 --------------------
 3 files changed, 2 insertions(+), 28 deletions(-)

diff --git a/mail-client/evolution/evolution-3.5.90-r1.ebuild b/mail-client/evolution/evolution-3.5.91.ebuild
similarity index 98%
rename from mail-client/evolution/evolution-3.5.90-r1.ebuild
rename to mail-client/evolution/evolution-3.5.91.ebuild
index 121e05f..5cbb0e8 100644
--- a/mail-client/evolution/evolution-3.5.90-r1.ebuild
+++ b/mail-client/evolution/evolution-3.5.91.ebuild
@@ -29,6 +29,7 @@ PINENTRY_DEPEND="|| ( app-crypt/pinentry[gtk] app-crypt/pinentry-qt app-crypt/pi
 
 # glade-3 support is for maintainers only per configure.ac
 # pst is not mature enough and changes API/ABI frequently
+# also supports gstreamer 1.0
 COMMON_DEPEND=">=dev-libs/glib-2.32:2
 	>=x11-libs/cairo-1.9.15[glib]
 	>=x11-libs/gtk+-3.4.0:3
@@ -118,8 +119,6 @@ src_prepare() {
 	# Fix paths for Gentoo spamassassin executables
 	epatch "${FILESDIR}/${PN}-3.3.91-spamassassin-paths.patch"
 
-	epatch "${FILESDIR}/${P}-webkit-api-abi-break.patch"
-
 	sed -e "s:@EPREFIX@:${EPREFIX}:g" \
 		-i data/org.gnome.evolution.spamassassin.gschema.xml.in \
 		-i modules/spamassassin/evolution-spamassassin.c || die "sed failed"

diff --git a/mail-client/evolution/evolution-9999.ebuild b/mail-client/evolution/evolution-9999.ebuild
index cf8c024..5cbb0e8 100644
--- a/mail-client/evolution/evolution-9999.ebuild
+++ b/mail-client/evolution/evolution-9999.ebuild
@@ -29,6 +29,7 @@ PINENTRY_DEPEND="|| ( app-crypt/pinentry[gtk] app-crypt/pinentry-qt app-crypt/pi
 
 # glade-3 support is for maintainers only per configure.ac
 # pst is not mature enough and changes API/ABI frequently
+# also supports gstreamer 1.0
 COMMON_DEPEND=">=dev-libs/glib-2.32:2
 	>=x11-libs/cairo-1.9.15[glib]
 	>=x11-libs/gtk+-3.4.0:3

diff --git a/mail-client/evolution/files/evolution-3.5.90-webkit-api-abi-break.patch b/mail-client/evolution/files/evolution-3.5.90-webkit-api-abi-break.patch
deleted file mode 100644
index c5c61e1..0000000
--- a/mail-client/evolution/files/evolution-3.5.90-webkit-api-abi-break.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 485704419b11685e4753024dabec53d1668aaa9d Mon Sep 17 00:00:00 2001
-From: Dominique Leuenberger <dimstar@opensuse.org>
-Date: Fri, 24 Aug 2012 20:47:00 +0000
-Subject: Adjust for webkit 1.9.90 API change.
-
----
-diff --git a/widgets/misc/e-web-view.c b/widgets/misc/e-web-view.c
-index 802e402..6612876 100644
---- a/widgets/misc/e-web-view.c
-+++ b/widgets/misc/e-web-view.c
-@@ -390,8 +390,13 @@ replace_text (WebKitDOMNode *node,
- 			}
- 
- 			split_offset = offset - node_data + text_length;
-+			#if WEBKIT_CHECK_VERSION (1, 9, 90)
-+			replacement_node =
-+				webkit_dom_node_clone_node (replacement, TRUE, NULL);
-+			#else
- 			replacement_node =
- 				webkit_dom_node_clone_node (replacement, TRUE);
-+			#endif
- 
- 			data_length = webkit_dom_character_data_get_length (
- 					(WebKitDOMCharacterData *) node);
---
-cgit v0.9.0.2


^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: mail-client/evolution/, mail-client/evolution/files/
@ 2013-03-03 12:50 Priit Laes
  0 siblings, 0 replies; 10+ messages in thread
From: Priit Laes @ 2013-03-03 12:50 UTC (permalink / raw
  To: gentoo-commits

commit:     12544bba84e79a37f7d6769085bcaceffad4430b
Author:     Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Sun Mar  3 12:49:55 2013 +0000
Commit:     Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Sun Mar  3 12:49:55 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=12544bba

mail-client/evolution: Add 3.7.90 to overlay

---
 mail-client/evolution/evolution-3.7.90.ebuild      |  156 ++++++++++++++++++++
 .../evolution-3.3.91-spamassassin-paths.patch      |   60 --------
 2 files changed, 156 insertions(+), 60 deletions(-)

diff --git a/mail-client/evolution/evolution-3.7.90.ebuild b/mail-client/evolution/evolution-3.7.90.ebuild
new file mode 100644
index 0000000..b1f7635
--- /dev/null
+++ b/mail-client/evolution/evolution-3.7.90.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit eutils flag-o-matic gnome2 versionator
+if [[ ${PV} = 9999 ]]; then
+	inherit gnome2-live
+fi
+MY_MAJORV=$(get_version_component_range 1-2)
+
+DESCRIPTION="Integrated mail, addressbook and calendaring functionality"
+HOMEPAGE="http://projects.gnome.org/evolution/"
+
+# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
+LICENSE="|| ( LGPL-2 LGPL-3 ) CC-BY-SA-3.0 FDL-1.3+ OPENLDAP"
+SLOT="2.0"
+IUSE="bogofilter crypt +gnome-online-accounts gstreamer highlight kerberos ldap map spamassassin ssl +weather"
+if [[ ${PV} = 9999 ]]; then
+	IUSE="${IUSE} doc"
+	KEYWORDS=""
+else
+	KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+fi
+
+# We need a graphical pinentry frontend to be able to ask for the GPG
+# password from inside evolution, bug 160302
+PINENTRY_DEPEND="|| ( app-crypt/pinentry[gtk] app-crypt/pinentry-qt app-crypt/pinentry[qt4] )"
+
+# glade-3 support is for maintainers only per configure.ac
+# pst is not mature enough and changes API/ABI frequently
+COMMON_DEPEND=">=dev-libs/glib-2.34:2
+	>=x11-libs/cairo-1.9.15:=[glib]
+	>=x11-libs/gtk+-3.4.0:3
+	>=gnome-base/gnome-desktop-2.91.3:3=
+	>=gnome-base/gsettings-desktop-schemas-2.91.92
+	>=media-libs/libcanberra-0.25[gtk3]
+	>=x11-libs/libnotify-0.7:=
+	>=gnome-extra/evolution-data-server-${PV}:=[gnome-online-accounts?,weather?]
+	=gnome-extra/evolution-data-server-${MY_MAJORV}*
+	>=gnome-extra/gtkhtml-4.5.2:4.0
+	dev-libs/atk
+	>=dev-libs/dbus-glib-0.6
+	>=dev-libs/libxml2-2.7.3:2
+	>=net-libs/libsoup-gnome-2.40.3:2.4
+	>=x11-misc/shared-mime-info-0.22
+	>=x11-themes/gnome-icon-theme-2.30.2.1
+	>=dev-libs/libgdata-0.10:=
+	>=net-libs/webkit-gtk-1.10.0
+
+	x11-libs/libSM
+	x11-libs/libICE
+
+	crypt? ( || (
+		( >=app-crypt/gnupg-2.0.1-r2 ${PINENTRY_DEPEND} )
+		=app-crypt/gnupg-1.4* ) )
+	map? (
+		>=app-misc/geoclue-0.12.0
+		>=media-libs/libchamplain-0.12:0.12
+		>=media-libs/clutter-1.0.0:1.0
+		>=media-libs/clutter-gtk-0.90:1.0
+		>=sci-geosciences/geocode-glib-0.99.0
+		x11-libs/mx:1.0 )
+	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.2 )
+	gstreamer? ( || (
+		 ( media-libs/gstreamer:1.0
+		   media-libs/gst-plugins-base:1.0 )
+		 ( media-libs/gstreamer:0.10
+		   media-libs/gst-plugins-base:0.10 )
+	) )
+	kerberos? ( virtual/krb5:= )
+	ldap? ( >=net-nds/openldap-2:= )
+	ssl? (
+		>=dev-libs/nspr-4.6.1:=
+		>=dev-libs/nss-3.11:= )
+	weather? ( >=dev-libs/libgweather-3.5.0:2= )"
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.40.0
+	virtual/pkgconfig"
+# eautoreconf needs:
+#	app-text/yelp-tools
+#	>=gnome-base/gnome-common-2.12
+RDEPEND="${COMMON_DEPEND}
+	bogofilter? ( mail-filter/bogofilter )
+	highlight? ( app-text/highlight )
+	spamassassin? ( mail-filter/spamassassin )
+	!<gnome-extra/evolution-exchange-2.32"
+
+if [[ ${PV} = 9999 ]]; then
+	DEPEND="${DEPEND}
+		app-text/yelp-tools
+		doc? ( >=dev-util/gtk-doc-1.14 )"
+fi
+
+src_prepare() {
+	ELTCONF="--reverse-deps"
+	DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS* README"
+
+	sed -e "s:@EPREFIX@:${EPREFIX}:g" \
+		-i data/org.gnome.evolution.spamassassin.gschema.xml.in \
+		-i modules/spamassassin/evolution-spamassassin.c || die "sed failed"
+
+	gnome2_src_prepare
+
+	# Fix compilation flags crazyness
+	sed -e 's/\(AM_CPPFLAGS="\)$WARNING_FLAGS/\1/' \
+		-i configure || die "CPPFLAGS sed failed"
+}
+
+src_configure() {
+	# Use NSS/NSPR only if 'ssl' is enabled.
+	# image-inline plugin needs a gtk+:3 gtkimageview, which does not exist yet
+	[[ ${PV} != 9999 ]] && G2CONF="${G2CONF} ITSTOOL=$(type -P true)"
+	gnome2_src_configure \
+		--disable-schemas-compile \
+		--without-glade-catalog \
+		--without-kde-applnk-path \
+		--disable-image-inline \
+		--disable-pst-import \
+		--enable-canberra \
+		$(use_enable bogofilter) \
+		$(use_enable gnome-online-accounts goa) \
+		$(use_enable gstreamer audio-inline) \
+		$(use_enable highlight) \
+		$(use_enable map contact-maps) \
+		$(use_enable spamassassin) \
+		$(use_enable ssl nss) \
+		$(use_enable ssl smime) \
+		$(use_with kerberos krb5 "${EPREFIX}"/usr) \
+		$(use_with ldap openldap) \
+		$(usex ssl --enable-nss=yes "--without-nspr-libs
+			--without-nspr-includes
+			--without-nss-libs
+			--without-nss-includes") \
+		$(use_enable weather)
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	elog "To change the default browser if you are not using GNOME, edit"
+	elog "~/.local/share/applications/mimeapps.list so it includes the"
+	elog "following content:"
+	elog ""
+	elog "[Default Applications]"
+	elog "x-scheme-handler/http=firefox.desktop"
+	elog "x-scheme-handler/https=firefox.desktop"
+	elog ""
+	elog "(replace firefox.desktop with the name of the appropriate .desktop"
+	elog "file from /usr/share/applications if you use a different browser)."
+}

diff --git a/mail-client/evolution/files/evolution-3.3.91-spamassassin-paths.patch b/mail-client/evolution/files/evolution-3.3.91-spamassassin-paths.patch
deleted file mode 100644
index 3078fb9..0000000
--- a/mail-client/evolution/files/evolution-3.3.91-spamassassin-paths.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 2f4ddb9f4d4262afbf8f60dd601a639ae33e05c6 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Fri, 16 Mar 2012 01:56:14 -0400
-Subject: [PATCH] Use correct Gentoo paths for spamassassin executables
-
----
- ...org.gnome.evolution.spamassassin.gschema.xml.in |    4 ++--
- modules/spamassassin/evolution-spamassassin.c      |    8 ++++----
- 2 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/data/org.gnome.evolution.spamassassin.gschema.xml.in b/data/org.gnome.evolution.spamassassin.gschema.xml.in
-index 85d43d4..07fabd3 100644
---- a/data/org.gnome.evolution.spamassassin.gschema.xml.in
-+++ b/data/org.gnome.evolution.spamassassin.gschema.xml.in
-@@ -16,12 +16,12 @@
-       <_description>Use SpamAssassin daemon and client (spamc/spamd).</_description>
-     </key>
-     <key name="spamc-binary" type="s">
--      <default>'/usr/bin/spamc'</default>
-+      <default>'@EPREFIX@/usr/bin/spamc'</default>
-       <_summary>SpamAssassin client binary</_summary>
-       <_description>SpamAssassin client binary</_description>
-     </key>
-     <key name="spamd-binary" type="s">
--      <default>'/usr/bin/spamd'</default>
-+      <default>'@EPREFIX@/usr/sbin/spamd'</default>
-       <_summary>SpamAssassin daemon binary</_summary>
-       <_description>SpamAssassin daemon binary</_description>
-     </key>
-diff --git a/modules/spamassassin/evolution-spamassassin.c b/modules/spamassassin/evolution-spamassassin.c
-index 7f595ca..a92e02d 100644
---- a/modules/spamassassin/evolution-spamassassin.c
-+++ b/modules/spamassassin/evolution-spamassassin.c
-@@ -35,19 +35,19 @@
- 	((obj), E_TYPE_SPAM_ASSASSIN, ESpamAssassin))
- 
- #ifndef SPAMASSASSIN_BINARY
--#define SPAMASSASSIN_BINARY "/usr/bin/spamassassin"
-+#define SPAMASSASSIN_BINARY "@EPREFIX@/usr/bin/spamassassin"
- #endif
- 
- #ifndef SA_LEARN_BINARY
--#define SA_LEARN_BINARY "/usr/bin/sa-learn"
-+#define SA_LEARN_BINARY "@EPREFIX@/usr/bin/sa-learn"
- #endif
- 
- #ifndef SPAMC_BINARY
--#define SPAMC_BINARY "/usr/bin/spamc"
-+#define SPAMC_BINARY "@EPREFIX@/usr/bin/spamc"
- #endif
- 
- #ifndef SPAMD_BINARY
--#define SPAMD_BINARY "/usr/bin/spamd"
-+#define SPAMD_BINARY "@EPREFIX@/usr/sbin/spamd"
- #endif
- 
- /* For starting our own daemon. */
--- 
-1.7.8.5
-


^ permalink raw reply related	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2013-03-03 12:50 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-03-03 12:50 [gentoo-commits] proj/gnome:master commit in: mail-client/evolution/, mail-client/evolution/files/ Priit Laes
  -- strict thread matches above, loose matches on Subject: below --
2012-09-02 10:14 Priit Laes
2012-08-25  8:06 Priit Laes
2012-08-10 20:40 Priit Laes
2012-04-20  7:12 Alexandre Restovtsev
2012-04-04 14:18 Alexandre Restovtsev
2012-03-16  6:09 Alexandre Restovtsev
2012-03-16  2:27 Alexandre Restovtsev
2011-10-31  7:35 Alexandre Restovtsev
2011-02-09 20:13 Nirbheek Chauhan

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox