| 1 |
matsuu 08/07/01 00:45:01 |
| 2 |
|
| 3 |
Added: kazehakase-0.5.4-xulrunner19.patch |
| 4 |
Removed: kazehakase-0.5.3-gcc43.patch |
| 5 |
Log: |
| 6 |
xulrunner-1.9 support, bug #228417. |
| 7 |
(Portage version: 2.1.5_rc6) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 www-client/kazehakase/files/kazehakase-0.5.4-xulrunner19.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/kazehakase/files/kazehakase-0.5.4-xulrunner19.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/kazehakase/files/kazehakase-0.5.4-xulrunner19.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: kazehakase-0.5.4-xulrunner19.patch |
| 16 |
=================================================================== |
| 17 |
diff -urN kazehakase-0.5.4.orig/ext/ruby/Makefile.in kazehakase-0.5.4/ext/ruby/Makefile.in |
| 18 |
--- kazehakase-0.5.4.orig/ext/ruby/Makefile.in 2008-03-29 10:20:54.000000000 +0200 |
| 19 |
+++ kazehakase-0.5.4/ext/ruby/Makefile.in 2008-06-19 03:32:03.000000000 +0300 |
| 20 |
@@ -306,7 +306,6 @@ |
| 21 |
top_srcdir = @top_srcdir@ |
| 22 |
ext_LTLIBRARIES = ruby.la |
| 23 |
INCLUDES = \ |
| 24 |
- $(MOZILLA_COMPONENT_CFLAGS) \ |
| 25 |
$(GTK_CFLAGS) \ |
| 26 |
$(LIBGNUTLS_CFLAGS) \ |
| 27 |
$(RUBY_CFLAGS) \ |
| 28 |
@@ -354,7 +353,6 @@ |
| 29 |
$(GTK_LIBS) \ |
| 30 |
$(LIBGNUTLS_LIBS) \ |
| 31 |
$(RUBY_LIBS) \ |
| 32 |
- $(MOZILLA_COMPONENT_LIBS) \ |
| 33 |
$(top_builddir)/src/libkazehakase.la |
| 34 |
|
| 35 |
all: all-am |
| 36 |
diff -urN kazehakase-0.5.4.orig/ext/ruby/Makefile.am kazehakase-0.5.4/ext/ruby/Makefile.am |
| 37 |
--- kazehakase-0.5.4.orig/ext/ruby/Makefile.am 2008-03-29 10:20:42.000000000 +0200 |
| 38 |
+++ kazehakase-0.5.4/ext/ruby/Makefile.am 2008-06-19 03:32:04.000000000 +0300 |
| 39 |
@@ -8,7 +8,6 @@ |
| 40 |
-DG_DISABLE_DEPRECATED=1 |
| 41 |
|
| 42 |
INCLUDES = \ |
| 43 |
- $(MOZILLA_COMPONENT_CFLAGS) \ |
| 44 |
$(GTK_CFLAGS) \ |
| 45 |
$(LIBGNUTLS_CFLAGS) \ |
| 46 |
$(RUBY_CFLAGS) \ |
| 47 |
@@ -63,5 +62,4 @@ |
| 48 |
$(GTK_LIBS) \ |
| 49 |
$(LIBGNUTLS_LIBS) \ |
| 50 |
$(RUBY_LIBS) \ |
| 51 |
- $(MOZILLA_COMPONENT_LIBS) \ |
| 52 |
$(top_builddir)/src/libkazehakase.la |
| 53 |
diff -urN kazehakase-0.5.4.orig/module/embed/gecko/mozilla.cpp kazehakase-0.5.4/module/embed/gecko/mozilla.cpp |
| 54 |
--- kazehakase-0.5.4.orig/module/embed/gecko/mozilla.cpp 2008-03-29 10:20:40.000000000 +0200 |
| 55 |
+++ kazehakase-0.5.4/module/embed/gecko/mozilla.cpp 2008-06-19 03:32:04.000000000 +0300 |
| 56 |
@@ -25,6 +25,7 @@ |
| 57 |
|
| 58 |
#define MOZILLA_CLIENT |
| 59 |
|
| 60 |
+#include <mozilla-config.h> |
| 61 |
#include <gtkmozembed.h> |
| 62 |
#include <nsXPCOM.h> |
| 63 |
#include <nsIGenericFactory.h> |
| 64 |
@@ -50,6 +51,10 @@ |
| 65 |
#include <gtkmozembed_glue.cpp> |
| 66 |
#include <nsGenericFactory.h> |
| 67 |
#endif |
| 68 |
+#ifdef HAVE_GECKO_1_9 |
| 69 |
+#include <nsComponentManagerUtils.h> |
| 70 |
+#endif |
| 71 |
+ |
| 72 |
|
| 73 |
NS_GENERIC_FACTORY_CONSTRUCTOR(KzFilePicker) |
| 74 |
NS_GENERIC_FACTORY_CONSTRUCTOR(KzContentHandler) |
| 75 |
diff -urN kazehakase-0.5.4.orig/module/embed/gecko/kz-mozlauncher.cpp kazehakase-0.5.4/module/embed/gecko/kz-mozlauncher.cpp |
| 76 |
--- kazehakase-0.5.4.orig/module/embed/gecko/kz-mozlauncher.cpp 2008-03-29 10:20:40.000000000 +0200 |
| 77 |
+++ kazehakase-0.5.4/module/embed/gecko/kz-mozlauncher.cpp 2008-06-19 03:32:04.000000000 +0300 |
| 78 |
@@ -76,6 +76,9 @@ |
| 79 |
nsISupports *aWindowContext, |
| 80 |
const PRUnichar *aDefaultFile, |
| 81 |
const PRUnichar *aSuggestedFileExtension, |
| 82 |
+#ifdef HAVE_GECKO_1_9 |
| 83 |
+ PRBool aForcePrompt, |
| 84 |
+#endif |
| 85 |
nsILocalFile **_retval) |
| 86 |
{ |
| 87 |
nsresult rv; |
| 88 |
diff -urN kazehakase-0.5.4.orig/module/embed/gecko/gtkmozembed/nsProfileDirServiceProvider2.cpp kazehakase-0.5.4/module/embed/gecko/gtkmozembed/nsProfileDirServiceProvider2.cpp |
| 89 |
--- kazehakase-0.5.4.orig/module/embed/gecko/gtkmozembed/nsProfileDirServiceProvider2.cpp 2008-03-29 10:20:40.000000000 +0200 |
| 90 |
+++ kazehakase-0.5.4/module/embed/gecko/gtkmozembed/nsProfileDirServiceProvider2.cpp 2008-06-19 03:32:04.000000000 +0300 |
| 91 |
@@ -306,26 +306,6 @@ |
| 92 |
rv = EnsureProfileFileExists(localFile, domainDir); |
| 93 |
} |
| 94 |
} |
| 95 |
- else if (strcmp(prop, NS_APP_MAIL_50_DIR) == 0) { |
| 96 |
- rv = domainDir->Clone(getter_AddRefs(localFile)); |
| 97 |
- if (NS_SUCCEEDED(rv)) |
| 98 |
- rv = localFile->AppendNative(MAIL_DIR_50_NAME); |
| 99 |
- } |
| 100 |
- else if (strcmp(prop, NS_APP_IMAP_MAIL_50_DIR) == 0) { |
| 101 |
- rv = domainDir->Clone(getter_AddRefs(localFile)); |
| 102 |
- if (NS_SUCCEEDED(rv)) |
| 103 |
- rv = localFile->AppendNative(IMAP_MAIL_DIR_50_NAME); |
| 104 |
- } |
| 105 |
- else if (strcmp(prop, NS_APP_NEWS_50_DIR) == 0) { |
| 106 |
- rv = domainDir->Clone(getter_AddRefs(localFile)); |
| 107 |
- if (NS_SUCCEEDED(rv)) |
| 108 |
- rv = localFile->AppendNative(NEWS_DIR_50_NAME); |
| 109 |
- } |
| 110 |
- else if (strcmp(prop, NS_APP_MESSENGER_FOLDER_CACHE_50_DIR) == 0) { |
| 111 |
- rv = domainDir->Clone(getter_AddRefs(localFile)); |
| 112 |
- if (NS_SUCCEEDED(rv)) |
| 113 |
- rv = localFile->AppendNative(MSG_FOLDER_CACHE_DIR_50_NAME); |
| 114 |
- } |
| 115 |
else if (strcmp(prop, NS_APP_STORAGE_50_FILE) == 0) { |
| 116 |
rv = domainDir->Clone(getter_AddRefs(localFile)); |
| 117 |
if (NS_SUCCEEDED(rv)) |
| 118 |
@@ -518,10 +498,6 @@ |
| 119 |
(void) directoryService->Undefine(NS_APP_BOOKMARKS_50_FILE); |
| 120 |
(void) directoryService->Undefine(NS_APP_DOWNLOADS_50_FILE); |
| 121 |
(void) directoryService->Undefine(NS_APP_SEARCH_50_FILE); |
| 122 |
- (void) directoryService->Undefine(NS_APP_MAIL_50_DIR); |
| 123 |
- (void) directoryService->Undefine(NS_APP_IMAP_MAIL_50_DIR); |
| 124 |
- (void) directoryService->Undefine(NS_APP_NEWS_50_DIR); |
| 125 |
- (void) directoryService->Undefine(NS_APP_MESSENGER_FOLDER_CACHE_50_DIR); |
| 126 |
|
| 127 |
return NS_OK; |
| 128 |
} |
| 129 |
|
| 130 |
|
| 131 |
|
| 132 |
-- |
| 133 |
gentoo-commits@l.g.o mailing list |
Archives