From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 6C506138010 for ; Sun, 2 Sep 2012 10:14:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2ED34E045E; Sun, 2 Sep 2012 10:14:40 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id E6729E045E for ; Sun, 2 Sep 2012 10:14:39 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1FC0033D8A2 for ; Sun, 2 Sep 2012 10:14:39 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 5E118E5443 for ; Sun, 2 Sep 2012 10:14:37 +0000 (UTC) From: "Priit Laes" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Priit Laes" Message-ID: <1346580836.6deb97ac602e74be621d8ec7f459f4a27f335b6d.plaes@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: mail-client/evolution/, mail-client/evolution/files/ X-VCS-Repository: proj/gnome X-VCS-Files: mail-client/evolution/evolution-3.5.90-r1.ebuild mail-client/evolution/evolution-3.5.91.ebuild mail-client/evolution/evolution-9999.ebuild mail-client/evolution/files/evolution-3.5.90-webkit-api-abi-break.patch X-VCS-Directories: mail-client/evolution/ mail-client/evolution/files/ X-VCS-Committer: plaes X-VCS-Committer-Name: Priit Laes X-VCS-Revision: 6deb97ac602e74be621d8ec7f459f4a27f335b6d X-VCS-Branch: master Date: Sun, 2 Sep 2012 10:14:37 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 9b747d81-877e-494f-bc26-c091d7637724 X-Archives-Hash: ee3d87cf3e98190ec0ced0fb63b8e21a commit: 6deb97ac602e74be621d8ec7f459f4a27f335b6d Author: Priit Laes plaes org> AuthorDate: Sun Sep 2 10:13:56 2012 +0000 Commit: Priit Laes plaes 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 -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