Package: galeon
Version: 2.0.0-2.1
Severity: wishlist
Tags: patch
Hi, attached here is a patch so that galeon 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 upstream does not support building against xulrunner without
changes, so you may want to send them the 30_xulrunner.patch file so
that they apply it.
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=C, LC_CTYPE=C (charmap=ANSI_X3.4-1968)
Versions of packages galeon depends on:
ii galeon-common 2.0.0-2.1 GNOME web browser for advanced use
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 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 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 libxul0d 1.8.0.1-2 Gecko engine library
ii procps 1:3.2.6-2 /proc file system utilities
ii zlib1g 1:1.2.3-9 compression library - runtime
Versions of packages galeon recommends:
ii gnome-control-center [capplet 1:2.12.2-2 utilities to configure the GNOME d
ii gnome-icon-theme 2.12.1-2 GNOME Desktop icon theme
ii iso-codes 0.49-1 ISO language, territory, currency
ii scrollkeeper 0.3.14-10 A free electronic cataloging syste
ii yelp 2.12.2-2.1 Help browser for GNOME 2
-- no debconf information
diff -ruN galeon-2.0.0.orig/debian/changelog galeon-2.0.0/debian/changelog
--- galeon-2.0.0.orig/debian/changelog 2006-02-09 08:54:35.778359216 +0100
+++ galeon-2.0.0/debian/changelog 2006-02-09 08:54:25.710889704 +0100
@@ -1,3 +1,15 @@
+galeon (2.0.0-2.1) unstable; urgency=low
+
+ * Test build with xulrunner.
+ * debian/control:
+ + Changed Build-deps from mozilla-browser to libxul-dev.
+ + Changed galeon's dependencies accordingly.
+ * debian/rules: Add --with-mozilla=xulrunner to the configure line.
+ * debian/patches/30_xulrunner.patch: Patch to support building against
+ xulrunner.
+
+ -- Mike Hommey <[EMAIL PROTECTED]> Wed, 8 Feb 2006 22:56:20 +0100
+
galeon (2.0.0-2) unstable; urgency=low
* GConf is not signalled via gconftool-2, re-add the patch, thanks Crispin
diff -ruN galeon-2.0.0.orig/debian/control galeon-2.0.0/debian/control
--- galeon-2.0.0.orig/debian/control 2006-02-09 08:54:35.769360584 +0100
+++ galeon-2.0.0/debian/control 2006-02-09 08:54:25.707890160 +0100
@@ -2,13 +2,13 @@
Section: gnome
Priority: optional
Maintainer: Loic Minier <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>> 4), cdbs, sharutils, libbonobo2-dev,
libbonoboui2-dev, libglade2-dev, libgnomeui-dev (>= 2.8.1-3), libxml2-dev,
libgconf2-dev, libglib2.0-dev, libgnomevfs2-dev (>= 2.10), libgnome-desktop-dev
(>= 2.10), libgtk2.0-dev, liborbit2-dev, mozilla-dev (>= 2:1.7.12), iso-codes,
libxml-parser-perl, scrollkeeper
+Build-Depends: debhelper (>> 4), cdbs, sharutils, libbonobo2-dev,
libbonoboui2-dev, libglade2-dev, libgnomeui-dev (>= 2.8.1-3), libxml2-dev,
libgconf2-dev, libglib2.0-dev, libgnomevfs2-dev (>= 2.10), libgnome-desktop-dev
(>= 2.10), libgtk2.0-dev, liborbit2-dev, libxul-dev, iso-codes,
libxml-parser-perl, scrollkeeper
Standards-Version: 3.6.2
Package: galeon
Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, mozilla-browser (>=2:1.7.5),
procps, galeon-common
-Recommends: mozilla-psm, mozilla-mailnews, gnome-icon-theme (>= 1.1.3-1),
yelp, scrollkeeper, iso-codes, capplets
+Depends: ${misc:Depends}, ${shlibs:Depends}, procps, galeon-common
+Recommends: gnome-icon-theme (>= 1.1.3-1), yelp, scrollkeeper, iso-codes,
capplets
Suggests: mozilla-bonobo
Provides: www-browser
Replaces: galeon-beta, galeon-snapshot, galeon-nautilus, galeon-common
diff -ruN galeon-2.0.0.orig/debian/patches/30_xulrunner.patch
galeon-2.0.0/debian/patches/30_xulrunner.patch
--- galeon-2.0.0.orig/debian/patches/30_xulrunner.patch 1970-01-01
01:00:00.000000000 +0100
+++ galeon-2.0.0/debian/patches/30_xulrunner.patch 2006-02-09
08:54:25.712889400 +0100
@@ -0,0 +1,145 @@
+--- galeon-2.0.0.new/configure 2006-02-08 23:39:00.489984536 +0100
++++ galeon-2.0.0/configure 2006-02-08 23:38:39.586162400 +0100
+@@ -1082,7 +1082,7 @@
+ both]
+ --with-tags[=TAGS]
+ include additional configurations [automatic]
+- --with-mozilla[=mozilla|seamonkey|firefox|thunderbird]
++ --with-mozilla[=mozilla|seamonkey|firefox|thunderbird|xulrunner]
+ Which gecko engine to use (default: autodetect)
+ --with-gconf-source=sourceaddress Config database for installing
schema files.
+ --with-gconf-schema-file-dir=dir Directory for installing schema
files.
+@@ -23418,7 +23418,7 @@
+
+ fi;
+
+-GECKOS="firefox mozilla-firefox seamonkey mozilla thunderbird
mozilla-thunderbird"
++GECKOS="firefox mozilla-firefox seamonkey mozilla thunderbird
mozilla-thunderbird xulrunner"
+ gecko=$with_mozilla
+ autodetect=
+
+@@ -23450,6 +23450,7 @@
+ seamonkey) min_version=1.0 flavour=mozilla ;;
+ *firefox) min_version=1.0 flavour=toolkit ;;
+ *thunderbird) min_version=1.0 flavour=toolkit ;;
++xulrunner) min_version=1.8 flavour=toolkit ;;
+ esac
+
+ MOZILLA=$gecko
+@@ -23465,12 +23466,12 @@
+ pkg_cv_MOZILLA_COMPONENT_CFLAGS="$MOZILLA_COMPONENT_CFLAGS"
+ else
+ if test -n "$PKG_CONFIG" && \
+- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors
\"\$MOZILLA-gtkmozembed >= \$min_version\"") >&5
+- ($PKG_CONFIG --exists --print-errors "$MOZILLA-gtkmozembed >=
$min_version") 2>&5
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors
\"\$MOZILLA-gtkmozembed >= \$min_version \$MOZILLA-js >= \$min_version\"") >&5
++ ($PKG_CONFIG --exists --print-errors "$MOZILLA-gtkmozembed >= $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" 2>/dev/null`
++ pkg_cv_MOZILLA_COMPONENT_CFLAGS=`$PKG_CONFIG --cflags "$MOZILLA-gtkmozembed
>= $min_version $MOZILLA-js >= $min_version" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+@@ -23483,12 +23484,12 @@
+ pkg_cv_MOZILLA_COMPONENT_LIBS="$MOZILLA_COMPONENT_LIBS"
+ else
+ if test -n "$PKG_CONFIG" && \
+- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors
\"\$MOZILLA-gtkmozembed >= \$min_version\"") >&5
+- ($PKG_CONFIG --exists --print-errors "$MOZILLA-gtkmozembed >=
$min_version") 2>&5
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors
\"\$MOZILLA-gtkmozembed >= \$min_version \$MOZILLA-js >= \$min_version\"") >&5
++ ($PKG_CONFIG --exists --print-errors "$MOZILLA-gtkmozembed >= $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" 2>/dev/null`
++ pkg_cv_MOZILLA_COMPONENT_LIBS=`$PKG_CONFIG --libs "$MOZILLA-gtkmozembed >=
$min_version $MOZILLA-js >= $min_version" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+@@ -23507,14 +23508,14 @@
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- MOZILLA_COMPONENT_PKG_ERRORS=`$PKG_CONFIG --short-errors
--errors-to-stdout --print-errors "$MOZILLA-gtkmozembed >= $min_version"`
++ MOZILLA_COMPONENT_PKG_ERRORS=`$PKG_CONFIG --short-errors
--errors-to-stdout --print-errors "$MOZILLA-gtkmozembed >= $min_version
$MOZILLA-js >= $min_version"`
+ else
+- MOZILLA_COMPONENT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout
--print-errors "$MOZILLA-gtkmozembed >= $min_version"`
++ MOZILLA_COMPONENT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout
--print-errors "$MOZILLA-gtkmozembed >= $min_version $MOZILLA-js >=
$min_version"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$MOZILLA_COMPONENT_PKG_ERRORS" >&5
+
+- { { echo "$as_me:$LINENO: error: Package requirements
($MOZILLA-gtkmozembed >= $min_version) were not met:
++ { { echo "$as_me:$LINENO: error: Package requirements
($MOZILLA-gtkmozembed >= $min_version $MOZILLA-js >= $min_version) were not met:
+
+ $MOZILLA_COMPONENT_PKG_ERRORS
+
+@@ -23525,7 +23526,7 @@
+ and MOZILLA_COMPONENT_LIBS 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) were not met:
++echo "$as_me: error: Package requirements ($MOZILLA-gtkmozembed >=
$min_version $MOZILLA-js >= $min_version) were not met:
+
+ $MOZILLA_COMPONENT_PKG_ERRORS
+
+@@ -23668,10 +23669,10 @@
+ _SAVE_CXXFLAGS=$CXXFLAGS
+ _SAVE_CPPFLAGS=$CPPFLAGS
+
+-CPPFLAGS="-I$MOZILLA_INCLUDE_ROOT `$PKG_CONFIG --cflags-only-I
$MOZILLA-xpcom`"
+-CXXFLAGS="$_SAVE_CXXFLAGS $AM_CXXFLAGS -I$MOZILLA_INCLUDE_ROOT `pkg-config
--cflags $MOZILLA-xpcom`"
++CPPFLAGS="-I$MOZILLA_INCLUDE_ROOT `$PKG_CONFIG --cflags-only-I $MOZILLA-xpcom
$MIZILLA-js`"
++CXXFLAGS="$_SAVE_CXXFLAGS $AM_CXXFLAGS -I$MOZILLA_INCLUDE_ROOT `pkg-config
--cflags $MOZILLA-xpcom $MOZILLA-js`"
+
+-TEST_MOZILLA_INCLUDE_DIRS="widget mimetype docshell history dom necko string
layout gfx content js exthandler pipnss uriloader caps xpconnect nkcache"
++TEST_MOZILLA_INCLUDE_DIRS="widget mimetype docshell history dom necko string
layout gfx content exthandler pipnss uriloader caps xpconnect nkcache"
+ for i in $TEST_MOZILLA_INCLUDE_DIRS ; do
+ CXXFLAGS="$CXXFLAGS -I$MOZILLA_INCLUDE_ROOT/$i"
+ done
+--- galeon-2.0.0.new/configure.in 2006-02-08 23:26:17.835925576 +0100
++++ galeon-2.0.0/configure.in 2006-02-08 23:36:58.826480200 +0100
+@@ -188,10 +188,10 @@
+ AC_MSG_CHECKING([which mozilla engine to use])
+
+ AC_ARG_WITH([mozilla],
+-
AC_HELP_STRING([--with-mozilla@<:@=mozilla|seamonkey|firefox|thunderbird@:>@],
++
AC_HELP_STRING([--with-mozilla@<:@=mozilla|seamonkey|firefox|thunderbird|xulrunner@:>@],
+ [Which gecko engine to use (default: autodetect)]))
+
+-GECKOS="firefox mozilla-firefox seamonkey mozilla thunderbird
mozilla-thunderbird"
++GECKOS="firefox mozilla-firefox seamonkey mozilla thunderbird
mozilla-thunderbird xulrunner"
+ gecko=$with_mozilla
+ autodetect=
+
+@@ -219,12 +219,13 @@
+ seamonkey) min_version=1.0 flavour=mozilla ;;
+ *firefox) min_version=1.0 flavour=toolkit ;;
+ *thunderbird) min_version=1.0 flavour=toolkit ;;
++xulrunner) min_version=1.8 flavour=toolkit ;;
+ esac
+
+ MOZILLA=$gecko
+ AC_SUBST([MOZILLA])
+
+-PKG_CHECK_MODULES(MOZILLA_COMPONENT, $MOZILLA-gtkmozembed >= $min_version)
++PKG_CHECK_MODULES(MOZILLA_COMPONENT, $MOZILLA-gtkmozembed >= $min_version
$MOZILLA-js >= $min_version)
+ AC_SUBST(MOZILLA_COMPONENT_CFLAGS)
+ AC_SUBST(MOZILLA_COMPONENT_LIBS)
+
+@@ -286,10 +286,10 @@
+ _SAVE_CXXFLAGS=$CXXFLAGS
+ _SAVE_CPPFLAGS=$CPPFLAGS
+
+-CPPFLAGS="-I$MOZILLA_INCLUDE_ROOT `$PKG_CONFIG --cflags-only-I
$MOZILLA-xpcom`"
+-CXXFLAGS="$_SAVE_CXXFLAGS $AM_CXXFLAGS -I$MOZILLA_INCLUDE_ROOT `pkg-config
--cflags $MOZILLA-xpcom`"
++CPPFLAGS="-I$MOZILLA_INCLUDE_ROOT `$PKG_CONFIG --cflags-only-I $MOZILLA-xpcom
$MIZILLA-js`"
++CXXFLAGS="$_SAVE_CXXFLAGS $AM_CXXFLAGS -I$MOZILLA_INCLUDE_ROOT `pkg-config
--cflags $MOZILLA-xpcom $MOZILLA-js`"
+
+-TEST_MOZILLA_INCLUDE_DIRS="widget mimetype docshell history dom necko string
layout gfx content js exthandler pipnss uriloader caps xpconnect nkcache"
++TEST_MOZILLA_INCLUDE_DIRS="widget mimetype docshell history dom necko string
layout gfx content exthandler pipnss uriloader caps xpconnect nkcache"
+ for i in $TEST_MOZILLA_INCLUDE_DIRS ; do
+ CXXFLAGS="$CXXFLAGS -I$MOZILLA_INCLUDE_ROOT/$i"
+ done
diff -ruN galeon-2.0.0.orig/debian/rules galeon-2.0.0/debian/rules
--- galeon-2.0.0.orig/debian/rules 2006-02-09 08:54:35.778359216 +0100
+++ galeon-2.0.0/debian/rules 2006-02-09 08:54:25.707890160 +0100
@@ -11,7 +11,7 @@
DEB_OPT_FLAG += -DDEBIAN_VERSION=$(DEB_VERSION)
DEB_CONFIGURE_EXTRA_FLAGS := \
- --enable-nautilus-view=no
+ --enable-nautilus-view=no --with-mozilla=xulrunner
common-install-indep::
# decode new icons, replace sucky icons
