Add xulrunner-2 support patches.

taken from OpenSUSE and Gentoo repository.

Bump PKGREVISION, because not bumped at xulrunner updated to 2.0.

7 files changed, 284 insertions, 7 deletions

diff --git a/misc/yelp/Makefile b/misc/yelp/Makefile
index 498c4997b44..eedcbe1802b 100644
--- a/misc/yelp/Makefile
+++ b/misc/yelp/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.95 2011/04/22 13:44:13 obache Exp $
+# $NetBSD: Makefile,v 1.96 2011/06/26 12:46:06 obache Exp $
 #
 
 DISTNAME=		yelp-2.30.2
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		misc gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/yelp/2.30/}
 EXTRACT_SUFX=		.tar.bz2
@@ -33,6 +33,14 @@ BUILDLINK_API_DEPENDS.libxml2+=			libxml2>=2.6.5
 BUILDLINK_DEPMETHOD.gnome-doc-utils+=	full
 BUILDLINK_DEPMETHOD.libXt?=	build
 
+# for xulrunner-2 support patch
+BUILD_DEPENDS+=		gnome-common-[0-9]*:../../devel/gnome-common
+USE_TOOLS+=		autoconf automake aclocal gettext-m4
+AUTOMAKE_REQD=		1.9
+AUTOMAKE_OVERRIDE=	no
+pre-configure:
+	${RUN}cd ${WRKSRC};${SETENV} ${CONFIGURE_ENV} NOCONFIGURE=y ./autogen.sh
+
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../devel/GConf/schemas.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/misc/yelp/distinfo b/misc/yelp/distinfo
index e186e533ced..ff96285b741 100644
--- a/misc/yelp/distinfo
+++ b/misc/yelp/distinfo
@@ -1,6 +1,10 @@
-$NetBSD: distinfo,v 1.31 2010/11/29 18:32:00 drochner Exp $
+$NetBSD: distinfo,v 1.32 2011/06/26 12:46:06 obache Exp $
 
 SHA1 (yelp-2.30.2.tar.bz2) = b36d36449ff19844a429b4e2bd5eaad0a7537281
 RMD160 (yelp-2.30.2.tar.bz2) = a92fde9f64489c5dee6a249964245b087aab5981
 Size (yelp-2.30.2.tar.bz2) = 1159521 bytes
-SHA1 (patch-ab) = 67b55fe06a9bceccd9e43ff85d49a92ab6cc67ea
+SHA1 (patch-ab) = de7b2abf4d12066650663241ce5a1f610540fcdc
+SHA1 (patch-aclocal.m4) = 58a457ff140ba9ac70b1751ca2e31ec613485c34
+SHA1 (patch-m4_gecko.m4) = a6884cbd4622aba05bf1683300082d58ff0615db
+SHA1 (patch-src_yelp-gecko-services.cpp) = 51c02cb86671739c5714a10ad37bf8d9587208a9
+SHA1 (patch-src_yelp-gecko-utils.cpp) = b9addf9fb652acbc72ce67b860e6ae09afe48bee
diff --git a/misc/yelp/patches/patch-ab b/misc/yelp/patches/patch-ab
index ffde16d3719..ed21d37d4f9 100644
--- a/misc/yelp/patches/patch-ab
+++ b/misc/yelp/patches/patch-ab
@@ -1,8 +1,10 @@
-$NetBSD: patch-ab,v 1.2 2007/04/11 18:26:28 drochner Exp $
+$NetBSD: patch-ab,v 1.3 2011/06/26 12:46:06 obache Exp $
 
---- configure.orig	2007-04-09 18:48:24.000000000 +0200
+* force to use PKGLOCALEDIR for localedir.
+
+--- configure.orig	2010-09-28 14:13:33.000000000 +0000
 +++ configure
-@@ -22315,6 +22315,7 @@ if test "x$CATOBJEXT" = "x.mo" ; then
+@@ -18013,6 +18013,7 @@ if test "x$CATOBJEXT" = "x.mo" ; then
  else
    localedir=`eval echo "${datadir}/locale"`
  fi
diff --git a/misc/yelp/patches/patch-aclocal.m4 b/misc/yelp/patches/patch-aclocal.m4
new file mode 100644
index 00000000000..41cb84e2dc3
--- /dev/null
+++ b/misc/yelp/patches/patch-aclocal.m4
@@ -0,0 +1,19 @@
+$NetBSD: patch-aclocal.m4,v 1.1 2011/06/26 12:46:06 obache Exp $
+
+* from patch-ab
+
+--- aclocal.m4.orig	2010-09-28 14:13:32.000000000 +0000
++++ aclocal.m4
+@@ -672,11 +672,7 @@ glib_save_datarootdir="$datarootdir"
+ test "x$prefix" = xNONE && prefix=$ac_default_prefix
+ test "x$exec_prefix" = xNONE && exec_prefix=$prefix
+ datarootdir=`eval echo "${datarootdir}"`
+-if test "x$CATOBJEXT" = "x.mo" ; then
+-  localedir=`eval echo "${libdir}/locale"`
+-else
+-  localedir=`eval echo "${datadir}/locale"`
+-fi
++localedir="$prefix/$PKGLOCALEDIR/locale"
+ prefix="$glib_save_prefix"
+ exec_prefix="$glib_save_exec_prefix"
+ datarootdir="$glib_save_datarootdir"
diff --git a/misc/yelp/patches/patch-m4_gecko.m4 b/misc/yelp/patches/patch-m4_gecko.m4
new file mode 100644
index 00000000000..7d2c85c844a
--- /dev/null
+++ b/misc/yelp/patches/patch-m4_gecko.m4
@@ -0,0 +1,84 @@
+$NetBSD: patch-m4_gecko.m4,v 1.1 2011/06/26 12:46:06 obache Exp $
+
+* xulrunner-2 support.
+
+--- m4/gecko.m4.orig	2010-08-03 19:41:59.000000000 +0000
++++ m4/gecko.m4
+@@ -212,25 +212,6 @@ AC_LANG_PUSH([C++])
+ _SAVE_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS $_GECKO_CFLAGS"
+ 
+-AC_MSG_CHECKING([[whether we have a gtk 2 gecko build]])
+-AC_RUN_IFELSE(
+-	[AC_LANG_SOURCE(
+-		[[#include <mozilla-config.h>
+-		  #include <string.h>
+-		  #include <stdlib.h>
+-                  int main(void) {
+-		    if (strcmp (MOZ_DEFAULT_TOOLKIT, "gtk2") == 0 ||
+-		        strcmp (MOZ_DEFAULT_TOOLKIT, "cairo-gtk2") == 0)
+-			    return EXIT_SUCCESS;
+-		
+-		    return EXIT_FAILURE;
+-		  } ]]
+-	)],
+-	[result=yes],
+-	[AC_MSG_ERROR([[This program needs a gtk 2 gecko build]])],
+-        [result=maybe])
+-AC_MSG_RESULT([$result])
+-
+ AC_MSG_CHECKING([[whether we have a gecko debug build]])
+ AC_COMPILE_IFELSE(
+ 	[AC_LANG_SOURCE(
+@@ -304,7 +285,9 @@ if (!stream) return 126;
+ #ifdef MOZILLA_1_8_BRANCH
+ version = "1.8.1";
+ #else
+-if (strncmp (MOZILLA_VERSION, "1.9", strlen ("1.9")) == 0) {
++if (strncmp (MOZILLA_VERSION, "2.0", strlen ("2.0")) == 0) {
++	version = "2.0";
++} else if (strncmp (MOZILLA_VERSION, "1.9", strlen ("1.9")) == 0) {
+ 	version = "1.9";
+ } else if (strncmp (MOZILLA_VERSION, "1.8", strlen ("1.8")) == 0) {
+ 	version = "1.8";
+@@ -328,7 +311,7 @@ AC_LANG_POP([C++])
+ 
+ gecko_cv_gecko_version_int="$(echo "$gecko_cv_gecko_version" | $AWK -F . '{print [$]1 * 1000000 + [$]2 * 1000 + [$]3}')"
+ 
+-if test "$gecko_cv_gecko_version_int" -lt "1007000" -o "$gecko_cv_gecko_version_int" -gt "1009000"; then
++if test "$gecko_cv_gecko_version_int" -lt "1007000" -o "$gecko_cv_gecko_version_int" -gt "2000000"; then
+ 	AC_MSG_ERROR([Gecko version $gecko_cv_gecko_version is not supported!])
+ fi
+ 
+@@ -350,7 +333,10 @@ if test "$gecko_cv_gecko_version_int" -g
+ fi
+ 
+ if test "${gecko_cv_gecko}" = "libxul-embedding" -o "${gecko_cv_gecko}" = "libxul"; then
+-	PKG_CHECK_EXISTS([${gecko_cv_gecko} >= 1.9.1],[gecko_cv_have_gecko_1_9_1=yes gecko_cv_gecko_version="1.9.1" gecko_cv_gecko_version_int=1009001],[gecko_cv_have_gecko_1_9_1=no])
++	PKG_CHECK_EXISTS([${gecko_cv_gecko} >= 1.9.1],
++        [ gecko_cv_have_gecko_1_9_1=yes
++          if test "$gecko_cv_gecko_version_int" -lt "2000000"; then gecko_cv_gecko_version="1.9.1" gecko_cv_gecko_version_int=1009001; fi
++        ],[gecko_cv_have_gecko_1_9_1=no])
+ else
+ 	gecko_cv_have_gecko_1_9_1=no
+ fi
+@@ -359,6 +345,11 @@ if test "$gecko_cv_have_gecko_1_9_1" = "
+         AC_DEFINE([HAVE_GECKO_1_9_1],[1],[Define if we have gecko 1.9.1])
+ fi
+ 
++if test "$gecko_cv_gecko_version_int" -ge "2000000"; then
++	AC_DEFINE([HAVE_GECKO_2_0],[1],[Define if we have gecko 2.0])
++	gecko_cv_have_gecko_2_0=yes
++fi
++
+ fi # if gecko_cv_have_gecko
+ 
+ $1[]_VERSION=$gecko_cv_gecko_version
+@@ -407,6 +398,7 @@ AM_CONDITIONAL([HAVE_GECKO_1_8],[test "$
+ AM_CONDITIONAL([HAVE_GECKO_1_8_1],[test "$gecko_cv_have_gecko" = "yes" -a "$gecko_cv_gecko_version_int" -ge "1008001"])
+ AM_CONDITIONAL([HAVE_GECKO_1_9],[test "$gecko_cv_have_gecko" = "yes" -a "$gecko_cv_gecko_version_int" -ge "1009000"])
+ AM_CONDITIONAL([HAVE_GECKO_1_9_1],[test "$gecko_cv_have_gecko" = "yes" -a "$gecko_cv_have_gecko_1_9_1" = "yes"])
++AM_CONDITIONAL([HAVE_GECKO_2_0],[test "$gecko_cv_have_gecko" = "yes" -a "$gecko_cv_have_gecko_2_0" = "yes"])
+ AM_CONDITIONAL([HAVE_GECKO_HOME],[test "x$_GECKO_HOME" != "x"])
+ AM_CONDITIONAL([HAVE_GECKO_DEBUG],[test "$gecko_cv_have_debug" = "yes"])
+ AM_CONDITIONAL([HAVE_GECKO_XPCOM_GLUE],[test "$gecko_cv_have_xpcom_glue" = "yes"])
diff --git a/misc/yelp/patches/patch-src_yelp-gecko-services.cpp b/misc/yelp/patches/patch-src_yelp-gecko-services.cpp
new file mode 100644
index 00000000000..74665baddc1
--- /dev/null
+++ b/misc/yelp/patches/patch-src_yelp-gecko-services.cpp
@@ -0,0 +1,143 @@
+$NetBSD: patch-src_yelp-gecko-services.cpp,v 1.1 2011/06/26 12:46:06 obache Exp $
+
+* xulrunner-2 support.
+
+--- src/yelp-gecko-services.cpp.orig	2010-08-03 19:41:59.000000000 +0000
++++ src/yelp-gecko-services.cpp
+@@ -32,7 +32,11 @@
+ #include <nsIComponentManager.h>
+ #include <nsComponentManagerUtils.h>
+ #include <nsIComponentRegistrar.h>
++#ifndef HAVE_GECKO_2_0
+ #include <nsIGenericFactory.h>
++#else
++#include <nsIFactory.h>
++#endif
+ #include <nsILocalFile.h>
+ #include <nsIPrintSettings.h>
+ #include <nsServiceManagerUtils.h>
+@@ -418,6 +422,8 @@ PrintListener::SetPrintSettings (YelpPri
+ 
+ /* component registration */
+ 
++#ifndef HAVE_GECKO_2_0
++
+ NS_GENERIC_FACTORY_CONSTRUCTOR(GPrintingPromptService)
+ 
+ static const nsModuleComponentInfo sAppComps[] = {
+@@ -462,3 +468,115 @@ yelp_register_printing ()
+     }
+     
+ }
++
++#else
++
++/*
++ * Adapted from code from ./embedding/browser/activex/src/control/PromptService.cpp in Firefox
++ */
++
++//*****************************************************************************
++// GPrintingPromptServiceFactory
++//*****************************************************************************
++
++class GPrintingPromptServiceFactory : public nsIFactory
++{
++public:
++    NS_DECL_ISUPPORTS
++    NS_DECL_NSIFACTORY
++
++    GPrintingPromptServiceFactory();
++    virtual ~GPrintingPromptServiceFactory();
++};
++
++//*****************************************************************************
++
++NS_IMPL_ISUPPORTS1(GPrintingPromptServiceFactory, nsIFactory)
++
++GPrintingPromptServiceFactory::GPrintingPromptServiceFactory()
++{
++}
++
++GPrintingPromptServiceFactory::~GPrintingPromptServiceFactory()
++{
++}
++
++NS_IMETHODIMP GPrintingPromptServiceFactory::CreateInstance(nsISupports *aOuter, const nsIID & aIID, void **aResult)
++{
++    NS_ENSURE_ARG_POINTER(aResult);
++
++    *aResult = NULL;
++    GPrintingPromptService *inst = new GPrintingPromptService;
++    if (!inst)
++    return NS_ERROR_OUT_OF_MEMORY;
++
++    nsresult rv = inst->QueryInterface(aIID, aResult);
++    if (rv != NS_OK) {
++        // We didn't get the right interface, so clean up
++        delete inst;
++    }
++
++    return rv;
++}
++
++NS_IMETHODIMP GPrintingPromptServiceFactory::LockFactory(PRBool lock)
++{
++    return NS_OK;
++}
++
++//*****************************************************************************
++
++nsresult NS_NewPrintingPromptServiceFactory(nsIFactory** aFactory)
++{
++    NS_ENSURE_ARG_POINTER(aFactory);
++    *aFactory = nsnull;
++
++    GPrintingPromptServiceFactory *result = new GPrintingPromptServiceFactory;
++    if (!result)
++        return NS_ERROR_OUT_OF_MEMORY;
++
++    NS_ADDREF(result);
++    *aFactory = result;
++
++    return NS_OK;
++}
++
++/*
++ * End of adapted code.
++ */
++
++static NS_DEFINE_CID(kGPrintingPromptServiceCID, G_PRINTINGPROMPTSERVICE_CID);
++
++void
++yelp_register_printing ()
++{
++  nsresult rv;
++  nsCOMPtr<nsIComponentRegistrar> cr;
++  rv = NS_GetComponentRegistrar(getter_AddRefs(cr));
++  NS_ENSURE_SUCCESS (rv, );
++
++  nsCOMPtr<nsIComponentManager> cm;
++  rv = NS_GetComponentManager (getter_AddRefs (cm));
++  NS_ENSURE_SUCCESS (rv, );
++
++  nsCOMPtr<nsIFactory> componentFactory;
++  rv = NS_NewPrintingPromptServiceFactory(getter_AddRefs(componentFactory));
++
++  if (NS_FAILED(rv) || !componentFactory)
++    {
++      g_warning ("Failed to make a factory for %s\n", G_PRINTINGPROMPTSERVICE_CLASSNAME);
++      return;
++    }
++
++  rv = cr->RegisterFactory(kGPrintingPromptServiceCID,
++			   G_PRINTINGPROMPTSERVICE_CLASSNAME,
++			   G_PRINTINGPROMPTSERVICE_CONTRACTID,
++			   componentFactory);
++  if (NS_FAILED(rv))
++    {
++      g_warning ("Failed to register %s\n", G_PRINTINGPROMPTSERVICE_CLASSNAME);
++    }
++
++}
++
++#endif
diff --git a/misc/yelp/patches/patch-src_yelp-gecko-utils.cpp b/misc/yelp/patches/patch-src_yelp-gecko-utils.cpp
new file mode 100644
index 00000000000..12eb18d000b
--- /dev/null
+++ b/misc/yelp/patches/patch-src_yelp-gecko-utils.cpp
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_yelp-gecko-utils.cpp,v 1.1 2011/06/26 12:46:06 obache Exp $
+
+* xulrunner-2 support.
+
+--- src/yelp-gecko-utils.cpp.orig	2010-08-03 19:41:59.000000000 +0000
++++ src/yelp-gecko-utils.cpp
+@@ -213,8 +213,8 @@ yelp_gecko_init (void)
+ 	nsresult rv;
+ #ifdef XPCOM_GLUE
+     static const GREVersionRange greVersion = {
+-    "1.9a", PR_TRUE,
+-    "2", PR_TRUE
++    "2.0a", PR_TRUE,
++    "2.0.*", PR_TRUE
+     };
+     char xpcomLocation[PATH_MAX];
+     rv = GRE_GetGREPathWithProperties(&greVersion, 1, nsnull, 0, xpcomLocation, sizeof (xpcomLocation));