xulrunner-1.9 support, bug #228417.

(Portage version: 2.1.5_rc6)

6 files changed, 130 insertions, 136 deletions

diff --git a/www-client/kazehakase/ChangeLog b/www-client/kazehakase/ChangeLog
index 0035cdf0b6ed..b7890b0ccde4 100644
--- a/www-client/kazehakase/ChangeLog
+++ b/www-client/kazehakase/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for www-client/kazehakase
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/kazehakase/ChangeLog,v 1.59 2008/04/03 17:00:21 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/kazehakase/ChangeLog,v 1.60 2008/07/01 00:45:00 matsuu Exp $
+
+*kazehakase-0.5.4-r1 (01 Jul 2008)
+
+  01 Jul 2008; MATSUU Takuto <matsuu@gentoo.org>
+  -files/kazehakase-0.5.3-gcc43.patch,
+  +files/kazehakase-0.5.4-xulrunner19.patch, -kazehakase-0.5.1.ebuild,
+  -kazehakase-0.5.2.ebuild, -kazehakase-0.5.3.ebuild,
+  +kazehakase-0.5.4-r1.ebuild:
+  xulrunner-1.9 support, bug #228417.
 
 *kazehakase-0.5.4 (03 Apr 2008)
 
diff --git a/www-client/kazehakase/files/kazehakase-0.5.3-gcc43.patch b/www-client/kazehakase/files/kazehakase-0.5.3-gcc43.patch
deleted file mode 100644
index fc3a231480f4..000000000000
--- a/www-client/kazehakase/files/kazehakase-0.5.3-gcc43.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -Naur kazehakase-0.5.3.orig/macros/gecko.m4 kazehakase-0.5.3/macros/gecko.m4
---- kazehakase-0.5.3.orig/macros/gecko.m4	2008-02-29 22:49:26.000000000 +0900
-+++ kazehakase-0.5.3/macros/gecko.m4	2008-03-01 00:18:17.000000000 +0900
-@@ -30,7 +30,7 @@
-     AM_CXXFLAGS=$_SAVE_AM_CXXFLAGS
- fi
- 
--CPPFLAGS="-I$MOZILLA_INCLUDE_ROOT -I$MOZILLA_INCLUDE_ROOT/widget -I$MOZILLA_INCLUDE_ROOT/layout -I$MOZILLA_INCLUDE_ROOT/helperAppDlg -I$MOZILLA_INCLUDE_ROOT/dom -I$MOZILLA_INCLUDE_ROOT/exthandler -I$MOZILLA_INCLUDE_ROOT/pipnss -I$MOZILLA_INCLUDE_ROOT/necko -I$MOZILLA_INCLUDE_ROOT/gfx -I$MOZILLA_INCLUDE_ROOT/content -I$MOZILLA_INCLUDE_ROOT/locale -I$MOZILLA_INCLUDE_ROOT/docshell -I$MOZILLA_INCLUDE_ROOT/mimetype -I$MOZILLA_INCLUDE_ROOT/nkcache `$PKG_CONFIG --cflags-only-I $GECKO_MODULE` -Wconversion -Wsign-compare -Werror"
-+CPPFLAGS="-I$MOZILLA_INCLUDE_ROOT -I$MOZILLA_INCLUDE_ROOT/widget -I$MOZILLA_INCLUDE_ROOT/layout -I$MOZILLA_INCLUDE_ROOT/helperAppDlg -I$MOZILLA_INCLUDE_ROOT/dom -I$MOZILLA_INCLUDE_ROOT/exthandler -I$MOZILLA_INCLUDE_ROOT/pipnss -I$MOZILLA_INCLUDE_ROOT/necko -I$MOZILLA_INCLUDE_ROOT/gfx -I$MOZILLA_INCLUDE_ROOT/content -I$MOZILLA_INCLUDE_ROOT/locale -I$MOZILLA_INCLUDE_ROOT/docshell -I$MOZILLA_INCLUDE_ROOT/mimetype -I$MOZILLA_INCLUDE_ROOT/nkcache `$PKG_CONFIG --cflags-only-I $GECKO_MODULE`"
- CXXFLAGS="$AM_CXXFLAGS `$PKG_CONFIG --cflags-only-other $GECKO_MODULE`"
- if test "x$GCC" = "xyes"; then
-   gxx_version=`g++ -dumpversion`
-@@ -158,9 +158,11 @@
- 
- AC_COMPILE_IFELSE(
- 	[AC_LANG_PROGRAM(
--		[[#include <nsIHelperAppLauncherDialog.h>]],
-+		[[#include <nsIHelperAppLauncherDialog.h>
-+		  class convert { private: operator PRUint32(); public: operator PRBool(); };]],
- 		[[nsIHelperAppLauncherDialog *p;
--		  p->Show (nsnull, nsnull, -1);]]
-+		  convert *c;
-+		  p->Show(nsnull, nsnull, *c);]]
- 	)],
- 	[AC_DEFINE([MOZ_NSIHELPERAPPLAUNCHERDIALOG_NSPRBOOL_],[1],[Define if nsIHelperAppLauncharDialog uses PRBool]) result=yes],
- 	[result=no])
diff --git a/www-client/kazehakase/files/kazehakase-0.5.4-xulrunner19.patch b/www-client/kazehakase/files/kazehakase-0.5.4-xulrunner19.patch
new file mode 100644
index 000000000000..5ac35b205706
--- /dev/null
+++ b/www-client/kazehakase/files/kazehakase-0.5.4-xulrunner19.patch
@@ -0,0 +1,112 @@
+diff -urN kazehakase-0.5.4.orig/ext/ruby/Makefile.in kazehakase-0.5.4/ext/ruby/Makefile.in
+--- kazehakase-0.5.4.orig/ext/ruby/Makefile.in	2008-03-29 10:20:54.000000000 +0200
++++ kazehakase-0.5.4/ext/ruby/Makefile.in	2008-06-19 03:32:03.000000000 +0300
+@@ -306,7 +306,6 @@
+ top_srcdir = @top_srcdir@
+ ext_LTLIBRARIES = ruby.la
+ INCLUDES = \
+-	$(MOZILLA_COMPONENT_CFLAGS)			\
+ 	$(GTK_CFLAGS)					\
+ 	$(LIBGNUTLS_CFLAGS)				\
+ 	$(RUBY_CFLAGS)					\
+@@ -354,7 +353,6 @@
+ 	$(GTK_LIBS)				\
+ 	$(LIBGNUTLS_LIBS)			\
+ 	$(RUBY_LIBS)				\
+-	$(MOZILLA_COMPONENT_LIBS)		\
+ 	$(top_builddir)/src/libkazehakase.la
+ 
+ all: all-am
+diff -urN kazehakase-0.5.4.orig/ext/ruby/Makefile.am kazehakase-0.5.4/ext/ruby/Makefile.am
+--- kazehakase-0.5.4.orig/ext/ruby/Makefile.am	2008-03-29 10:20:42.000000000 +0200
++++ kazehakase-0.5.4/ext/ruby/Makefile.am	2008-06-19 03:32:04.000000000 +0300
+@@ -8,7 +8,6 @@
+ 	-DG_DISABLE_DEPRECATED=1
+ 
+ INCLUDES =						\
+-	$(MOZILLA_COMPONENT_CFLAGS)			\
+ 	$(GTK_CFLAGS)					\
+ 	$(LIBGNUTLS_CFLAGS)				\
+ 	$(RUBY_CFLAGS)					\
+@@ -63,5 +62,4 @@
+ 	$(GTK_LIBS)				\
+ 	$(LIBGNUTLS_LIBS)			\
+ 	$(RUBY_LIBS)				\
+-	$(MOZILLA_COMPONENT_LIBS)		\
+ 	$(top_builddir)/src/libkazehakase.la
+diff -urN kazehakase-0.5.4.orig/module/embed/gecko/mozilla.cpp kazehakase-0.5.4/module/embed/gecko/mozilla.cpp
+--- kazehakase-0.5.4.orig/module/embed/gecko/mozilla.cpp	2008-03-29 10:20:40.000000000 +0200
++++ kazehakase-0.5.4/module/embed/gecko/mozilla.cpp	2008-06-19 03:32:04.000000000 +0300
+@@ -25,6 +25,7 @@
+ 
+ #define MOZILLA_CLIENT
+ 
++#include <mozilla-config.h>
+ #include <gtkmozembed.h>
+ #include <nsXPCOM.h>
+ #include <nsIGenericFactory.h>
+@@ -50,6 +51,10 @@
+ #include <gtkmozembed_glue.cpp>
+ #include <nsGenericFactory.h>
+ #endif
++#ifdef HAVE_GECKO_1_9
++#include <nsComponentManagerUtils.h>
++#endif
++
+ 
+ NS_GENERIC_FACTORY_CONSTRUCTOR(KzFilePicker)
+ NS_GENERIC_FACTORY_CONSTRUCTOR(KzContentHandler)
+diff -urN kazehakase-0.5.4.orig/module/embed/gecko/kz-mozlauncher.cpp kazehakase-0.5.4/module/embed/gecko/kz-mozlauncher.cpp
+--- kazehakase-0.5.4.orig/module/embed/gecko/kz-mozlauncher.cpp	2008-03-29 10:20:40.000000000 +0200
++++ kazehakase-0.5.4/module/embed/gecko/kz-mozlauncher.cpp	2008-06-19 03:32:04.000000000 +0300
+@@ -76,6 +76,9 @@
+ 				    nsISupports *aWindowContext,
+ 				    const PRUnichar *aDefaultFile,
+ 				    const PRUnichar *aSuggestedFileExtension,
++#ifdef HAVE_GECKO_1_9
++				    PRBool aForcePrompt,
++#endif
+ 				    nsILocalFile **_retval)
+ {
+ 	nsresult rv;
+diff -urN kazehakase-0.5.4.orig/module/embed/gecko/gtkmozembed/nsProfileDirServiceProvider2.cpp kazehakase-0.5.4/module/embed/gecko/gtkmozembed/nsProfileDirServiceProvider2.cpp
+--- kazehakase-0.5.4.orig/module/embed/gecko/gtkmozembed/nsProfileDirServiceProvider2.cpp	2008-03-29 10:20:40.000000000 +0200
++++ kazehakase-0.5.4/module/embed/gecko/gtkmozembed/nsProfileDirServiceProvider2.cpp	2008-06-19 03:32:04.000000000 +0300
+@@ -306,26 +306,6 @@
+         rv = EnsureProfileFileExists(localFile, domainDir);
+     }
+   }
+-  else if (strcmp(prop, NS_APP_MAIL_50_DIR) == 0) {
+-    rv = domainDir->Clone(getter_AddRefs(localFile));
+-    if (NS_SUCCEEDED(rv))
+-      rv = localFile->AppendNative(MAIL_DIR_50_NAME);
+-  }
+-  else if (strcmp(prop, NS_APP_IMAP_MAIL_50_DIR) == 0) {
+-    rv = domainDir->Clone(getter_AddRefs(localFile));
+-    if (NS_SUCCEEDED(rv))
+-      rv = localFile->AppendNative(IMAP_MAIL_DIR_50_NAME);
+-  }
+-  else if (strcmp(prop, NS_APP_NEWS_50_DIR) == 0) {
+-    rv = domainDir->Clone(getter_AddRefs(localFile));
+-    if (NS_SUCCEEDED(rv))
+-      rv = localFile->AppendNative(NEWS_DIR_50_NAME);
+-  }
+-  else if (strcmp(prop, NS_APP_MESSENGER_FOLDER_CACHE_50_DIR) == 0) {
+-    rv = domainDir->Clone(getter_AddRefs(localFile));
+-    if (NS_SUCCEEDED(rv))
+-      rv = localFile->AppendNative(MSG_FOLDER_CACHE_DIR_50_NAME);
+-  }
+   else if (strcmp(prop, NS_APP_STORAGE_50_FILE) == 0) {
+     rv = domainDir->Clone(getter_AddRefs(localFile));
+     if (NS_SUCCEEDED(rv))
+@@ -518,10 +498,6 @@
+   (void) directoryService->Undefine(NS_APP_BOOKMARKS_50_FILE);
+   (void) directoryService->Undefine(NS_APP_DOWNLOADS_50_FILE);
+   (void) directoryService->Undefine(NS_APP_SEARCH_50_FILE);
+-  (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);
+ 
+   return NS_OK;
+ }
diff --git a/www-client/kazehakase/kazehakase-0.5.1.ebuild b/www-client/kazehakase/kazehakase-0.5.1.ebuild
deleted file mode 100644
index 998fba61a6ca..000000000000
--- a/www-client/kazehakase/kazehakase-0.5.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/kazehakase/kazehakase-0.5.1.ebuild,v 1.2 2008/03/14 17:31:10 armin76 Exp $
-
-inherit flag-o-matic
-
-IUSE="hyperestraier migemo ruby ssl"
-
-DESCRIPTION="a browser with gecko engine like Epiphany or Galeon."
-SRC_URI="mirror://sourceforge.jp/${PN}/28710/${P}.tar.gz"
-HOMEPAGE="http://kazehakase.sourceforge.jp/"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-LICENSE="GPL-2"
-
-DEPEND=">=x11-libs/gtk+-2.12
-	|| (
-		=www-client/mozilla-firefox-2*
-		=www-client/seamonkey-1*
-		=mail-client/mozilla-thunderbird-2*
-		=net-libs/xulrunner-1.8*
-	)
-	ssl? ( >=net-libs/gnutls-1.2.0 )
-	ruby? ( dev-ruby/ruby-gtk2 dev-ruby/ruby-gettext )
-	hyperestraier? ( >=app-text/hyperestraier-1.2 )"
-
-RDEPEND="${DEPEND}
-	migemo? ( app-text/migemo )"
-
-DEPEND="${DEPEND}
-	dev-util/pkgconfig"
-
-src_compile(){
-	local myconf
-
-	# Bug 159949
-	replace-flags -Os -O2
-
-	myconf="${myconf} $(use_enable migemo)"
-	use ruby || myconf="${myconf} --with-ruby=no --with-rgettext=no"
-	use ssl || myconf="${myconf} --disable-ssl"
-
-	econf ${myconf} || die
-	emake || die
-}
-
-src_install(){
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README* TODO*
-}
diff --git a/www-client/kazehakase/kazehakase-0.5.2.ebuild b/www-client/kazehakase/kazehakase-0.5.2.ebuild
deleted file mode 100644
index ccb96ec515af..000000000000
--- a/www-client/kazehakase/kazehakase-0.5.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/kazehakase/kazehakase-0.5.2.ebuild,v 1.2 2008/03/14 17:31:10 armin76 Exp $
-
-inherit flag-o-matic
-
-IUSE="hyperestraier migemo ruby ssl"
-
-DESCRIPTION="a browser with gecko engine like Epiphany or Galeon."
-SRC_URI="mirror://sourceforge.jp/${PN}/29143/${P}.tar.gz"
-HOMEPAGE="http://kazehakase.sourceforge.jp/"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-LICENSE="GPL-2"
-
-DEPEND=">=x11-libs/gtk+-2.12
-	|| (
-		=www-client/mozilla-firefox-2*
-		=www-client/seamonkey-1*
-		=mail-client/mozilla-thunderbird-2*
-		=net-libs/xulrunner-1.8*
-	)
-	ssl? ( >=net-libs/gnutls-1.2.0 )
-	ruby? ( dev-ruby/ruby-gtk2 dev-ruby/ruby-gettext )
-	hyperestraier? ( >=app-text/hyperestraier-1.2 )"
-
-RDEPEND="${DEPEND}
-	migemo? ( app-text/migemo )"
-
-DEPEND="${DEPEND}
-	dev-util/pkgconfig"
-
-src_compile(){
-	local myconf
-
-	# Bug 159949
-	replace-flags -Os -O2
-
-	myconf="${myconf} $(use_enable migemo)"
-	use ruby || myconf="${myconf} --with-ruby=no --with-rgettext=no"
-	use ssl || myconf="${myconf} --disable-ssl"
-
-	econf ${myconf} || die
-	emake || die
-}
-
-src_install(){
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README* TODO*
-}
diff --git a/www-client/kazehakase/kazehakase-0.5.3.ebuild b/www-client/kazehakase/kazehakase-0.5.4-r1.ebuild
index d77ac5cfaf83..2d37ed3864e9 100644
--- a/www-client/kazehakase/kazehakase-0.5.3.ebuild
+++ b/www-client/kazehakase/kazehakase-0.5.4-r1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/kazehakase/kazehakase-0.5.3.ebuild,v 1.2 2008/03/14 17:31:10 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/kazehakase/kazehakase-0.5.4-r1.ebuild,v 1.1 2008/07/01 00:45:00 matsuu Exp $
 
-inherit autotools eutils flag-o-matic
+inherit eutils flag-o-matic
 
 IUSE="hyperestraier migemo ruby ssl"
 
 DESCRIPTION="a browser with gecko engine like Epiphany or Galeon."
-SRC_URI="mirror://sourceforge.jp/${PN}/29695/${P}.tar.gz"
+SRC_URI="mirror://sourceforge.jp/${PN}/30219/${P}.tar.gz"
 HOMEPAGE="http://kazehakase.sourceforge.jp/"
 
 SLOT="0"
@@ -19,11 +19,12 @@ DEPEND=">=x11-libs/gtk+-2.12
 		=www-client/mozilla-firefox-2*
 		=www-client/seamonkey-1*
 		=mail-client/mozilla-thunderbird-2*
-		=net-libs/xulrunner-1.8*
+		>=net-libs/xulrunner-1.8
 	)
 	ssl? ( >=net-libs/gnutls-1.2.0 )
 	ruby? ( dev-ruby/ruby-gtk2 dev-ruby/ruby-gettext )
 	hyperestraier? ( >=app-text/hyperestraier-1.2 )"
+#		net-libs/webkit
 
 RDEPEND="${DEPEND}
 	migemo? ( app-text/migemo )"
@@ -31,11 +32,11 @@ RDEPEND="${DEPEND}
 DEPEND="${DEPEND}
 	dev-util/pkgconfig"
 
-src_unpack() {
+src_unpack(){
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}"/${P}-gcc43.patch
-	AT_M4DIR=macros eautoreconf
+
+	epatch "${FILESDIR}"/${P}-xulrunner19.patch
 }
 
 src_compile(){