tag 480796 + patch
thanks
On Mon, May 12, 2008 at 09:07:26AM +0200, Mike Hommey wrote:
> Package: kazehakase
> Severity: wishlist
> User: [EMAIL PROTECTED]
> Usertags: xulrunner-transition
>
> With the upcoming xulrunner transition, libxul-dev is going to disappear.
>
> I already sent instructions on what you should be doing in
> http://lists.debian.org/debian-release/2008/05/msg00009.html
>
> This bug report is mostly to help follow the transition going.
>
> FYI, I will start NMUing plugins and components next week, and will break
> the remaining packages by uploading xulrunner 1.9 in unstable on May 25.
>
> Though help will be appreciated, I'll also prepare updated packages for
> these during this week and next.
Attached is the patch for proper support of xulrunner 1.9. I tested it
to work on startup and loading a page, but not further. It would be
helpful if you could do an upload to experimental with the patch
applied.
Cheers,
Mike
diff -u kazehakase-0.5.4/debian/rules kazehakase-0.5.4/debian/rules
--- kazehakase-0.5.4/debian/rules
+++ kazehakase-0.5.4/debian/rules
@@ -45,7 +45,7 @@
dh_testdir
chmod +x ./configure
chmod +x ./mkinstalldirs
- $(COMPILER_FLAGS) ./configure --host=$(DEB_HOST_GNU_TYPE)
--build=$(DEB_BUILD_GNU_TYPE) --enable-migemo --prefix=/usr
--mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
--sysconfdir=/etc --with-gecko-engine=xulrunner --with-ruby=/usr/bin/ruby1.8
+ $(COMPILER_FLAGS) ./configure --host=$(DEB_HOST_GNU_TYPE)
--build=$(DEB_BUILD_GNU_TYPE) --enable-migemo --prefix=/usr
--mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
--sysconfdir=/etc --with-gecko-engine=libxul --disable-gtkmozembed
--with-ruby=/usr/bin/ruby1.8
build: build-stamp
build-stamp: patch config.status
--- kazehakase-0.5.4/debian/control
+++ kazehakase-0.5.4/debian/control
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Hidetaka Iwai <[EMAIL PROTECTED]>
Uploaders: Andres Salomon <[EMAIL PROTECTED]>
-Build-Depends: debhelper(>> 4.0.0), dpatch, libatk1.0-dev, libglib2.0-dev,
libgtk2.0-dev (>= 2.12.0), libpango1.0-dev, libxul-dev, libgnutls-dev (>=
1.2.6), ruby1.8, ruby1.8-dev, libgtk2-ruby, libgettext-ruby1.8,
libxml-parser-perl, libwebkit-dev
+Build-Depends: debhelper(>> 4.0.0), dpatch, libatk1.0-dev, libglib2.0-dev,
libgtk2.0-dev (>= 2.12.0), libpango1.0-dev, xulrunner-dev, libgnutls-dev (>=
1.2.6), ruby1.8, ruby1.8-dev, libgtk2-ruby, libgettext-ruby1.8,
libxml-parser-perl, libwebkit-dev
Standards-Version: 3.7.3
Package: kazehakase
@@ -22,7 +22,7 @@
Package: kazehakase-gecko
Architecture: any
-Depends: ${gecko:Depends}
+Depends: ${gecko:Depends}, xulrunner-1.9
Replaces: kazehakase
Description: Gecko rendering engine for kazehakase
Kazehakase is a web browser that can use either Gecko or WebKit as
--- kazehakase-0.5.4.orig/ext/ruby/Makefile.in
+++ kazehakase-0.5.4/ext/ruby/Makefile.in
@@ -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
--- kazehakase-0.5.4.orig/ext/ruby/Makefile.am
+++ kazehakase-0.5.4/ext/ruby/Makefile.am
@@ -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
--- kazehakase-0.5.4.orig/module/embed/gecko/mozilla.cpp
+++ kazehakase-0.5.4/module/embed/gecko/mozilla.cpp
@@ -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)
--- kazehakase-0.5.4.orig/module/embed/gecko/kz-mozlauncher.cpp
+++ kazehakase-0.5.4/module/embed/gecko/kz-mozlauncher.cpp
@@ -76,6 +76,9 @@
nsISupports *aWindowContext,
const PRUnichar *aDefaultFile,
const PRUnichar *aSuggestedFileExtension,
+#ifdef HAVE_GECKO_1_9
+ PRBool aForcePrompt,
+#endif
nsILocalFile **_retval)
{
nsresult rv;
---
kazehakase-0.5.4.orig/module/embed/gecko/gtkmozembed/nsProfileDirServiceProvider2.cpp
+++
kazehakase-0.5.4/module/embed/gecko/gtkmozembed/nsProfileDirServiceProvider2.cpp
@@ -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;
}
