Set the XULRunner version requirement to exclude 1.9.1

XULRunner 1.9.1 makes an incompatible interface change which we aren't
ready to adapt to.

diff --git a/ChangeLog b/ChangeLog
index 9f88a4b156b4c850f76a846dc38fcc8fc48f6be0..bd76af1bb9ad28c365c776dea01e138e89fb47b4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+videolink (1.2.8) unstable; urgency=low
+
+  * Set the XULRunner version requirement to exclude 1.9.1 since it
+    makes an incompatible interface change
+
+ -- Ben Hutchings <ben@decadent.org.uk>  Sun, 16 Aug 2009 18:39:50 +0100
+
 videolink (1.2.7) unstable; urgency=low
 
   * Remove redundant '-vcodec' option to ffmpeg which stopped working

diff --git a/README b/README
index 0fc5f26fb77318b94b8c2b2a88fb67d9b81d6444..d673eca94058387b375999feae53302ea396afd6 100644 (file)
--- a/README
+++ b/README
@@ -24,7 +24,7 @@ VideoLink depends on the following software:
   - both of:
     - mjpegtools 1.8 or later
     - netpbm
-- Mozilla 1.8 or later, or XULRunner
+- Mozilla 1.8 or later, or XULRunner 1.9 (currently 1.9.1 is not compatible)
 - Xvfb (from XFree86 or X.org)
 
 To build a complete DVD image you will also need:

diff --git a/browser_widget.cpp b/browser_widget.cpp
index baa0748b36eafb9863cfceb7fda2ccbdbb506664..f32240b96eb5bb497f9b9079d3feb7412e935350 100644 (file)
--- a/browser_widget.cpp
+++ b/browser_widget.cpp
@@ -533,7 +533,7 @@ browser_widget::initialiser::initialiser()
 #if MOZ_VERSION_MAJOR == 1 && MOZ_VERSION_MINOR == 9
     static const GREVersionRange gre_versions = {
        "1.9a", PR_TRUE,
-       "1.9.*", PR_TRUE
+       "1.9.1", PR_FALSE
     };
     char path[PATH_MAX];
     check(GRE_GetGREPathWithProperties(&gre_versions, 1, 0, 0,