[pkgsrc/trunk]: pkgsrc/www/kazehakase Switch to xulrunner ... but unfortunate...

[tnn <tnn%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/050b67cda9e1
branches:  trunk
changeset: 396958:050b67cda9e1
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Thu Aug 06 12:21:37 2009 +0000

description:
Switch to xulrunner ... but unfortunately it doesn't work.
There's a SEGV in glib2 and the backtrace doesn't have any browser
engine references in it so I'm inclined to believe this package was
broken by a glib2/gtk2 update.

diffstat:

 www/kazehakase/Makefile         |   6 +++---
 www/kazehakase/distinfo         |   4 +++-
 www/kazehakase/options.mk       |   3 +--
 www/kazehakase/patches/patch-an |  33 +++++++++++++++++++++++++++++++++
 www/kazehakase/patches/patch-ao |  12 ++++++++++++
 5 files changed, 52 insertions(+), 6 deletions(-)

diffs (108 lines):

diff -r 65643bd57ecd -r 050b67cda9e1 www/kazehakase/Makefile
--- a/www/kazehakase/Makefile   Thu Aug 06 11:34:21 2009 +0000
+++ b/www/kazehakase/Makefile   Thu Aug 06 12:21:37 2009 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.28 2009/07/22 09:01:51 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2009/08/06 12:21:37 tnn Exp $
 #
 
 DISTNAME=      kazehakase-0.5.4
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    www
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE_JP:=kazehakase/30219/}
 
@@ -35,8 +35,8 @@
 CONF_FILES+=   ${EGDIR}/mozilla/encodings.xml ${PKG_SYSCONFDIR}/mozilla/encodings.xml
 
 .include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/xulrunner/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 BUILDLINK_API_DEPENDS.gtk2+=   gtk2+>=2.12.0
 .include "../../x11/gtk2/buildlink3.mk"
-.include "../../www/seamonkey/gecko-depends.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 65643bd57ecd -r 050b67cda9e1 www/kazehakase/distinfo
--- a/www/kazehakase/distinfo   Thu Aug 06 11:34:21 2009 +0000
+++ b/www/kazehakase/distinfo   Thu Aug 06 12:21:37 2009 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2009/07/03 14:00:24 drochner Exp $
+$NetBSD: distinfo,v 1.9 2009/08/06 12:21:37 tnn Exp $
 
 SHA1 (kazehakase-0.5.4.tar.gz) = 0edb089c8af3ec04bf1a2c9ba107096a79d8c014
 RMD160 (kazehakase-0.5.4.tar.gz) = 85f41a395e01d6b11c3c24f3d8ca576be205d308
@@ -11,3 +11,5 @@
 SHA1 (patch-ak) = 4735bc0ce5b0d333b1521026375ef72fb916dd8f
 SHA1 (patch-al) = bdacee4da52a7c8c5b218dd643aee838e2cdf3ed
 SHA1 (patch-am) = 15dc6e2d40f3c25a3f27ba4b5e7dca5c55707eec
+SHA1 (patch-an) = c003ed63f00180bfd7353dd26dd9974b578df0ec
+SHA1 (patch-ao) = a7982462d686ae8228c1fd0e7e0f28bb33ced7ff
diff -r 65643bd57ecd -r 050b67cda9e1 www/kazehakase/options.mk
--- a/www/kazehakase/options.mk Thu Aug 06 11:34:21 2009 +0000
+++ b/www/kazehakase/options.mk Thu Aug 06 12:21:37 2009 +0000
@@ -1,11 +1,10 @@
-# $NetBSD: options.mk,v 1.4 2009/07/03 14:00:24 drochner Exp $
+# $NetBSD: options.mk,v 1.5 2009/08/06 12:21:37 tnn Exp $
 #
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.kazehakase
 PKG_SUPPORTED_OPTIONS= gnutls
 PKG_SUGGESTED_OPTIONS+=        gnutls
 
-.include "../../www/seamonkey/gecko-options.mk"
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mgnutls)
diff -r 65643bd57ecd -r 050b67cda9e1 www/kazehakase/patches/patch-an
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/kazehakase/patches/patch-an   Thu Aug 06 12:21:37 2009 +0000
@@ -0,0 +1,33 @@
+$NetBSD: patch-an,v 1.1 2009/08/06 12:21:37 tnn Exp $
+
+--- module/embed/gecko/gtkmozembed/nsProfileDirServiceProvider2.cpp.orig       2008-03-29 09:20:40.000000000 +0100
++++ module/embed/gecko/gtkmozembed/nsProfileDirServiceProvider2.cpp
+@@ -306,6 +306,7 @@ nsProfileDirServiceProvider::GetFile(con
+         rv = EnsureProfileFileExists(localFile, domainDir);
+     }
+   }
++#if 0
+   else if (strcmp(prop, NS_APP_MAIL_50_DIR) == 0) {
+     rv = domainDir->Clone(getter_AddRefs(localFile));
+     if (NS_SUCCEEDED(rv))
+@@ -326,6 +327,7 @@ nsProfileDirServiceProvider::GetFile(con
+     if (NS_SUCCEEDED(rv))
+       rv = localFile->AppendNative(MSG_FOLDER_CACHE_DIR_50_NAME);
+   }
++#endif
+   else if (strcmp(prop, NS_APP_STORAGE_50_FILE) == 0) {
+     rv = domainDir->Clone(getter_AddRefs(localFile));
+     if (NS_SUCCEEDED(rv))
+@@ -518,10 +520,12 @@ nsProfileDirServiceProvider::UndefineFil
+   (void) directoryService->Undefine(NS_APP_BOOKMARKS_50_FILE);
+   (void) directoryService->Undefine(NS_APP_DOWNLOADS_50_FILE);
+   (void) directoryService->Undefine(NS_APP_SEARCH_50_FILE);
++#if 0
+   (void) directoryService->Undefine(NS_APP_MAIL_50_DIR);
+   (void) directoryService->Undefine(NS_APP_IMAP_MAIL_50_DIR);
+   (void) directoryService->Undefine(NS_APP_NEWS_50_DIR);
+   (void) directoryService->Undefine(NS_APP_MESSENGER_FOLDER_CACHE_50_DIR);
++#endif
+ 
+   return NS_OK;
+ }
diff -r 65643bd57ecd -r 050b67cda9e1 www/kazehakase/patches/patch-ao
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/kazehakase/patches/patch-ao   Thu Aug 06 12:21:37 2009 +0000
@@ -0,0 +1,12 @@
+$NetBSD: patch-ao,v 1.1 2009/08/06 12:21:37 tnn Exp $
+
+--- module/embed/gecko/kz-mozlauncher.cpp.orig 2008-03-29 09:20:40.000000000 +0100
++++ module/embed/gecko/kz-mozlauncher.cpp
+@@ -76,6 +76,7 @@ NS_IMETHODIMP KzContentHandler::PromptFo
+                                   nsISupports *aWindowContext,
+                                   const PRUnichar *aDefaultFile,
+                                   const PRUnichar *aSuggestedFileExtension,
++                                  PRBool aForcePrompt,
+                                   nsILocalFile **_retval)
+ {
+       nsresult rv;