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 DB3C3138010 for ; Fri, 7 Sep 2012 05:58:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E38FE21C003; Fri, 7 Sep 2012 05:58:22 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 9E33221C003 for ; Fri, 7 Sep 2012 05:58:22 +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 6297B33D4C8 for ; Fri, 7 Sep 2012 05:58:21 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 22515E543D for ; Fri, 7 Sep 2012 05:58:20 +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: <1346997449.53b40b56543aedc50a46026b181dcaa038350823.plaes@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: www-client/epiphany/files/, www-client/epiphany/ X-VCS-Repository: proj/gnome X-VCS-Files: www-client/epiphany/epiphany-3.5.91.1-r1.ebuild www-client/epiphany/epiphany-3.5.91.1.ebuild www-client/epiphany/files/epiphany-64bit-troubles.patch X-VCS-Directories: www-client/epiphany/files/ www-client/epiphany/ X-VCS-Committer: plaes X-VCS-Committer-Name: Priit Laes X-VCS-Revision: 53b40b56543aedc50a46026b181dcaa038350823 X-VCS-Branch: master Date: Fri, 7 Sep 2012 05:58:20 +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: c18fda02-3703-46ec-867a-9fa1611f0c6c X-Archives-Hash: ad1d920f654a12ac9cb49d448d5d2b49 commit: 53b40b56543aedc50a46026b181dcaa038350823 Author: Priit Laes plaes org> AuthorDate: Fri Sep 7 05:56:38 2012 +0000 Commit: Priit Laes plaes org> CommitDate: Fri Sep 7 05:57:29 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=53b40b56 www-client/epiphany: Revbump to fix 64-bit issues --- ...3.5.91.1.ebuild => epiphany-3.5.91.1-r1.ebuild} | 2 + .../epiphany/files/epiphany-64bit-troubles.patch | 36 ++++++++++++++++++++ 2 files changed, 38 insertions(+), 0 deletions(-) diff --git a/www-client/epiphany/epiphany-3.5.91.1.ebuild b/www-client/epiphany/epiphany-3.5.91.1-r1.ebuild similarity index 98% rename from www-client/epiphany/epiphany-3.5.91.1.ebuild rename to www-client/epiphany/epiphany-3.5.91.1-r1.ebuild index f6c8d34..6e81739 100644 --- a/www-client/epiphany/epiphany-3.5.91.1.ebuild +++ b/www-client/epiphany/epiphany-3.5.91.1-r1.ebuild @@ -70,6 +70,8 @@ pkg_setup() { } src_prepare() { + epatch "${FILESDIR}/${PN}-64bit-troubles.patch" + # Build-time segfaults under PaX with USE=introspection when building # against webkit-gtk[introspection,jit] if use introspection && use jit; then diff --git a/www-client/epiphany/files/epiphany-64bit-troubles.patch b/www-client/epiphany/files/epiphany-64bit-troubles.patch new file mode 100644 index 0000000..e5091c4 --- /dev/null +++ b/www-client/epiphany/files/epiphany-64bit-troubles.patch @@ -0,0 +1,36 @@ +From 8431cabd4d8f72dfaadbe64adf9f8dc89a26ae62 Mon Sep 17 00:00:00 2001 +From: Giovanni Campagna +Date: Thu, 6 Sep 2012 17:40:51 +0200 +Subject: [PATCH] EphyOverviewStore: don't register the snapshot mtime as long + +All code paths use int, and this breaks on architechtures where +long is not the same as int (such as x86_64). + +https://bugzilla.gnome.org/show_bug.cgi?id=683029 + +[Do the same for the visit time column] +Signed-off-by: Claudio Saavedra +--- + lib/widgets/ephy-overview-store.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/lib/widgets/ephy-overview-store.c b/lib/widgets/ephy-overview-store.c +index 99ef2cf..074ec8b 100644 +--- a/lib/widgets/ephy-overview-store.c ++++ b/lib/widgets/ephy-overview-store.c +@@ -161,10 +161,10 @@ ephy_overview_store_init (EphyOverviewStore *self) + types[EPHY_OVERVIEW_STORE_TITLE] = G_TYPE_STRING; + types[EPHY_OVERVIEW_STORE_AUTHOR] = G_TYPE_STRING; + types[EPHY_OVERVIEW_STORE_SNAPSHOT] = GDK_TYPE_PIXBUF; +- types[EPHY_OVERVIEW_STORE_LAST_VISIT] = G_TYPE_LONG; ++ types[EPHY_OVERVIEW_STORE_LAST_VISIT] = G_TYPE_INT; + types[EPHY_OVERVIEW_STORE_SELECTED] = G_TYPE_BOOLEAN; + types[EPHY_OVERVIEW_STORE_SNAPSHOT_CANCELLABLE] = G_TYPE_CANCELLABLE; +- types[EPHY_OVERVIEW_STORE_SNAPSHOT_MTIME] = G_TYPE_LONG; ++ types[EPHY_OVERVIEW_STORE_SNAPSHOT_MTIME] = G_TYPE_INT; + types[EPHY_OVERVIEW_STORE_CLOSE_BUTTON_RENDER_POLICY] = EPHY_TYPE_REMOVABLE_PIXBUF_RENDER_POLICY; + + gtk_list_store_set_column_types (GTK_LIST_STORE (self), +-- +1.7.12 +