diff options
| author | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2011-02-18 04:17:04 +0800 |
|---|---|---|
| committer | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2011-02-18 04:17:04 +0800 |
| commit | 2c162908da1c78fceca716b8b1816179346348ff (patch) | |
| tree | d5ca868783718718cf34a9d7a6a1eb523ba5c7ea | |
| parent | fc31b5c66b2d19b95023d54cf74d22ccf954febb (diff) | |
| download | marcuscom-ports-2c162908da1c78fceca716b8b1816179346348ff.tar marcuscom-ports-2c162908da1c78fceca716b8b1816179346348ff.tar.gz marcuscom-ports-2c162908da1c78fceca716b8b1816179346348ff.tar.bz2 marcuscom-ports-2c162908da1c78fceca716b8b1816179346348ff.tar.lz marcuscom-ports-2c162908da1c78fceca716b8b1816179346348ff.tar.xz marcuscom-ports-2c162908da1c78fceca716b8b1816179346348ff.tar.zst marcuscom-ports-2c162908da1c78fceca716b8b1816179346348ff.zip | |
Fix patching, patch was backwards.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@15237 df743ca5-7f9a-e211-a948-0013205c9059
| -rw-r--r-- | multimedia/totem3/files/patch-gtk | 64 |
1 files changed, 28 insertions, 36 deletions
diff --git a/multimedia/totem3/files/patch-gtk b/multimedia/totem3/files/patch-gtk index 941b8d84c..51027c069 100644 --- a/multimedia/totem3/files/patch-gtk +++ b/multimedia/totem3/files/patch-gtk @@ -1,44 +1,40 @@ -diff --git a/browser-plugin/totem-plugin-viewer.c b/browser-plugin/totem-plugin-viewer.c -index 3b6e2da..8f63842 100644 ---- browser-plugin/totem-plugin-viewer.c -+++ browser-plugin/totem-plugin-viewer.c +--- browser-plugin/totem-plugin-viewer.c.orig 2011-02-02 11:24:22.000000000 +0000 ++++ browser-plugin/totem-plugin-viewer.c 2011-02-17 21:10:13.000000000 +0000 @@ -33,7 +33,7 @@ #include <glib.h> #include <glib/gi18n.h> #include <gio/gio.h> --#include <gdk/gdkx.h> -+#include <gtk/gtkx.h> +-#include <gtk/gtkx.h> ++#include <gdk/gdkx.h> #include <gtk/gtk.h> #include <gdk/gdk.h> -@@ -1797,7 +1797,7 @@ totem_embedded_key_press_event (GtkWidget *widget, GdkEventKey *event, +@@ -1797,7 +1797,7 @@ totem_embedded_key_press_event (GtkWidge static gboolean totem_embedded_construct (TotemEmbedded *emb, -- GdkNativeWindow xid, -+ Window xid, +- Window xid, ++ GdkNativeWindow xid, int width, int height) { -@@ -2086,7 +2086,7 @@ totem_embedded_set_window (TotemEmbedded *embedded, +@@ -2086,7 +2086,7 @@ totem_embedded_set_window (TotemEmbedded embedded->width = width; embedded->height = height; -- totem_embedded_construct (embedded, (GdkNativeWindow) window, -+ totem_embedded_construct (embedded, (Window) window, +- totem_embedded_construct (embedded, (Window) window, ++ totem_embedded_construct (embedded, (GdkNativeWindow) window, width, height); return TRUE; -diff --git a/src/backend/bacon-video-widget-gst-missing-plugins.c b/src/backend/bacon-video-widget-gst-missing-plugins.c -index bb874ca..f91c58f 100644 ---- src/backend/bacon-video-widget-gst-missing-plugins.c -+++ src/backend/bacon-video-widget-gst-missing-plugins.c +--- src/backend/bacon-video-widget-gst-missing-plugins.c.orig 2011-02-02 11:24:22.000000000 +0000 ++++ src/backend/bacon-video-widget-gst-missing-plugins.c 2011-02-17 21:10:13.000000000 +0000 @@ -35,7 +35,7 @@ #include <gtk/gtk.h> #ifdef GDK_WINDOWING_X11 --#include <gdk/gdkx.h> -+#include <gtk/gtkx.h> +-#include <gtk/gtkx.h> ++#include <gdk/gdkx.h> #endif #include <string.h> @@ -46,47 +42,43 @@ index bb874ca..f91c58f 100644 #ifdef GDK_WINDOWING_X11 /* Adapted from totem-interface.c */ --static GdkNativeWindow -+static Window +-static Window ++static GdkNativeWindow bacon_video_widget_gtk_plug_get_toplevel (GtkPlug *plug) { Window root, parent, *children; guint nchildren; -- GdkNativeWindow xid; -+ Window xid; +- Window xid; ++ GdkNativeWindow xid; g_return_val_if_fail (GTK_IS_PLUG (plug), 0); -@@ -86,7 +86,7 @@ bacon_video_widget_gtk_plug_get_toplevel (GtkPlug *plug) +@@ -86,7 +86,7 @@ bacon_video_widget_gtk_plug_get_toplevel while (TRUE); } --static GdkNativeWindow -+static Window +-static Window ++static GdkNativeWindow bacon_video_widget_gst_get_toplevel (GtkWidget *widget) { GtkWidget *parent; -diff --git a/src/totem-interface.c b/src/totem-interface.c -index 5d2b42d..a17fef5 100644 ---- src/totem-interface.c -+++ src/totem-interface.c +--- src/totem-interface.c.orig 2011-02-02 11:24:22.000000000 +0000 ++++ src/totem-interface.c 2011-02-17 21:10:13.000000000 +0000 @@ -43,7 +43,7 @@ #include <glib.h> #include <glib/gi18n.h> #include <gtk/gtk.h> --#include <gdk/gdkx.h> -+#include <gtk/gtkx.h> +-#include <gtk/gtkx.h> ++#include <gdk/gdkx.h> #include "totem-interface.h" -@@ -293,7 +293,7 @@ totem_gtk_plug_get_toplevel (GtkPlug *plug) +@@ -293,7 +293,7 @@ totem_gtk_plug_get_toplevel (GtkPlug *pl { Window root, parent, *children; guint nchildren; -- GdkNativeWindow xid; -+ Window xid; +- Window xid; ++ GdkNativeWindow xid; g_return_val_if_fail (GTK_IS_PLUG (plug), NULL); --- -cgit v0.8.3.1 |