From: Ben Hutchings <ben@decadent.org.uk>
Date: Mon, 7 Feb 2011 12:31:12 +0000 (+0000)
Subject: Merge remote branch 'jcristau/master'
X-Git-Tag: 1.2.10~1
X-Git-Url: https://git.decadent.org.uk/gitweb/?p=videolink.git;a=commitdiff_plain;h=cd758c798d0c48f8161e5102faf8d862ba76aa2d;hp=b4878dceb480836e59032998bf1214f4f015d5ae

Merge remote branch 'jcristau/master'

Update ChangeLog based on debian/changelog entry 1.2.9-2.1.

Resolve conflict on setting of moz_ldflags_extra in Makefile.
---

diff --git a/ChangeLog b/ChangeLog
index 4b1bb2f..7d3e9ba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,14 @@
 videolink (1.2.10) UNRELEASED; urgency=low
 
+  [ Ben Hutchings ]
   * List all needed libraries to the linker.  We were accidentally
     depending on the behaviour of GNU ld, which treats 'needed' as
     transitive by default - Debian bug #556760
 
+  [ Nobuhiro Iwamatsu ]
+  * Define XPCOM_GLUE_USE_NSPR, link against nspr - Debian bug #611389
+  * Include <cstdio> in xpcom_support.cpp - Debian bug #611427
+
  -- Ben Hutchings <ben@decadent.org.uk>  Wed, 18 Nov 2009 02:42:40 +0000
 
 videolink (1.2.9) unstable; urgency=low
diff --git a/Makefile b/Makefile
index 72ce839..7238b7b 100644
--- a/Makefile
+++ b/Makefile
@@ -8,11 +8,12 @@ mandir := $(sharedir)/man
 ifeq ($(shell pkg-config --atleast-version 1.9 mozilla-gtkmozembed-embedding && echo yes),yes)
     moz_name := xulrunner-1.9
     moz_pc := mozilla-gtkmozembed-embedding
-    moz_cppflags_extra := $(shell pkg-config --cflags xulrunner-nspr)
+    moz_cppflags_extra := $(shell pkg-config --cflags xulrunner-nspr) -DXPCOM_GLUE_USE_NSPR
     moz_unstable_cppflags_extra :=
+    moz_ldflags_extra := $(shell pkg-config --libs xulrunner-nspr)
     # libxpcomglue needs libdl, but mozilla-gtkmozembed-embedding.pc
     # doesn't mention it.
-    moz_ldflags_extra := -ldl
+    moz_ldflags_extra += -ldl
 else
     ifeq ($(shell pkg-config --exists xulrunner-gtkmozembed && echo yes),yes)
     moz_name := xulrunner
diff --git a/debian/changelog b/debian/changelog
index f767978..6df306a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+videolink (1.2.9-2.1) unstable; urgency=high
+
+  * Non-maintainer, high urgency upload to fix FTBFS.
+  * Define XPCOM_GLUE_USE_NSPR, link against nspr (closes: #611389).  Patch by
+    Nobuhiro Iwamatsu.
+  * Include <cstdio> in xpcom_support.cpp (closes: #611427).  Patch by
+    Nobuhiro Iwamatsu.
+
+ -- Julien Cristau <jcristau@debian.org>  Wed, 02 Feb 2011 15:23:49 +0100
+
 videolink (1.2.9-2) unstable; urgency=low
 
   * Use dh_xulrunner to determine xulrunner dependency
diff --git a/xpcom_support.cpp b/xpcom_support.cpp
index 2c452d7..5c8b26e 100644
--- a/xpcom_support.cpp
+++ b/xpcom_support.cpp
@@ -1,6 +1,7 @@
 // Copyright 2005 Ben Hutchings <ben@decadent.org.uk>.
 // See the file "COPYING" for licence details.
 
+#include <cstdio>
 #include <cassert>
 #include <memory>
 #include <stdexcept>