Bug#861039: unblock: jd/1:2.8.9-150226-5+b1
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package jd
jd was not in testing since it has FTBFS and it can be fixed with below change.
+- const bool is_drawarea_realized(){ return m_window; }
++ const bool is_drawarea_realized(){ return static_cast<bool>(m_window); }
Could you review debdiff and put it to testing if you can.
(packaging changes are more than patch for FTBFS sicne it was committed
in repository long time ago...)
diff -Nru jd-2.8.9-150226/debian/changelog jd-2.8.9-150226/debian/changelog
--- jd-2.8.9-150226/debian/changelog 2015-12-13 16:23:40.000000000 +0900
+++ jd-2.8.9-150226/debian/changelog 2017-04-24 07:21:46.000000000 +0900
@@ -1,3 +1,17 @@
+jd (1:2.8.9-150226-6) unstable; urgency=medium
+
+ * use debhelper 10
+ - simplify debian/rules
+ - update debian/compat
+ - simplify debian/control
+ * debian/control
+ - set Standards-Version: 3.9.8
+ * debian/patches
+ - add fix-build-failure-with-newer-lib.patch to fix FTBFS
+ Thanks to anonymous Arch user.
+
+ -- Hideki Yamane <henrich@debian.org> Mon, 24 Apr 2017 07:21:46 +0900
+
jd (1:2.8.9-150226-5) unstable; urgency=medium
* remove unnecessary debian/menu file
diff -Nru jd-2.8.9-150226/debian/compat jd-2.8.9-150226/debian/compat
--- jd-2.8.9-150226/debian/compat 2015-12-13 16:23:40.000000000 +0900
+++ jd-2.8.9-150226/debian/compat 2017-04-24 07:21:46.000000000 +0900
@@ -1 +1 @@
-9
+10
diff -Nru jd-2.8.9-150226/debian/control jd-2.8.9-150226/debian/control
--- jd-2.8.9-150226/debian/control 2015-12-13 16:23:40.000000000 +0900
+++ jd-2.8.9-150226/debian/control 2017-04-24 07:21:46.000000000 +0900
@@ -2,11 +2,11 @@
Section: net
Priority: optional
Maintainer: Hideki Yamane <henrich@debian.org>
-Build-Depends: debhelper (>= 9), autoconf, automake, libtool,
+Build-Depends: debhelper (>= 10),
libgnutls28-dev, libgcrypt20-dev, libgtkmm-2.4-dev, zlib1g-dev, libmigemo-dev,
libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386]
Homepage: http://jd4linux.osdn.jp/
-Standards-Version: 3.9.6
+Standards-Version: 3.9.8
Vcs-Git: https://anonscm.debian.org/git/collab-maint/jd.git
Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/jd.git/
diff -Nru jd-2.8.9-150226/debian/patches/fix-build-failure-with-newer-lib.patch jd-2.8.9-150226/debian/patches/fix-build-failure-with-newer-lib.patch
--- jd-2.8.9-150226/debian/patches/fix-build-failure-with-newer-lib.patch 1970-01-01 09:00:00.000000000 +0900
+++ jd-2.8.9-150226/debian/patches/fix-build-failure-with-newer-lib.patch 2017-04-24 07:21:46.000000000 +0900
@@ -0,0 +1,11 @@
+--- a/src/article/drawareabase.h
++++ b/src/article/drawareabase.h
+@@ -330,7 +330,7 @@
+
+ // リアライズしたか
+ // Gtk::Widget::is_realized() はうまく動作しない
+- const bool is_drawarea_realized(){ return m_window; }
++ const bool is_drawarea_realized(){ return static_cast<bool>(m_window); }
+
+ // 文字色のID( colorid.h にある ID を指定)
+ const int get_colorid_text() const{ return m_colorid_text; }
diff -Nru jd-2.8.9-150226/debian/patches/series jd-2.8.9-150226/debian/patches/series
--- jd-2.8.9-150226/debian/patches/series 2015-12-13 16:23:40.000000000 +0900
+++ jd-2.8.9-150226/debian/patches/series 2017-04-24 07:21:46.000000000 +0900
@@ -1,3 +1,4 @@
+fix-build-failure-with-newer-lib.patch
browsers.cpp
add-keywords-entry-in-desktop.patch
remove-timestamps_from_cpp_macros.patch
diff -Nru jd-2.8.9-150226/debian/rules jd-2.8.9-150226/debian/rules
--- jd-2.8.9-150226/debian/rules 2015-12-13 16:23:40.000000000 +0900
+++ jd-2.8.9-150226/debian/rules 2017-04-24 07:21:46.000000000 +0900
@@ -12,29 +12,11 @@
--with-migemo --with-migemodict=/usr/share/cmigemo/utf-8/migemo-dict
%:
- dh $@ --parallel
+ dh $@
override_dh_auto_configure:
- touch $(CURDIR)/debian/generatedfiles
- autoreconf -i
dh_auto_configure -- $(jd_option)
-override_dh_auto_clean:
- [ ! -f Makefile ] || $(MAKE) clean
- dh_clean
-
- -@rm -f $(CURDIR)/config.[a-z]* $(CURDIR)/ltmain.sh $(CURDIR)/install-sh
- -@find $(CURDIR) -name .deps -exec rm -rf {} \;
-
- if [ -f $(CURDIR)/debian/generatedfiles ]; then \
- find $(CURDIR) -path $(CURDIR)/debian -prune -o -name configure.in \
- -o -name Makefile.am -o -name browsers.cpp -o -name core.cpp \
- -o -name jdversion.h -o -name cache.h -o -name confloader.cpp \
- -o -name misctime.cpp -o -name miscutil.cpp \
- -o -newer $(CURDIR)/debian/generatedfiles -type f -exec rm {} \; ; \
- fi
- -rm -f $(CURDIR)/debian/generatedfiles
-
override_dh_installchangelogs:
dh_installchangelogs ChangeLog
unblock jd/1:2.8.9-150226-5+b1
Reply to: