[SCM] qbs packaging branch, master, updated. debian/1.8.1+dfsg-1-2-g9ccd968
Dmitry Shachnev
mitya57 at moszumanska.debian.org
Mon Jul 10 10:32:32 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qbs.git;a=commitdiff;h=9ccd968
The following commit has been merged in the master branch:
commit 9ccd968c01a28ab8a445c53a723e9128b0e51541
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date: Mon Jul 10 13:32:07 2017 +0300
Install missing tools/version.h header to fix QtCreator build.
---
debian/changelog | 1 +
debian/patches/install_missing_header.diff | 16 ++++++++++++++++
debian/patches/series | 1 +
3 files changed, 18 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 0c270f7..dc4672c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
qbs (1.8.1+dfsg-2) UNRELEASED; urgency=medium
+ * Install missing tools/version.h header to fix QtCreator build.
-- Dmitry Shachnev <mitya57 at debian.org> Mon, 10 Jul 2017 13:27:31 +0300
diff --git a/debian/patches/install_missing_header.diff b/debian/patches/install_missing_header.diff
new file mode 100644
index 0000000..cbb628a
--- /dev/null
+++ b/debian/patches/install_missing_header.diff
@@ -0,0 +1,16 @@
+Description: install missing public header
+Origin: https://codereview.qt-project.org/199668
+Last-Update: 2017-07-10
+
+--- a/src/lib/corelib/tools/tools.pri
++++ b/src/lib/corelib/tools/tools.pri
+@@ -125,7 +125,8 @@
+ $$PWD/generatorpluginmanager.h \
+ $$PWD/installoptions.h \
+ $$PWD/setupprojectparameters.h \
+- $$PWD/toolchains.h
++ $$PWD/toolchains.h \
++ $$PWD/version.h
+ tools_headers.path = $${QBS_INSTALL_PREFIX}/include/qbs/tools
+ INSTALLS += tools_headers
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 585e8ce..9c75c6d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ disable_tests_qtscript.diff
skip_test_concurrent.diff
fix_ftbfs_gcc6.diff
kfreebsd_soname.diff
+install_missing_header.diff
--
qbs packaging
More information about the pkg-kde-commits
mailing list