Package: kazehakase
Severity: important
Tags: patch
Xulrunner 1.9.1 is going to replace xulrunner 1.9 in unstable sometime
soonish, so kazehakase should switch to using it.
As a matter of being future-proof, a dh_xulrunner program has been added
to xulrunner-dev, that will add the proper dependency to shlibs:Depends.
Please note that the package supporting this command is not yet in the
archive and should reach experimental some time today.
The attached patch implements the necessary changes[1], please upload to
unstable as soon as possible. The package will then be dep-wait, and will
get built as soon as xulrunner 1.9.1 reaches unstable, which will happen
when all the changes required on other packages will be ready.
Cheers,
Mike
1. Please note that this patch still hardcodes the GREVersionRange, which
is not really future-proof. Something similar to what exists in chmsee would
be required for that.
-- System Information:
Debian Release: squeeze/sid
APT prefers unstable
APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.30-1-amd64 (SMP w/2 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
Versions of packages kazehakase depends on:
pn kazehakase-gecko | kaz <none> (no description available)
ii libatk1.0-0 1.28.0-1 The ATK accessibility toolkit
ii libc6 2.9-26 GNU C Library: Shared libraries
ii libcairo2 1.8.8-2 The Cairo 2D vector graphics libra
ii libfontconfig1 2.6.0-4 generic font configuration library
ii libfreetype6 2.3.9-5 FreeType 2 font engine, shared lib
ii libgcrypt11 1.4.4-4 LGPL Crypto library - runtime libr
pn libgettext-ruby1.8 <none> (no description available)
ii libglib2.0-0 2.22.0-1 The GLib library of C routines
ii libgnutls26 2.8.3-3 the GNU TLS library - runtime libr
ii libgpg-error0 1.6-1 library for common error values an
pn libgtk2-ruby <none> (no description available)
ii libgtk2.0-0 2.18.0-1 The GTK+ graphical user interface
ii libice6 2:1.0.5-1 X11 Inter-Client Exchange library
ii libpango1.0-0 1.26.0-1 Layout and rendering of internatio
ii libpixman-1-0 0.14.0-1 pixel-manipulation library for X a
ii libpng12-0 1.2.39-1 PNG library - runtime
ii libsm6 2:1.1.1-1 X11 Session Management library
ii libtasn1-3 2.3-1 Manage ASN.1 structures (runtime)
ii libx11-6 2:1.2.2-1 X11 client-side library
ii libxrender1 1:0.9.4-2 X Rendering Extension client libra
ii ruby1.8 1.8.7.174-2 Interpreter of object-oriented scr
ii zlib1g 1:1.2.3.3.dfsg-15 compression library - runtime
Versions of packages kazehakase recommends:
pn hyperestraier <none> (no description available)
Versions of packages kazehakase suggests:
pn migemo <none> (no description available)
diff -ruN kazehakase-0.5.6/debian/control kazehakase-0.5.6.new/debian/control
--- kazehakase-0.5.6/debian/control
+++ kazehakase-0.5.6.new/debian/control
@@ -10,7 +10,7 @@
libpango1.0-dev,
intltool,
libgnutls-dev,
- xulrunner-dev,
+ xulrunner-dev (>= 1.9.1.3-2),
ruby-gnome2-dev (>= 0.19.1),
libgettext-ruby-util,
libqdbm-dev,
@@ -44,8 +44,7 @@
Package: kazehakase-gecko
Architecture: any
-Depends: ${gecko:Depends},
- xulrunner-1.9 (>= 1.9~rc2-3)
+Depends: ${shlibs:Depends}
Replaces: kazehakase
Description: Gecko rendering engine for kazehakase
Kazehakase is a web browser that can use either Gecko or WebKit as
diff -ruN kazehakase-0.5.6/debian/patches/30_xulrunner-1.9.1.dpatch kazehakase-0.5.6.new/debian/patches/30_xulrunner-1.9.1.dpatch
--- kazehakase-0.5.6/debian/patches/30_xulrunner-1.9.1.dpatch
+++ kazehakase-0.5.6.new/debian/patches/30_xulrunner-1.9.1.dpatch
@@ -1,18 +1,20 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
## 30_xulrunner-1.9.1.dpatch by Mike Hommey <mh+report...@glandium.org>
##
-## DP: Prevent crash with xulrunner 1.9.1.
+## DP: Support for xulrunner 1.9.1
@DPATCH@
diff -urNad kazehakase-0.5.6~/module/embed/gecko/mozilla.cpp kazehakase-0.5.6/module/embed/gecko/mozilla.cpp
--- kazehakase-0.5.6~/module/embed/gecko/mozilla.cpp 2009-08-17 17:24:42.000000000 +0300
+++ kazehakase-0.5.6/module/embed/gecko/mozilla.cpp 2009-08-19 23:58:51.000000000 +0300
-@@ -133,7 +133,7 @@
+@@ -132,8 +132,8 @@
+ xulrunner_init (void)
{
static const GREVersionRange greVersion = {
- "1.9a", PR_TRUE,
+- "1.9a", PR_TRUE,
- "2", PR_TRUE
-+ "1.9.1", PR_FALSE
++ "1.9.1", PR_TRUE,
++ "1.9.2", PR_FALSE
};
char xpcomPath[PATH_MAX];
diff -ruN kazehakase-0.5.6/debian/rules kazehakase-0.5.6.new/debian/rules
--- kazehakase-0.5.6/debian/rules
+++ kazehakase-0.5.6.new/debian/rules
@@ -101,8 +101,9 @@
$(CURDIR)/debian/kazehakase/usr/lib/kazehakase/ext/ruby.so \
$(CURDIR)/debian/kazehakase/usr/lib/kazehakase/search/hyper-estraier.so
dpkg-shlibdeps -T$(CURDIR)/debian/kazehakase-gecko.substvars \
- -pgecko -xkazehakase \
+ -xkazehakase \
$(CURDIR)/debian/kazehakase-gecko/usr/lib/kazehakase/embed/gecko.so
+ dh_xulrunner
dh_gencontrol
dh_md5sums
dh_builddeb
