tag 660661 patch pending thanks Cyril Brulebois <k...@debian.org> (20/02/2012): > while checking the feasibility of binNMUing packages for the iceweasel > 10 transition[1,2], I came across a single FTBFS, for gxine. > > 1. http://lists.debian.org/debian-release/2012/02/msg00317.html > 2. http://release.debian.org/transitions/html/iceweasel10.html > > Considering it has no rdeps, removing it from testing temporarily (to > let the transition happen when it's otherwise ready) could be an > option, but we'd rather see a fixed package. :)
I've just uploaded a fixed package (using the attached source debdiff) to DELAYED/5, so that you can still perform a maintainer upload if you wish, and so that it gets a chance to get into the archive before iceweasel reaches 10 days. Mraw, KiBi.
diff -Nru gxine-0.5.906/debian/changelog gxine-0.5.906/debian/changelog
--- gxine-0.5.906/debian/changelog 2012-01-27 02:44:53.000000000 +0100
+++ gxine-0.5.906/debian/changelog 2012-02-21 03:30:23.000000000 +0100
@@ -1,3 +1,13 @@
+gxine (0.5.906-3.1) unstable; urgency=high
+
+ * Non-maintainer upload.
+ * Add iceweasel-10-jsfloat to deal with API changes when switching to
+ iceweasel 10 (Closes: #660661). Thanks to Mike Hommey for the hint!
+ * Pass -lm through LDFLAGS since linking would fail otherwise.
+ * Set urgency to “high” for the RC bug fix.
+
+ -- Cyril Brulebois <k...@debian.org> Tue, 21 Feb 2012 03:30:23 +0100
+
gxine (0.5.906-3) unstable; urgency=low
* Switch to xine-lib-1.2. Build dependencies adjusted accordingly.
diff -Nru gxine-0.5.906/debian/patches/debian-changes gxine-0.5.906/debian/patches/debian-changes
--- gxine-0.5.906/debian/patches/debian-changes 2012-01-27 19:10:57.000000000 +0100
+++ gxine-0.5.906/debian/patches/debian-changes 2012-02-21 03:35:02.000000000 +0100
@@ -69,3 +69,7 @@
if (defaultfile)
free ((char *)fname);
return ret;
+--- /dev/null
++++ gxine-0.5.906/include/version.h
+@@ -0,0 +1 @@
++#define CSET_ID ""
diff -Nru gxine-0.5.906/debian/patches/iceweasel-10-jsfloat gxine-0.5.906/debian/patches/iceweasel-10-jsfloat
--- gxine-0.5.906/debian/patches/iceweasel-10-jsfloat 1970-01-01 01:00:00.000000000 +0100
+++ gxine-0.5.906/debian/patches/iceweasel-10-jsfloat 2012-02-21 03:31:33.000000000 +0100
@@ -0,0 +1,56 @@
+Replace JSFloat64 with jsdouble everywhere.
+--- a/src/engine.c
++++ b/src/engine.c
+@@ -150,7 +150,7 @@ int engine_exec_obj (const char *cmd, se
+ {
+ struct {
+ JSInt32 i;
+- JSFloat64 d;
++ jsdouble d;
+ JSBool b;
+ } num;
+ char *str;
+--- a/src/script_engine.c
++++ b/src/script_engine.c
+@@ -207,7 +207,7 @@ int se_result_int (se_t *se, JSInt32 *nu
+ return 0;
+ }
+
+-int se_result_double (se_t *se, JSFloat64 *num)
++int se_result_double (se_t *se, jsdouble *num)
+ {
+ if (JSVAL_IS_DOUBLE (se->rval))
+ return JS_ValueToNumber (se->cx, se->rval, num);
+@@ -225,7 +225,7 @@ int se_result_num_as_int (se_t *se, JSIn
+ {
+ if (JSVAL_IS_DOUBLE (se->rval))
+ {
+- JSFloat64 f;
++ jsdouble f;
+ JS_ValueToNumber (se->cx, se->rval, &f);
+ *num = floor (f);
+ return 1;
+@@ -233,7 +233,7 @@ int se_result_num_as_int (se_t *se, JSIn
+ return JS_ValueToInt32 (se->cx, se->rval, num);
+ }
+
+-int se_result_num_as_double (se_t *se, JSFloat64 *num)
++int se_result_num_as_double (se_t *se, jsdouble *num)
+ {
+ if (JSVAL_IS_INT (se->rval))
+ {
+--- a/src/script_engine.h
++++ b/src/script_engine.h
+@@ -244,10 +244,10 @@ int se_eval_ext (se_t *, const gchar *,
+ gchar *se_result_str (se_t *se);
+
+ int se_result_int (se_t *se, JSInt32 *num);
+-int se_result_double (se_t *se, JSFloat64 *num);
++int se_result_double (se_t *se, jsdouble *num);
+ int se_result_bool (se_t *se, JSBool *num);
+ int se_result_num_as_int (se_t *se, JSInt32 *num);
+-int se_result_num_as_double (se_t *se, JSFloat64 *num);
++int se_result_num_as_double (se_t *se, jsdouble *num);
+
+ /*
+ * create a script engine object (in javascript name space)
diff -Nru gxine-0.5.906/debian/patches/series gxine-0.5.906/debian/patches/series
--- gxine-0.5.906/debian/patches/series 2012-01-27 19:04:22.000000000 +0100
+++ gxine-0.5.906/debian/patches/series 2012-02-21 03:26:36.000000000 +0100
@@ -1 +1,2 @@
debian-changes
+iceweasel-10-jsfloat
diff -Nru gxine-0.5.906/debian/rules gxine-0.5.906/debian/rules
--- gxine-0.5.906/debian/rules 2012-01-09 18:46:49.000000000 +0100
+++ gxine-0.5.906/debian/rules 2012-02-21 03:25:27.000000000 +0100
@@ -51,7 +51,7 @@
BUILD_TARGET := all
INSTALL_TARGET := install
CFLAGS := -Wall
-LDFLAGS := -Wl,-z,defs
+LDFLAGS := -Wl,-z,defs -lm
DH_STRIP = dh_strip
ifneq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
BUILD_TARGET := debug
signature.asc
Description: Digital signature
