From: Julien Cristau <jcristau@debian.org>
Date: Wed, 2 Feb 2011 14:21:14 +0000 (+0100)
Subject: Define XPCOM_GLUE_USE_NSPR, link against nspr (closes: #611389).
X-Git-Tag: 1.2.10~1^2~2
X-Git-Url: https://git.decadent.org.uk/gitweb/?p=videolink.git;a=commitdiff_plain;h=b409f253ecd2899fe61a78739a0d4123f5c21702

Define XPCOM_GLUE_USE_NSPR, link against nspr (closes: #611389).

Patch by Nobuhiro Iwamatsu.
---

diff --git a/Makefile b/Makefile
index b9b794e..c250490 100644
--- a/Makefile
+++ b/Makefile
@@ -8,9 +8,9 @@ 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 :=
+    moz_ldflags_extra := $(shell pkg-config --libs xulrunner-nspr)
 else
     ifeq ($(shell pkg-config --exists xulrunner-gtkmozembed && echo yes),yes)
     moz_name := xulrunner
diff --git a/debian/changelog b/debian/changelog
index f767978..9714072 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+videolink (1.2.9-2.1) UNRELEASED; urgency=high
+
+  * Define XPCOM_GLUE_USE_NSPR, link against nspr (closes: #611389).  Patch by
+    Nobuhiro Iwamatsu.
+
+ -- Julien Cristau <jcristau@debian.org>  Wed, 02 Feb 2011 15:19:38 +0100
+
 videolink (1.2.9-2) unstable; urgency=low
 
   * Use dh_xulrunner to determine xulrunner dependency