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 3039C138010 for ; Wed, 10 Oct 2012 17:35:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9C7A5E04C2; Wed, 10 Oct 2012 17:34:43 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 0B06DE04C2 for ; Wed, 10 Oct 2012 17:34:42 +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 0AB9633D797 for ; Wed, 10 Oct 2012 17:34:42 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id A0BDBE5436 for ; Wed, 10 Oct 2012 17:34:39 +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: <1349890356.3a106303c6d33cde43a51c6982bf02e772d625a3.plaes@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: net-libs/webkit-gtk/files/, net-libs/webkit-gtk/ X-VCS-Repository: proj/gnome X-VCS-Files: net-libs/webkit-gtk/files/webkit-gtk-1.9.4-llint-build-failure.patch net-libs/webkit-gtk/webkit-gtk-1.10.0-r300.ebuild net-libs/webkit-gtk/webkit-gtk-1.9.91-r300.ebuild X-VCS-Directories: net-libs/webkit-gtk/files/ net-libs/webkit-gtk/ X-VCS-Committer: plaes X-VCS-Committer-Name: Priit Laes X-VCS-Revision: 3a106303c6d33cde43a51c6982bf02e772d625a3 X-VCS-Branch: master Date: Wed, 10 Oct 2012 17:34:39 +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: 2f0a538a-5124-4622-a544-2b62553e0748 X-Archives-Hash: 9f8ba3b16519823ff9aa9b37507b9f13 commit: 3a106303c6d33cde43a51c6982bf02e772d625a3 Author: Priit Laes plaes org> AuthorDate: Wed Oct 10 17:32:36 2012 +0000 Commit: Priit Laes plaes org> CommitDate: Wed Oct 10 17:32:36 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=3a106303 net-libs/webkit-gtk: 1.9.91 → 1.10.0 --- .../webkit-gtk-1.9.4-llint-build-failure.patch | 43 -------------------- ...1-r300.ebuild => webkit-gtk-1.10.0-r300.ebuild} | 6 +-- 2 files changed, 1 insertions(+), 48 deletions(-) diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.9.4-llint-build-failure.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.9.4-llint-build-failure.patch deleted file mode 100644 index a614d3b..0000000 --- a/net-libs/webkit-gtk/files/webkit-gtk-1.9.4-llint-build-failure.patch +++ /dev/null @@ -1,43 +0,0 @@ -[GTK] LLint build fails with -g -02 -https://bugs.webkit.org/show_bug.cgi?id=90098 - -diff --git a/Source/JavaScriptCore/offlineasm/offsets.rb b/Source/JavaScriptCore/offlineasm/offsets.rb -index 4f2734f..ecd1b53 100644 ---- a/Source/JavaScriptCore/offlineasm/offsets.rb -+++ b/Source/JavaScriptCore/offlineasm/offsets.rb -@@ -60,7 +60,7 @@ end - - # - # offsetsAndConfigurationIndex(ast, file) -> --# [[offsets, index], ...] -+# {[offsets, index], ...} - # - # Parses the offsets from a file and returns a list of offsets and the - # index of the configuration that is valid in this build target. -@@ -68,7 +68,7 @@ end - - def offsetsAndConfigurationIndex(file) - endiannessMarkerBytes = nil -- result = [] -+ result = {} - - def readInt(endianness, bytes) - if endianness == :little -@@ -154,13 +154,15 @@ def offsetsAndConfigurationIndex(file) - | data | - offsets << readInt(endianness, data) - } -- result << [offsets, index] -+ #result << [offsets, index] -+ if not result.has_key?(offsets) -+ result[offsets] = index -+ end - } - end - } - - raise MissingMagicValuesException unless result.length >= 1 -- raise if result.map{|v| v[1]}.uniq.size < result.map{|v| v[1]}.size - - result - end diff --git a/net-libs/webkit-gtk/webkit-gtk-1.9.91-r300.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.10.0-r300.ebuild similarity index 97% rename from net-libs/webkit-gtk/webkit-gtk-1.9.91-r300.ebuild rename to net-libs/webkit-gtk/webkit-gtk-1.10.0-r300.ebuild index 4680564..1fb6329 100644 --- a/net-libs/webkit-gtk/webkit-gtk-1.9.91-r300.ebuild +++ b/net-libs/webkit-gtk/webkit-gtk-1.10.0-r300.ebuild @@ -7,7 +7,7 @@ EAPI="4" # Don't define PYTHON_DEPEND: python only needed at build time inherit autotools flag-o-matic gnome2-utils pax-utils python virtualx -MY_P="webkit-${PV}" +MY_P="webkitgtk-${PV}" DESCRIPTION="Open source web browser engine" HOMEPAGE="http://www.webkitgtk.org/" SRC_URI="http://www.webkitgtk.org/releases/${MY_P}.tar.xz" @@ -133,10 +133,6 @@ src_prepare() { # occasional test failure due to additional Xvfb process spawned # TODO epatch "${FILESDIR}/${PN}-1.8.1-tests-xvfb.patch" - # Build failure with "-g -O2" - # https://bugs.webkit.org/show_bug.cgi?id=90098 - epatch "${FILESDIR}/${PN}-1.9.4-llint-build-failure.patch" - # bug #417523, https://bugs.webkit.org/show_bug.cgi?id=96602 epatch "${FILESDIR}/${PN}-1.9.91-libdl.patch"