On 29.08.2017 at 21:22 +0200, Andrey Rahmatullin wrote:
On Tue, Aug 29, 2017 at 08:22:28PM +0200, Mateusz Łukasik wrote:
If parallel is more than 1 (-j1) when is this FTFBS. I will try fix that.
Actually you shouldn't fix that if the package works with -J but fails
with -j.
Please send the nmudiff to the original bug and I will sponsor this.
In my case is FTBFS in both cases.
debdiff attacted.
--
.''`. Mateusz Łukasik
: :' : https://l0calh0st.pl
`. `' Debian Member - mat...@linuxmint.pl
`- GPG: D93B 0C12 C8D0 4D7A AFBC FA27 CCD9 1D61 11A0 6851
diff -Nru kadu-4.1/debian/changelog kadu-4.1/debian/changelog
--- kadu-4.1/debian/changelog 2016-11-28 09:15:45.000000000 +0100
+++ kadu-4.1/debian/changelog 2017-08-30 19:57:07.000000000 +0200
@@ -1,3 +1,12 @@
+kadu (4.1-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Add patch to fix FTBFS with gcc-7. Thanks Fanael Linithien (Closes:
#853470)
+ * debian/rules: remove NJOBS and CMAKE_INSTALL_ALWAYS=1 for fix FTBFS with
+ parallel.
+
+ -- Mateusz Łukasik <mat...@linuxmint.pl> Wed, 30 Aug 2017 19:57:07 +0200
+
kadu (4.1-1) unstable; urgency=medium
* New upstream release. (Closes: #841787)
diff -Nru kadu-4.1/debian/patches/06-fix-ftbfs-with-gcc7.patch
kadu-4.1/debian/patches/06-fix-ftbfs-with-gcc7.patch
--- kadu-4.1/debian/patches/06-fix-ftbfs-with-gcc7.patch 1970-01-01
01:00:00.000000000 +0100
+++ kadu-4.1/debian/patches/06-fix-ftbfs-with-gcc7.patch 2017-08-18
14:23:18.000000000 +0200
@@ -0,0 +1,13 @@
+Description: add missing #include to fix ftbfs with GCC 7
+Author: Fanael Linithien <fana...@gmail.com>
+
+--- a/kadu-core/plugin/dependency-graph/plugin-dependency-graph-builder.h
++++ b/kadu-core/plugin/dependency-graph/plugin-dependency-graph-builder.h
+@@ -22,6 +22,7 @@
+ #include <QtCore/QObject>
+ #include <map>
+ #include <set>
++#include <functional>
+
+ #include "plugin/dependency-graph/plugin-dependency-graph.h"
+ #include "exports.h"
diff -Nru kadu-4.1/debian/patches/series kadu-4.1/debian/patches/series
--- kadu-4.1/debian/patches/series 2016-11-28 09:15:45.000000000 +0100
+++ kadu-4.1/debian/patches/series 2017-08-28 10:52:51.000000000 +0200
@@ -2,3 +2,4 @@
03-exclude_unsupported_plugins.patch
04-fix_compilation_error_c++14_vs_gnu++11.patch
05-no_tests_during_build.patch
+06-fix-ftbfs-with-gcc7.patch
diff -Nru kadu-4.1/debian/rules kadu-4.1/debian/rules
--- kadu-4.1/debian/rules 2016-11-28 09:15:45.000000000 +0100
+++ kadu-4.1/debian/rules 2017-08-30 19:30:40.000000000 +0200
@@ -13,11 +13,6 @@
CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS)
LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
-ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
- NJOBS:=-j $(patsubst parallel=%,%,$(filter
parallel=%,$(DEB_BUILD_OPTIONS)))
-endif
-
-
configure: configure-stamp
configure-stamp:
dh_testdir
@@ -52,7 +47,7 @@
dh_testroot
dh_prep -i
dh_installdirs -i
- cd $(BUILD_DIR) && $(MAKE) DESTDIR=$(INSTALL_DIR) install
+ cd $(BUILD_DIR) && $(MAKE) CMAKE_INSTALL_ALWAYS=1
DESTDIR=$(INSTALL_DIR) install
# Remove all license files
find $(INSTALL_DIR) -name '[lL][iI][cC][eE][nN][sS][eE].txt' -delete
# Remove all thumbnails files
@@ -64,7 +59,7 @@
dh_testroot
dh_prep -s
dh_installdirs -s
- cd $(BUILD_DIR) && $(MAKE) DESTDIR=$(INSTALL_DIR) install
+ cd $(BUILD_DIR) && $(MAKE) CMAKE_INSTALL_ALWAYS=1
DESTDIR=$(INSTALL_DIR) install
cp $(INSTALL_DIR)/usr/share/kadu/ChangeLog
debian/kadu/usr/share/doc/kadu/about-changes-tab.txt
# Rmove some cruft
# Remove RPATH from all the plugins
