summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMasatomo Nakano <nakano@gentoo.org>2005-04-08 15:41:33 +0000
committerMasatomo Nakano <nakano@gentoo.org>2005-04-08 15:41:33 +0000
commit5fba23c165442568fee3a3414ae05a03b7db9ce2 (patch)
treea9b403e14ffee3aaf002442266ff6712e2472557 /www-client
parentRemove some older beta1s, add in beta2 (still heavily under development) (diff)
downloadgentoo-2-5fba23c165442568fee3a3414ae05a03b7db9ce2.tar.gz
gentoo-2-5fba23c165442568fee3a3414ae05a03b7db9ce2.tar.bz2
gentoo-2-5fba23c165442568fee3a3414ae05a03b7db9ce2.zip
Added patch to fix compile error without firefox.
(Portage version: 2.0.51.19)
Diffstat (limited to 'www-client')
-rw-r--r--www-client/kazehakase/ChangeLog6
-rw-r--r--www-client/kazehakase/files/kazehakase-0.2.6-gentoo-2.patch51
-rw-r--r--www-client/kazehakase/kazehakase-0.2.6.ebuild3
3 files changed, 58 insertions, 2 deletions
diff --git a/www-client/kazehakase/ChangeLog b/www-client/kazehakase/ChangeLog
index 77efb0385af2..86b6b63add7c 100644
--- a/www-client/kazehakase/ChangeLog
+++ b/www-client/kazehakase/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for www-client/kazehakase
# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/kazehakase/ChangeLog,v 1.7 2005/03/29 19:46:48 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/kazehakase/ChangeLog,v 1.8 2005/04/08 15:41:33 nakano Exp $
+
+ 08 Apr 2005; Masatomo Nakano <nakano@gentoo.org>
+ +files/kazehakase-0.2.6-gentoo-2.patch, kazehakase-0.2.6.ebuild:
+ Added patch to fix compile error without firefox.
*kazehakase-0.2.6 (29 Mar 2005)
diff --git a/www-client/kazehakase/files/kazehakase-0.2.6-gentoo-2.patch b/www-client/kazehakase/files/kazehakase-0.2.6-gentoo-2.patch
new file mode 100644
index 000000000000..0e023e6563e1
--- /dev/null
+++ b/www-client/kazehakase/files/kazehakase-0.2.6-gentoo-2.patch
@@ -0,0 +1,51 @@
+? p
+Index: src/mozilla/kz-mozfilepicker.cpp
+===================================================================
+RCS file: /cvsroot/kazehakase/kazehakase/src/mozilla/kz-mozfilepicker.cpp,v
+retrieving revision 1.11
+diff -u -p -r1.11 kz-mozfilepicker.cpp
+--- src/mozilla/kz-mozfilepicker.cpp 20 Mar 2005 00:50:53 -0000 1.11
++++ src/mozilla/kz-mozfilepicker.cpp 30 Mar 2005 23:13:08 -0000
+@@ -120,7 +120,7 @@ NS_IMETHODIMP KzFilePicker::Init(nsIDOMW
+ #ifdef MOZ_NSIFILEPICKER_NSASTRING_
+ NS_UTF16ToCString(aTitle, NS_CSTRING_ENCODING_UTF8, mTitle);
+ #else
+- mTitle = nsEmbedCString(aTitle);
++ NS_UTF16ToCString(nsEmbedString(aTitle), NS_CSTRING_ENCODING_UTF8, mTitle);
+ #endif
+ mMode = aMode;
+
+@@ -151,7 +151,7 @@ NS_IMETHODIMP KzFilePicker::AppendFilter
+ #ifdef MOZ_NSIFILEPICKER_NSASTRING_
+ NS_UTF16ToCString(aFilter, NS_CSTRING_ENCODING_UTF8, mFilter);
+ #else
+- mFilter = nsEmbedCString(aFilter);
++ NS_UTF16ToCString(nsEmbedString(aFilter), NS_CSTRING_ENCODING_UTF8, mFilter);
+ #endif
+ return NS_OK;
+ }
+@@ -176,7 +176,7 @@ NS_IMETHODIMP KzFilePicker::GetDefaultSt
+ #ifdef MOZ_NSIFILEPICKER_NSASTRING_
+ aDefaultString = mDefaultString;
+ #else
+- *aDefaultString = mDefaultString.get();
++ *aDefaultString = NS_StringCloneData(mDefaultString);
+ #endif
+ return NS_OK;
+ }
+Index: src/mozilla/kz-mozlauncher.cpp
+===================================================================
+RCS file: /cvsroot/kazehakase/kazehakase/src/mozilla/kz-mozlauncher.cpp,v
+retrieving revision 1.13
+diff -u -p -r1.13 kz-mozlauncher.cpp
+--- src/mozilla/kz-mozlauncher.cpp 15 Mar 2005 07:44:26 -0000 1.13
++++ src/mozilla/kz-mozlauncher.cpp 30 Mar 2005 23:13:08 -0000
+@@ -124,7 +124,7 @@ NS_IMETHODIMP KzContentHandler::PromptFo
+ filePicker->SetDefaultString(defaultFile);
+ #else
+ filePicker->Init(windowInternal,
+- PromiseFlatString(title).get(),
++ title.get(),
+ nsIFilePicker::modeSave);
+ filePicker->SetDefaultString(aDefaultFile);
+ #endif
diff --git a/www-client/kazehakase/kazehakase-0.2.6.ebuild b/www-client/kazehakase/kazehakase-0.2.6.ebuild
index a6e87f0ae481..2a2dca4cd27d 100644
--- a/www-client/kazehakase/kazehakase-0.2.6.ebuild
+++ b/www-client/kazehakase/kazehakase-0.2.6.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/kazehakase/kazehakase-0.2.6.ebuild,v 1.1 2005/03/29 19:46:48 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/kazehakase/kazehakase-0.2.6.ebuild,v 1.2 2005/04/08 15:41:33 nakano Exp $
inherit eutils
@@ -43,6 +43,7 @@ pkg_setup(){
src_compile(){
epatch ${FILESDIR}/${P}-gentoo.patch
+ epatch ${FILESDIR}/${P}-gentoo-2.patch
if use firefox; then
geckoengine="firefox"