SOURCES: monodevelop-MOZILLA_FIVE_HOME.patch - up for cvs snap - r...

[wolf]

Author: wolf                         Date: Wed Sep 26 20:10:06 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- up for cvs snap
- remove magic, require xulrunner

---- Files affected:
SOURCES:
   monodevelop-MOZILLA_FIVE_HOME.patch (1.9 -> 1.10) 

---- Diffs:

================================================================
Index: SOURCES/monodevelop-MOZILLA_FIVE_HOME.patch
diff -u SOURCES/monodevelop-MOZILLA_FIVE_HOME.patch:1.9 SOURCES/monodevelop-MOZILLA_FIVE_HOME.patch:1.10
--- SOURCES/monodevelop-MOZILLA_FIVE_HOME.patch:1.9	Fri Feb 23 23:56:54 2007
+++ SOURCES/monodevelop-MOZILLA_FIVE_HOME.patch	Wed Sep 26 22:10:00 2007
@@ -1,33 +1,44 @@
 --- monodevelop-0.13/monodevelop.in.orig	2007-02-23 23:44:59.145107172 +0100
 +++ monodevelop-0.13/monodevelop.in	2007-02-23 23:45:24.230049808 +0100
-@@ -19,16 +19,20 @@
- #(NOTE: any changes to this block should be kept in sync with the one in configure.in)
- if test -n "$MOZILLA_FIVE_HOME"; then
- 	MOZILLA_HOME=$MOZILLA_FIVE_HOME
--elif [ -f @MOZILLA_HOME@/chrome/comm.jar ]; then
--        MOZILLA_HOME=@MOZILLA_HOME@
--elif grep GRE_PATH /etc/gre.d/*.conf > /dev/null ; then
--	MOZILLA_HOME=$(grep -h GRE_PATH= /etc/gre.d/*.conf | cut -d '"' -f 2 -d = | head -n 1)
--elif [ $(which mozilla 2>/dev/null) ] && grep MOZILLA_FIVE_HOME= "$(which mozilla)" > /dev/null ; then
--	MOZILLA_HOME=$(grep MOZILLA_FIVE_HOME= $(which mozilla) | cut -d '"' -f 2 | cut -d '=' -f 2 )
--elif [ $(which firefox 2>/dev/null) ] && grep MOZILLA_FIVE_HOME= "$(which firefox)" > /dev/null ; then
--	MOZILLA_HOME=$(grep MOZILLA_FIVE_HOME= $(which firefox) | cut -d '"' -f 2 | cut -d '=' -f 2 )
--elif [ $(which firefox 2>/dev/null) ] && grep MOZILLA_LIBDIR= "$(which firefox)" > /dev/null ; then
--	MOZILLA_HOME=$(grep MOZILLA_LIBDIR= $(which firefox) | cut -d '"' -f 2 | cut -d '=' -f 2)
-+elif [ -f @MOZILLA_HOME@/mozilla/chrome/comm.jar ]; then
-+	MOZILLA_HOME=@MOZILLA_HOME@/mozilla
-+elif [ -f @libdir@/mozilla/chrome/comm.jar ]; then
-+	MOZILLA_HOME=@libdir@/mozilla
-+elif [ -f @libdir@/seamonkey/chrome/comm.jar ]; then
-+	MOZILLA_HOME=@libdir@/seamonkey
-+elif [ -f @libdir@/mozilla-firefox/chrome/comm.jar ]; then
-+	MOZILLA_HOME=@libdir@/mozilla-firefox
-+elif [ -f @libdir@/mozilla-firefox-bin/chrome/comm.jar ]; then
-+	MOZILLA_HOME=@libdir@/mozilla-firefox-bin
-+elif [ -f @libdir@/mozilla-thunderbird/chrome/comm.jar ]; then
-+	MOZILLA_HOME=@libdir@/mozilla-thunderbird
-+elif [ -f @libdir@/xulrunner/chrome/comm.jar ]; then
-+	MOZILLA_HOME=@libdir@/xulrunner
- else
- 	echo "Cannot find mozilla installation directory. Please set MOZILLA_FIVE_HOME to your mozilla directory"
- 	exit 1
+@@ -17,40 +17,7 @@
+ }
+ 
+ 
+-#(NOTE: any changes to this block should be kept in sync with the one in configure.in)
+-MOZFILE="libgtkembedmoz.so"
+-find_libgtkembedmoz ()
+-{
+-	MOZDIR=$MOZILLA_FIVE_HOME
+-	if test -e "$MOZDIR/$MOZFILE"; then echo $MOZDIR; return; fi
+-	
+-	MOZDIR=$(grep -h GRE_PATH= /etc/gre.d/*.conf 2>/dev/null | cut -d '"' -f 2 -d = | head -n 1) #"
+-	if test -e "$MOZDIR/$MOZFILE"; then echo $MOZDIR; return; fi
+-	
+-	mozilla_script=$(which mozilla 2> /dev/null)
+-	firefox_script=$(which firefox 2> /dev/null)
+-	
+-	for runtime_script in "$firefox_script $mozilla_script"; do
+-		MOZDIR=$(grep "MOZ_DIST_LIB=" $runtime_script 2> /dev/null | cut -d '"' -f 2 | cut -d '=' -f 2)
+-		if test -e "$MOZDIR/$MOZFILE"; then echo $MOZDIR; return; fi
+-		MOZDIR=$(grep "MOZILLA_FIVE_HOME=" $runtime_script 2> /dev/null | cut -d '"' -f 2 | cut -d '=' -f 2)
+-		if test -e "$MOZDIR/$MOZFILE"; then echo $MOZDIR; return; fi
+-		MOZDIR=$(grep "MOZILLA_LIBDIR=" $runtime_script 2> /dev/null | cut -d '"' -f 2 | cut -d '=' -f 2)
+-		if test -e "$MOZDIR/$MOZFILE"; then echo $MOZDIR; return; fi
+-		MOZDIR=$(grep "moz_libdir=" $runtime_script 2> /dev/null | cut -d '"' -f 2 | cut -d '=' -f 2)
+-		if test -e "$MOZDIR/$MOZFILE"; then echo $MOZDIR; return; fi
+-	done
+-}
+-
+-if test -e "@MOZILLA_HOME@/$MOZFILE"; then
+-	MOZILLA_HOME=@MOZILLA_HOME@
+-else
+-	MOZILLA_HOME=`find_libgtkembedmoz`
+-	if test ! -e "$MOZILLA_HOME/$MOZFILE"; then
+-		MOZILLA_HOME=
+-		echo "WARNING: Cannot find Mozilla directory containing $MOZFILE. Some Addins may not be able to function. Please set MOZILLA_FIVE_HOME to your Mozilla directory."
+-	fi
+-fi
++MOZILLA_HOME=@libdir@/xulrunner
+ 
+ MD_BIN_PATH=@prefix@/lib/monodevelop/bin
+ 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/monodevelop-MOZILLA_FIVE_HOME.patch?r1=1.9&r2=1.10&f=u