Bug#351976: epiphany-browser: Please build against xulrunner when
it will reach unstable
Mike Hommey
mh at glandium.org
Wed Feb 8 21:44:57 UTC 2006
Package: epiphany-browser
Version: 1.8.3-3.1
Severity: wishlist
Tags: patch
Hi, attached here is a patch so that epiphany-browser builds against
xulrunner instead of mozilla.
Xulrunner is in the NEW queue at the moment, so I can't say for sure
when it will reach unstable.
Note that while upstream supports building against xulrunner without
changes, it actually fails with a stock xulrunner because the sidebar
component is not built with default xulrunner. I added it to the debian
xulrunner, though. I would advise upstream to add a test in configure so
that it fails if the sidebar component is not detected.
Another thing that would be nice to have applied upstream is the change
to configure script so that it depends also on xulrunner-js, so that it
gets the correct path for libmozjs's includes, especially when, as in
debian, it is not installed in the /usr/include/xulrunner directory.
Cheers,
Mike
-- System Information:
Debian Release: testing/unstable
APT prefers unstable
APT policy: (500, 'unstable')
Architecture: i386 (i686)
Shell: /bin/sh linked to /bin/bash
Kernel: Linux 2.6.15-1-686
Locale: LANG=ja_JP.UTF-8, LC_CTYPE=ja_JP.UTF-8 (charmap=UTF-8)
Versions of packages epiphany-browser depends on:
ii gconf2 2.12.1-8 GNOME configuration database syste
ii gnome-icon-theme 2.12.1-2 GNOME Desktop icon theme
ii iso-codes 0.49-1 ISO language, territory, currency
ii libart-2.0-2 2.3.17-1 Library of functions for 2D graphi
ii libatk1.0-0 1.10.3-1 The ATK accessibility toolkit
ii libbonobo2-0 2.10.1-1 Bonobo CORBA interfaces library
ii libbonoboui2-0 2.10.1-2 The Bonobo UI library
ii libc6 2.3.5-13 GNU C Library: Shared libraries an
ii libcairo2 1.0.2-3 The Cairo 2D vector graphics libra
ii libdbus-1-2 0.60-5 simple interprocess messaging syst
ii libdbus-glib-1-2 0.60-5 simple interprocess messaging syst
ii libfontconfig1 2.3.2-1.1 generic font configuration library
ii libgcc1 1:4.0.2-8 GCC support library
ii libgconf2-4 2.12.1-8 GNOME configuration database syste
ii libglade2-0 1:2.5.1-2 library to load .glade files at ru
ii libglib2.0-0 2.8.6-1 The GLib library of C routines
ii libgnome-desktop-2 2.12.2-2 Utility library for loading .deskt
ii libgnome-keyring0 0.4.6-2 GNOME keyring services library
ii libgnome2-0 2.12.0.1-5 The GNOME 2 library - runtime file
ii libgnomecanvas2-0 2.12.0-2 A powerful object-oriented display
ii libgnomeprint2.2-0 2.12.1-3 The GNOME 2.2 print architecture -
ii libgnomeprintui2.2-0 2.12.1-2 GNOME 2.2 print architecture User
ii libgnomeui-0 2.12.0-2 The GNOME 2 libraries (User Interf
ii libgnomevfs2-0 2.12.2-5 GNOME virtual file-system (runtime
ii libgtk2.0-0 2.8.10-1 The GTK+ graphical user interface
ii libice6 6.9.0.dfsg.1-4 Inter-Client Exchange library
ii libmozjs0d 1.8.0.1-2 The Mozilla SpiderMonkey JavaScrip
ii libnspr4-0d 1.8.0.1-2 NetScape Portable Runtime Library
ii liborbit2 1:2.12.4-1 libraries for ORBit2 - a CORBA ORB
ii libpango1.0-0 1.10.3-1 Layout and rendering of internatio
ii libpopt0 1.7-5 lib for parsing cmdline parameters
ii libsm6 6.9.0.dfsg.1-4 X Window System Session Management
ii libstartup-notification0 0.8-1 library for program launch feedbac
ii libstdc++6 4.0.2-8 The GNU Standard C++ Library v3
ii libx11-6 6.9.0.dfsg.1-4 X Window System protocol client li
ii libxcursor1 1.1.3-1 X cursor management library
ii libxext6 6.9.0.dfsg.1-4 X Window System miscellaneous exte
ii libxi6 6.9.0.dfsg.1-4 X Window System Input extension li
ii libxinerama1 6.9.0.dfsg.1-4 X Window System multi-head display
ii libxml2 2.6.23.dfsg.2-1 GNOME XML library
ii libxrandr2 6.9.0.dfsg.1-4 X Window System Resize, Rotate and
ii libxrender1 1:0.9.0.2-1 X Rendering Extension client libra
ii libxslt1.1 1.1.15-3 XSLT processing library - runtime
ii libxul0d 1.8.0.1-2 Gecko engine library
ii zlib1g 1:1.2.3-9 compression library - runtime
Versions of packages epiphany-browser recommends:
pn epiphany-extensions <none> (no description available)
ii yelp 2.12.2-2.1 Help browser for GNOME 2
-- no debconf information
-------------- next part --------------
diff -ruN epiphany-browser-1.8.3.orig/debian/changelog epiphany-browser-1.8.3/debian/changelog
--- epiphany-browser-1.8.3.orig/debian/changelog 2006-02-06 16:42:50.436498912 +0100
+++ epiphany-browser-1.8.3/debian/changelog 2006-02-06 16:52:20.834785192 +0100
@@ -1,3 +1,14 @@
+epiphany-browser (1.8.3-3.1) unstable; urgency=low
+
+ * Test build with xulrunner.
+ * debian/control, debian/control.in:
+ + Changed Build-deps from mozilla-browser to libxul-dev.
+ + Changed epiphany-browser's dependencies and conflicts accordingly.
+ * debian/rules: Add --with-mozilla=xulrunner to the configure line.
+ * debian/patches/xulrunner.patch: Correctly detect libmozjs location.
+
+ -- Mike Hommey <glandium at debian.org> Mon, 6 Feb 2006 16:51:49 +0100
+
epiphany-browser (1.8.3-3) unstable; urgency=low
* Upload to unstable
diff -ruN epiphany-browser-1.8.3.orig/debian/control epiphany-browser-1.8.3/debian/control
--- epiphany-browser-1.8.3.orig/debian/control 2006-02-06 16:42:50.436498912 +0100
+++ epiphany-browser-1.8.3/debian/control 2006-02-06 16:43:46.390992536 +0100
@@ -3,16 +3,15 @@
Priority: optional
Maintainer: Jordi Mallach <jordi at debian.org>
Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Akira TAGOH <tagoh at debian.org>, Andreas Rottmann <rotty at debian.org>, Andrew Lau <netsnipe at users.sourceforge.net>, Carlos Perell? Mar?n <carlos at pemas.net>, Cl?ment Stenac <zorglub at debian.org>, Ed Boraas <ed at debian.org>, Edd Dumbill <ejad at debian.org>, Emil Soleyman-Zomalan <emil at nishra.com>, Guilherme de S. Pastore <guilherme.pastore at terra.com.br>, Gustavo Noronha Silva <kov at debian.org>, J.H.M. Dassen (Ray) <jdassen at debian.org>, Joe Drew <drew at debian.org>, Johannes Rohr <jr.debian at rohr.org>, Jose Carlos Garcia Sogo <jsogo at debian.org>, Josselin Mouette <joss at debian.org>, Loic Minier <lool at dooz.org>, Marc 'HE' Brockschmidt <he at debian.org>, Ond?ej Sur? <ondrej at debian.org>, Rob Bradford <rob at debianplanet.org>, Robert McQueen <robot101 at debian.org>, Ross Burton <ross at debian.org>, Sebastien Bacher <seb128 at debian.org>, Sjoerd Simons <sjoerd at debian.org>, Takuo KITAME <kitame at debian.org>
-Build-Depends: debhelper (>= 4.2.22), liborbit2-dev (>= 2.12.4), pkg-config, libglade2-dev (>= 2.3.1), libglib2.0-dev (>= 2.8.0), libgtk2.0-dev (>= 2.8.3), libbonobo2-dev (>= 2.1.1), libgconf2-dev, libgnomevfs2-dev (>= 2.9.2), libstartup-notification0-dev (>= 0.5), libpango1.0-dev (>= 1.8.0), scrollkeeper, cdbs (>= 0.4.17), libgnome-desktop-dev (>= 2.9.91), perl, libxml2-dev (>= 2.6.12), libxslt1-dev (>= 1.1.7), gnome-pkg-tools, libxml-parser-perl, libgnomeui-dev (>= 2.6), mozilla-dev (>= 2:1.7.10), iso-codes, gnome-icon-theme (>= 2.9.90), libdbus-glib-1-dev (>= 0.60), libgnomeprintui2.2-dev, gnome-doc-utils (>= 0.3.2)
+Build-Depends: debhelper (>= 4.2.22), liborbit2-dev (>= 2.12.4), pkg-config, libglade2-dev (>= 2.3.1), libglib2.0-dev (>= 2.8.0), libgtk2.0-dev (>= 2.8.3), libbonobo2-dev (>= 2.1.1), libgconf2-dev, libgnomevfs2-dev (>= 2.9.2), libstartup-notification0-dev (>= 0.5), libpango1.0-dev (>= 1.8.0), scrollkeeper, cdbs (>= 0.4.17), libgnome-desktop-dev (>= 2.9.91), perl, libxml2-dev (>= 2.6.12), libxslt1-dev (>= 1.1.7), gnome-pkg-tools, libxml-parser-perl, libgnomeui-dev (>= 2.6), libxul-dev, iso-codes, gnome-icon-theme (>= 2.9.90), libdbus-glib-1-dev (>= 0.60), libgnomeprintui2.2-dev, gnome-doc-utils (>= 0.3.2)
Standards-Version: 3.6.2
Package: epiphany-browser
Architecture: any
-Depends: ${shlibs:Depends}, mozilla-browser (>= 2:1.7.10), mozilla-psm (>= 2:1.7.10), gnome-icon-theme (>= 2.9.90), iso-codes, ${misc:Depends}
+Depends: ${shlibs:Depends}, gnome-icon-theme (>= 2.9.90), iso-codes, ${misc:Depends}
Recommends: yelp, epiphany-extensions
Suggests: mozilla-bonobo
Provides: www-browser
-Conflicts: mozilla-browser (>= 2:1.8)
Description: Intuitive GNOME web browser
A simple yet powerful GNOME web browser targeted at
non-technical users. Its principles are simplicity and standards
diff -ruN epiphany-browser-1.8.3.orig/debian/control.in epiphany-browser-1.8.3/debian/control.in
--- epiphany-browser-1.8.3.orig/debian/control.in 2006-02-06 16:42:50.436498912 +0100
+++ epiphany-browser-1.8.3/debian/control.in 2006-02-06 16:43:46.390992536 +0100
@@ -3,16 +3,15 @@
Priority: optional
Maintainer: Jordi Mallach <jordi at debian.org>
Uploaders: @GNOME_TEAM@
-Build-Depends: debhelper (>= 4.2.22), liborbit2-dev (>= 2.12.4), pkg-config, libglade2-dev (>= 2.3.1), libglib2.0-dev (>= 2.8.0), libgtk2.0-dev (>= 2.8.3), libbonobo2-dev (>= 2.1.1), libgconf2-dev, libgnomevfs2-dev (>= 2.9.2), libstartup-notification0-dev (>= 0.5), libpango1.0-dev (>= 1.8.0), scrollkeeper, cdbs (>= 0.4.17), libgnome-desktop-dev (>= 2.9.91), perl, libxml2-dev (>= 2.6.12), libxslt1-dev (>= 1.1.7), gnome-pkg-tools, libxml-parser-perl, libgnomeui-dev (>= 2.6), mozilla-dev (>= 2:1.7.10), iso-codes, gnome-icon-theme (>= 2.9.90), libdbus-glib-1-dev (>= 0.60), libgnomeprintui2.2-dev, gnome-doc-utils (>= 0.3.2)
+Build-Depends: debhelper (>= 4.2.22), liborbit2-dev (>= 2.12.4), pkg-config, libglade2-dev (>= 2.3.1), libglib2.0-dev (>= 2.8.0), libgtk2.0-dev (>= 2.8.3), libbonobo2-dev (>= 2.1.1), libgconf2-dev, libgnomevfs2-dev (>= 2.9.2), libstartup-notification0-dev (>= 0.5), libpango1.0-dev (>= 1.8.0), scrollkeeper, cdbs (>= 0.4.17), libgnome-desktop-dev (>= 2.9.91), perl, libxml2-dev (>= 2.6.12), libxslt1-dev (>= 1.1.7), gnome-pkg-tools, libxml-parser-perl, libgnomeui-dev (>= 2.6), libxul-dev, iso-codes, gnome-icon-theme (>= 2.9.90), libdbus-glib-1-dev (>= 0.60), libgnomeprintui2.2-dev, gnome-doc-utils (>= 0.3.2)
Standards-Version: 3.6.2
Package: epiphany-browser
Architecture: any
-Depends: ${shlibs:Depends}, mozilla-browser (>= 2:1.7.10), mozilla-psm (>= 2:1.7.10), gnome-icon-theme (>= 2.9.90), iso-codes, ${misc:Depends}
+Depends: ${shlibs:Depends}, gnome-icon-theme (>= 2.9.90), iso-codes, ${misc:Depends}
Recommends: yelp, epiphany-extensions
Suggests: mozilla-bonobo
Provides: www-browser
-Conflicts: mozilla-browser (>= 2:1.8)
Description: Intuitive GNOME web browser
A simple yet powerful GNOME web browser targeted at
non-technical users. Its principles are simplicity and standards
diff -ruN epiphany-browser-1.8.3.orig/debian/patches/xulrunner.patch epiphany-browser-1.8.3/debian/patches/xulrunner.patch
--- epiphany-browser-1.8.3.orig/debian/patches/xulrunner.patch 1970-01-01 01:00:00.000000000 +0100
+++ epiphany-browser-1.8.3/debian/patches/xulrunner.patch 2006-02-06 16:51:43.602445368 +0100
@@ -0,0 +1,69 @@
+diff -ruN epiphany-browser-1.8.3.orig/configure epiphany-browser-1.8.3/configure
+--- epiphany-browser-1.8.3.orig/configure 2006-02-06 16:42:50.506488272 +0100
++++ epiphany-browser-1.8.3/configure 2006-02-06 16:48:40.786237656 +0100
+@@ -23050,12 +23050,12 @@
+
+ if test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$MOZILLA-gtkmozembed >= \$min_version \$MOZILLA-xpcom >= \$min_version\"") >&5
+- ($PKG_CONFIG --exists --print-errors "$MOZILLA-gtkmozembed >= $min_version $MOZILLA-xpcom >= $min_version") 2>&5
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$MOZILLA-gtkmozembed >= \$min_version \$MOZILLA-xpcom >= \$min_version \$MOZILLA-js >= \$min_version\"") >&5
++ ($PKG_CONFIG --exists --print-errors "$MOZILLA-gtkmozembed >= $min_version $MOZILLA-xpcom >= $min_version $MOZILLA-js >= $min_version") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+- pkg_cv_MOZILLA_COMPONENT_CFLAGS=`$PKG_CONFIG --cflags "$MOZILLA-gtkmozembed >= $min_version $MOZILLA-xpcom >= $min_version" 2>/dev/null`
++ pkg_cv_MOZILLA_COMPONENT_CFLAGS=`$PKG_CONFIG --cflags "$MOZILLA-gtkmozembed >= $min_version $MOZILLA-xpcom >= $min_version $MOZILLA-js >= $min_version" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+@@ -23064,12 +23064,12 @@
+ fi
+ if test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$MOZILLA-gtkmozembed >= \$min_version \$MOZILLA-xpcom >= \$min_version\"") >&5
+- ($PKG_CONFIG --exists --print-errors "$MOZILLA-gtkmozembed >= $min_version $MOZILLA-xpcom >= $min_version") 2>&5
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$MOZILLA-gtkmozembed >= \$min_version \$MOZILLA-xpcom >= \$min_version \$MOZILLA-js >= \$min_version\"") >&5
++ ($PKG_CONFIG --exists --print-errors "$MOZILLA-gtkmozembed >= $min_version $MOZILLA-xpcom >= $min_version $MOZILLA-js >= $min_version") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+- pkg_cv_MOZILLA_COMPONENT_LIBS=`$PKG_CONFIG --libs "$MOZILLA-gtkmozembed >= $min_version $MOZILLA-xpcom >= $min_version" 2>/dev/null`
++ pkg_cv_MOZILLA_COMPONENT_LIBS=`$PKG_CONFIG --libs "$MOZILLA-gtkmozembed >= $min_version $MOZILLA-xpcom >= $min_version $MOZILLA-js >= $min_version" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+@@ -23078,18 +23078,18 @@
+ fi
+
+ if test $pkg_failed = yes; then
+- MOZILLA_COMPONENT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$MOZILLA-gtkmozembed >= $min_version $MOZILLA-xpcom >= $min_version"`
++ MOZILLA_COMPONENT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$MOZILLA-gtkmozembed >= $min_version $MOZILLA-xpcom >= $min_version $MOZILLA-js >= $min_version"`
+ # Put the nasty error message in config.log where it belongs
+ echo "$MOZILLA_COMPONENT_PKG_ERRORS" 1>&5
+
+- { { echo "$as_me:$LINENO: error: Package requirements ($MOZILLA-gtkmozembed >= $min_version $MOZILLA-xpcom >= $min_version) were not met.
++ { { echo "$as_me:$LINENO: error: Package requirements ($MOZILLA-gtkmozembed >= $min_version $MOZILLA-xpcom >= $min_version $MOZILLA-js >= $min_version) were not met.
+ Consider adjusting the PKG_CONFIG_PATH environment variable if you
+ installed software in a non-standard prefix.
+
+ Alternatively you may set the MOZILLA_COMPONENT_CFLAGS and MOZILLA_COMPONENT_LIBS environment variables
+ to avoid the need to call pkg-config. See the pkg-config man page for
+ more details." >&5
+-echo "$as_me: error: Package requirements ($MOZILLA-gtkmozembed >= $min_version $MOZILLA-xpcom >= $min_version) were not met.
++echo "$as_me: error: Package requirements ($MOZILLA-gtkmozembed >= $min_version $MOZILLA-xpcom >= $min_version $MOZILLA-js >= $min_version) were not met.
+ Consider adjusting the PKG_CONFIG_PATH environment variable if you
+ installed software in a non-standard prefix.
+
+diff -ruN epiphany-browser-1.8.3.orig/configure.ac epiphany-browser-1.8.3/configure.ac
+--- epiphany-browser-1.8.3.orig/configure.ac 2006-02-06 16:42:50.510487664 +0100
++++ epiphany-browser-1.8.3/configure.ac 2006-02-06 16:48:26.831359120 +0100
+@@ -206,7 +206,7 @@
+ MOZILLA_FLAVOUR=$flavour
+ AC_SUBST([MOZILLA_FLAVOUR])
+
+-PKG_CHECK_MODULES(MOZILLA_COMPONENT, $MOZILLA-gtkmozembed >= $min_version $MOZILLA-xpcom >= $min_version)
++PKG_CHECK_MODULES(MOZILLA_COMPONENT, $MOZILLA-gtkmozembed >= $min_version $MOZILLA-xpcom >= $min_version $MOZILLA-js >= $min_version)
+ AC_SUBST([MOZILLA_COMPONENT_CFLAGS])
+ AC_SUBST([MOZILLA_COMPONENT_LIBS])
+
diff -ruN epiphany-browser-1.8.3.orig/debian/rules epiphany-browser-1.8.3/debian/rules
--- epiphany-browser-1.8.3.orig/debian/rules 2006-02-06 16:42:50.436498912 +0100
+++ epiphany-browser-1.8.3/debian/rules 2006-02-06 16:46:07.378559168 +0100
@@ -6,7 +6,7 @@
include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
DEB_CONFIGURE_EXTRA_FLAGS := --enable-dbus --disable-scrollkeeper \
- --enable-zeroconf
+ --enable-zeroconf --with-mozilla=xulrunner
clean::
rm -f po/.intltool-merge-cache
More information about the Pkg-gnome-maintainers
mailing list