[Pkg-mono-svn-commits] [SCM] moon branch, master, updated. upstream/2.3-47-g8f32d36

[Jo Shields]

The following commit has been merged in the master branch:
commit a728e65ad266f6f9ead368eea797e3a35168a405
Author: Jo Shields <directhex at apebox.org>
Date:   Fri Nov 5 00:26:01 2010 +0000

    Import Ubuntu upload 2.3-0ubuntu4

diff --git a/debian/changelog b/debian/changelog
index ee6a947..a558f88 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+moon (2.3-0ubuntu4) maverick; urgency=low
+
+  * ARM development made possible by Genesi USA
+  * add_arm_to_firefox-xpi.m4.patch:
+    + For reasons best known to themselves, Mozilla don't define a 
+      plugin ABI for several platforms, including ARM. This patch 
+      tweaks the build system not to fail on ARM, by setting the 
+      bogus Linux_unknownABI ABI on ARM, rather than bailing out.
+      (LP: #635406)
+  * realign_nocodec_API_with_codec_API.patch:
+    + Import upstream git commit 66993b158727585e889d, which fixes 
+      the build on architectures without official binary codecs 
+      available (such as ARM and PowerPC).
+
+ -- Jo Shields <directhex at apebox.org>  Mon, 04 Oct 2010 20:58:14 +0100
+
 moon (2.3-0ubuntu3) maverick; urgency=low
 
   * Fix the check for GC_test_and_set and GC_clear on armel. The sync
diff --git a/debian/patches/add_arm_to_firefox-xpi.m4.patch b/debian/patches/add_arm_to_firefox-xpi.m4.patch
new file mode 100644
index 0000000..867c7e3
--- /dev/null
+++ b/debian/patches/add_arm_to_firefox-xpi.m4.patch
@@ -0,0 +1,15 @@
+Index: moon-2.3/m4/firefox-xpi.m4
+===================================================================
+--- moon-2.3.orig/m4/firefox-xpi.m4	2010-10-04 13:55:10.665419510 -0500
++++ moon-2.3/m4/firefox-xpi.m4	2010-10-04 18:43:40.035413874 -0500
+@@ -40,6 +40,10 @@
+ 			TARGET_PLATFORM="$TARGET_PLATFORM"_sparc64-gcc3
+ 			INSTALL_ARCH=sparc
+ 			;;
++		arm)
++			TARGET_PLATFORM="$TARGET_PLATFORM"_unknownABI
++			INSTALL_ARCH=arm
++			;;
+ 		*)
+ 			AC_MSG_ERROR([Target cpu $target_cpu is unknown.
+ 				Please add the appropriate string to configure.ac.
diff --git a/debian/patches/realign_nocodec_API_with_codec_API.patch b/debian/patches/realign_nocodec_API_with_codec_API.patch
new file mode 100644
index 0000000..3133f27
--- /dev/null
+++ b/debian/patches/realign_nocodec_API_with_codec_API.patch
@@ -0,0 +1,36 @@
+From 66993b158727585e889df1b3bd8a481d5d25d0a6 Mon Sep 17 00:00:00 2001
+From: Rolf Bjarne Kvinge <RKvinge at novell.com>
+Date: Tue, 5 Oct 2010 23:50:56 +0200
+Subject: [PATCH] Fix nocodec ui dialog API to match the codec ui dialog API.
+
+---
+ src/pipeline-nocodec-ui.cpp |    2 +-
+ src/pipeline-nocodec-ui.h   |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+Index: moon-2.3/src/pipeline-nocodec-ui.cpp
+===================================================================
+--- moon-2.3.orig/src/pipeline-nocodec-ui.cpp	2010-06-22 12:04:44.000000000 -0500
++++ moon-2.3/src/pipeline-nocodec-ui.cpp	2010-10-05 17:30:17.305416512 -0500
+@@ -44,7 +44,7 @@
+ }
+ 
+ void
+-CodecDownloader::ShowUI (Surface *surface)
++CodecDownloader::ShowUI (Surface *surface, bool is_user_initiated)
+ {
+ 	if (running) {
+ 		return;
+Index: moon-2.3/src/pipeline-nocodec-ui.h
+===================================================================
+--- moon-2.3.orig/src/pipeline-nocodec-ui.h	2010-06-22 12:04:44.000000000 -0500
++++ moon-2.3/src/pipeline-nocodec-ui.h	2010-10-05 17:30:17.315414637 -0500
+@@ -52,7 +52,7 @@
+ 
+ 
+ public:
+-	static void ShowUI (Surface *surface); 
++	static void ShowUI (Surface *surface, bool is_user_initiated); 
+ };
+ 
+ #endif /* __MOON_PIPELINE_UI_H__ */
diff --git a/debian/patches/series b/debian/patches/series
index 1db2aea..a5cd585 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,5 @@ use_bundled_mono_runtime_for_smcs.patch
 include_config.h_in_all_files.patch
 use_atomic_builtins_on_armel.patch
 arm_changes_from_mono_package.patch
+add_arm_to_firefox-xpi.m4.patch
+realign_nocodec_API_with_codec_API.patch

-- 
moon