[Pkg-mono-svn-commits] [SCM] moon branch, master, updated. upstream/2.3-47-g8f32d36
Jo Shields
directhex at apebox.org
Fri Nov 5 00:59:07 UTC 2010
The following commit has been merged in the master branch:
commit b0a6717764883f93c1d536fd0c76bfe301f75ff0
Author: Jo Shields <directhex at apebox.org>
Date: Thu Nov 4 23:48:45 2010 +0000
Fix support for building FF3 and FF3.6 as different entities, whilst we wait for a usable xulrunner-dev 1.9.2
(Historic bzr commit from Wed 2010-02-17 22:18:43 +0000)
diff --git a/debian/patches/moon_backport_support_for_firefox_3.6_r150505_r151553.patch b/debian/patches/moon_backport_support_for_firefox_3.6_r150505_r151553_r151933.patch
similarity index 93%
rename from debian/patches/moon_backport_support_for_firefox_3.6_r150505_r151553.patch
rename to debian/patches/moon_backport_support_for_firefox_3.6_r150505_r151553_r151933.patch
index f10935e..848c9d1 100644
--- a/debian/patches/moon_backport_support_for_firefox_3.6_r150505_r151553.patch
+++ b/debian/patches/moon_backport_support_for_firefox_3.6_r150505_r151553_r151933.patch
@@ -1,16 +1,21 @@
Index: moonlight-2.1/m4/mozilla.m4
===================================================================
---- moonlight-2.1.orig/m4/mozilla.m4 2010-02-17 12:55:35.000000000 +0000
-+++ moonlight-2.1/m4/mozilla.m4 2010-02-17 12:56:14.000000000 +0000
-@@ -1,10 +1,36 @@
+--- moonlight-2.1.orig/m4/mozilla.m4 2010-02-16 20:03:50.000000000 +0000
++++ moonlight-2.1/m4/mozilla.m4 2010-02-17 22:16:17.000000000 +0000
+@@ -1,8 +1,37 @@
AC_DEFUN([MOONLIGHT_CHECK_MOZILLA],
[
with_mozilla=no
-+ with_ff36=$browser_support
- with_ff3=$browser_support
- with_ff2=$browser_support
-
- dnl
+- with_ff3=$browser_support
+- with_ff2=$browser_support
++
++ if test x$browser_support = xno; then
++ with_ff36=no
++ with_ff3=no
++ with_ff2=no
++ fi
++
++ dnl
+ dnl Firefox 3.6
+ dnl
+
@@ -34,12 +39,10 @@ Index: moonlight-2.1/m4/mozilla.m4
+ fi
+
+ AM_CONDITIONAL(HAVE_GECKO_1_9_2,test x$with_ff36 = xyes)
-+
-+ dnl
- dnl Firefox 3
- dnl
-@@ -76,8 +102,10 @@
+ dnl
+ dnl Firefox 3
+@@ -76,8 +105,10 @@
fi
elif test x$with_ff3 = xyes; then
with_mozilla=yes
@@ -53,8 +56,8 @@ Index: moonlight-2.1/m4/mozilla.m4
AC_SUBST([MIN_FIREFOX_VERSION])
Index: moonlight-2.1/plugin/plugin.cpp
===================================================================
---- moonlight-2.1.orig/plugin/plugin.cpp 2010-02-17 12:55:35.000000000 +0000
-+++ moonlight-2.1/plugin/plugin.cpp 2010-02-17 12:56:14.000000000 +0000
+--- moonlight-2.1.orig/plugin/plugin.cpp 2010-02-16 20:03:55.000000000 +0000
++++ moonlight-2.1/plugin/plugin.cpp 2010-02-17 20:26:24.000000000 +0000
@@ -34,6 +34,7 @@
#include "deployment.h"
#include "uri.h"
@@ -112,7 +115,7 @@ Index: moonlight-2.1/plugin/plugin.cpp
Index: moonlight-2.1/plugin/plugin-domevents.cpp
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ moonlight-2.1/plugin/plugin-domevents.cpp 2010-02-17 12:56:14.000000000 +0000
++++ moonlight-2.1/plugin/plugin-domevents.cpp 2010-02-17 20:26:24.000000000 +0000
@@ -0,0 +1,297 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/*
@@ -413,8 +416,8 @@ Index: moonlight-2.1/plugin/plugin-domevents.cpp
+}
Index: moonlight-2.1/plugin/plugin-class.cpp
===================================================================
---- moonlight-2.1.orig/plugin/plugin-class.cpp 2010-02-17 12:55:35.000000000 +0000
-+++ moonlight-2.1/plugin/plugin-class.cpp 2010-02-17 12:56:14.000000000 +0000
+--- moonlight-2.1.orig/plugin/plugin-class.cpp 2010-02-16 20:03:55.000000000 +0000
++++ moonlight-2.1/plugin/plugin-class.cpp 2010-02-17 20:26:24.000000000 +0000
@@ -17,7 +17,6 @@
#include "plugin-class.h"
@@ -457,7 +460,7 @@ Index: moonlight-2.1/plugin/plugin-class.cpp
Index: moonlight-2.1/plugin/firefox/ff36/ff36-bridge.cpp
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ moonlight-2.1/plugin/firefox/ff36/ff36-bridge.cpp 2010-02-17 12:56:14.000000000 +0000
++++ moonlight-2.1/plugin/firefox/ff36/ff36-bridge.cpp 2010-02-17 20:26:24.000000000 +0000
@@ -0,0 +1,25 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/*
@@ -487,7 +490,7 @@ Index: moonlight-2.1/plugin/firefox/ff36/ff36-bridge.cpp
Index: moonlight-2.1/plugin/firefox/ff36/ff36-http.cpp
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ moonlight-2.1/plugin/firefox/ff36/ff36-http.cpp 2010-02-17 12:56:14.000000000 +0000
++++ moonlight-2.1/plugin/firefox/ff36/ff36-http.cpp 2010-02-17 20:26:24.000000000 +0000
@@ -0,0 +1,30 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/*
@@ -522,7 +525,7 @@ Index: moonlight-2.1/plugin/firefox/ff36/ff36-http.cpp
Index: moonlight-2.1/plugin/firefox/ff36/ff36-bridge.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ moonlight-2.1/plugin/firefox/ff36/ff36-bridge.h 2010-02-17 12:56:14.000000000 +0000
++++ moonlight-2.1/plugin/firefox/ff36/ff36-bridge.h 2010-02-17 20:26:24.000000000 +0000
@@ -0,0 +1,26 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/*
@@ -553,7 +556,7 @@ Index: moonlight-2.1/plugin/firefox/ff36/ff36-bridge.h
Index: moonlight-2.1/plugin/firefox/ff36/Makefile.am
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ moonlight-2.1/plugin/firefox/ff36/Makefile.am 2010-02-17 12:56:14.000000000 +0000
++++ moonlight-2.1/plugin/firefox/ff36/Makefile.am 2010-02-17 20:26:24.000000000 +0000
@@ -0,0 +1,29 @@
+
+INCLUDES = \
@@ -586,8 +589,8 @@ Index: moonlight-2.1/plugin/firefox/ff36/Makefile.am
+libmoonpluginxpi_ff36bridge_la_LIBADD = $(FF36_LIBS) ../../libmoonpluginxpi.la
Index: moonlight-2.1/plugin/firefox/Makefile.am
===================================================================
---- moonlight-2.1.orig/plugin/firefox/Makefile.am 2010-02-17 12:55:35.000000000 +0000
-+++ moonlight-2.1/plugin/firefox/Makefile.am 2010-02-17 12:56:14.000000000 +0000
+--- moonlight-2.1.orig/plugin/firefox/Makefile.am 2010-02-16 20:03:55.000000000 +0000
++++ moonlight-2.1/plugin/firefox/Makefile.am 2010-02-17 20:26:24.000000000 +0000
@@ -5,5 +5,8 @@
if HAVE_GECKO_1_9
SUBDIRS += ff3
@@ -599,7 +602,7 @@ Index: moonlight-2.1/plugin/firefox/Makefile.am
EXTRA_DIST = browser-http.inc ff-common.h
Index: moonlight-2.1/plugin/firefox/ff2/ff2-dom.cpp
===================================================================
---- moonlight-2.1.orig/plugin/firefox/ff2/ff2-dom.cpp 2010-02-17 12:55:35.000000000 +0000
+--- moonlight-2.1.orig/plugin/firefox/ff2/ff2-dom.cpp 2010-02-16 20:03:55.000000000 +0000
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,327 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
@@ -931,8 +934,8 @@ Index: moonlight-2.1/plugin/firefox/ff2/ff2-dom.cpp
-}
Index: moonlight-2.1/plugin/firefox/ff2/ff2-bridge.cpp
===================================================================
---- moonlight-2.1.orig/plugin/firefox/ff2/ff2-bridge.cpp 2010-02-17 12:55:35.000000000 +0000
-+++ moonlight-2.1/plugin/firefox/ff2/ff2-bridge.cpp 2010-02-17 12:56:14.000000000 +0000
+--- moonlight-2.1.orig/plugin/firefox/ff2/ff2-bridge.cpp 2010-02-16 20:03:55.000000000 +0000
++++ moonlight-2.1/plugin/firefox/ff2/ff2-bridge.cpp 2010-02-17 20:26:24.000000000 +0000
@@ -15,6 +15,10 @@
#include "ff2-bridge.h"
@@ -946,8 +949,8 @@ Index: moonlight-2.1/plugin/firefox/ff2/ff2-bridge.cpp
return new FF2BrowserBridge ();
Index: moonlight-2.1/plugin/firefox/ff2/Makefile.am
===================================================================
---- moonlight-2.1.orig/plugin/firefox/ff2/Makefile.am 2010-02-17 12:55:35.000000000 +0000
-+++ moonlight-2.1/plugin/firefox/ff2/Makefile.am 2010-02-17 12:56:14.000000000 +0000
+--- moonlight-2.1.orig/plugin/firefox/ff2/Makefile.am 2010-02-16 20:03:55.000000000 +0000
++++ moonlight-2.1/plugin/firefox/ff2/Makefile.am 2010-02-17 20:26:24.000000000 +0000
@@ -15,7 +15,6 @@
libmoonplugin_ff2bridge_la_SOURCES= ff2-bridge.cpp \
@@ -958,8 +961,8 @@ Index: moonlight-2.1/plugin/firefox/ff2/Makefile.am
Index: moonlight-2.1/plugin/firefox/ff2/ff2-bridge.h
===================================================================
---- moonlight-2.1.orig/plugin/firefox/ff2/ff2-bridge.h 2010-02-17 12:55:35.000000000 +0000
-+++ moonlight-2.1/plugin/firefox/ff2/ff2-bridge.h 2010-02-17 12:56:14.000000000 +0000
+--- moonlight-2.1.orig/plugin/firefox/ff2/ff2-bridge.h 2010-02-16 20:03:55.000000000 +0000
++++ moonlight-2.1/plugin/firefox/ff2/ff2-bridge.h 2010-02-17 20:26:24.000000000 +0000
@@ -21,10 +21,6 @@
public:
FF2BrowserBridge ();
@@ -973,7 +976,7 @@ Index: moonlight-2.1/plugin/firefox/ff2/ff2-bridge.h
Index: moonlight-2.1/plugin/firefox/ff3/ff3-dom.cpp
===================================================================
---- moonlight-2.1.orig/plugin/firefox/ff3/ff3-dom.cpp 2010-02-17 12:55:35.000000000 +0000
+--- moonlight-2.1.orig/plugin/firefox/ff3/ff3-dom.cpp 2010-02-16 20:03:55.000000000 +0000
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,327 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
@@ -1305,8 +1308,8 @@ Index: moonlight-2.1/plugin/firefox/ff3/ff3-dom.cpp
-}
Index: moonlight-2.1/plugin/firefox/ff3/Makefile.am
===================================================================
---- moonlight-2.1.orig/plugin/firefox/ff3/Makefile.am 2010-02-17 12:55:35.000000000 +0000
-+++ moonlight-2.1/plugin/firefox/ff3/Makefile.am 2010-02-17 12:56:14.000000000 +0000
+--- moonlight-2.1.orig/plugin/firefox/ff3/Makefile.am 2010-02-16 20:03:55.000000000 +0000
++++ moonlight-2.1/plugin/firefox/ff3/Makefile.am 2010-02-17 20:26:24.000000000 +0000
@@ -17,7 +17,6 @@
libmoonplugin_ff3bridge_la_SOURCES= ff3-bridge.cpp \
@@ -1317,8 +1320,8 @@ Index: moonlight-2.1/plugin/firefox/ff3/Makefile.am
Index: moonlight-2.1/plugin/firefox/ff3/ff3-bridge.cpp
===================================================================
---- moonlight-2.1.orig/plugin/firefox/ff3/ff3-bridge.cpp 2010-02-17 12:55:35.000000000 +0000
-+++ moonlight-2.1/plugin/firefox/ff3/ff3-bridge.cpp 2010-02-17 12:56:14.000000000 +0000
+--- moonlight-2.1.orig/plugin/firefox/ff3/ff3-bridge.cpp 2010-02-16 20:03:55.000000000 +0000
++++ moonlight-2.1/plugin/firefox/ff3/ff3-bridge.cpp 2010-02-17 20:26:24.000000000 +0000
@@ -15,6 +15,10 @@
#include "ff3-bridge.h"
@@ -1332,8 +1335,8 @@ Index: moonlight-2.1/plugin/firefox/ff3/ff3-bridge.cpp
return new FF3BrowserBridge ();
Index: moonlight-2.1/plugin/firefox/ff3/ff3-bridge.h
===================================================================
---- moonlight-2.1.orig/plugin/firefox/ff3/ff3-bridge.h 2010-02-17 12:55:35.000000000 +0000
-+++ moonlight-2.1/plugin/firefox/ff3/ff3-bridge.h 2010-02-17 12:56:14.000000000 +0000
+--- moonlight-2.1.orig/plugin/firefox/ff3/ff3-bridge.h 2010-02-16 20:03:55.000000000 +0000
++++ moonlight-2.1/plugin/firefox/ff3/ff3-bridge.h 2010-02-17 20:26:24.000000000 +0000
@@ -20,10 +20,6 @@
public:
FF3BrowserBridge ();
@@ -1347,8 +1350,8 @@ Index: moonlight-2.1/plugin/firefox/ff3/ff3-bridge.h
Index: moonlight-2.1/plugin/plugin.h
===================================================================
---- moonlight-2.1.orig/plugin/plugin.h 2010-02-17 12:55:35.000000000 +0000
-+++ moonlight-2.1/plugin/plugin.h 2010-02-17 12:56:14.000000000 +0000
+--- moonlight-2.1.orig/plugin/plugin.h 2010-02-16 20:03:55.000000000 +0000
++++ moonlight-2.1/plugin/plugin.h 2010-02-17 20:26:24.000000000 +0000
@@ -25,6 +25,10 @@
#endif
@@ -1375,7 +1378,7 @@ Index: moonlight-2.1/plugin/plugin.h
Index: moonlight-2.1/plugin/plugin-domevents.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ moonlight-2.1/plugin/plugin-domevents.h 2010-02-17 12:56:14.000000000 +0000
++++ moonlight-2.1/plugin/plugin-domevents.h 2010-02-17 20:26:24.000000000 +0000
@@ -0,0 +1,87 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/*
@@ -1467,8 +1470,8 @@ Index: moonlight-2.1/plugin/plugin-domevents.h
\ No newline at end of file
Index: moonlight-2.1/plugin/plugin-class.h
===================================================================
---- moonlight-2.1.orig/plugin/plugin-class.h 2010-02-17 12:55:35.000000000 +0000
-+++ moonlight-2.1/plugin/plugin-class.h 2010-02-17 12:56:14.000000000 +0000
+--- moonlight-2.1.orig/plugin/plugin-class.h 2010-02-16 20:03:55.000000000 +0000
++++ moonlight-2.1/plugin/plugin-class.h 2010-02-17 20:26:24.000000000 +0000
@@ -1205,15 +1205,6 @@
/*** HtmlObject ***************************************************/
@@ -1487,8 +1490,8 @@ Index: moonlight-2.1/plugin/plugin-class.h
bool html_object_has_property (PluginInstance *plugin, NPObject *npobj, char *name);
Index: moonlight-2.1/plugin/browser-bridge.h
===================================================================
---- moonlight-2.1.orig/plugin/browser-bridge.h 2010-02-17 12:55:35.000000000 +0000
-+++ moonlight-2.1/plugin/browser-bridge.h 2010-02-17 12:56:14.000000000 +0000
+--- moonlight-2.1.orig/plugin/browser-bridge.h 2010-02-16 20:03:55.000000000 +0000
++++ moonlight-2.1/plugin/browser-bridge.h 2010-02-17 20:26:24.000000000 +0000
@@ -28,11 +28,6 @@
class BrowserBridge {
@@ -1503,8 +1506,8 @@ Index: moonlight-2.1/plugin/browser-bridge.h
Index: moonlight-2.1/plugin/Makefile.am
===================================================================
---- moonlight-2.1.orig/plugin/Makefile.am 2010-02-17 12:55:35.000000000 +0000
-+++ moonlight-2.1/plugin/Makefile.am 2010-02-17 12:56:14.000000000 +0000
+--- moonlight-2.1.orig/plugin/Makefile.am 2010-02-16 20:03:55.000000000 +0000
++++ moonlight-2.1/plugin/Makefile.am 2010-02-17 20:26:24.000000000 +0000
@@ -51,6 +51,8 @@
plugin.h \
plugin-accessibility.cpp \
@@ -1516,8 +1519,8 @@ Index: moonlight-2.1/plugin/Makefile.am
plugin-entry.cpp \
Index: moonlight-2.1/configure.ac
===================================================================
---- moonlight-2.1.orig/configure.ac 2010-02-17 12:55:35.000000000 +0000
-+++ moonlight-2.1/configure.ac 2010-02-17 12:56:14.000000000 +0000
+--- moonlight-2.1.orig/configure.ac 2010-02-16 20:05:43.000000000 +0000
++++ moonlight-2.1/configure.ac 2010-02-17 20:26:24.000000000 +0000
@@ -134,7 +134,9 @@
DOCDIR=$(pkg-config --variable=sourcesdir monodoc)
@@ -1545,9 +1548,11 @@ Index: moonlight-2.1/configure.ac
EOF
fi
---- moon/plugin/install/Makefile.am 2010/02/10 03:59:19 151183
-+++ moon/plugin/install/Makefile.am 2010/02/11 21:42:20 151553
-@@ -77,6 +77,10 @@
+Index: moonlight-2.1/plugin/install/Makefile.am
+===================================================================
+--- moonlight-2.1.orig/plugin/install/Makefile.am 2010-02-16 20:03:55.000000000 +0000
++++ moonlight-2.1/plugin/install/Makefile.am 2010-02-17 20:26:24.000000000 +0000
+@@ -79,6 +79,10 @@
# Rename the bridges to the original names
cp -L ../firefox/ff2/.libs/libmoonpluginxpi-ff2bridge.so .xpinstall/plugins/moonlight/libmoonplugin-ff2bridge.so
endif HAVE_GECKO_1_8
diff --git a/debian/patches/series b/debian/patches/series
index c442146..25a665a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
use_bundled_mono_runtime_for_smcs.patch
-moon_backport_support_for_firefox_3.6_r150505_r151553.patch
+moon_backport_support_for_firefox_3.6_r150505_r151553_r151933.patch
diff --git a/debian/rules b/debian/rules
index 51bf249..3ae7dc6 100644
--- a/debian/rules
+++ b/debian/rules
@@ -106,7 +106,7 @@ moonlight-build-stamp: moonlight-configure-stamp
moonlight-configure-stamp: mono-install-stamp
autoreconf
- PKG_CONFIG_PATH=$(MONO_SHARED_DIR)/monoprefix/lib/pkgconfig ./configure --with-mcspath=$(MONO_SHARED_DIR)/mono-2-6/mcs --with-mono-basic-path=$(MONO_SHARED_DIR)/mono-basic-2-6 --with-cairo=system --prefix=/usr
+ PKG_CONFIG_PATH=$(MONO_SHARED_DIR)/monoprefix/lib/pkgconfig ./configure --with-mcspath=$(MONO_SHARED_DIR)/mono-2-6/mcs --with-mono-basic-path=$(MONO_SHARED_DIR)/mono-basic-2-6 --with-cairo=system --with-ff36=no --with-ff3=yes --prefix=/usr
touch moonlight-configure-stamp
get-orig-source:
--
moon
More information about the Pkg-mono-svn-commits
mailing list