Title: [149954] releases/WebKitGTK/webkit-2.0/Tools
- Revision
- 149954
- Author
- [email protected]
- Date
- 2013-05-12 04:19:19 -0700 (Sun, 12 May 2013)
Log Message
Merge r145881 - Build fix for Tools/GtkLauncher/Programs_GtkLauncher-main.o if gstreamer is not installed
https://bugs.webkit.org/show_bug.cgi?id=112394
Patch by Tobias Mueller <[email protected]> on 2013-03-15
Reviewed by Philippe Normand.
* GtkLauncher/main.c:
(main): Guard using the gstreamer function with #ifdef WTF_USE_GSTREAMER
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.0/Tools/ChangeLog (149953 => 149954)
--- releases/WebKitGTK/webkit-2.0/Tools/ChangeLog 2013-05-12 11:15:54 UTC (rev 149953)
+++ releases/WebKitGTK/webkit-2.0/Tools/ChangeLog 2013-05-12 11:19:19 UTC (rev 149954)
@@ -1,3 +1,13 @@
+2013-03-15 Tobias Mueller <[email protected]>
+
+ Build fix for Tools/GtkLauncher/Programs_GtkLauncher-main.o if gstreamer is not installed
+ https://bugs.webkit.org/show_bug.cgi?id=112394
+
+ Reviewed by Philippe Normand.
+
+ * GtkLauncher/main.c:
+ (main): Guard using the gstreamer function with #ifdef WTF_USE_GSTREAMER
+
2013-04-08 Manuel Rego Casasnovas <[email protected]>
[GTK] Bump gnome-themes-standard to 3.6.0
Modified: releases/WebKitGTK/webkit-2.0/Tools/GtkLauncher/main.c (149953 => 149954)
--- releases/WebKitGTK/webkit-2.0/Tools/GtkLauncher/main.c 2013-05-12 11:15:54 UTC (rev 149953)
+++ releases/WebKitGTK/webkit-2.0/Tools/GtkLauncher/main.c 2013-05-12 11:19:19 UTC (rev 149954)
@@ -28,7 +28,9 @@
#include "autotoolsconfig.h"
#include "LauncherInspectorWindow.h"
#include <errno.h>
+#ifdef WTF_USE_GSTREAMER
#include <gst/gst.h>
+#endif
#include <gtk/gtk.h>
#include <stdlib.h>
#include <string.h>
@@ -489,8 +491,9 @@
GOptionContext *context = g_option_context_new(0);
g_option_context_add_main_entries(context, commandLineOptions, 0);
g_option_context_add_group(context, gtk_get_option_group(TRUE));
+#ifdef WTF_USE_GSTREAMER
g_option_context_add_group(context, gst_init_get_option_group());
-
+#endif
webkitSettings = webkit_web_settings_new();
g_object_set(webkitSettings, "enable-developer-extras", TRUE, NULL);
if (!addWebSettingsGroupToContext(context, webkitSettings)) {
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
