diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2010-06-26 09:48:21 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-06-26 09:48:21 +0000 |
commit | 967621a1cea7dd62a61446bc3aaf9aceab99e4a1 (patch) | |
tree | dee7d24762cb325e1d1b9c06667b50e9d3b28e8d /www-client | |
parent | Drop ruby19 target to allow stabilization. (diff) | |
download | gentoo-2-967621a1cea7dd62a61446bc3aaf9aceab99e4a1.tar.gz gentoo-2-967621a1cea7dd62a61446bc3aaf9aceab99e4a1.tar.bz2 gentoo-2-967621a1cea7dd62a61446bc3aaf9aceab99e4a1.zip |
old
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'www-client')
8 files changed, 0 insertions, 677 deletions
diff --git a/www-client/kazehakase/Manifest b/www-client/kazehakase/Manifest index 43ab5b3db7d0..1f8c02c42b93 100644 --- a/www-client/kazehakase/Manifest +++ b/www-client/kazehakase/Manifest @@ -1,13 +1,4 @@ -AUX kazehakase-0.5.4-xulrunner19.patch 4437 RMD160 2300ca1c55626f0a7ac6ceee05aa718b5946355d SHA1 d3ddf857154b9d5ab134d558c11be522c7c81109 SHA256 79a663e897ba16257fe5fbe60f20c5ac5fbb02135507009aaec54c2623065703 -AUX kazehakase-0.5.5-xulrunner19.patch 11988 RMD160 327158aa44c72447f15a35761ea8939dcc8ba2ea SHA1 d5fc51eb697bbdcc8f747fc84cf4003d176c0332 SHA256 feb53a32de9ea7f3cf50922090c749c375947c85544813d138c4308d87209c0a -AUX kazehakase-0.5.6-gnutls-2.8.patch 325 RMD160 2de2eca304b62de9b01a14efe5eac3f4679af2b7 SHA1 79224b661c1c95d6cbd9d862785581046cbd83dc SHA256 cbed54f40fb06aae9a7b1b8e52b97e6e7edf3a402e293f188387de1b25d4e485 -AUX kazehakase-0.5.7-gentoo.patch 1802 RMD160 52421abd85b2570fb33447f2beb105820350c84e SHA1 9130d90a6fbbc3dc508919ff46eee3f627bf1cea SHA256 e662cc06fcffe48944a06369e155d0ed1c520ec5f7415b6113db16e45958a549 -AUX kazehakase-0.5.7-gtkentry.patch 1029 RMD160 a5fba3579c6bcb352f4f02d846775ce556884df6 SHA1 4a0cb3a22c9d2777e9dc752363ca28bbaee09ac0 SHA256 64cae2960199648cebc719930ec3815bd80961075598607e70c41925720f77ec -DIST kazehakase-0.5.6.tar.gz 1405935 RMD160 484c6e2088b6d1491b052e845584b820e4473983 SHA1 a11e13d05962884f6f4e94eb8215e85c4847960c SHA256 fb7407952ee5031a66318dfc7e9c4ee6bffe25b6824354ce02a8fb540ccbf92a -DIST kazehakase-0.5.7.tar.gz 1409157 RMD160 73f471a1c3294015572601e9cde079e2a473756f SHA1 7f85bab0c30f2a3ed9360718c67eaf465ea03693 SHA256 217ee7f1eaf68ed415da55c74dea4cb55d02cf401a699402316622cedfd4e25a DIST kazehakase-0.5.8.tar.gz 1433099 RMD160 52a6e1d85a43d5f2350fc58166675c31901b5794 SHA1 a64fdfa1b772239ae236d398e3b840577cf27148 SHA256 1d461c56b3df86544d123d2a15484a156a6053c4fe2884d773a987d450406943 -EBUILD kazehakase-0.5.6-r1.ebuild 1447 RMD160 99e1cc904de4817435438cb7276573186e247012 SHA1 c34d13b75aa1d60e65e27577ddf5102328e475bc SHA256 61f6efff7c1c74526e54a9c240e0c33584964da33bc623901e1e92317d0a76c2 -EBUILD kazehakase-0.5.7.ebuild 1542 RMD160 70561d968d2a732e692c56ed8fd6a719ec881a1a SHA1 1f989a458636b30236d57fb80d2be631f33b9dc7 SHA256 635c4f51e093a4d52fb2b24996a5c65bba55f433ddd4908f0af72b64937fd0cc EBUILD kazehakase-0.5.8.ebuild 1488 RMD160 7d302dfc98219921ba6f0b216501bcdea89018da SHA1 99ca431c88db805cfcd5d4566c7b3c27ce358dbe SHA256 23936e69ad3806e0d533bd0291cd3d3b1a258900095b9f90d03405ba774ae5cc MISC ChangeLog 17852 RMD160 5abbca6c65a712e103427103fc8b7fb4d530b648 SHA1 57dc423a7ead95d132bbcba9942fab55c683b25f SHA256 940720b654b1a41d22d5fd829ce639f5d544340f6116a26ac1ddabc024570f37 MISC metadata.xml 463 RMD160 4c86a27110e266ef404fec9712f4651f283c5a05 SHA1 1b4a35fa52c06a7e72e5b9176d1f07cdf680f84b SHA256 91586a6e4cdd465caac5826207f51461fdf0a667866557cc8f48eb08df457004 diff --git a/www-client/kazehakase/files/kazehakase-0.5.4-xulrunner19.patch b/www-client/kazehakase/files/kazehakase-0.5.4-xulrunner19.patch deleted file mode 100644 index 5ac35b205706..000000000000 --- a/www-client/kazehakase/files/kazehakase-0.5.4-xulrunner19.patch +++ /dev/null @@ -1,112 +0,0 @@ -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/files/kazehakase-0.5.5-xulrunner19.patch b/www-client/kazehakase/files/kazehakase-0.5.5-xulrunner19.patch deleted file mode 100644 index 73f6e327bf35..000000000000 --- a/www-client/kazehakase/files/kazehakase-0.5.5-xulrunner19.patch +++ /dev/null @@ -1,358 +0,0 @@ -diff -urN kazehakase-0.5.5.orig/ext/ruby/Makefile.am kazehakase-0.5.5/ext/ruby/Makefile.am ---- kazehakase-0.5.5.orig/ext/ruby/Makefile.am 2008-07-29 17:15:31.000000000 +0300 -+++ kazehakase-0.5.5/ext/ruby/Makefile.am 2008-08-11 02:22:57.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.5.orig/ext/ruby/Makefile.in kazehakase-0.5.5/ext/ruby/Makefile.in ---- kazehakase-0.5.5.orig/ext/ruby/Makefile.in 2008-07-29 17:21:39.000000000 +0300 -+++ kazehakase-0.5.5/ext/ruby/Makefile.in 2008-08-11 02:22:57.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.5.orig/module/embed/gecko/gtkmozembed/nsProfileDirServiceProvider2.cpp kazehakase-0.5.5/module/embed/gecko/gtkmozembed/nsProfileDirServiceProvider2.cpp ---- kazehakase-0.5.5.orig/module/embed/gecko/gtkmozembed/nsProfileDirServiceProvider2.cpp 2008-07-29 17:15:30.000000000 +0300 -+++ kazehakase-0.5.5/module/embed/gecko/gtkmozembed/nsProfileDirServiceProvider2.cpp 2008-08-11 02:23:39.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 -urN kazehakase-0.5.5.orig/module/embed/gecko/GtkPromptService.cpp kazehakase-0.5.5/module/embed/gecko/GtkPromptService.cpp ---- kazehakase-0.5.5.orig/module/embed/gecko/GtkPromptService.cpp 2008-07-29 17:15:30.000000000 +0300 -+++ kazehakase-0.5.5/module/embed/gecko/GtkPromptService.cpp 2008-08-11 02:22:57.000000000 +0300 -@@ -36,6 +36,7 @@ - * - * ***** END LICENSE BLOCK ***** */ - -+#include "config.h" - #include "GtkPromptService.h" - #include <nsIWindowWatcher.h> - #include <nsIWebBrowserChrome.h> -@@ -49,6 +50,23 @@ - #include <nsIDOMCharacterData.h> - #include <nsIDOMText.h> - #include <nsMemory.h> -+#ifdef HAVE_GECKO_1_9 -+#include <nsIAuthInformation.h> -+#include <nsIStringBundle.h> -+#include <nsServiceManagerUtils.h> -+/* That is ugly but I didn't find another way, except including -+ * NS_GetAuthHostPort */ -+#define kNotFound -1 -+NS_COM void AppendUTF16toUTF8( const nsAString& aSource, nsACString& aDest ); -+#include <nsStringAPI.h> -+#include <nsIProxiedChannel.h> -+#include <nsIProxyInfo.h> -+#include <nsIIDNService.h> -+#include <nsNetCID.h> -+#include <nsIURI.h> -+#include <nsNetUtil.h> -+#include <nsPromptUtils.h> -+#endif - - #include <glib/gi18n.h> - #include "kz-prompt-dialog.h" -@@ -89,8 +107,11 @@ - { - } - -- -+#ifdef HAVE_GECKO_1_9 -+NS_IMPL_ISUPPORTS2(GtkPromptService, nsIPromptService, nsIPromptService2) -+#else - NS_IMPL_ISUPPORTS1(GtkPromptService, nsIPromptService) -+#endif - - NS_IMETHODIMP - GtkPromptService::Alert(nsIDOMWindow* aParent, const PRUnichar* aDialogTitle, -@@ -338,10 +359,12 @@ - KzPromptDialog *prompt = KZ_PROMPT_DIALOG(kz_prompt_dialog_new_with_parent - (TYPE_PROMPT_USER_PASS, - GTK_WINDOW(GetGtkWindowForDOMWindow(aParent)))); -+#ifndef HAVE_GECKO_1_9 - gchar *host = GetURIForDOMWindow(aParent); - kz_prompt_dialog_set_host (prompt, host); - if (host) - g_free(host); -+#endif - kz_prompt_dialog_set_title(prompt, - aDialogTitle ? cTitle.get() : _("Prompt")); - kz_prompt_dialog_set_message_text(prompt, cText.get()); -@@ -391,10 +414,12 @@ - KzPromptDialog *prompt = KZ_PROMPT_DIALOG(kz_prompt_dialog_new_with_parent - (TYPE_PROMPT_PASS, - GTK_WINDOW(GetGtkWindowForDOMWindow(aParent)))); -+#ifndef HAVE_GECKO_1_9 - gchar *host = GetURIForDOMWindow(aParent); - kz_prompt_dialog_set_host (prompt, host); - if (host) - g_free(host); -+#endif - kz_prompt_dialog_set_title(prompt, - aDialogTitle ? cTitle.get() : _("Prompt")); - kz_prompt_dialog_set_message_text(prompt, cText.get()); -@@ -510,3 +535,147 @@ - NS_UTF16ToCString(uri, NS_CSTRING_ENCODING_UTF8, c_uri); - return g_strdup(c_uri.get()); - } -+ -+#ifdef HAVE_GECKO_1_9 -+static nsresult -+MakeDialogText(nsIChannel* aChannel, nsIAuthInformation* aAuthInfo, -+ nsString& message) -+{ -+ nsresult rv; -+ nsCOMPtr<nsIStringBundleService> bundleSvc = -+ do_GetService(NS_STRINGBUNDLE_CONTRACTID, &rv); -+ NS_ENSURE_SUCCESS(rv, rv); -+ -+ nsCOMPtr<nsIStringBundle> bundle; -+ rv = bundleSvc->CreateBundle("chrome://global/locale/prompts.properties", -+ getter_AddRefs(bundle)); -+ NS_ENSURE_SUCCESS(rv, rv); -+ -+ // figure out what message to display... -+ nsCAutoString host; -+ PRInt32 port; -+ NS_GetAuthHostPort(aChannel, aAuthInfo, PR_FALSE, host, &port); -+ -+ nsAutoString displayHost; -+ CopyUTF8toUTF16(host, displayHost); -+ -+ nsCOMPtr<nsIURI> uri; -+ aChannel->GetURI(getter_AddRefs(uri)); -+ -+ nsCAutoString scheme; -+ uri->GetScheme(scheme); -+ -+ nsAutoString username; -+ aAuthInfo->GetUsername(username); -+ -+ PRUint32 flags; -+ aAuthInfo->GetFlags(&flags); -+ PRBool proxyAuth = (flags & nsIAuthInformation::AUTH_PROXY) != 0; -+ -+ nsAutoString realm; -+ aAuthInfo->GetRealm(realm); -+ -+ // Append the port if it was specified -+ if (port != -1) { -+ displayHost.Append(PRUnichar(':')); -+ displayHost.AppendInt(port); -+ } -+ -+ NS_NAMED_LITERAL_STRING(proxyText, "EnterLoginForProxy"); -+ NS_NAMED_LITERAL_STRING(originText, "EnterLoginForRealm"); -+ NS_NAMED_LITERAL_STRING(noRealmText, "EnterUserPasswordFor"); -+ NS_NAMED_LITERAL_STRING(passwordText, "EnterPasswordFor"); -+ -+ const PRUnichar *text; -+ if (proxyAuth) { -+ text = proxyText.get(); -+ } else { -+ text = originText.get(); -+ -+ // prepend "scheme://" -+ nsAutoString schemeU; -+ CopyASCIItoUTF16(scheme, schemeU); -+ schemeU.AppendLiteral("://"); -+ displayHost.Insert(schemeU, 0); -+ } -+ -+ const PRUnichar *strings[] = { realm.get(), displayHost.get() }; -+ PRUint32 count = NS_ARRAY_LENGTH(strings); -+ -+ if (flags & nsIAuthInformation::ONLY_PASSWORD) { -+ text = passwordText.get(); -+ strings[0] = username.get(); -+ } else if (!proxyAuth && realm.IsEmpty()) { -+ text = noRealmText.get(); -+ count--; -+ strings[0] = strings[1]; -+ } -+ -+ rv = bundle->FormatStringFromName(text, strings, count, getter_Copies(message)); -+ return rv; -+} -+ -+NS_METHOD -+GtkPromptService::PromptAuth(nsIDOMWindow *aParent, -+ nsIChannel *aChannel, -+ PRUint32 level, -+ nsIAuthInformation *authInfo, -+ const PRUnichar *checkboxLabel, -+ PRBool *checkValue, -+ PRBool *retval) -+{ -+ NS_ENSURE_ARG_POINTER (retval); -+ NS_ENSURE_ARG_POINTER (authInfo); -+ -+ nsString message; -+ MakeDialogText(aChannel, authInfo, message); -+ -+ nsAutoString defaultUser, defaultDomain, defaultPass; -+ authInfo->GetUsername(defaultUser); -+ authInfo->GetDomain(defaultDomain); -+ authInfo->GetPassword(defaultPass); -+ -+ PRUint32 flags; -+ authInfo->GetFlags(&flags); -+ -+ if ((flags & nsIAuthInformation::NEED_DOMAIN) && !defaultDomain.IsEmpty()) { -+ defaultDomain.Append(PRUnichar('\\')); -+ defaultUser.Insert(defaultDomain, 0); -+ } -+ -+ // NOTE: Allocation failure is not fatal here (just default to empty string -+ // if allocation fails) -+ PRUnichar *user = ToNewUnicode(defaultUser), -+ *pass = ToNewUnicode(defaultPass); -+ nsresult rv; -+ if (flags & nsIAuthInformation::ONLY_PASSWORD) -+ rv = PromptPassword(aParent, nsnull, message.get(), -+ &pass, checkboxLabel, -+ checkValue, retval); -+ else -+ rv = PromptUsernameAndPassword(aParent, nsnull, message.get(), -+ &user, &pass, checkboxLabel, -+ checkValue, retval); -+ -+ nsString userStr(user); -+ nsString passStr(pass); -+ authInfo->SetUsername(userStr); -+ authInfo->SetPassword(passStr); -+ -+ return rv; -+} -+ -+NS_METHOD GtkPromptService::AsyncPromptAuth(nsIDOMWindow *aParent, -+ nsIChannel *aChannel, -+ nsIAuthPromptCallback *aCallback, -+ nsISupports *aContext, -+ PRUint32 level, -+ nsIAuthInformation *authInfo, -+ const PRUnichar *checkboxLabel, -+ PRBool *checkValue, -+ nsICancelable **retval) -+{ -+ return NS_ERROR_NOT_IMPLEMENTED; -+} -+ -+#endif -diff -urN kazehakase-0.5.5.orig/module/embed/gecko/GtkPromptService.h kazehakase-0.5.5/module/embed/gecko/GtkPromptService.h ---- kazehakase-0.5.5.orig/module/embed/gecko/GtkPromptService.h 2008-07-29 17:15:30.000000000 +0300 -+++ kazehakase-0.5.5/module/embed/gecko/GtkPromptService.h 2008-08-11 02:22:57.000000000 +0300 -@@ -37,7 +37,11 @@ - * - * ***** END LICENSE BLOCK ***** */ - -+#ifdef HAVE_GECKO_1_9 -+#include <nsIPromptService2.h> -+#else - #include <nsIPromptService.h> -+#endif - #include <gtk/gtk.h> - - #define NS_PROMPTSERVICE_CID \ -@@ -45,7 +49,12 @@ - - class nsIDOMWindow; - --class GtkPromptService : public nsIPromptService -+class GtkPromptService : -+#ifdef HAVE_GECKO_1_9 -+ public nsIPromptService2 -+#else -+ public nsIPromptService -+#endif - { - public: - GtkPromptService(); -@@ -53,6 +62,9 @@ - - NS_DECL_ISUPPORTS - NS_DECL_NSIPROMPTSERVICE -+#ifdef HAVE_GECKO_1_9 -+ NS_DECL_NSIPROMPTSERVICE2 -+#endif - - private: - const char *GetButtonLabel(PRUint32 aFlags, PRUint32 aPos, -diff -urN kazehakase-0.5.5.orig/module/embed/gecko/kz-mozutils.h kazehakase-0.5.5/module/embed/gecko/kz-mozutils.h ---- kazehakase-0.5.5.orig/module/embed/gecko/kz-mozutils.h 2008-07-29 17:15:30.000000000 +0300 -+++ kazehakase-0.5.5/module/embed/gecko/kz-mozutils.h 2008-08-11 02:22:57.000000000 +0300 -@@ -49,6 +49,8 @@ - * The following functions is taken from include/necko/nsNetUtils.h in mozilla - */ - -+#ifndef nsNetUtil_h__ -+ - inline nsresult - GetIOService (nsIIOService **ioService) - { -@@ -245,6 +247,6 @@ - - return resultBuffer; - } -- -+#endif - - #endif /* __KZ_MOZ_UTILS_H__ */ diff --git a/www-client/kazehakase/files/kazehakase-0.5.6-gnutls-2.8.patch b/www-client/kazehakase/files/kazehakase-0.5.6-gnutls-2.8.patch deleted file mode 100644 index 0651ea1263b5..000000000000 --- a/www-client/kazehakase/files/kazehakase-0.5.6-gnutls-2.8.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.ac -+++ configure.ac -@@ -168,7 +168,7 @@ - Disable GNU TLS suport],, - disable_ssl=no) - if test x"$disable_ssl" = "xno"; then -- AM_PATH_LIBGNUTLS(1.2.0, -+ PKG_CHECK_MODULES(LIBGNUTLS, gnutls >= 1.2.0, - AC_DEFINE(USE_SSL, 1, [Define using GNU TLS]), - AC_MSG_WARN([[libgnutls was not found.]])) - fi diff --git a/www-client/kazehakase/files/kazehakase-0.5.7-gentoo.patch b/www-client/kazehakase/files/kazehakase-0.5.7-gentoo.patch deleted file mode 100644 index 2dc6b0f8d0c3..000000000000 --- a/www-client/kazehakase/files/kazehakase-0.5.7-gentoo.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff -Naur kazehakase-0.5.7.orig/configure.ac kazehakase-0.5.7/configure.ac ---- kazehakase-0.5.7.orig/configure.ac 2009-08-29 07:18:16.000000000 +0900 -+++ kazehakase-0.5.7/configure.ac 2009-10-20 02:01:03.000000000 +0900 -@@ -596,7 +596,7 @@ - GENHTML_OPTIONS="--title 'Kazehakase Code Coverage'" - - KAZEHAKASE_CFLAGS="$GTK_CFLAGS $LIBGNUTLS_CFLAGS $GIO_CFLAGS" --KAZEHAKASE_CFLAGS="$KAZEHAKASE_CFLAGS -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED" -+KAZEHAKASE_CFLAGS="$KAZEHAKASE_CFLAGS -DGDK_DISABLE_DEPRECATED" dnl -DGTK_DISABLE_DEPRECATED - KAZEHAKASE_CFLAGS="$KAZEHAKASE_CFLAGS -DG_DISABLE_DEPRECATED" - KAZEHAKASE_CFLAGS="$KAZEHAKASE_CFLAGS -DSYSDATADIR=\\\"\"\$(datadir)\"\\\"" - KAZEHAKASE_CFLAGS="$KAZEHAKASE_CFLAGS -DLOCALEDIR=\\\"\"\$(localedir)\"\\\"" -diff -Naur kazehakase-0.5.7.orig/module/search/kz-hyper-estraier-search.c kazehakase-0.5.7/module/search/kz-hyper-estraier-search.c ---- kazehakase-0.5.7.orig/module/search/kz-hyper-estraier-search.c 2009-08-29 07:15:09.000000000 +0900 -+++ kazehakase-0.5.7/module/search/kz-hyper-estraier-search.c 2009-10-20 01:17:40.000000000 +0900 -@@ -401,7 +401,7 @@ - strlen(G_DIR_SEPARATOR_S)); - - thumb_filename = -- egg_pixbuf_get_thumb_filename(uri, -+ egg_pixbuf_get_thumbnail_filename(uri, - EGG_PIXBUF_THUMBNAIL_LARGE); - thumb_uri = g_strdup_printf("history-search:?image=%s", - thumb_filename); -diff -Naur kazehakase-0.5.7.orig/src/actions/kz-actions.c kazehakase-0.5.7/src/actions/kz-actions.c ---- kazehakase-0.5.7.orig/src/actions/kz-actions.c 2009-08-29 07:15:13.000000000 +0900 -+++ kazehakase-0.5.7/src/actions/kz-actions.c 2009-10-20 01:14:55.000000000 +0900 -@@ -23,6 +23,7 @@ - - #include <string.h> - #include <glib/gi18n.h> -+#include <gtk/gtkaction.h> - - #include "gtk-utils.h" - #include "glib-utils.h" diff --git a/www-client/kazehakase/files/kazehakase-0.5.7-gtkentry.patch b/www-client/kazehakase/files/kazehakase-0.5.7-gtkentry.patch deleted file mode 100644 index 133237ec9a2d..000000000000 --- a/www-client/kazehakase/files/kazehakase-0.5.7-gtkentry.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -urN kazehakase-0.5.7.orig/src/widget/kz-entry.c kazehakase-0.5.7/src/widget/kz-entry.c ---- kazehakase-0.5.7.orig/src/widget/kz-entry.c 2009-08-29 01:15:11.000000000 +0300 -+++ kazehakase-0.5.7/src/widget/kz-entry.c 2009-09-03 22:42:29.000000000 +0300 -@@ -514,7 +514,7 @@ - - if (entry->visible) - { -- g_string_prepend_len (tmp_string, entry->text, entry->x_n_bytes); -+ g_string_prepend_len (tmp_string, entry->text, entry->n_bytes); - g_string_insert (tmp_string, cursor_index, preedit_string); - } - else -@@ -523,7 +523,7 @@ - gint preedit_len_chars; - gunichar invisible_char; - -- ch_len = g_utf8_strlen (entry->text, entry->x_n_bytes); -+ ch_len = g_utf8_strlen (entry->text, entry->n_bytes); - preedit_len_chars = g_utf8_strlen (preedit_string, -1); - ch_len += preedit_len_chars; - -@@ -557,7 +557,7 @@ - { - if (entry->visible) - { -- pango_layout_set_text (layout, entry->text, entry->x_n_bytes); -+ pango_layout_set_text (layout, entry->text, entry->n_bytes); - } - else - { diff --git a/www-client/kazehakase/kazehakase-0.5.6-r1.ebuild b/www-client/kazehakase/kazehakase-0.5.6-r1.ebuild deleted file mode 100644 index 8165823ee2a8..000000000000 --- a/www-client/kazehakase/kazehakase-0.5.6-r1.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/kazehakase/kazehakase-0.5.6-r1.ebuild,v 1.7 2010/06/13 02:29:02 nirbheek Exp $ - -inherit autotools eutils flag-o-matic - -IUSE="hyperestraier migemo ruby ssl webkit" - -DESCRIPTION="a browser with gecko engine like Epiphany or Galeon." -SRC_URI="mirror://sourceforge.jp/${PN}/33533/${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 - >=mail-client/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 ) - webkit? ( net-libs/webkit-gtk )" - -RDEPEND="${DEPEND} - migemo? ( app-text/migemo )" - -DEPEND="${DEPEND} - dev-util/pkgconfig" - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/${PN}-0.5.5-xulrunner19.patch - epatch "${FILESDIR}"/${P}-gnutls-2.8.patch - eautoreconf -} - -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.7.ebuild b/www-client/kazehakase/kazehakase-0.5.7.ebuild deleted file mode 100644 index 493f10d03527..000000000000 --- a/www-client/kazehakase/kazehakase-0.5.7.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/kazehakase/kazehakase-0.5.7.ebuild,v 1.2 2009/10/25 11:15:06 volkmar Exp $ - -EAPI="2" -inherit autotools eutils flag-o-matic - -IUSE="hyperestraier migemo ruby ssl webkit" - -DESCRIPTION="a browser with gecko engine like Epiphany or Galeon." -SRC_URI="mirror://sourceforge.jp/${PN}/43338/${P}.tar.gz" -HOMEPAGE="http://kazehakase.sourceforge.jp/" - -SLOT="0" -KEYWORDS="~amd64 ppc ~sparc ~x86" -LICENSE="GPL-2" - -DEPEND=">=x11-libs/gtk+-2.14 - net-libs/xulrunner:1.9 - ssl? ( >=net-libs/gnutls-1.2.0 ) - ruby? ( dev-ruby/ruby-gtk2 dev-ruby/ruby-gettext ) - hyperestraier? ( >=app-text/hyperestraier-1.2 ) - webkit? ( >=net-libs/webkit-gtk-1.1.1 )" -# >=dev-libs/cutter-1.0.6 - -RDEPEND="${DEPEND} - migemo? ( app-text/migemo )" - -DEPEND="${DEPEND} - dev-util/pkgconfig" - -src_prepare() { - epatch \ - "${FILESDIR}"/${P}-gtkentry.patch \ - "${FILESDIR}"/${P}-gentoo.patch - eautoreconf -} - -src_configure() { - local myconf - - # Bug 159949 - replace-flags -Os -O2 - - use ruby || myconf="${myconf} --with-ruby=no --with-rgettext=no" - use ssl || myconf="${myconf} --disable-ssl" - - # The "e" in heyper is not a mistake, it is a typo in the source package - econf \ - --with-gecko-engine=libxul \ - $(use_enable migemo) \ - $(use_enable hyperestraier heyper-estraier) \ - ${myconf} || die -} - -src_compile() { - emake -j1 || die -} - -src_install() { - emake DESTDIR="${D}" install || die - dodoc AUTHORS ChangeLog NEWS README* TODO* -} |