From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QVDFj-0003CF-Nj for garchives@archives.gentoo.org; Sat, 11 Jun 2011 01:44:44 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B364B1C00F; Sat, 11 Jun 2011 01:44:34 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 5B6B41C00F for ; Sat, 11 Jun 2011 01:44:34 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D7B702AC00B for ; Sat, 11 Jun 2011 01:44:33 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id E80E98003C for ; Sat, 11 Jun 2011 01:44:32 +0000 (UTC) From: "Nirbheek Chauhan" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Nirbheek Chauhan" Message-ID: <8887d9954c0e9af89adfc6a19b6b8adae25c1e93.nirbheek@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.2.5-darwin-quartz.patch net-libs/webkit-gtk/files/webkit-gtk-1.2.5-darwin8.patch net-libs/webkit-gtk/files/webkit-gtk-1.2.5-tests-build.patch net-libs/webkit-gtk/webkit-gtk-1.4.1-r200.ebuild net-libs/webkit-gtk/webkit-gtk-1.4.1.ebuild X-VCS-Directories: net-libs/webkit-gtk/files/ net-libs/webkit-gtk/ X-VCS-Committer: nirbheek X-VCS-Committer-Name: Nirbheek Chauhan X-VCS-Revision: 8887d9954c0e9af89adfc6a19b6b8adae25c1e93 Date: Sat, 11 Jun 2011 01:44:32 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 880ac4dfcc9485c2330d5fd19cb1ac6b commit: 8887d9954c0e9af89adfc6a19b6b8adae25c1e93 Author: Nirbheek Chauhan gentoo org> AuthorDate: Sat Jun 11 01:44:08 2011 +0000 Commit: Nirbheek Chauhan gentoo org> CommitDate: Sat Jun 11 01:44:08 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3D8887d995 net-libs/webkit-gtk: moved to the tree --- .../files/webkit-gtk-1.2.5-darwin-quartz.patch | 79 ------------ .../files/webkit-gtk-1.2.5-darwin8.patch | 33 ----- .../files/webkit-gtk-1.2.5-tests-build.patch | 22 ---- net-libs/webkit-gtk/webkit-gtk-1.4.1-r200.ebuild | 131 --------------= ----- net-libs/webkit-gtk/webkit-gtk-1.4.1.ebuild | 133 --------------= ------ 5 files changed, 0 insertions(+), 398 deletions(-) diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.2.5-darwin-quartz.pat= ch b/net-libs/webkit-gtk/files/webkit-gtk-1.2.5-darwin-quartz.patch deleted file mode 100644 index fe1ebc4..0000000 --- a/net-libs/webkit-gtk/files/webkit-gtk-1.2.5-darwin-quartz.patch +++ /dev/null @@ -1,79 +0,0 @@ -http://trac.macports.org/browser/trunk/dports/www/webkit-gtk/files/patch= -quartz-WebCore-plugins-gtk-gtkxtbin.c.diff?format=3Dtxt -http://trac.macports.org/browser/trunk/dports/www/webkit-gtk/files/patch= -quartz-WebCore-plugins-gtk-PluginViewGtk.cpp.diff?format=3Dtxt - ---- WebCore/plugins/gtk/gtk2xtbin.c.orig 2010-09-10 06:20:33.000000000 -= 0700 -+++ WebCore/plugins/gtk/gtk2xtbin.c 2010-10-06 09:45:37.000000000 -0700 -@@ -41,7 +41,7 @@ - * The GtkXtBin widget allows for Xt toolkit code to be used - * inside a GTK application. =20 - */ -- -+#if 0 - #include "GtkVersioning.h" - #include "xembed.h" - #include "gtk2xtbin.h" -@@ -951,3 +951,4 @@ -=20 - return; - } -+#endif ---- WebCore/plugins/gtk/PluginViewGtk.cpp.orig 2010-09-10 06:20:33.00000= 0000 -0700 -+++ WebCore/plugins/gtk/PluginViewGtk.cpp 2010-10-06 09:45:37.000000000 = -0700 -@@ -60,10 +60,13 @@ - #include "runtime_root.h" - #include - #include -+#include "NotImplemented.h" -=20 - #include - #include -=20 -+#undef XP_UNIX -+ - #if defined(XP_UNIX) - #include "gtk2xtbin.h" - #define Bool int // this got undefined somewhere -@@ -441,9 +444,9 @@ - event->setDefaultHandled(); - } -=20 --#if defined(XP_UNIX) - void PluginView::handleFocusInEvent() - { -+#if defined(XP_UNIX) - XEvent npEvent; - initXEvent(&npEvent); -=20 -@@ -453,10 +456,12 @@ - event.detail =3D NotifyDetailNone; -=20 - dispatchNPEvent(npEvent); -+#endif - } -=20 - void PluginView::handleFocusOutEvent() - { -+#if defined(XP_UNIX) - XEvent npEvent; - initXEvent(&npEvent); -=20 -@@ -466,8 +471,8 @@ - event.detail =3D NotifyDetailNone; -=20 - dispatchNPEvent(npEvent); --} - #endif -+} -=20 - void PluginView::setParent(ScrollView* parent) - { -@@ -797,8 +802,8 @@ - } -=20 - if (m_isWindowed) { --#if defined(XP_UNIX) - GtkWidget* pageClient =3D m_parentFrame->view()->hostWindow()->= platformPageClient(); -+#if defined(XP_UNIX) -=20 - if (m_needsXEmbed) { - // If our parent is not anchored the startup process will diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.2.5-darwin8.patch b/n= et-libs/webkit-gtk/files/webkit-gtk-1.2.5-darwin8.patch deleted file mode 100644 index cf25b5d..0000000 --- a/net-libs/webkit-gtk/files/webkit-gtk-1.2.5-darwin8.patch +++ /dev/null @@ -1,33 +0,0 @@ -https://bugs.webkit.org/show_bug.cgi?id=3D39847 - -additionally, also on Darwin8 glib stuff includes system headers that -use isascii, so we can't have it die on that. - ---- JavaScriptCore/wtf/FastMalloc.cpp -+++ JavaScriptCore/wtf/FastMalloc.cpp -@@ -1381,14 +1381,12 @@ - // Bytes allocated from system - uint64_t system_bytes_; -=20 --#if USE_BACKGROUND_THREAD_TO_SCAVENGE_MEMORY - // Number of pages kept in free lists that are still committed. - Length free_committed_pages_; -=20 - // Minimum number of free committed pages since last scavenge. (Can b= e 0 if - // we've committed new pages since the last scavenge.) - Length min_free_committed_pages_since_last_scavenge_; --#endif -=20 - bool GrowHeap(Length n); -=20 ---- WebCore/config.h -+++ WebCore/config.h -@@ -125,7 +125,7 @@ - // this breaks compilation of , at least, so turn it off= for now - // Also generates errors on wx on Windows, presumably because these fun= ctions - // are used from wx headers. --#if !PLATFORM(QT) && !PLATFORM(WX) && !PLATFORM(CHROMIUM) -+#if !PLATFORM(QT) && !PLATFORM(WX) && !PLATFORM(CHROMIUM) && !defined(B= UILDING_ON_TIGER) - #include - #endif -=20 diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.2.5-tests-build.patch= b/net-libs/webkit-gtk/files/webkit-gtk-1.2.5-tests-build.patch deleted file mode 100644 index 0d9e144..0000000 --- a/net-libs/webkit-gtk/files/webkit-gtk-1.2.5-tests-build.patch +++ /dev/null @@ -1,22 +0,0 @@ -Do not build tests if not requested to. - ---- a/GNUmakefile.am 2010-12-21 17:23:58.000000000 +0100 -+++ b/GNUmakefile.am 2010-12-21 17:24:28.000000000 +0100 -@@ -46,7 +46,8 @@ -=20 - # Libraries and support components - bin_PROGRAMS :=3D -+check_PROGRAMS :=3D - noinst_PROGRAMS :=3D - noinst_HEADERS :=3D - noinst_LTLIBRARIES :=3D - lib_LIBRARIES :=3D -@@ -541,7 +541,7 @@ - include WebKit/gtk/po/GNUmakefile.am -=20 - # Build unit tests --noinst_PROGRAMS +=3D $(TEST_PROGS) -+check_PROGRAMS +=3D $(TEST_PROGS) -=20 - webkit_tests_cflags =3D \ - -fno-strict-aliasing \ diff --git a/net-libs/webkit-gtk/webkit-gtk-1.4.1-r200.ebuild b/net-libs/= webkit-gtk/webkit-gtk-1.4.1-r200.ebuild deleted file mode 100644 index 9bacd74..0000000 --- a/net-libs/webkit-gtk/webkit-gtk-1.4.1-r200.ebuild +++ /dev/null @@ -1,131 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=3D"2" - -inherit autotools flag-o-matic eutils virtualx - -MY_P=3D"webkit-${PV}" -DESCRIPTION=3D"Open source web browser engine" -HOMEPAGE=3D"http://www.webkitgtk.org/" -SRC_URI=3D"http://www.webkitgtk.org/${MY_P}.tar.gz" - -LICENSE=3D"LGPL-2 LGPL-2.1 BSD" -SLOT=3D"2" -KEYWORDS=3D"~alpha ~amd64 ~arm ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd ~x86-fre= ebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos" -# geoclue -IUSE=3D"aqua coverage debug doc spell +gstreamer +introspection +jit" - -# use sqlite, svg by default -# dependency on >=3Dx11-libs/gtk+-2.13:2 for gail -RDEPEND=3D" - dev-libs/libxml2:2 - dev-libs/libxslt - virtual/jpeg - >=3Dmedia-libs/libpng-1.4:0 - x11-libs/cairo - >=3Ddev-libs/glib-2.27.90:2 - >=3Dx11-libs/gtk+-2.13:2[aqua=3D] - >=3Ddev-libs/icu-3.8.1-r1 - >=3Dnet-libs/libsoup-2.33.6:2.4 - >=3Ddev-db/sqlite-3 - >=3Dx11-libs/pango-1.12 - - gstreamer? ( - media-libs/gstreamer:0.10 - >=3Dmedia-libs/gst-plugins-base-0.10.25:0.10 ) - - introspection? ( - >=3Ddev-libs/gobject-introspection-0.9.5 ) - - spell? ( - >=3Dapp-text/enchant-0.22 )" - -DEPEND=3D"${RDEPEND} - >=3Dsys-devel/flex-2.5.33 - sys-devel/gettext - dev-util/gperf - dev-util/pkgconfig - dev-util/gtk-doc-am - doc? ( >=3Ddev-util/gtk-doc-1.10 ) - test? ( x11-themes/hicolor-icon-theme )" - -S=3D"${WORKDIR}/${MY_P}" - -src_prepare() { - # FIXME: Fix unaligned accesses on ARM, IA64 and SPARC - # https://bugs.webkit.org/show_bug.cgi?id=3D19775 - use sparc && epatch "${FILESDIR}"/${PN}-1.1.15.2-unaligned.patch - - # intermediate MacPorts hack while upstream bug is not fixed properly - # https://bugs.webkit.org/show_bug.cgi?id=3D28727 - use sparc && epatch "${FILESDIR}"/${PN}-1.2.3-fix-pool-sparc.patch - - # Fix build on Darwin8 (10.4 Tiger) - # XXX: Fails to apply - #epatch "${FILESDIR}"/${PN}-1.2.5-darwin8.patch - - # Don't force -O2 - sed -i 's/-O2//g' "${S}"/configure.ac || die "sed failed" - - # Don't build tests if not needed, part of bug #343249 - # XXX: Fails to apply - #epatch "${FILESDIR}/${PN}-1.2.5-tests-build.patch" - - # Prevent maintainer mode from being triggered during make - AT_M4DIR=3DSource/autotools eautoreconf -} - -src_configure() { - # It doesn't compile on alpha without this in LDFLAGS - use alpha && append-ldflags "-Wl,--no-relax" - - # Sigbuses on SPARC with mcpu and co. - use sparc && filter-flags "-mcpu=3D*" "-mvis" "-mtune=3D*" - - # https://bugs.webkit.org/show_bug.cgi?id=3D42070 , #301634 - use ppc64 && append-flags "-mminimal-toc" - - local myconf - - # XXX: Check Web Audio support - # XXX: webgl fails compilation - # XXX: Wtf is WebKit2? - myconf=3D" - $(use_enable coverage) - $(use_enable debug) - $(use_enable spell spellcheck) - $(use_enable introspection) - $(use_enable gstreamer video) - $(use_enable jit) - --disable-webgl - --with-gtk=3D2.0 - --disable-webkit2 - --disable-web-sockets - $(use aqua && echo "--with-font-backend=3Dpango --with-target=3Dquartz= ")" - # Disable web-sockets per bug #326547 - - econf ${myconf} -} - -src_compile() { - # Fix sandbox error with USE=3D"introspection" - # https://bugs.webkit.org/show_bug.cgi?id=3D35471 - emake XDG_DATA_HOME=3D"${T}/.local" || die "Compile failed" -} - -src_test() { - unset DISPLAY - # Tests need virtualx, bug #294691, bug #310695 - # Set XDG_DATA_HOME for introspection tools, bug #323669 - Xemake check XDG_DATA_HOME=3D"${T}/.local" || die "Test phase failed" -} - -src_install() { - emake DESTDIR=3D"${D}" install || die "Install failed" - dodoc Source/WebKit/gtk/{NEWS,ChangeLog} || die "dodoc failed" - - # Remove .la files - find "${D}" -name '*.la' -exec rm -f '{}' + || die -} diff --git a/net-libs/webkit-gtk/webkit-gtk-1.4.1.ebuild b/net-libs/webki= t-gtk/webkit-gtk-1.4.1.ebuild deleted file mode 100644 index 8c0dff1..0000000 --- a/net-libs/webkit-gtk/webkit-gtk-1.4.1.ebuild +++ /dev/null @@ -1,133 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=3D"2" - -inherit autotools flag-o-matic eutils virtualx - -MY_P=3D"webkit-${PV}" -DESCRIPTION=3D"Open source web browser engine" -HOMEPAGE=3D"http://www.webkitgtk.org/" -SRC_URI=3D"http://www.webkitgtk.org/${MY_P}.tar.gz" - -LICENSE=3D"LGPL-2 LGPL-2.1 BSD" -SLOT=3D"3" -KEYWORDS=3D"~alpha ~amd64 ~arm ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd ~x86-fre= ebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos" -# aqua, geoclue -IUSE=3D"coverage debug doc +gstreamer +introspection +jit spell" - -# use sqlite, svg by default -# dependency on >=3Dx11-libs/gtk+-2.13:2 for gail -# Aqua support in gtk3 is untested -RDEPEND=3D" - dev-libs/libxml2:2 - dev-libs/libxslt - virtual/jpeg - >=3Dmedia-libs/libpng-1.4:0 - x11-libs/cairo - >=3Ddev-libs/glib-2.27.90:2 - >=3Dx11-libs/gtk+-3.0:3 - >=3Ddev-libs/icu-3.8.1-r1 - >=3Dnet-libs/libsoup-2.33.6:2.4 - >=3Ddev-db/sqlite-3 - >=3Dx11-libs/pango-1.12 - - gstreamer? ( - media-libs/gstreamer:0.10 - >=3Dmedia-libs/gst-plugins-base-0.10.25:0.10 ) - - introspection? ( - >=3Ddev-libs/gobject-introspection-0.9.5 ) - - spell? ( - >=3Dapp-text/enchant-0.22 )" - -DEPEND=3D"${RDEPEND} - >=3Dsys-devel/flex-2.5.33 - sys-devel/gettext - dev-util/gperf - dev-util/pkgconfig - dev-util/gtk-doc-am - doc? ( >=3Ddev-util/gtk-doc-1.10 ) - test? ( x11-themes/hicolor-icon-theme )" - -S=3D"${WORKDIR}/${MY_P}" - -src_prepare() { - # FIXME: Fix unaligned accesses on ARM, IA64 and SPARC - # https://bugs.webkit.org/show_bug.cgi?id=3D19775 - use sparc && epatch "${FILESDIR}"/${PN}-1.2.3-fix-pool-sparc.patch - - # intermediate MacPorts hack while upstream bug is not fixed properly - # https://bugs.webkit.org/show_bug.cgi?id=3D28727 - use aqua && epatch "${FILESDIR}"/${PN}-1.2.5-darwin-quartz.patch - - # Fix build on Darwin8 (10.4 Tiger) - # XXX: Fails to apply - #epatch "${FILESDIR}"/${PN}-1.2.5-darwin8.patch - - # Don't force -O2 - sed -i 's/-O2//g' "${S}"/configure.ac || die "sed failed" - - # Don't build tests if not needed, part of bug #343249 - # XXX: Fails to apply - #epatch "${FILESDIR}/${PN}-1.2.5-tests-build.patch" - - # Prevent maintainer mode from being triggered during make - AT_M4DIR=3DSource/autotools eautoreconf -} - -src_configure() { - # It doesn't compile on alpha without this in LDFLAGS - use alpha && append-ldflags "-Wl,--no-relax" - - # Sigbuses on SPARC with mcpu and co. - use sparc && filter-flags "-mcpu=3D*" "-mvis" "-mtune=3D*" - - # https://bugs.webkit.org/show_bug.cgi?id=3D42070 , #301634 - use ppc64 && append-flags "-mminimal-toc" - - local myconf - - # XXX: Check Web Audio support - # XXX: webgl fails compilation - # XXX: Wtf is WebKit2? - myconf=3D" - $(use_enable coverage) - $(use_enable debug) - $(use_enable spell spellcheck) - $(use_enable introspection) - $(use_enable gstreamer video) - $(use_enable jit) - --disable-webgl - --with-gtk=3D3.0 - --disable-webkit2 - --disable-web-sockets" - # Aqua support in gtk3 is untested - #$(use aqua && echo "--with-font-backend=3Dpango --with-target=3Dquart= z")" - # Disable web-sockets per bug #326547 - - econf ${myconf} -} - -src_compile() { - # Fix sandbox error with USE=3D"introspection" - # https://bugs.webkit.org/show_bug.cgi?id=3D35471 - emake XDG_DATA_HOME=3D"${T}/.local" || die "Compile failed" -} - -src_test() { - unset DISPLAY - # Tests need virtualx, bug #294691, bug #310695 - # Set XDG_DATA_HOME for introspection tools, bug #323669 - Xemake check XDG_DATA_HOME=3D"${T}/.local" || die "Test phase failed" -} - -src_install() { - emake DESTDIR=3D"${D}" install || die "Install failed" - dodoc Source/WebKit/gtk/{NEWS,ChangeLog} || die "dodoc failed" - - # Remove .la files - find "${D}" -name '*.la' -exec rm -f '{}' + || die -}