On Wed, Feb 02, 2011 at 09:03:35AM +0900, Nobuhiro Iwamatsu wrote: > Hi, > > On Tue, Feb 01, 2011 at 06:35:15AM +0000, Adam D. Barratt wrote: > > Hi Nobuhiro, > > > > On Sun, 2011-01-30 at 07:24 +0900, Nobuhiro Iwamatsu wrote: > > > We lacked defined of the XPCOM_GLUE_USE_NSPRB. > > > I attached the patch which revised this problem. > > > > Thanks for your work on these bugs. Would you consider uploading an NMU > > incorporating your patches, in order to have the bugs resolved for the > > Squeeze release? > > > > OK, I am going to upload videolink with urgency=high. > And I do bug report of unblock.
Hi, release team. I just uploaded with the attached patch. Please unblock videolink/1.2.9-2.1. videolink (1.2.9-2.1) unstable; urgency=high * Non-maintainer upload. * Update debian/control. Add quilt to Build-Depends. * Add patches/611389.patch (Closes: #611389). - Fix FTBFS: error: 'struct nsID' has no member named 'ToProvidedString'. * Add patches/611427.patch (Closes* #611427). - Fix FTBFS: error: ‘sprintf’ is not a member of ‘std’. -- Nobuhiro Iwamatsu <[email protected]> Wed, 02 Feb 2011 08:51:32 +0900 Best regards, Nobuhiro
diff -u videolink-1.2.9/debian/rules videolink-1.2.9/debian/rules
--- videolink-1.2.9/debian/rules
+++ videolink-1.2.9/debian/rules
@@ -1,6 +1,7 @@
#!/usr/bin/make -f
build :
+ QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
$(MAKE) prefix=/usr
binary : binary-arch binary-indep
@@ -26,6 +27,8 @@
binary-indep :
clean :
+ QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
+ rm -rf .pc
$(MAKE) clean
dh_clean
diff -u videolink-1.2.9/debian/changelog videolink-1.2.9/debian/changelog
--- videolink-1.2.9/debian/changelog
+++ videolink-1.2.9/debian/changelog
@@ -1,3 +1,15 @@
+videolink (1.2.9-2.1) unstable; urgency=high
+
+ * Non-maintainer upload.
+ * Update debian/control.
+ Add quilt to Build-Depends.
+ * Add patches/611389.patch (Closes: #611389).
+ - Fix FTBFS: error: 'struct nsID' has no member named 'ToProvidedString'.
+ * Add patches/611427.patch (Closes* #611427).
+ - Fix FTBFS: error: ‘sprintf’ is not a member of ‘std’.
+
+ -- Nobuhiro Iwamatsu <[email protected]> Wed, 02 Feb 2011 08:51:32 +0900
+
videolink (1.2.9-2) unstable; urgency=low
* Use dh_xulrunner to determine xulrunner dependency
diff -u videolink-1.2.9/debian/control videolink-1.2.9/debian/control
--- videolink-1.2.9/debian/control
+++ videolink-1.2.9/debian/control
@@ -2,7 +2,7 @@
Maintainer: Ben Hutchings <[email protected]>
Section: contrib/video
Priority: extra
-Build-Depends: debhelper (>=4), libgtkmm-2.4-dev, xulrunner-dev (>=
1.9.1.3-2), libexpat1-dev
+Build-Depends: debhelper (>=4), libgtkmm-2.4-dev, xulrunner-dev (>=
1.9.1.3-2), libexpat1-dev, quilt
Standards-Version: 3.8.0
Vcs-Browser: http://git.decadent.org.uk/gitweb?p=videolink.git
Vcs-Git: http://git.decadent.org.uk/git/videolink.git
only in patch2:
unchanged:
--- videolink-1.2.9.orig/debian/patches/611389.patch
+++ videolink-1.2.9/debian/patches/611389.patch
@@ -0,0 +1,16 @@
+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
only in patch2:
unchanged:
--- videolink-1.2.9.orig/debian/patches/series
+++ videolink-1.2.9/debian/patches/series
@@ -0,0 +1,2 @@
+611389.patch
+611427.patch
only in patch2:
unchanged:
--- videolink-1.2.9.orig/debian/patches/611427.patch
+++ videolink-1.2.9/debian/patches/611427.patch
@@ -0,0 +1,12 @@
+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 <[email protected]>.
+ // See the file "COPYING" for licence details.
+
++#include <cstdio>
+ #include <cassert>
+ #include <memory>
+ #include <stdexcept>
signature.asc
Description: Digital signature
