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 1R8S3v-0000EG-7s for garchives@archives.gentoo.org; Tue, 27 Sep 2011 07:26:43 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D333D21C1B4; Tue, 27 Sep 2011 07:26:35 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 7E2D921C1B4 for ; Tue, 27 Sep 2011 07:26:35 +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 A98701B400D for ; Tue, 27 Sep 2011 07:26:34 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 06A0080042 for ; Tue, 27 Sep 2011 07:26:34 +0000 (UTC) From: "Alexandre Restovtsev" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexandre Restovtsev" Message-ID: Subject: [gentoo-commits] proj/gnome:gnome-next 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.5.2-deprecations.patch net-libs/webkit-gtk/files/webkit-gtk-1.5.2-mimehandling-test.patch net-libs/webkit-gtk/webkit-gtk-1.5.2-r200.ebuild net-libs/webkit-gtk/webkit-gtk-1.5.2-r300.ebuild net-libs/webkit-gtk/webkit-gtk-1.6.0-r200.ebuild net-libs/webkit-gtk/webkit-gtk-1.6.0-r300.ebuild X-VCS-Directories: net-libs/webkit-gtk/files/ net-libs/webkit-gtk/ X-VCS-Committer: tetromino X-VCS-Committer-Name: Alexandre Restovtsev X-VCS-Revision: c8a8566cb09838d45349d998d35e580d2f93fb34 Date: Tue, 27 Sep 2011 07:26:34 +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: e98d3948112864edf521512e07ebb6e5 commit: c8a8566cb09838d45349d998d35e580d2f93fb34 Author: Alexandre Rostovtsev gmail com> AuthorDate: Tue Sep 27 07:25:32 2011 +0000 Commit: Alexandre Restovtsev gmail com> CommitDate: Tue Sep 27 07:25:32 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3Dc8a8566c net-libs/webkit-gtk: 1.5.2 =E2=86=92 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 =3D> webkit-gtk-1.6.0-r200.ebuild} | 9 +- ....2-r300.ebuild =3D> 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.patc= h 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 - - [GTK] Fix compilation problems with deprecations in gtk+ - https://bugs.webkit.org/show_bug.cgi?id=3D66073 - - Reviewed by Martin Robinson. - - * platform/gtk/GtkAuthenticationDialog.cpp: - (WebCore::GtkAuthenticationDialog::GtkAuthenticationDialog): Add= ed - 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 ha= ve - GTK_TYPE_SCALE in gtk+3. - -2011-08-17 Alejandro G. Castro - - [GTK] Fix compilation problems with deprecations in gtk+ - https://bugs.webkit.org/show_bug.cgi?id=3D66073 - - 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, w= e - are just supporting gtk+-3 for WebKit2. - -2011-08-17 Alejandro G. Castro - - [GTK] Fix compilation problems with deprecations in gtk+ - https://bugs.webkit.org/show_bug.cgi?id=3D66073 - - 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 -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D ---- /trunk/Source/WebKit/gtk/WebCoreSupport/FullscreenVideoController.cp= p (revision 89044) -+++ /trunk/Source/WebKit/gtk/WebCoreSupport/FullscreenVideoController.cp= p (revision 93338) -@@ -532,5 +532,9 @@ - g_signal_connect(m_hudWindow, "motion-notify-event", G_CALLBACK(onF= ullscreenGtkMotionNotifyEvent), this); -=20 -+#ifdef GTK_API_VERSION_2 - GtkWidget* hbox =3D gtk_hbox_new(FALSE, 4); -+#else -+ GtkWidget* hbox =3D gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4); -+#endif - gtk_container_add(GTK_CONTAINER(m_hudWindow), hbox); -=20 -@@ -547,5 +551,9 @@ -=20 - GtkAdjustment* adjustment =3D GTK_ADJUSTMENT(gtk_adjustment_new(0.0= , 0.0, 100.0, 0.1, 1.0, 1.0)); -+#ifdef GTK_API_VERSION_2 - m_timeHScale =3D gtk_hscale_new(adjustment); -+#else -+ m_timeHScale =3D gtk_scale_new(GTK_ORIENTATION_HORIZONTAL, adjustme= nt); -+#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 -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D ---- /trunk/Source/WebCore/platform/gtk/RenderThemeGtk3.cpp (revision 884= 05) -+++ /trunk/Source/WebCore/platform/gtk/RenderThemeGtk3.cpp (revision 933= 38) -@@ -150,5 +150,5 @@ - case SliderVerticalPart: - case SliderHorizontalPart: -- context =3D getStyleContext(part =3D=3D SliderThumbHorizontalPa= rt ? GTK_TYPE_HSCALE : GTK_TYPE_VSCALE); -+ context =3D getStyleContext(GTK_TYPE_SCALE); - break; - case ButtonPart: -@@ -599,5 +599,5 @@ - ASSERT(part =3D=3D SliderHorizontalPart || part =3D=3D SliderVertic= alPart || part =3D=3D MediaVolumeSliderPart); -=20 -- GtkStyleContext* context =3D getStyleContext(part =3D=3D SliderThum= bHorizontalPart ? GTK_TYPE_HSCALE : GTK_TYPE_VSCALE); -+ GtkStyleContext* context =3D getStyleContext(GTK_TYPE_SCALE); - gtk_style_context_save(context); -=20 -@@ -634,5 +634,5 @@ - ASSERT(part =3D=3D SliderThumbHorizontalPart || part =3D=3D SliderT= humbVerticalPart || part =3D=3D MediaVolumeSliderThumbPart); -=20 -- GtkStyleContext* context =3D getStyleContext(part =3D=3D SliderThum= bHorizontalPart ? GTK_TYPE_HSCALE : GTK_TYPE_VSCALE); -+ GtkStyleContext* context =3D getStyleContext(GTK_TYPE_SCALE); - gtk_style_context_save(context); -=20 -@@ -675,5 +675,5 @@ -=20 - gint sliderWidth, sliderLength; -- gtk_style_context_get_style(getStyleContext(part =3D=3D SliderThumb= HorizontalPart ? 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 -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D ---- /trunk/Source/WebCore/platform/gtk/GtkAuthenticationDialog.cpp (revi= sion 88800) -+++ /trunk/Source/WebCore/platform/gtk/GtkAuthenticationDialog.cpp (revi= sion 93338) -@@ -88,5 +88,9 @@ -=20 - // Build contents. -+#ifdef GTK_API_VERSION_2 - GtkWidget* hBox =3D gtk_hbox_new(FALSE, 12); -+#else -+ GtkWidget* hBox =3D 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)), hB= ox, TRUE, TRUE, 0); -@@ -96,5 +100,9 @@ - gtk_box_pack_start(GTK_BOX(hBox), icon, FALSE, FALSE, 0); -=20 -+#ifdef GTK_API_VERSION_2 - GtkWidget* mainVBox =3D gtk_vbox_new(FALSE, 18); -+#else -+ GtkWidget* mainVBox =3D gtk_box_new(GTK_ORIENTATION_VERTICAL, 18); -+#endif - gtk_box_pack_start(GTK_BOX(hBox), mainVBox, TRUE, TRUE, 0); -=20 -@@ -106,5 +114,9 @@ - gtk_box_pack_start(GTK_BOX(mainVBox), GTK_WIDGET(descriptionLabel),= FALSE, FALSE, 0); -=20 -+#ifdef GTK_API_VERSION_2 - GtkWidget* vBox =3D gtk_vbox_new(FALSE, 6); -+#else -+ GtkWidget* vBox =3D gtk_box_new(GTK_ORIENTATION_VERTICAL, 6); -+#endif - gtk_box_pack_start(GTK_BOX(mainVBox), vBox, FALSE, FALSE, 0); -=20 -@@ -140,5 +152,9 @@ -=20 - if (sessionCanSavePasswords(m_session)) { -+#ifdef GTK_API_VERSION_2 - GtkWidget* rememberBox =3D gtk_vbox_new(FALSE, 6); -+#else -+ GtkWidget* rememberBox =3D gtk_box_new(GTK_ORIENTATION_VERTICAL= , 6); -+#endif - gtk_box_pack_start(GTK_BOX(vBox), rememberBox, FALSE, FALSE, 0)= ; -=20 -Index: /trunk/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D ---- /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(WebKitW= ebHistoryItem*); -+extern const gchar* webkit_web_history_item_get_target(WebKitWebHistory= Item*); - extern gboolean webkit_web_history_item_is_target_item(WebKitWebHistory= Item*); - extern GList* webkit_web_history_item_get_children(WebKitWebHistoryItem= *); -@@ -1168,5 +1168,10 @@ -=20 - window =3D gtk_window_new(GTK_WINDOW_POPUP); -+#ifdef GTK_API_VERSION_2 - container =3D gtk_hbox_new(TRUE, 0); -+#else -+ container =3D 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 -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D ---- /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)); -=20 -- GtkWidget *vbox =3D gtk_vbox_new(FALSE, 0); -+ GtkWidget *vbox =3D gtk_box_new(GTK_ORIENTATION_VERTICAL, 0); - window->mainBox =3D vbox; - gtk_box_pack_start(GTK_BOX(vbox), toolbar, FALSE, FALSE, 0); -Index: /trunk/Tools/GtkLauncher/main.c -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D ---- /trunk/Tools/GtkLauncher/main.c (revision 89438) -+++ /trunk/Tools/GtkLauncher/main.c (revision 93338) -@@ -214,5 +214,9 @@ - uriEntry =3D gtk_entry_new(); -=20 -+#ifdef GTK_API_VERSION_2 - vbox =3D gtk_vbox_new(FALSE, 0); -+#else -+ vbox =3D gtk_box_new(GTK_ORIENTATION_VERTICAL, 0); -+#endif - statusbar =3D 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.pat= ch 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_de= cision_requested_cb: assertion failed (mime_type =3D=3D "audio/x-vorbis+o= gg"): ("application/octet-stream" =3D=3D "audio/x-vorbis+ogg") -FAIL - -diff -ur a/Source/WebKit/gtk/GNUmakefile.am b/Source/WebKit/gtk/GNUmakef= ile.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=3D" =20 gstreamer? ( media-libs/gstreamer:0.10 - >=3Dmedia-libs/gst-plugins-base-0.10.25:0.10 ) + >=3Dmedia-libs/gst-plugins-base-0.10.30:0.10 ) =20 introspection? ( >=3Ddev-libs/gobject-introspection-0.9.5 ) =20 @@ -78,13 +78,6 @@ src_prepare() { # XXX: Fails to apply #epatch "${FILESDIR}/${PN}-1.2.5-tests-build.patch" =20 - # FIXME: mimehandling test fails, so disable it for now - # assertion failed (mime_type =3D=3D "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=3DSource/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=3D" =20 gstreamer? ( media-libs/gstreamer:0.10 - >=3Dmedia-libs/gst-plugins-base-0.10.25:0.10 ) + >=3Dmedia-libs/gst-plugins-base-0.10.30:0.10 ) =20 introspection? ( >=3Ddev-libs/gobject-introspection-0.9.5 ) =20 @@ -80,13 +80,6 @@ src_prepare() { # XXX: Fails to apply #epatch "${FILESDIR}/${PN}-1.2.5-tests-build.patch" =20 - # FIXME: mimehandling test fails, so disable it for now - # assertion failed (mime_type =3D=3D "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=3DSource/autotools eautoreconf }