[gentoo-commits] proj/gnome:gnome-next commit in: net-libs/webkit-gtk/files/, net-libs/webkit-gtk/

[Alexandre Restovtsev]

commit:     c8a8566cb09838d45349d998d35e580d2f93fb34
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Tue Sep 27 07:25:32 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Tue Sep 27 07:25:32 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=c8a8566c

net-libs/webkit-gtk: 1.5.2 → 1.6.0

Bump. Deprecations patch was applied upstream; mimehandling test patch
appears to be no longer needed (tests pass fine without it).

---
 .../files/webkit-gtk-1.5.2-deprecations.patch      |  191 --------------------
 .../files/webkit-gtk-1.5.2-mimehandling-test.patch |   17 --
 ....2-r200.ebuild => webkit-gtk-1.6.0-r200.ebuild} |    9 +-
 ....2-r300.ebuild => webkit-gtk-1.6.0-r300.ebuild} |    9 +-
 4 files changed, 2 insertions(+), 224 deletions(-)

diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.5.2-deprecations.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.5.2-deprecations.patch
deleted file mode 100644
index d21a44e..0000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-1.5.2-deprecations.patch
+++ /dev/null
@@ -1,191 +0,0 @@
-2011-08-17  Alejandro G. Castro  <alex@××××××.com>
-
-        [GTK] Fix compilation problems with deprecations in gtk+
-        https://bugs.webkit.org/show_bug.cgi?id=66073
-
-        Reviewed by Martin Robinson.
-
-        * platform/gtk/GtkAuthenticationDialog.cpp:
-        (WebCore::GtkAuthenticationDialog::GtkAuthenticationDialog): Added
-        gtk_box_new conditional compilation for gtk+-3.
-        * platform/gtk/RenderThemeGtk3.cpp:
-        (WebCore::RenderThemeGtk::adjustRepaintRect):
-        (WebCore::RenderThemeGtk::paintSliderTrack):
-        (WebCore::RenderThemeGtk::paintSliderThumb):
-        (WebCore::RenderThemeGtk::adjustSliderThumbSize): Now we have have
-        GTK_TYPE_SCALE in gtk+3.
-
-2011-08-17  Alejandro G. Castro  <alex@××××××.com>
-
-        [GTK] Fix compilation problems with deprecations in gtk+
-        https://bugs.webkit.org/show_bug.cgi?id=66073
-
-        Reviewed by Martin Robinson.
-
-        * DumpRenderTree/gtk/DumpRenderTree.cpp:
-        (main): G_CONST_RETURN was deprecated
-        * GtkLauncher/main.c:
-        (createWindow): Added gtk_box_new conditional compilation for
-        gtk+-3.
-        * MiniBrowser/gtk/BrowserWindow.c:
-        (browser_window_init): Replaced gtk_vbox_new with gtk_box_new, we
-        are just supporting gtk+-3 for WebKit2.
-
-2011-08-17  Alejandro G. Castro  <alex@××××××.com>
-
-        [GTK] Fix compilation problems with deprecations in gtk+
-        https://bugs.webkit.org/show_bug.cgi?id=66073
-
-        Reviewed by Martin Robinson.
-
-        * WebCoreSupport/FullscreenVideoController.cpp:
-        (FullscreenVideoController::createHud): Added gtk_box_new
-        conditional compilation for gtk+-3.
-
-Index: /trunk/Source/WebKit/gtk/WebCoreSupport/FullscreenVideoController.cpp
-===================================================================
---- /trunk/Source/WebKit/gtk/WebCoreSupport/FullscreenVideoController.cpp	(revision 89044)
-+++ /trunk/Source/WebKit/gtk/WebCoreSupport/FullscreenVideoController.cpp	(revision 93338)
-@@ -532,5 +532,9 @@
-     g_signal_connect(m_hudWindow, "motion-notify-event", G_CALLBACK(onFullscreenGtkMotionNotifyEvent), this);
- 
-+#ifdef GTK_API_VERSION_2
-     GtkWidget* hbox = gtk_hbox_new(FALSE, 4);
-+#else
-+    GtkWidget* hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
-+#endif
-     gtk_container_add(GTK_CONTAINER(m_hudWindow), hbox);
- 
-@@ -547,5 +551,9 @@
- 
-     GtkAdjustment* adjustment = GTK_ADJUSTMENT(gtk_adjustment_new(0.0, 0.0, 100.0, 0.1, 1.0, 1.0));
-+#ifdef GTK_API_VERSION_2
-     m_timeHScale = gtk_hscale_new(adjustment);
-+#else
-+    m_timeHScale = gtk_scale_new(GTK_ORIENTATION_HORIZONTAL, adjustment);
-+#endif
-     gtk_scale_set_draw_value(GTK_SCALE(m_timeHScale), FALSE);
-     gtk_range_set_show_fill_level(GTK_RANGE(m_timeHScale), TRUE);
-Index: /trunk/Source/WebCore/platform/gtk/RenderThemeGtk3.cpp
-===================================================================
---- /trunk/Source/WebCore/platform/gtk/RenderThemeGtk3.cpp	(revision 88405)
-+++ /trunk/Source/WebCore/platform/gtk/RenderThemeGtk3.cpp	(revision 93338)
-@@ -150,5 +150,5 @@
-     case SliderVerticalPart:
-     case SliderHorizontalPart:
--        context = getStyleContext(part == SliderThumbHorizontalPart ?  GTK_TYPE_HSCALE : GTK_TYPE_VSCALE);
-+        context = getStyleContext(GTK_TYPE_SCALE);
-         break;
-     case ButtonPart:
-@@ -599,5 +599,5 @@
-     ASSERT(part == SliderHorizontalPart || part == SliderVerticalPart || part == MediaVolumeSliderPart);
- 
--    GtkStyleContext* context = getStyleContext(part == SliderThumbHorizontalPart ? GTK_TYPE_HSCALE : GTK_TYPE_VSCALE);
-+    GtkStyleContext* context = getStyleContext(GTK_TYPE_SCALE);
-     gtk_style_context_save(context);
- 
-@@ -634,5 +634,5 @@
-     ASSERT(part == SliderThumbHorizontalPart || part == SliderThumbVerticalPart || part == MediaVolumeSliderThumbPart);
- 
--    GtkStyleContext* context = getStyleContext(part == SliderThumbHorizontalPart ? GTK_TYPE_HSCALE : GTK_TYPE_VSCALE);
-+    GtkStyleContext* context = getStyleContext(GTK_TYPE_SCALE);
-     gtk_style_context_save(context);
- 
-@@ -675,5 +675,5 @@
- 
-     gint sliderWidth, sliderLength;
--    gtk_style_context_get_style(getStyleContext(part == SliderThumbHorizontalPart ? GTK_TYPE_HSCALE : GTK_TYPE_VSCALE),
-+    gtk_style_context_get_style(getStyleContext(GTK_TYPE_SCALE),
-                                 "slider-width", &sliderWidth,
-                                 "slider-length", &sliderLength,
-Index: /trunk/Source/WebCore/platform/gtk/GtkAuthenticationDialog.cpp
-===================================================================
---- /trunk/Source/WebCore/platform/gtk/GtkAuthenticationDialog.cpp	(revision 88800)
-+++ /trunk/Source/WebCore/platform/gtk/GtkAuthenticationDialog.cpp	(revision 93338)
-@@ -88,5 +88,9 @@
- 
-     // Build contents.
-+#ifdef GTK_API_VERSION_2
-     GtkWidget* hBox = gtk_hbox_new(FALSE, 12);
-+#else
-+    GtkWidget* hBox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 12);
-+#endif
-     gtk_container_set_border_width(GTK_CONTAINER(hBox), 5);
-     gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(dialog)), hBox, TRUE, TRUE, 0);
-@@ -96,5 +100,9 @@
-     gtk_box_pack_start(GTK_BOX(hBox), icon, FALSE, FALSE, 0);
- 
-+#ifdef GTK_API_VERSION_2
-     GtkWidget* mainVBox = gtk_vbox_new(FALSE, 18);
-+#else
-+    GtkWidget* mainVBox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 18);
-+#endif
-     gtk_box_pack_start(GTK_BOX(hBox), mainVBox, TRUE, TRUE, 0);
- 
-@@ -106,5 +114,9 @@
-     gtk_box_pack_start(GTK_BOX(mainVBox), GTK_WIDGET(descriptionLabel), FALSE, FALSE, 0);
- 
-+#ifdef GTK_API_VERSION_2
-     GtkWidget* vBox = gtk_vbox_new(FALSE, 6);
-+#else
-+    GtkWidget* vBox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 6);
-+#endif
-     gtk_box_pack_start(GTK_BOX(mainVBox), vBox, FALSE, FALSE, 0);
- 
-@@ -140,5 +152,9 @@
- 
-     if (sessionCanSavePasswords(m_session)) {
-+#ifdef GTK_API_VERSION_2
-         GtkWidget* rememberBox = gtk_vbox_new(FALSE, 6);
-+#else
-+        GtkWidget* rememberBox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 6);
-+#endif
-         gtk_box_pack_start(GTK_BOX(vBox), rememberBox, FALSE, FALSE, 0);
- 
-Index: /trunk/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp
-===================================================================
---- /trunk/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp	(revision 91707)
-+++ /trunk/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp	(revision 93338)
-@@ -65,5 +65,5 @@
- extern "C" {
- // This API is not yet public.
--extern G_CONST_RETURN gchar* webkit_web_history_item_get_target(WebKitWebHistoryItem*);
-+extern const gchar* webkit_web_history_item_get_target(WebKitWebHistoryItem*);
- extern gboolean webkit_web_history_item_is_target_item(WebKitWebHistoryItem*);
- extern GList* webkit_web_history_item_get_children(WebKitWebHistoryItem*);
-@@ -1168,5 +1168,10 @@
- 
-     window = gtk_window_new(GTK_WINDOW_POPUP);
-+#ifdef GTK_API_VERSION_2
-     container = gtk_hbox_new(TRUE, 0);
-+#else
-+    container = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
-+    gtk_box_set_homogeneous(GTK_BOX(container), TRUE);
-+#endif
-     gtk_container_add(GTK_CONTAINER(window), container);
-     gtk_widget_show_all(window);
-Index: /trunk/Tools/MiniBrowser/gtk/BrowserWindow.c
-===================================================================
---- /trunk/Tools/MiniBrowser/gtk/BrowserWindow.c	(revision 90551)
-+++ /trunk/Tools/MiniBrowser/gtk/BrowserWindow.c	(revision 93338)
-@@ -160,5 +160,5 @@
-     gtk_widget_show(GTK_WIDGET(item));
- 
--    GtkWidget *vbox = gtk_vbox_new(FALSE, 0);
-+    GtkWidget *vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
-     window->mainBox = vbox;
-     gtk_box_pack_start(GTK_BOX(vbox), toolbar, FALSE, FALSE, 0);
-Index: /trunk/Tools/GtkLauncher/main.c
-===================================================================
---- /trunk/Tools/GtkLauncher/main.c	(revision 89438)
-+++ /trunk/Tools/GtkLauncher/main.c	(revision 93338)
-@@ -214,5 +214,9 @@
-     uriEntry = gtk_entry_new();
- 
-+#ifdef GTK_API_VERSION_2
-     vbox = gtk_vbox_new(FALSE, 0);
-+#else
-+    vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
-+#endif
-     statusbar = createStatusbar(webView);
-     gtk_box_pack_start(GTK_BOX(vbox), createToolbar(uriEntry, webView), FALSE, FALSE, 0);

diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.5.2-mimehandling-test.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.5.2-mimehandling-test.patch
deleted file mode 100644
index 70d52e2..0000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-1.5.2-mimehandling-test.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Disable mimehandling test for now. For unknown reasons it fails:
-
-  /webkit/mime/remote-OGG:                                             **
-ERROR:Source/WebKit/gtk/tests/testmimehandling.c:128:mime_type_policy_decision_requested_cb: assertion failed (mime_type == "audio/x-vorbis+ogg"): ("application/octet-stream" == "audio/x-vorbis+ogg")
-FAIL
-
-diff -ur a/Source/WebKit/gtk/GNUmakefile.am b/Source/WebKit/gtk/GNUmakefile.am
---- a/Source/WebKit/gtk/GNUmakefile.am
-+++ b/Source/WebKit/gtk/GNUmakefile.am
-@@ -432,7 +432,6 @@
- 	Programs/unittests/testhttpbackend \
- 	Programs/unittests/testloading \
- 	Programs/unittests/testglobals \
--	Programs/unittests/testmimehandling \
- 	Programs/unittests/testnetworkrequest \
- 	Programs/unittests/testnetworkresponse \
- 	Programs/unittests/testwebframe \

diff --git a/net-libs/webkit-gtk/webkit-gtk-1.5.2-r200.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.6.0-r200.ebuild
similarity index 91%
rename from net-libs/webkit-gtk/webkit-gtk-1.5.2-r200.ebuild
rename to net-libs/webkit-gtk/webkit-gtk-1.6.0-r200.ebuild
index 4780d01..6dd0911 100644
--- a/net-libs/webkit-gtk/webkit-gtk-1.5.2-r200.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-1.6.0-r200.ebuild
@@ -37,7 +37,7 @@ RDEPEND="
 
 	gstreamer? (
 		media-libs/gstreamer:0.10
-		>=media-libs/gst-plugins-base-0.10.25:0.10 )
+		>=media-libs/gst-plugins-base-0.10.30:0.10 )
 
 	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
 
@@ -78,13 +78,6 @@ src_prepare() {
 	# XXX: Fails to apply
 	#epatch "${FILESDIR}/${PN}-1.2.5-tests-build.patch"
 
-	# FIXME: mimehandling test fails, so disable it for now
-	# assertion failed (mime_type == "audio/x-vorbis+ogg")
-	epatch "${FILESDIR}/${PN}-1.5.2-mimehandling-test.patch"
-
-	# Upstream patch to fix deprecation failures with glib-2.29.x and gtk+-3.1.x
-	epatch "${FILESDIR}/${P}-deprecations.patch"
-
 	# Prevent maintainer mode from being triggered during make
 	AT_M4DIR=Source/autotools eautoreconf
 }

diff --git a/net-libs/webkit-gtk/webkit-gtk-1.5.2-r300.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.6.0-r300.ebuild
similarity index 92%
rename from net-libs/webkit-gtk/webkit-gtk-1.5.2-r300.ebuild
rename to net-libs/webkit-gtk/webkit-gtk-1.6.0-r300.ebuild
index 403bfed..99f3845 100644
--- a/net-libs/webkit-gtk/webkit-gtk-1.5.2-r300.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-1.6.0-r300.ebuild
@@ -39,7 +39,7 @@ RDEPEND="
 
 	gstreamer? (
 		media-libs/gstreamer:0.10
-		>=media-libs/gst-plugins-base-0.10.25:0.10 )
+		>=media-libs/gst-plugins-base-0.10.30:0.10 )
 
 	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
 
@@ -80,13 +80,6 @@ src_prepare() {
 	# XXX: Fails to apply
 	#epatch "${FILESDIR}/${PN}-1.2.5-tests-build.patch"
 
-	# FIXME: mimehandling test fails, so disable it for now
-	# assertion failed (mime_type == "audio/x-vorbis+ogg")
-	epatch "${FILESDIR}/${PN}-1.5.2-mimehandling-test.patch"
-
-	# Upstream patch to fix deprecation failures with glib-2.29.x and gtk+-3.1.x
-	epatch "${FILESDIR}/${P}-deprecations.patch"
-
 	# Prevent maintainer mode from being triggered during make
 	AT_M4DIR=Source/autotools eautoreconf
 }