------------------------------------------------------------
revno: 81
tags: 3.1.4-1
committer: Dmitrijs Ledkovs <[email protected]>
branch nick: trunk
timestamp: Sat 2010-11-27 16:41:39 +0000
message:
patches/xul-2.0.patch: bump UPPER_RANGE to allow running against xul20.
added:
debian/patches/xul-2.0.patch
modified:
debian/changelog
debian/patches/series
--
lp:xiphos/debian
https://code.launchpad.net/~pkgcrosswire/xiphos/main
Your team Crosswire Packaging Team is subscribed to branch lp:xiphos/debian.
To unsubscribe from this branch go to
https://code.launchpad.net/~pkgcrosswire/xiphos/main/+edit-subscription
=== modified file 'debian/changelog'
--- debian/changelog 2010-11-14 00:43:39 +0000
+++ debian/changelog 2010-11-27 16:41:39 +0000
@@ -1,4 +1,4 @@
-xiphos (3.1.4-1) UNRELEASED; urgency=low
+xiphos (3.1.4-1) experimental; urgency=low
[ Jonathan Marsden ]
* New upstream release 3.1.4
@@ -8,14 +8,14 @@
* debian/control: Add Jonathan Marsden back into Uploaders.
[ Dmitrijs Ledkovs ]
- * Merged bzr packaging history with lp:xiphos
* Added local options dpkg-source to unapply patches and fail on
upstream source changes (ignoring false positives).
* Added bzr-builddeb hook to generate source-format before build. If you
are not using bzr-builddeb, you must run "./debian/rules clean" before
building.
+ * patches/xul-2.0.patch: bump UPPER_RANGE to allow running against xul20.
- -- Dmitrijs Ledkovs <[email protected]> Sat, 13 Nov 2010 23:52:18 +0000
+ -- Dmitrijs Ledkovs <[email protected]> Thu, 25 Nov 2010 21:26:48 +0000
xiphos (3.1.3-3) unstable; urgency=low
=== modified file 'debian/patches/series'
--- debian/patches/series 2010-11-14 00:43:39 +0000
+++ debian/patches/series 2010-11-27 16:41:39 +0000
@@ -1,1 +1,1 @@
-
+xul-2.0.patch
=== added file 'debian/patches/xul-2.0.patch'
--- debian/patches/xul-2.0.patch 1970-01-01 00:00:00 +0000
+++ debian/patches/xul-2.0.patch 2010-11-27 16:41:39 +0000
@@ -0,0 +1,63 @@
+=== modified file 'src/gecko/gecko-utils.cpp'
+--- a/src/gecko/gecko-utils.cpp 2010-03-29 16:50:00 +0000
++++ b/src/gecko/gecko-utils.cpp 2010-11-26 12:29:42 +0000
+@@ -233,11 +233,9 @@
+ //I have really no clue what this ranges mean but if xulrunner is
+ //outside of this range we get coredumps =( so here is a bold assumption
+ //that we will be able to work with any future xulrunner.
+-#define UPPER_RANGE "1.9.99"
+-#define LOWER_RANGE "1.9.0"
+ static const GREVersionRange greVersion = {
+- LOWER_RANGE, PR_TRUE,
+- UPPER_RANGE, PR_TRUE
++ GECKO_MIN, PR_TRUE,
++ GECKO_MAX, PR_TRUE
+ };
+ char xpcomLocation[PATH_MAX];
+ rv = GRE_GetGREPathWithProperties(&greVersion, 1, nsnull, 0, xpcomLocation, sizeof (xpcomLocation));
+
+=== modified file 'wscript'
+--- a/wscript 2010-11-08 13:20:13 +0000
++++ b/wscript 2010-11-27 11:10:13 +0000
+@@ -311,7 +311,7 @@
+
+
+ if conf.check_cfg(modversion='gtkhtml-editor-3.14',
+- msg='Is post GNOME3 gtkhtml-editor available?',
++ msg='Checking for GNOME3 gtkhtml-editor',
+ okmsg='Deffinatly',
+ errmsg='Probably, not'
+ ):
+@@ -377,6 +377,20 @@
+ args='--variable=sdkdir',
+ okmsg=waffles.misc.myokmsg,
+ msg="Checking for libxul sdkdir").strip())
++ conf.define('GECKO_VER', conf.check_cfg(package='libxul-embedding',
++ args='--modversion',
++ okmsg=waffles.misc.myokmsg,
++ msg="Checking for Gecko GREVersion").strip())
++ if not env['GECKO_VER'][3].isalpha():
++ conf.define('GECKO_MIN', env['GECKO_VER'][0:5]+'.0')
++ conf.define('GECKO_MAX', env['GECKO_VER'][0:5]+'.99')
++ else:
++ conf.define('GECKO_MIN', env['GECKO_VER'][0:4]+'0')
++ conf.define('GECKO_MAX', env['GECKO_VER'][0:3]+'.0.99')
++
++ conf.check_message("Gecko", "GREVersionMin", 1, env['GECKO_MIN'])
++ conf.check_message("Gecko", "GREVersionMax", 1, env['GECKO_MAX'])
++
+ else:
+ d = env['MOZILLA_DISTDIR']
+ conf.define['CPPPATH_GECKO'] = ['%s/sdk/include' % d,
+@@ -389,6 +403,10 @@
+ '%s/include/gfx' % d]
+ conf.define['LIBPATH_GECKO'] = ['%s/sdk/lib' % d]
+ conf.define['LIB_GECKO'] = ['xpcomglue_s', 'xpcom', 'xul', 'nspr4']
++ # FIXME: how to detect Gecko-ver on Win similar to pkg-config on unix?
++ conf.define('GECKO_MIN', '1.9.0.0')
++ conf.define('GECKO_MAX', '2.0.0.*')
++
+
+ env.append_value('ALL_LIBS', 'NSPR')
+ env.append_value('ALL_LIBS', 'GECKO')
+
_______________________________________________
Pkg-crosswire-devel mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-crosswire-devel
