diff options
| -rw-r--r-- | net-libs/webkit-gtk/ChangeLog | 7 | ||||
| -rw-r--r-- | net-libs/webkit-gtk/Manifest | 6 | ||||
| -rw-r--r-- | net-libs/webkit-gtk/files/webkit-gtk-1.2.5-darwin-quartz.patch | 79 | ||||
| -rw-r--r-- | net-libs/webkit-gtk/files/webkit-gtk-1.2.5-darwin8.patch | 33 | ||||
| -rw-r--r-- | net-libs/webkit-gtk/webkit-gtk-1.2.5.ebuild | 20 |
5 files changed, 132 insertions, 13 deletions
diff --git a/net-libs/webkit-gtk/ChangeLog b/net-libs/webkit-gtk/ChangeLog index 12775560c1d2..98c2f97007ee 100644 --- a/net-libs/webkit-gtk/ChangeLog +++ b/net-libs/webkit-gtk/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-libs/webkit-gtk # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.84 2010/11/24 08:12:00 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.85 2010/11/25 07:25:39 grobian Exp $ + + 25 Nov 2010; Fabian Groffen <grobian@gentoo.org> webkit-gtk-1.2.5.ebuild, + +files/webkit-gtk-1.2.5-darwin-quartz.patch, + +files/webkit-gtk-1.2.5-darwin8.patch: + Re-introduce USE=aqua, add necessary patches 24 Nov 2010; Fabian Groffen <grobian@gentoo.org> webkit-gtk-1.2.5.ebuild: Fix double-prefix issue, bug #346595 diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest index 0fb32ac98a0a..ca040a1aabee 100644 --- a/net-libs/webkit-gtk/Manifest +++ b/net-libs/webkit-gtk/Manifest @@ -2,11 +2,13 @@ AUX webkit-gtk-1.1.15.2-unaligned.patch 4403 RMD160 c9ba117a35e07ed1097787934fdb AUX webkit-gtk-1.1.15.4-darwin-quartz.patch 2353 RMD160 4293e345e05390cf93b97d381edb7c443ae0cc02 SHA1 f2d67803f59503ff9d408be0a38983ac25439dad SHA256 3aedd95fc50d92b31e6043d1e8df0c50385b96503e94945547b1f65675f21a12 AUX webkit-gtk-1.1.15.4-icu44.patch 4907 RMD160 aec153a9a9cbeb435a0e28ba567daf215380d870 SHA1 c5366b8f1e65105faa170ef8c90c1d94f739fec2 SHA256 75a6f47728436082b5039f961f3dc5a10888c1c49779c2b4dcbb0321cf65ef8e AUX webkit-gtk-1.2.3-fix-pool-sparc.patch 2518 RMD160 48ec89fb42403fae1b1533b54917a3311553cc78 SHA1 8c4e6c5e7c0c957ee1743a0d347b50f992460c17 SHA256 aee1f0d846c1e47c225e421a774fe93c49b71b7d31234fc5515d33922f130434 +AUX webkit-gtk-1.2.5-darwin-quartz.patch 1984 RMD160 5995be8598b62aff487726de02ac12b1a79357b4 SHA1 c7f0c5ac74f8a92f93ab36cfa1e1356f6112eac8 SHA256 8f37d606dec60186c10cca8795adc1dd3c8ec4ded86c94bad3036ed955573b78 +AUX webkit-gtk-1.2.5-darwin8.patch 1152 RMD160 a546515b8a088f8f11e532662833c3e41ad6df83 SHA1 e1e841cae9d5a70940630a918b40ac4b27497c58 SHA256 51e3fb832793cb0be13ceff63d1b4c4ef82efaa7b3151ab53d04ae966d65efa6 DIST webkit-1.1.15.4.tar.gz 6093252 RMD160 dcfae86f7a2fc63b478741b370ac620d1659513e SHA1 0778b130720756d880c2bbe9eeef79f35bcf861a SHA256 ec2511fc1d4a1e64534574cd5f9b2bc552de9bb22d7b3837dd17146fb5f1c90f DIST webkit-1.2.3.tar.gz 6740030 RMD160 41fa194de2865867dbf7d1156d0962a7580f2275 SHA1 88c38ebeba187a062272b2aa8ca2bbd0bbb86306 SHA256 ff70b25ea8dedc0031f29f2ea8d9aa226bfa65ebd2f12772390f4e2845306fe1 DIST webkit-1.2.5.tar.gz 6727977 RMD160 7510af4c5d15c06adf984a090a9e9550f5ea7147 SHA1 2cd50e62a0c94bba8cc8a8466ea16fac1f9fc1ce SHA256 b08a69a9ccbd84b2e23a94caf7eb5cfc390bb6cef49a4921b5eb11860b329d41 EBUILD webkit-gtk-1.1.15.4.ebuild 2557 RMD160 771413d3807a9da4522f483f4e838b8120177175 SHA1 7d71f4cacd1ebf7d8066f4e9e3cbb055c5515e58 SHA256 f1c9236bb0cefb171230c5b6852f2ce96036c75e25b45bbf262f81475386f89a EBUILD webkit-gtk-1.2.3.ebuild 3225 RMD160 1b77c8ffe7a7670f4b3ad7a47531589d3f4ede09 SHA1 d9455dd4b8212de85f15197750959b7d28d58cd1 SHA256 c986810420fb57c811bfb548201749df24d74bdd2cd73bbe7490f2a4d05f82b1 -EBUILD webkit-gtk-1.2.5.ebuild 3037 RMD160 a7ef98d6c61763487058f6405946fa2372b044b8 SHA1 e38904989e535a8d736382bfa41d7e4b11e0009c SHA256 0b50f31d6e2ee66ebbf947f2e1bedba4f2e4d0d9938eb99371bc78b3e169f569 -MISC ChangeLog 17331 RMD160 f36da716c72e88fa932ca3fcfe7d5a7a69afbf83 SHA1 66800031d1daaec9435037a39315797b68c37da6 SHA256 cbe45afbf1c91e4df09ccd70f1abf5fb0762fadd42c7f814bdc93cac7ed9651d +EBUILD webkit-gtk-1.2.5.ebuild 3046 RMD160 d34cbc829f8210f06382e08a0a5299f0f7c8b443 SHA1 bda4b76c3db66326c9d645037187ea685d72a612 SHA256 c81a3296f5cb6d0343c5be3a47d4a18c4da845405be1cab1b67e33bda6549b88 +MISC ChangeLog 17543 RMD160 33c1aa11e5b83fb6f17a76190978bdd533476fcc SHA1 9b02c5e6361e0364f2072bb7314de65250f0446c SHA256 9cf049cbf5d343869fc4a6d3b68053c5eae0b2f15a779eea8104f7a3379105d1 MISC metadata.xml 415 RMD160 4cf82e15e7b1dadf71e0b4549a01b41f508d36e2 SHA1 f74ebd33bba8b57f7714e7267e2f13f97277bd38 SHA256 7498f904ea7154281d4082a83ff5a47647bdfca09ee3da630dd8e6a1ee6b0e1e diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.2.5-darwin-quartz.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.2.5-darwin-quartz.patch new file mode 100644 index 000000000000..fe1ebc4d50a8 --- /dev/null +++ b/net-libs/webkit-gtk/files/webkit-gtk-1.2.5-darwin-quartz.patch @@ -0,0 +1,79 @@ +http://trac.macports.org/browser/trunk/dports/www/webkit-gtk/files/patch-quartz-WebCore-plugins-gtk-gtkxtbin.c.diff?format=txt +http://trac.macports.org/browser/trunk/dports/www/webkit-gtk/files/patch-quartz-WebCore-plugins-gtk-PluginViewGtk.cpp.diff?format=txt + +--- 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. + */ +- ++#if 0 + #include "GtkVersioning.h" + #include "xembed.h" + #include "gtk2xtbin.h" +@@ -951,3 +951,4 @@ + + return; + } ++#endif +--- WebCore/plugins/gtk/PluginViewGtk.cpp.orig 2010-09-10 06:20:33.000000000 -0700 ++++ WebCore/plugins/gtk/PluginViewGtk.cpp 2010-10-06 09:45:37.000000000 -0700 +@@ -60,10 +60,13 @@ + #include "runtime_root.h" + #include <runtime/JSLock.h> + #include <runtime/JSValue.h> ++#include "NotImplemented.h" + + #include <gdkconfig.h> + #include <gtk/gtk.h> + ++#undef XP_UNIX ++ + #if defined(XP_UNIX) + #include "gtk2xtbin.h" + #define Bool int // this got undefined somewhere +@@ -441,9 +444,9 @@ + event->setDefaultHandled(); + } + +-#if defined(XP_UNIX) + void PluginView::handleFocusInEvent() + { ++#if defined(XP_UNIX) + XEvent npEvent; + initXEvent(&npEvent); + +@@ -453,10 +456,12 @@ + event.detail = NotifyDetailNone; + + dispatchNPEvent(npEvent); ++#endif + } + + void PluginView::handleFocusOutEvent() + { ++#if defined(XP_UNIX) + XEvent npEvent; + initXEvent(&npEvent); + +@@ -466,8 +471,8 @@ + event.detail = NotifyDetailNone; + + dispatchNPEvent(npEvent); +-} + #endif ++} + + void PluginView::setParent(ScrollView* parent) + { +@@ -797,8 +802,8 @@ + } + + if (m_isWindowed) { +-#if defined(XP_UNIX) + GtkWidget* pageClient = m_parentFrame->view()->hostWindow()->platformPageClient(); ++#if defined(XP_UNIX) + + 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/net-libs/webkit-gtk/files/webkit-gtk-1.2.5-darwin8.patch new file mode 100644 index 000000000000..cf25b5dd57a9 --- /dev/null +++ b/net-libs/webkit-gtk/files/webkit-gtk-1.2.5-darwin8.patch @@ -0,0 +1,33 @@ +https://bugs.webkit.org/show_bug.cgi?id=39847 + +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_; + +-#if USE_BACKGROUND_THREAD_TO_SCAVENGE_MEMORY + // Number of pages kept in free lists that are still committed. + Length free_committed_pages_; + + // Minimum number of free committed pages since last scavenge. (Can be 0 if + // we've committed new pages since the last scavenge.) + Length min_free_committed_pages_since_last_scavenge_; +-#endif + + bool GrowHeap(Length n); + +--- WebCore/config.h ++++ WebCore/config.h +@@ -125,7 +125,7 @@ + // this breaks compilation of <QFontDatabase>, at least, so turn it off for now + // Also generates errors on wx on Windows, presumably because these functions + // are used from wx headers. +-#if !PLATFORM(QT) && !PLATFORM(WX) && !PLATFORM(CHROMIUM) ++#if !PLATFORM(QT) && !PLATFORM(WX) && !PLATFORM(CHROMIUM) && !defined(BUILDING_ON_TIGER) + #include <wtf/DisallowCType.h> + #endif + diff --git a/net-libs/webkit-gtk/webkit-gtk-1.2.5.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.2.5.ebuild index 83ab654510e5..966a7557234b 100644 --- a/net-libs/webkit-gtk/webkit-gtk-1.2.5.ebuild +++ b/net-libs/webkit-gtk/webkit-gtk-1.2.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.2.5.ebuild,v 1.3 2010/11/24 08:12:00 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.2.5.ebuild,v 1.4 2010/11/25 07:25:39 grobian Exp $ EAPI="3" @@ -15,19 +15,18 @@ LICENSE="LGPL-2 LGPL-2.1 BSD" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos" # geoclue is missing -IUSE="coverage debug doc +gstreamer introspection" # aqua +IUSE="aqua coverage debug doc +gstreamer introspection" # use sqlite, svg by default # dependency on >=x11-libs/gtk+-2.13 for gail # XXX: Quartz patch does not apply -# >=x11-libs/gtk+-2.13[aqua=] RDEPEND=" dev-libs/libxml2 dev-libs/libxslt virtual/jpeg >=media-libs/libpng-1.4 x11-libs/cairo - >=x11-libs/gtk+-2.13 + >=x11-libs/gtk+-2.13[aqua=] >=dev-libs/glib-2.21.3 >=dev-libs/icu-3.8.1-r1 >=net-libs/libsoup-2.29.90 @@ -55,10 +54,12 @@ src_prepare() { # https://bugs.webkit.org/show_bug.cgi?id=19775 use sparc && epatch "${FILESDIR}"/${PN}-1.2.3-fix-pool-sparc.patch - # Darwin/Aqua build is broken, needs autoreconf - # XXX: BROKEN. Patch does not apply anymore. + # intermediate MacPorts hack while upstream bug is not fixed properly # https://bugs.webkit.org/show_bug.cgi?id=28727 - #epatch "${FILESDIR}"/${PN}-1.1.15.4-darwin-quartz.patch + use aqua && epatch "${FILESDIR}"/${P}-darwin-quartz.patch + + # Fix build on Darwin8 (10.4 Tiger) + epatch "${FILESDIR}"/${P}-darwin8.patch # Don't force -O2 sed -i 's/-O2//g' "${S}"/configure.ac || die "sed failed" @@ -82,10 +83,9 @@ src_configure() { $(use_enable coverage) $(use_enable debug) $(use_enable gstreamer video) - $(use_enable introspection)" + $(use_enable introspection) + $(use aqua && echo "--with-font-backend=pango --with-target=quartz")" # Disable web-sockets per bug #326547 - # quartz patch above does not apply anymore - #$(use aqua && echo "--with-target=quartz")" econf ${myconf} } |