Updated xulrunner patch, remove work-around
This commit is contained in:
Bastien Nocera
parent
9354b52cd5
commit
9aaeec3d40
@ -1,6 +1,6 @@
|
||||
Index: browser-plugin/totemStringGlue.h
|
||||
===================================================================
|
||||
--- browser-plugin/totemStringGlue.h (revision 5020)
|
||||
--- browser-plugin/totemStringGlue.h (revision 5028)
|
||||
+++ browser-plugin/totemStringGlue.h (working copy)
|
||||
@@ -1,58 +0,0 @@
|
||||
-/* Totem browser plugin
|
||||
@ -61,9 +61,23 @@ Index: browser-plugin/totemStringGlue.h
|
||||
-typedef nsCString nsDependentCString;
|
||||
-typedef nsCString nsDependentCSubstring;
|
||||
-
|
||||
Index: browser-plugin/totemGMPPlugin.cpp
|
||||
===================================================================
|
||||
--- browser-plugin/totemGMPPlugin.cpp (revision 5028)
|
||||
+++ browser-plugin/totemGMPPlugin.cpp (working copy)
|
||||
@@ -68,7 +68,8 @@
|
||||
{ "video/x-ms-wvx", "wmv", "video/x-ms-wmv" },
|
||||
{ "video/x-ms-wm", "wmv", "video/x-ms-wmv" },
|
||||
{ "application/x-ms-wms", "wms", "video/x-ms-wmv" },
|
||||
- { "application/asx", "asx", "audio/x-ms-asx" }
|
||||
+ { "application/asx", "asx", "audio/x-ms-asx" },
|
||||
+ { "application/x-oleobject", "", "video/x-msvideo" }
|
||||
};
|
||||
|
||||
void*
|
||||
Index: browser-plugin/totemPlugin.h
|
||||
===================================================================
|
||||
--- browser-plugin/totemPlugin.h (revision 5020)
|
||||
--- browser-plugin/totemPlugin.h (revision 5028)
|
||||
+++ browser-plugin/totemPlugin.h (working copy)
|
||||
@@ -29,9 +29,8 @@
|
||||
|
||||
@ -79,7 +93,7 @@ Index: browser-plugin/totemPlugin.h
|
||||
#include <nsTArray.h>
|
||||
Index: browser-plugin/Makefile.am
|
||||
===================================================================
|
||||
--- browser-plugin/Makefile.am (revision 5020)
|
||||
--- browser-plugin/Makefile.am (revision 5028)
|
||||
+++ browser-plugin/Makefile.am (working copy)
|
||||
@@ -144,7 +144,6 @@
|
||||
totemPluginGlue.h \
|
||||
@ -89,7 +103,22 @@ Index: browser-plugin/Makefile.am
|
||||
totemBasicPlugin.cpp \
|
||||
totemBasicPlugin.h \
|
||||
totemClassInfo.h \
|
||||
@@ -210,7 +209,6 @@
|
||||
@@ -182,12 +181,13 @@
|
||||
libtotempluginviewer_helper.la \
|
||||
$(DBUS_LIBS) \
|
||||
$(BROWSER_PLUGIN_LIBS) \
|
||||
- $(LIBXPCOMGLUE_S)
|
||||
+ $(GECKO_LIBS)
|
||||
|
||||
libtotem_basic_plugin_la_LDFLAGS = \
|
||||
-avoid-version \
|
||||
-export-symbols $(srcdir)/plugin.symbols \
|
||||
-module \
|
||||
+ -no-undefined \
|
||||
$(AM_LDFLAGS)
|
||||
|
||||
endif
|
||||
@@ -210,7 +210,6 @@
|
||||
totemPluginGlue.h \
|
||||
totemPlugin.cpp \
|
||||
totemPlugin.h \
|
||||
@ -97,7 +126,22 @@ Index: browser-plugin/Makefile.am
|
||||
totemGMPPlugin.cpp \
|
||||
totemGMPPlugin.h \
|
||||
totemClassInfo.h \
|
||||
@@ -270,7 +268,6 @@
|
||||
@@ -248,12 +247,13 @@
|
||||
libtotempluginviewer_helper.la \
|
||||
$(DBUS_LIBS) \
|
||||
$(BROWSER_PLUGIN_LIBS) \
|
||||
- $(LIBXPCOMGLUE_S)
|
||||
+ $(GECKO_LIBS)
|
||||
|
||||
libtotem_gmp_plugin_la_LDFLAGS = \
|
||||
-avoid-version \
|
||||
-export-symbols $(srcdir)/plugin.symbols \
|
||||
-module \
|
||||
+ -no-undefined \
|
||||
$(AM_LDFLAGS)
|
||||
|
||||
endif
|
||||
@@ -270,7 +270,6 @@
|
||||
totemPluginGlue.h \
|
||||
totemPlugin.cpp \
|
||||
totemPlugin.h \
|
||||
@ -105,7 +149,22 @@ Index: browser-plugin/Makefile.am
|
||||
totemComplexPlugin.cpp \
|
||||
totemComplexPlugin.h \
|
||||
totemClassInfo.h \
|
||||
@@ -330,7 +327,6 @@
|
||||
@@ -308,12 +307,13 @@
|
||||
libtotempluginviewer_helper.la \
|
||||
$(DBUS_LIBS) \
|
||||
$(BROWSER_PLUGIN_LIBS) \
|
||||
- $(LIBXPCOMGLUE_S)
|
||||
+ $(GECKO_LIBS)
|
||||
|
||||
libtotem_complex_plugin_la_LDFLAGS = \
|
||||
-avoid-version \
|
||||
-export-symbols $(srcdir)/plugin.symbols \
|
||||
-module \
|
||||
+ -no-undefined \
|
||||
$(AM_LDFLAGS)
|
||||
|
||||
endif
|
||||
@@ -330,7 +330,6 @@
|
||||
totemPluginGlue.h \
|
||||
totemPlugin.cpp \
|
||||
totemPlugin.h \
|
||||
@ -113,7 +172,22 @@ Index: browser-plugin/Makefile.am
|
||||
totemNarrowSpacePlugin.cpp \
|
||||
totemNarrowSpacePlugin.h \
|
||||
totemClassInfo.h \
|
||||
@@ -390,7 +386,6 @@
|
||||
@@ -368,12 +367,13 @@
|
||||
libtotempluginviewer_helper.la \
|
||||
$(DBUS_LIBS) \
|
||||
$(BROWSER_PLUGIN_LIBS) \
|
||||
- $(LIBXPCOMGLUE_S)
|
||||
+ $(GECKO_LIBS)
|
||||
|
||||
libtotem_narrowspace_plugin_la_LDFLAGS = \
|
||||
-avoid-version \
|
||||
-export-symbols $(srcdir)/plugin.symbols \
|
||||
-module \
|
||||
+ -no-undefined \
|
||||
$(AM_LDFLAGS)
|
||||
|
||||
endif
|
||||
@@ -390,7 +390,6 @@
|
||||
totemPluginGlue.h \
|
||||
totemPlugin.cpp \
|
||||
totemPlugin.h \
|
||||
@ -121,7 +195,22 @@ Index: browser-plugin/Makefile.am
|
||||
totemMullYPlugin.cpp \
|
||||
totemMullYPlugin.h \
|
||||
totemClassInfo.h \
|
||||
@@ -450,7 +445,6 @@
|
||||
@@ -428,12 +427,13 @@
|
||||
libtotempluginviewer_helper.la \
|
||||
$(DBUS_LIBS) \
|
||||
$(BROWSER_PLUGIN_LIBS) \
|
||||
- $(LIBXPCOMGLUE_S)
|
||||
+ $(GECKO_LIBS)
|
||||
|
||||
libtotem_mully_plugin_la_LDFLAGS = \
|
||||
-avoid-version \
|
||||
-export-symbols $(srcdir)/plugin.symbols \
|
||||
-module \
|
||||
+ -no-undefined \
|
||||
$(AM_LDFLAGS)
|
||||
|
||||
endif
|
||||
@@ -450,7 +450,6 @@
|
||||
totemPluginGlue.h \
|
||||
totemPlugin.cpp \
|
||||
totemPlugin.h \
|
||||
@ -129,9 +218,24 @@ Index: browser-plugin/Makefile.am
|
||||
totemConePlugin.cpp \
|
||||
totemConePlugin.h \
|
||||
totemClassInfo.h \
|
||||
@@ -488,12 +487,13 @@
|
||||
libtotempluginviewer_helper.la \
|
||||
$(DBUS_LIBS) \
|
||||
$(BROWSER_PLUGIN_LIBS) \
|
||||
- $(LIBXPCOMGLUE_S)
|
||||
+ $(GECKO_LIBS)
|
||||
|
||||
libtotem_cone_plugin_la_LDFLAGS = \
|
||||
-avoid-version \
|
||||
-export-symbols $(srcdir)/plugin.symbols \
|
||||
-module \
|
||||
+ -no-undefined \
|
||||
$(AM_LDFLAGS)
|
||||
|
||||
endif
|
||||
Index: configure.in
|
||||
===================================================================
|
||||
--- configure.in (revision 5020)
|
||||
--- configure.in (revision 5028)
|
||||
+++ configure.in (working copy)
|
||||
@@ -40,6 +40,7 @@
|
||||
GNOMEICON_REQS=2.15.90
|
||||
@ -238,7 +342,7 @@ Index: configure.in
|
||||
fi
|
||||
|
||||
if test "$enable_browser_plugins" = "yes" ; then
|
||||
- PKG_CHECK_MODULES([SN], [ libstartup-notification-1.0 >= 0.8 ], [enable_browser_plugins = yes], [enable_browser_plugins=no])
|
||||
- PKG_CHECK_MODULES([SN], [ libstartup-notification-1.0 >= 0.8 ], [enable_browser_plugins=yes], [enable_browser_plugins=no])
|
||||
+ PKG_CHECK_MODULES([SN], [ libstartup-notification-1.0 >= 0.8 ], enable_browser_plugins=yes, enable_browser_plugins=no)
|
||||
if test "x$enable_browser_plugins" != "xyes" ; then
|
||||
AC_MSG_WARN([libstartup-notification not found, necessary to build the plugin viewer])
|
||||
@ -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-3.patch
|
||||
Patch0: totem-xul-4.patch
|
||||
# http://bugzilla.gnome.org/show_bug.cgi?id=510320
|
||||
Patch1: x-content.patch
|
||||
|
||||
@ -151,8 +151,7 @@ autoconf
|
||||
/usr/bin/gst-inspect-0.10 --print-all > /dev/null
|
||||
export MOZILLA_PLUGINDIR=%{_libdir}/mozilla/plugins
|
||||
|
||||
# Try work-around from http://benjamin.smedbergs.us/blog/2005-10-27/gcc-40-workaround/
|
||||
ac_cv_visibility_pragma=no ./configure --program-prefix= --prefix=/usr --exec-prefix=/usr --bindir=/usr/bin --sbindir=/usr/sbin --sysconfdir=/etc --datadir=/usr/share --includedir=/usr/include --libdir=/usr/lib64 --libexecdir=/usr/libexec --localstatedir=/var --sharedstatedir=/usr/com --mandir=/usr/share/man --infodir=/usr/share/info \
|
||||
%configure \
|
||||
--enable-gstreamer \
|
||||
--enable-mozilla \
|
||||
--enable-nautilus \
|
||||
|
||||
Loading…
Reference in New Issue
Block a user