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 930EA138010 for ; Sat, 25 Aug 2012 08:06:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 12C08E04EC; Sat, 25 Aug 2012 08:06:09 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id C13DDE04EC for ; Sat, 25 Aug 2012 08:06:09 +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 BD6C333D79E for ; Sat, 25 Aug 2012 08:06:08 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 4601FE543D for ; Sat, 25 Aug 2012 08:06:07 +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: <1345881896.27a6463ee72a3cdca61bb692f74333dd506e5561.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.90.ebuild mail-client/evolution/evolution-9999.ebuild mail-client/evolution/files/evolution-3.5.5-redefinition-of-typedef-causing-build-error-with-gcc.patch 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: 27a6463ee72a3cdca61bb692f74333dd506e5561 X-VCS-Branch: master Date: Sat, 25 Aug 2012 08:06:07 +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: a540477c-4bff-4fdb-8005-208a7e5c0707 X-Archives-Hash: 9c97b0bd96d5fa710752acfdf7f36bc4 commit: 27a6463ee72a3cdca61bb692f74333dd506e5561 Author: Priit Laes plaes org> AuthorDate: Sat Aug 25 08:04:56 2012 +0000 Commit: Priit Laes plaes 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 -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 +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