Origin: upstream, other, *
Description: Applied patches. See Vcs-* headers in debian/control.

--- gxine-0.5.906.orig/ChangeLog
+++ gxine-0.5.906/ChangeLog
@@ -1,3 +1,9 @@
+0.5.907: 2012-??-??
+	* Fix compilation with that nice stable API in libmozjs. This time
+	  it's a jsval change in Firefox 9 which is to blame.
+	* Fix a build failure which occurs when how to retrieve certain HAL
+	  properties isn't known. (Observed on Debian hurd-i386.)
+
 0.5.906: 2011-08-11
 	* Reset pointer shape on stream stop/eject.
 	* Use re-entrant versions of xine-lib's XML parser functions
--- gxine-0.5.906.orig/src/preferences.c
+++ gxine-0.5.906/src/preferences.c
@@ -474,8 +474,12 @@ get_hal_device_info (const char *dev)
 
   return get_hal_property (buf, "block.device", "storage.model")
 	 ? : get_hal_property (buf, "block.device", "info.product")
+#ifdef HAL_DEVICE_FILE_PROPERTY
 	 ? : get_hal_property (buf_unprefixed, HAL_DEVICE_FILE_PROPERTY, "info.product")
+#else
 	 /* FIXME - BSD etc. */
+	 ? : NULL
+#endif
 	 ;
 }
 #endif /* WITH_HAL */
--- gxine-0.5.906.orig/src/script_engine.c
+++ gxine-0.5.906/src/script_engine.c
@@ -846,9 +846,13 @@ SE_JS_PROPERTY_SETTER_DECLARE(generic_JS
       se_o_t *p = (se_o_t *) n->data;
       if (!strcasecmp (p->id, prop))
       {
-	static jsval dot = 0;
-	if (!dot)
+	static jsval dot = {0};
+	static int dot_init = 0;
+	if (!dot_init)
+	{
+	  dot_init = 1;
 	  dot = se_js_string_val (cx, ".");
+	}
         if (!SE_JS_CALL_PROPERTY_SETTER_WITH_JSVAL (generic_JSSetProperty, cx, p->obj, dot, vp))
 	  *vp = OBJECT_TO_JSVAL (p->obj);
 	return JS_TRUE;
--- gxine-0.5.906.orig/src/playlist.c
+++ gxine-0.5.906/src/playlist.c
@@ -427,7 +427,7 @@ static int playlist_load (const char *fn
     if (errno != ENOENT && (defaultfile || errno != ENOTDIR))
       display_error (FROM_GXINE, _("Loading of playlist file failed."),
 		     _("Failed to open file ‘%s’\n%s"), fname, strerror (errno));
-    goto ret0;
+    goto ret1;
   }
 
   xml_parser_init_R (xml_parser_t *xml, plfile, st.st_size, XML_PARSER_CASE_INSENSITIVE);
@@ -524,9 +524,10 @@ static int playlist_load (const char *fn
   return 1;
 
   ret0:
-  free (plfile);
   xml_parser_free_tree (root);
   xml_parser_finalize_R (xml);
+  free (plfile);
+  ret1:
   if (defaultfile)
     free ((char *)fname);
   return ret;
