From: Ben Hutchings Date: Sun, 16 Aug 2009 17:54:39 +0000 (+0100) Subject: Set the XULRunner version requirement to exclude 1.9.1 X-Git-Tag: 1.2.8^0 X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=588553096cd61ef36c1bc6ab6133764a608b0ef3;p=videolink.git 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 9f88a4b..bd76af1 100644 --- 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 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 0fc5f26..d673eca 100644 --- 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 baa0748..f32240b 100644 --- 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,