Control: tags -1 + pending I've tested gxine with the patch now and everything seems to work as expected. I've also gone through the code a bit more and couldn't find any place where Javascript is used for more than the custom code to run for keybindings.
So here comes the usual nmudiff text: Dear maintainer, I've prepared an NMU for gxine (versioned as 0.5.907-2.1) and uploaded it to DELAYED/5. Please feel free to tell me if I should delay it longer. Regards. -- Sebastian Ramacher
diff -Nru gxine-0.5.907/debian/changelog gxine-0.5.907/debian/changelog --- gxine-0.5.907/debian/changelog 2012-06-08 18:57:10.000000000 +0200 +++ gxine-0.5.907/debian/changelog 2013-08-07 15:09:37.000000000 +0200 @@ -1,3 +1,15 @@ +gxine (0.5.907-2.1) unstable; urgency=low + + * Non-maintainer upload. + * debian/patches: + - glib.patch: Fix building with newer glib. Thanks to Micheal Biebl for + the patch. (Closes: #665555) + - underlinkage.patch: Link with -ldl and -lm to fix unresolved symbols. + * debian/control: Replace libmozjs-dev with libmozjs185-dev since gxine + doesn't build with libmozjs-dev from iceweasel 17. + + -- Sebastian Ramacher <sramac...@debian.org> Wed, 07 Aug 2013 15:09:34 +0200 + gxine (0.5.907-2) unstable; urgency=low * Switched source maintenance to mercurial-buildpackage. diff -Nru gxine-0.5.907/debian/control gxine-0.5.907/debian/control --- gxine-0.5.907/debian/control 2012-06-08 18:56:59.000000000 +0200 +++ gxine-0.5.907/debian/control 2013-08-06 15:06:02.000000000 +0200 @@ -6,7 +6,7 @@ Build-Depends: debhelper (>> 5.0.0), libxine2-dev, libxine2-misc-plugins, libgtk2.0-dev (>= 2.8.0), - libmozjs-dev, liblircclient-dev, + libmozjs185-dev, liblircclient-dev, libdbus-glib-1-dev, libgudev-1.0-dev [linux-any], libhal-dev [!linux-any], libxcb1-dev | x11-common (<< 1:7.2), diff -Nru gxine-0.5.907/debian/patches/glib.patch gxine-0.5.907/debian/patches/glib.patch --- gxine-0.5.907/debian/patches/glib.patch 1970-01-01 01:00:00.000000000 +0100 +++ gxine-0.5.907/debian/patches/glib.patch 2013-08-06 15:34:33.000000000 +0200 @@ -0,0 +1,42 @@ +Description: Replace include of individual glib headers with #include <glib.h> +Author: Michael Biebl <bi...@debian.org> +Last-Update: 2013-08-06 + +Index: gxine-0.5.907/src/console_output.h +=================================================================== +--- gxine-0.5.907.orig/src/console_output.h 2010-04-11 16:46:54.000000000 +0200 ++++ gxine-0.5.907/src/console_output.h 2012-12-16 05:51:59.294513288 +0100 +@@ -21,7 +21,7 @@ + #ifndef GXINE_CONSOLE_OUTPUT_H + #define GXINE_CONSOLE_OUTPUT_H + +-#include <glib/gmessages.h> ++#include <glib.h> + + void console_output_init (void); + +Index: gxine-0.5.907/src/engine.c +=================================================================== +--- gxine-0.5.907.orig/src/engine.c 2011-10-12 00:47:52.000000000 +0200 ++++ gxine-0.5.907/src/engine.c 2012-12-16 05:51:59.134511591 +0100 +@@ -30,7 +30,7 @@ + #include <errno.h> + #include <unistd.h> + +-#include <glib/gthread.h> ++#include <glib.h> + + #include "engine.h" + #include "ui.h" +Index: gxine-0.5.907/src/main.c +=================================================================== +--- gxine-0.5.907.orig/src/main.c 2010-12-05 12:38:44.000000000 +0100 ++++ gxine-0.5.907/src/main.c 2012-12-16 05:51:59.226512567 +0100 +@@ -46,7 +46,6 @@ + #include <gdk/gdk.h> + #include <gdk/gdkkeysyms.h> + #include <glib.h> +-#include <glib/gmessages.h> + + #include "desktop_integration.h" + #include "engine.h" diff -Nru gxine-0.5.907/debian/patches/series gxine-0.5.907/debian/patches/series --- gxine-0.5.907/debian/patches/series 1970-01-01 01:00:00.000000000 +0100 +++ gxine-0.5.907/debian/patches/series 2013-08-06 15:18:51.000000000 +0200 @@ -0,0 +1,2 @@ +glib.patch +underlinkage.patch diff -Nru gxine-0.5.907/debian/patches/underlinkage.patch gxine-0.5.907/debian/patches/underlinkage.patch --- gxine-0.5.907/debian/patches/underlinkage.patch 1970-01-01 01:00:00.000000000 +0100 +++ gxine-0.5.907/debian/patches/underlinkage.patch 2013-08-06 15:35:06.000000000 +0200 @@ -0,0 +1,26 @@ +Description: Link with -ldl and -lm +Author: Sebastian Ramacher <sramac...@debian.org> +Last-Update: 2013-08-06 + +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -53,7 +53,7 @@ + gxine_LDADD = $(XINE_LIBS) $(GTK2_LIBS) $(GTHREAD2_LIBS) \ + $(JS_LIBS) $(HAL_LIBS) $(UDEV_LIBS) $(DBUS_LIBS) $(LIRC_LIBS) \ + $(X_LIBS) $(X_EXTRA_LIBS) $(XEXT_LIBS) $(XTEST_LIBS) \ +- $(XINERAMA_LIBS) $(XRANDR_LIBS) $(XCB_LIBS) ++ $(XINERAMA_LIBS) $(XRANDR_LIBS) $(XCB_LIBS) -ldl -lm + + gxine_client_SOURCES = client.c console_output.c + +--- a/src/Makefile.in ++++ b/src/Makefile.in +@@ -377,7 +377,7 @@ + gxine_LDADD = $(XINE_LIBS) $(GTK2_LIBS) $(GTHREAD2_LIBS) \ + $(JS_LIBS) $(HAL_LIBS) $(UDEV_LIBS) $(DBUS_LIBS) $(LIRC_LIBS) \ + $(X_LIBS) $(X_EXTRA_LIBS) $(XEXT_LIBS) $(XTEST_LIBS) \ +- $(XINERAMA_LIBS) $(XRANDR_LIBS) $(XCB_LIBS) ++ $(XINERAMA_LIBS) $(XRANDR_LIBS) $(XCB_LIBS) -ldl -lm + + gxine_client_SOURCES = client.c console_output.c + gxine_client_CFLAGS = $(AM_CFLAGS) -DGXINE_CLIENT
signature.asc
Description: Digital signature
