- updated for 0.21

Changed files:
    devhelp-libxul.patch -> 1.2

diff --git a/devhelp-libxul.patch b/devhelp-libxul.patch
index 4aab515e3d74032884bf23bf19a108718f45c330..091d38793485479cb68b1a13b694c3add56f668c 100644 (file)
--- a/devhelp-libxul.patch
+++ b/devhelp-libxul.patch
@@ -1,116 +1,12 @@
-diff -up devhelp-0.19.1/configure.in.xulrunner devhelp-0.19.1/configure.in
---- devhelp-0.19.1/configure.in.xulrunner      2008-05-25 12:56:13.000000000 -0400
-+++ devhelp-0.19.1/configure.in        2008-05-26 12:18:07.000000000 -0400
-@@ -73,6 +73,7 @@ AC_SUBST([GECKO_INCLUDE_ROOT])
- AC_SUBST([GECKO_HOME])
- AC_SUBST([GECKO_PREFIX])
- AC_SUBST([GECKO_EXTRA_LIBS])
-+AC_SUBST([GECKO_XPCOM])
- 
- case "$GECKO" in
- mozilla) gecko_min_version=1.7 ;;
-@@ -80,9 +81,10 @@ seamonkey) gecko_min_version=1.0 ;;
- *firefox) gecko_min_version=1.0 ;;
- *thunderbird) gecko_min_version=1.0 ;;
- xulrunner) gecko_min_version=1.8 ;;
-+libxul*) gecko_min_version=1.9 ;;
- esac
- 
--PKG_CHECK_MODULES([GECKO],[$GECKO_EXTRA_PKG_DEPENDENCIES $GECKO-xpcom >= $gecko_min_version])
-+PKG_CHECK_MODULES([GECKO],[$GECKO_EXTRA_PKG_DEPENDENCIES $GECKO_XPCOM >= $gecko_min_version])
- AC_SUBST([GECKO_CFLAGS])
- AC_SUBST([GECKO_LIBS])
- 
-diff -up devhelp-0.19.1/m4/gecko.m4.xulrunner devhelp-0.19.1/m4/gecko.m4
---- devhelp-0.19.1/m4/gecko.m4.xulrunner       2008-05-25 12:55:36.000000000 -0400
-+++ devhelp-0.19.1/m4/gecko.m4 2008-05-26 12:18:07.000000000 -0400
-@@ -51,22 +51,32 @@ AC_PROG_AWK
- AC_MSG_CHECKING([which gecko to use])
- 
- AC_ARG_WITH([gecko],
--      AS_HELP_STRING([--with-gecko@<:@=mozilla|firefox|seamonkey|xulrunner@:>@],
-+      AS_HELP_STRING([--with-gecko@<:@=mozilla|firefox|seamonkey|xulrunner|libxul@:>@],
-                      [Which gecko engine to use (autodetected by default)]))
- 
- # Backward compat
- AC_ARG_WITH([mozilla],[],[with_gecko=$withval],[])
- 
- gecko_cv_gecko=$with_gecko
-+if $PKG_CONFIG --exists $with_gecko-xpcom; then
-+      gecko_cv_gecko_xpcom=$with_gecko-xpcom
-+else
-+      gecko_cv_gecko_xpcom=$with_gecko
-+fi
- 
- # Autodetect gecko
--_geckos="xulrunner firefox mozilla-firefox seamonkey mozilla"
-+_geckos="xulrunner firefox mozilla-firefox seamonkey mozilla libxul"
- if test -z "$gecko_cv_gecko"; then
-       for lizard in $_geckos; do
-               if $PKG_CONFIG --exists $lizard-xpcom; then
-                       gecko_cv_gecko=$lizard
-+                      gecko_cv_gecko_xpcom=$lizard-xpcom
-                       break;
--              fi
-+              elif $PKG_CONFIG --exists $lizard; then
-+                      gecko_cv_gecko=$lizard
-+                      gecko_cv_gecko_xpcom=$lizard
-+                      break;                  
-+              fi              
-       done
- fi
- 
-@@ -93,12 +103,13 @@ mozilla) gecko_cv_gecko_flavour=mozilla 
- seamonkey) gecko_cv_gecko_flavour=mozilla ;;
- *firefox) gecko_cv_gecko_flavour=toolkit ;;
- xulrunner) gecko_cv_gecko_flavour=toolkit ;;
-+libxul*) gecko_cv_gecko_flavour=toolkit ;;
- esac
- 
--_GECKO_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir ${gecko_cv_gecko}-xpcom`"
--_GECKO_LIBDIR="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko}-xpcom`"
--_GECKO_HOME="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko}-xpcom`"
--_GECKO_PREFIX="`$PKG_CONFIG --variable=prefix ${gecko_cv_gecko}-xpcom`"
-+_GECKO_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir ${gecko_cv_gecko_xpcom}`"
-+_GECKO_LIBDIR="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko_xpcom}`"
-+_GECKO_HOME="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko_xpcom}`"
-+_GECKO_PREFIX="`$PKG_CONFIG --variable=prefix ${gecko_cv_gecko_xpcom}`"
- 
- fi # if gecko_cv_have_gecko
- 
-@@ -114,6 +125,7 @@ $1[]_INCLUDE_ROOT=$_GECKO_INCLUDE_ROOT
- $1[]_LIBDIR=$_GECKO_LIBDIR
- $1[]_HOME=$_GECKO_HOME
- $1[]_PREFIX=$_GECKO_PREFIX
-+$1[]_XPCOM=$gecko_cv_gecko_xpcom
- 
- # **************************************************************
- # This is really gcc-only
-@@ -359,10 +371,10 @@ _SAVE_CPPFLAGS="$CPPFLAGS"
- _SAVE_CXXFLAGS="$CXXFLAGS"
- _SAVE_LDFLAGS="$LDFLAGS"
- _SAVE_LIBS="$LIBS"
--CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS -I$_GECKO_INCLUDE_ROOT $($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko}-xpcom)"
--CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko}-xpcom)"
-+CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS -I$_GECKO_INCLUDE_ROOT $($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko_xpcom})"
-+CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko_xpcom})"
- LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS -Wl,--rpath=$_GECKO_HOME"
--LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}-xpcom)"
-+LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko_xpcom})"
- 
- _GECKO_DISPATCH_INCLUDEDIRS="$2"
- 
-@@ -595,11 +607,11 @@ fi
- AC_DEFUN([GECKO_XPIDL],
- [AC_REQUIRE([GECKO_INIT])dnl
- 
--_GECKO_LIBDIR="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko}-xpcom`"
-+_GECKO_LIBDIR="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko_xpcom}`"
- 
- AC_PATH_PROG([XPIDL],[xpidl],[no],[$_GECKO_LIBDIR:$PATH])
- 
--XPIDL_IDLDIR="`$PKG_CONFIG --variable=idldir ${gecko_cv_gecko}-xpcom`"
-+XPIDL_IDLDIR="`$PKG_CONFIG --variable=idldir ${gecko_cv_gecko_xpcom}`"
- 
- # Older geckos don't have this variable, see
- # https://bugzilla.mozilla.org/show_bug.cgi?id=240473
+diff -urN devhelp-0.21/m4/gecko.m4 devhelp-0.21.new/m4/gecko.m4
+--- devhelp-0.21/m4/gecko.m4   2008-09-08 09:29:56.000000000 +0200
++++ devhelp-0.21.new/m4/gecko.m4       2008-10-10 09:48:12.000000000 +0200
+@@ -116,7 +116,7 @@
+       _GECKO_PREFIX="`$PKG_CONFIG --variable=prefix ${gecko_cv_gecko}-xpcom`"
+       _GECKO_NSPR=no # XXX asac: this is currently a blind guess and should be a AC test
+ else
+-      _GECKO_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir ${gecko_cv_gecko}`/unstable"
++      _GECKO_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir ${gecko_cv_gecko}`"
+       _GECKO_CFLAGS="`$PKG_CONFIG --cflags ${gecko_cv_gecko}` `$PKG_CONFIG --cflags ${gecko_cv_gecko}-unstable`"
+       _GECKO_LIBDIR="`$PKG_CONFIG --variable=sdkdir ${gecko_cv_gecko}`/bin"
+       _GECKO_HOME=$with_gecko_home