[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:20 UTC 2010
The following commit has been merged in the master branch:
commit 1ecda4fae0a3c30851e3bd28d0e71619e606dc5c
Author: Jo Shields <directhex at apebox.org>
Date: Fri Nov 5 00:20:21 2010 +0000
Import Ubuntu upload 2.3-0ubuntu1
diff --git a/debian/changelog b/debian/changelog
index b1f76bc..db0667d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,26 @@
+moon (2.3-0ubuntu1) maverick; urgency=low
+
+ * New upstream release
+ * The "Ubuntu UK Podcast" release
+ * debian/control,
+ debian/rules:
+ + Build-depend on chromium-browser
+ + Build against libcurl, for Chromium bridge
+ * debian/patches/include_config.h_in_all_files.patch:
+ + Force inclusion of config.h where it isn't currently included, to
+ ensure that important values such as object sizes are consistent.
+ This ensures that the Chromium bridge doesn't break when built with
+ -Bsymbolic-functions
+ * debian/patches/use_AC_PATH_PROGS_to_satisfy_chromium_search.patch:
+ + Use AC_PATH_PROGS, not multiple calls to AC_PATH_PROG, to search
+ for a chromium binary, otherwise a cached "no" is used despite
+ /usr/bin/chromium-browser existing
+ * debian/rules:
+ + Use --with-ff3 not --with-ff36, as the Xulrunner bridge is now
+ cross-version.
+
+ -- Jo Shields <directhex at apebox.org> Fri, 09 Jul 2010 07:34:51 +0100
+
moon (2.2-0ubuntu1) lucid; urgency=low
* New upstream release
diff --git a/debian/control b/debian/control
index 37eb6aa..eeb6864 100644
--- a/debian/control
+++ b/debian/control
@@ -25,6 +25,7 @@ Build-Depends: debhelper (>= 7.0.50~),
autoconf,
automake,
autotools-dev,
+ libcurl4-gnutls-dev,
libgtk2.0-cil-dev,
libglade2.0-cil-dev,
libglib2.0-cil-dev,
@@ -72,6 +73,24 @@ Description: Free Software clone of Silverlight 2.0 - Xulrunner 1.9 plugin
Xulrunner 1.9 browsers such as Firefox/Iceweasel 3, Epiphany-Gecko, HulaHop,
and others.
+Package: moonlight-plugin-chromium
+Architecture: i386 lpia kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390
+Depends: ${shlibs:Depends}, moonlight-plugin-core (= ${binary:Version}), ${misc:Depends}
+Recommends: chromium-browser
+Conflicts: moonlight
+Description: Free Software clone of Silverlight 2.0 - Chromium plugin
+ Moonlight is a free Silverlight clone, allowing Free Software systems to
+ run embedded web-browser objects or standalone code targetting Microsoft
+ Silverlight.
+ .
+ About Microsoft Silverlight
+ Microsoft Silverlight is a cross-browser, cross-platform, and cross-device
+ plug-in for delivering the next generation of .NET based media experiences
+ and rich interactive applications for the Web.
+ .
+ This package contains the Curl plugin bridge, for full use with the Chromium
+ web browser.
+
Package: libmoon
Section: libs
Architecture: i386 lpia kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390
diff --git a/debian/moonlight-plugin-chromium.install b/debian/moonlight-plugin-chromium.install
new file mode 100644
index 0000000..35d399c
--- /dev/null
+++ b/debian/moonlight-plugin-chromium.install
@@ -0,0 +1 @@
+usr/lib/moonlight/plugin/libmoonplugin-curlbridge.so
diff --git a/debian/moonlight-plugin-chromium.links b/debian/moonlight-plugin-chromium.links
new file mode 100644
index 0000000..86e8f5b
--- /dev/null
+++ b/debian/moonlight-plugin-chromium.links
@@ -0,0 +1 @@
+usr/lib/moonlight/plugin/libmoonloader.so usr/lib/chromium-browser/plugins/libmoonloader.so
diff --git a/debian/patches/include_config.h_in_all_files.patch b/debian/patches/include_config.h_in_all_files.patch
new file mode 100644
index 0000000..823077f
--- /dev/null
+++ b/debian/patches/include_config.h_in_all_files.patch
@@ -0,0 +1,244 @@
+commit a92301e09249b864f02a18ad498644b8a192d5b3
+Author: Andreia Gaita <shana at jitted.com>
+Date: Thu Jul 15 12:03:15 2010 +0100
+
+ * plugin/curl/curl-bridge.cpp,
+ plugin/curl/curl-http.cpp,
+ plugin/firefox/ff2/ff2-bridge.cpp,
+ plugin/firefox/ff2/ff2-http.cpp,
+ plugin/firefox/ff3/ff3-bridge.cpp,
+ plugin/firefox/ff3/ff3-http.cpp,
+ plugin/plugin-accessibility.cpp,
+ plugin/plugin-domevents.cpp,
+ src/applier.cpp,
+ src/asf/asf-debug.cpp,
+ src/asf/asf-test.cpp,
+ src/imagesource.cpp,
+ src/layoutinformation.cpp,
+ src/pipeline-logo.cpp,
+ src/popup.cpp,
+ src/tabnavigationwalker.cpp,
+ src/tilesource.cpp,
+ src/writeablebitmap.cpp: add missing config.h include
+
+Index: moon-2.3/plugin/curl/curl-bridge.cpp
+===================================================================
+--- moon-2.3.orig/plugin/curl/curl-bridge.cpp 2010-07-15 14:04:53.000000000 +0100
++++ moon-2.3/plugin/curl/curl-bridge.cpp 2010-07-15 14:12:36.189697861 +0100
+@@ -11,6 +11,7 @@
+ *
+ */
+
++#include <config.h>
+ #include "plugin.h"
+
+ #include "curl-bridge.h"
+Index: moon-2.3/plugin/curl/curl-http.cpp
+===================================================================
+--- moon-2.3.orig/plugin/curl/curl-http.cpp 2010-07-15 14:04:53.000000000 +0100
++++ moon-2.3/plugin/curl/curl-http.cpp 2010-07-15 14:12:36.189697861 +0100
+@@ -11,6 +11,7 @@
+ *
+ */
+
++#include <config.h>
+
+ // define this here so that protypes.h isn't included (and doesn't
+ // muck with our npapi.h)
+Index: moon-2.3/plugin/firefox/ff2/ff2-bridge.cpp
+===================================================================
+--- moon-2.3.orig/plugin/firefox/ff2/ff2-bridge.cpp 2010-07-15 14:04:53.000000000 +0100
++++ moon-2.3/plugin/firefox/ff2/ff2-bridge.cpp 2010-07-15 14:12:36.189697861 +0100
+@@ -11,6 +11,7 @@
+ *
+ */
+
++#include <config.h>
+ #include "plugin.h"
+
+ #include "ff2-bridge.h"
+Index: moon-2.3/plugin/firefox/ff2/ff2-http.cpp
+===================================================================
+--- moon-2.3.orig/plugin/firefox/ff2/ff2-http.cpp 2010-07-15 14:04:53.000000000 +0100
++++ moon-2.3/plugin/firefox/ff2/ff2-http.cpp 2010-07-15 14:12:36.189697861 +0100
+@@ -11,6 +11,8 @@
+ *
+ */
+
++#include <config.h>
++
+ // define this here so that protypes.h isn't included (and doesn't
+ // muck with our npapi.h)
+ #define NO_NSPR_10_SUPPORT
+Index: moon-2.3/plugin/firefox/ff3/ff3-bridge.cpp
+===================================================================
+--- moon-2.3.orig/plugin/firefox/ff3/ff3-bridge.cpp 2010-07-15 14:04:53.000000000 +0100
++++ moon-2.3/plugin/firefox/ff3/ff3-bridge.cpp 2010-07-15 14:12:36.189697861 +0100
+@@ -11,6 +11,7 @@
+ *
+ */
+
++#include <config.h>
+ #include "plugin.h"
+
+ #include "ff3-bridge.h"
+Index: moon-2.3/plugin/firefox/ff3/ff3-http.cpp
+===================================================================
+--- moon-2.3.orig/plugin/firefox/ff3/ff3-http.cpp 2010-07-15 14:04:53.000000000 +0100
++++ moon-2.3/plugin/firefox/ff3/ff3-http.cpp 2010-07-15 14:12:36.189697861 +0100
+@@ -11,6 +11,7 @@
+ *
+ */
+
++#include <config.h>
+ // define this here so that protypes.h isn't included (and doesn't
+ // muck with our npapi.h)
+ #define NO_NSPR_10_SUPPORT
+Index: moon-2.3/plugin/plugin-accessibility.cpp
+===================================================================
+--- moon-2.3.orig/plugin/plugin-accessibility.cpp 2010-07-15 14:04:53.000000000 +0100
++++ moon-2.3/plugin/plugin-accessibility.cpp 2010-07-15 14:12:36.189697861 +0100
+@@ -12,7 +12,7 @@
+ *
+ */
+
+-
++#include <config.h>
+ #include "plugin-accessibility.h"
+ #include "moonlight.h"
+
+Index: moon-2.3/plugin/plugin-domevents.cpp
+===================================================================
+--- moon-2.3.orig/plugin/plugin-domevents.cpp 2010-07-15 14:04:53.000000000 +0100
++++ moon-2.3/plugin/plugin-domevents.cpp 2010-07-15 14:12:36.189697861 +0100
+@@ -11,6 +11,7 @@
+ *
+ */
+
++#include <config.h>
+ #include "plugin-domevents.h"
+
+ #ifdef DEBUG
+Index: moon-2.3/src/applier.cpp
+===================================================================
+--- moon-2.3.orig/src/applier.cpp 2010-07-15 14:03:52.000000000 +0100
++++ moon-2.3/src/applier.cpp 2010-07-15 14:12:36.189697861 +0100
+@@ -9,6 +9,7 @@
+ *
+ */
+
++#include <config.h>
+ #include "applier.h"
+
+ typedef struct {
+Index: moon-2.3/src/asf/asf-debug.cpp
+===================================================================
+--- moon-2.3.orig/src/asf/asf-debug.cpp 2010-07-15 14:03:52.000000000 +0100
++++ moon-2.3/src/asf/asf-debug.cpp 2010-07-15 14:12:36.189697861 +0100
+@@ -9,6 +9,7 @@
+ * See the LICENSE file included with the distribution for details.
+ */
+
++#include <config.h>
+ #include "asf-debug.h"
+
+ #if DEBUG
+Index: moon-2.3/src/imagesource.cpp
+===================================================================
+--- moon-2.3.orig/src/imagesource.cpp 2010-07-15 14:03:52.000000000 +0100
++++ moon-2.3/src/imagesource.cpp 2010-07-15 14:12:36.199691659 +0100
+@@ -11,6 +11,7 @@
+ *
+ */
+
++#include <config.h>
+ #include <stdio.h>
+
+ #include "application.h"
+Index: moon-2.3/src/layoutinformation.cpp
+===================================================================
+--- moon-2.3.orig/src/layoutinformation.cpp 2010-07-15 14:03:52.000000000 +0100
++++ moon-2.3/src/layoutinformation.cpp 2010-07-15 14:12:36.199691659 +0100
+@@ -7,6 +7,7 @@
+ * See the LICENSE file included with the distribution for details.
+ *
+ */
++#include <config.h>
+ #include "frameworkelement.h"
+ #include "geometry.h"
+ #include "rect.h"
+Index: moon-2.3/src/pipeline-logo.cpp
+===================================================================
+--- moon-2.3.orig/src/pipeline-logo.cpp 2010-07-15 14:03:52.000000000 +0100
++++ moon-2.3/src/pipeline-logo.cpp 2010-07-15 14:12:36.199691659 +0100
+@@ -11,6 +11,7 @@
+ *
+ */
+
++#include <config.h>
+
+ extern const char moonlight_logo [] = {
+ '\x42', '\x4D', '\xF6', '\x5D', '\x00', '\x00', '\x00', '\x00', '\x00', '\x00', '\x36', '\x00', '\x00', '\x00', '\x28', '\x00',
+Index: moon-2.3/src/popup.cpp
+===================================================================
+--- moon-2.3.orig/src/popup.cpp 2010-07-15 14:03:52.000000000 +0100
++++ moon-2.3/src/popup.cpp 2010-07-15 14:12:36.199691659 +0100
+@@ -8,6 +8,7 @@
+ *
+ */
+
++#include <config.h>
+ #include "popup.h"
+ #include "runtime.h"
+ #include "deployment.h"
+@@ -136,4 +137,4 @@
+ control->UpdateEnabled ();
+ walker.SkipBranch ();
+ }
+-}
+\ No newline at end of file
++}
+Index: moon-2.3/src/tabnavigationwalker.cpp
+===================================================================
+--- moon-2.3.orig/src/tabnavigationwalker.cpp 2010-07-15 14:03:52.000000000 +0100
++++ moon-2.3/src/tabnavigationwalker.cpp 2010-07-15 14:12:36.199691659 +0100
+@@ -11,10 +11,11 @@
+ // */
+ //
+
+- #include "control.h"
+- #include "deployment.h"
+- #include "tabnavigationwalker.h"
+- #include "type.h"
++#include <config.h>
++#include "control.h"
++#include "deployment.h"
++#include "tabnavigationwalker.h"
++#include "type.h"
+
+ TabNavigationWalker::TabNavigationWalker (UIElement *root, UIElement *current, bool forwards, Types *types)
+ {
+Index: moon-2.3/src/tilesource.cpp
+===================================================================
+--- moon-2.3.orig/src/tilesource.cpp 2010-07-15 14:03:52.000000000 +0100
++++ moon-2.3/src/tilesource.cpp 2010-07-15 14:12:36.199691659 +0100
+@@ -11,6 +11,7 @@
+ *
+ */
+
++#include <config.h>
+ #include "tilesource.h"
+
+
+Index: moon-2.3/src/writeablebitmap.cpp
+===================================================================
+--- moon-2.3.orig/src/writeablebitmap.cpp 2010-07-15 14:03:52.000000000 +0100
++++ moon-2.3/src/writeablebitmap.cpp 2010-07-15 14:12:36.199691659 +0100
+@@ -11,6 +11,7 @@
+ *
+ */
+
++#include <config.h>
+ #include "runtime.h"
+ #include "transform.h"
+ #include "rect.h"
diff --git a/debian/patches/series b/debian/patches/series
index 73ac86a..20a62e7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,3 @@
+use_AC_PATH_PROGS_to_satisfy_chromium_search.patch
use_bundled_mono_runtime_for_smcs.patch
+include_config.h_in_all_files.patch
diff --git a/debian/patches/use_AC_PATH_PROGS_to_satisfy_chromium_search.patch b/debian/patches/use_AC_PATH_PROGS_to_satisfy_chromium_search.patch
new file mode 100644
index 0000000..0ec2285
--- /dev/null
+++ b/debian/patches/use_AC_PATH_PROGS_to_satisfy_chromium_search.patch
@@ -0,0 +1,17 @@
+--- moon-2.3~/m4/chrome.m4 2010-06-22 18:04:43.000000000 +0100
++++ moon-2.3/m4/chrome.m4 2010-07-09 09:57:31.899698578 +0100
+@@ -10,13 +10,7 @@
+
+ chrome_extension="yes"
+
+- AC_PATH_PROG(CHROME, google-chrome, no)
+- if test "x$CHROME" = "xno" ; then
+- AC_PATH_PROG(CHROME, chromium, no)
+- fi
+- if test "x$CHROME" = "xno" ; then
+- AC_PATH_PROG(CHROME, chromium-browser, no)
+- fi
++ AC_PATH_PROGS(CHROME, google-chrome chromium chromium-browser, no)
+
+ if test "x$CHROME" = "xno" ; then
+ chrome_extension="no"
diff --git a/debian/rules b/debian/rules
index aaced71..43fae40 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 --with-ff36=yes --with-ff3=no --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-ff3=yes --prefix=/usr --with-curl=system
touch moonlight-configure-stamp
get-orig-source:
--
moon
More information about the Pkg-mono-svn-commits
mailing list