From e6a3149428ef2d42d9a9df78a19c2e52496f3deb Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@linux.intel.com>
Date: Fri, 22 May 2009 09:42:20 +0100
Subject: gcc: Add 4.3.3 and switch to for Moblin

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
---
 .../gcc-4.3.3/debian/libjava-xulrunner1.9.dpatch   | 41 ++++++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 meta/packages/gcc/gcc-4.3.3/debian/libjava-xulrunner1.9.dpatch

(limited to 'meta/packages/gcc/gcc-4.3.3/debian/libjava-xulrunner1.9.dpatch')

diff --git a/meta/packages/gcc/gcc-4.3.3/debian/libjava-xulrunner1.9.dpatch b/meta/packages/gcc/gcc-4.3.3/debian/libjava-xulrunner1.9.dpatch
new file mode 100644
index 000000000..19d67d88b
--- /dev/null
+++ b/meta/packages/gcc/gcc-4.3.3/debian/libjava-xulrunner1.9.dpatch
@@ -0,0 +1,41 @@
+#! /bin/sh -e
+
+# DP: Add configure check for xulrunner-1.9.
+
+dir=
+if [ $# -eq 3 -a "$2" = '-d' ]; then
+    pdir="-d $3"
+    dir="$3/"
+elif [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+case "$1" in
+    -patch)
+        patch $pdir -f --no-backup-if-mismatch -p0 < $0
+        cd ${dir}libjava/classpath && aclocal -I m4 -I ../.. -I ../../config && autoconf
+        ;;
+    -unpatch)
+        patch $pdir -f --no-backup-if-mismatch -R -p0 < $0
+        rm -f ${dir}libjava/configure
+        ;;
+    *)
+        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+        exit 1
+esac
+exit 0
+
+--- libjava/classpath/configure.ac~	2008-02-22 08:37:10.356094701 +0100
++++ libjava/classpath/configure.ac	2008-02-22 08:38:49.397588719 +0100
+@@ -702,7 +702,10 @@
+ 
+   dnl Check for plugin support headers and libraries.
+   if test "x${COMPILE_PLUGIN}" = xyes; then
+-    PKG_CHECK_MODULES(MOZILLA, mozilla-plugin, [MOZILLA_FOUND=yes], [MOZILLA_FOUND=no])
++    PKG_CHECK_MODULES(MOZILLA, mozilla-plugin libxul-unstable, [MOZILLA_FOUND=yes], [MOZILLA_FOUND=no])
++    if test "x${MOZILLA_FOUND}" = xno; then
++      PKG_CHECK_MODULES(MOZILLA, mozilla-plugin, [MOZILLA_FOUND=yes], [MOZILLA_FOUND=no])
++    fi
+     if test "x${MOZILLA_FOUND}" = xno; then
+       PKG_CHECK_MODULES(MOZILLA, firefox-plugin firefox-xpcom, [MOZILLA_FOUND=yes], [MOZILLA_FOUND=no])
+     fi
-- 
cgit v1.2.3