From 7b053af4eba84b840499e26dc281842f2ba1d9c7 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@fedoraproject.org>
Date: Fri, 11 Jan 2008 15:49:02 +0000
Subject: [PATCH] Update patch from upstream bug, and apply the damn patch as
 well!

---
 totem-xul.patch => totem-xul-2.patch | 12 ++++++------
 totem.spec                           |  4 +++-
 2 files changed, 9 insertions(+), 7 deletions(-)
 rename totem-xul.patch => totem-xul-2.patch (97%)

diff --git a/totem-xul.patch b/totem-xul-2.patch
similarity index 97%
rename from totem-xul.patch
rename to totem-xul-2.patch
index a0853b6..0319833 100644
--- a/totem-xul.patch
+++ b/totem-xul-2.patch
@@ -1,6 +1,6 @@
 Index: browser-plugin/totemStringGlue.h
 ===================================================================
---- browser-plugin/totemStringGlue.h	(revision 5011)
+--- browser-plugin/totemStringGlue.h	(revision 5015)
 +++ browser-plugin/totemStringGlue.h	(working copy)
 @@ -1,58 +0,0 @@
 -/* Totem browser plugin
@@ -63,7 +63,7 @@ Index: browser-plugin/totemStringGlue.h
 -
 Index: browser-plugin/totemPlugin.h
 ===================================================================
---- browser-plugin/totemPlugin.h	(revision 5011)
+--- browser-plugin/totemPlugin.h	(revision 5015)
 +++ browser-plugin/totemPlugin.h	(working copy)
 @@ -29,9 +29,8 @@
  
@@ -79,7 +79,7 @@ Index: browser-plugin/totemPlugin.h
  #include <nsTArray.h>
 Index: browser-plugin/Makefile.am
 ===================================================================
---- browser-plugin/Makefile.am	(revision 5011)
+--- browser-plugin/Makefile.am	(revision 5015)
 +++ browser-plugin/Makefile.am	(working copy)
 @@ -144,7 +144,6 @@
  	totemPluginGlue.h		\
@@ -131,7 +131,7 @@ Index: browser-plugin/Makefile.am
  	totemClassInfo.h		\
 Index: configure.in
 ===================================================================
---- configure.in	(revision 5011)
+--- configure.in	(revision 5015)
 +++ configure.in	(working copy)
 @@ -560,61 +560,23 @@
  	[AS_HELP_STRING([--enable-browser-plugins],[compile the totem browser plugins])],
@@ -204,7 +204,7 @@ Index: configure.in
  	PKG_CHECK_MODULES([MOZILLA_NOT_LINKED],
 -		[$MOZILLA-xpcom >= $MOZILLA_VERSION_MIN \
 -		 $MOZILLA-plugin],,
-+		[libxul >= 1.8],,
++		[libxul >= 1.9],,
                  [enable_browser_plugins=no])
  fi
  # Check for other required modules, and merge CFLAGS, but not link
@@ -220,7 +220,7 @@ Index: configure.in
 +	MOZILLA_PREFIX="`$PKG_CONFIG libxul --variable=prefix`"
 +	MOZILLA_LIBDIR="`$PKG_CONFIG libxul --variable=libdir`"
 +	MOZILLA_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir libxul`"
-+	MOZILLA_XPCOM_CFLAGS="`$PKG_CONFIG --cflags --define-variable=includetype=unstable libxul`"
++	MOZILLA_XPCOM_CFLAGS="`$PKG_CONFIG --cflags libxul-unstable`"
 +	MOZILLA_LIBS="`$PKG_CONFIG --libs libxul`"
 +
  	MOZILLA_PLUGINDIR="${MOZILLA_PLUGINDIR:-"\${libdir}/mozilla/plugins"}"
diff --git a/totem.spec b/totem.spec
index 7972cc9..9af580f 100644
--- a/totem.spec
+++ b/totem.spec
@@ -61,7 +61,7 @@ BuildRequires: intltool autoconf automake libtool gettext check-devel
 Obsoletes: nautilus-media
 
 # http://bugzilla.gnome.org/show_bug.cgi?id=458324
-Patch0: totem-xul.patch
+Patch0: totem-xul-2.patch
 
 %description
 Totem is simple movie player for the Gnome desktop. It features a
@@ -137,6 +137,8 @@ in that playlist) with other Totems on the same local network.
 
 %prep
 %setup -q
+
+%patch0 -p0 -b .xulrunner
 autoreconf -f
 
 %build