[SCM] qtcreator packaging branch, master, updated. debian/4.2.0-1-8-g5497875

[Adam Majer]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtcreator.git;a=commitdiff;h=5497875

The following commit has been merged in the master branch:
commit 54978752e1c11b060e98388cf4791182e37718b4
Author: Adam Majer <adamm at zombino.com>
Date:   Thu Jul 6 01:11:22 2017 +0200

    Refresh patches and fix compilation with Qt 4.7.1
---
 debian/changelog                           |  5 +++++
 debian/patches/fix_documentation_path.diff | 19 +++++++++++++++++
 debian/patches/qbs_set.diff                | 34 ++++++++++++++++++++++++++++++
 debian/patches/remove_libexec.diff         | 11 ++++++++--
 debian/patches/series                      |  2 ++
 5 files changed, 69 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0fa8d59..e4139eb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,11 @@ qtcreator (4.3.1-1) UNRELEASED; urgency=medium
     + Fix memory leak in code completion
     + Fix crash when requesting refactoring on invalid C++ code
   * Remove qtscript5-private-dev as a BuildDepend
+  * remove_libexec.diff: refreshed
+  * qbs_set.diff: fix compilation with Qt 4.7.1
+  * fix_documentation_path.diff: re-add. We are putting compiled
+    documentation in compiled directory instead of human readable
+    documentation directory
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 01 Jun 2017 20:41:24 -0500
 
diff --git a/debian/patches/fix_documentation_path.diff b/debian/patches/fix_documentation_path.diff
new file mode 100644
index 0000000..b1371c8
--- /dev/null
+++ b/debian/patches/fix_documentation_path.diff
@@ -0,0 +1,19 @@
+---
+ src/plugins/coreplugin/icore.cpp |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/qtcreator.pri
++++ b/qtcreator.pri
+@@ -131,11 +131,11 @@ osx {
+     isEmpty(IDE_OUTPUT_PATH): IDE_OUTPUT_PATH = $$IDE_BUILD_TREE
+ 
+     IDE_LIBRARY_PATH = $$IDE_OUTPUT_PATH/$$IDE_LIBRARY_BASENAME/qtcreator
+     IDE_PLUGIN_PATH  = $$IDE_LIBRARY_PATH/plugins
+     IDE_DATA_PATH    = $$IDE_OUTPUT_PATH/share/qtcreator
+-    IDE_DOC_PATH     = $$IDE_OUTPUT_PATH/share/doc/qtcreator
++    IDE_DOC_PATH     = $$IDE_OUTPUT_PATH/share/qtcreator/doc
+     IDE_BIN_PATH     = $$IDE_OUTPUT_PATH/bin
+     win32: \
+         IDE_LIBEXEC_PATH = $$IDE_OUTPUT_PATH/bin
+     else: \
+         IDE_LIBEXEC_PATH = $$IDE_LIBRARY_PATH/libexec
diff --git a/debian/patches/qbs_set.diff b/debian/patches/qbs_set.diff
new file mode 100644
index 0000000..606ed73
--- /dev/null
+++ b/debian/patches/qbs_set.diff
@@ -0,0 +1,34 @@
+Author: Adam Majer <adamm at zombino.com>
+Date: Thu Jul  6 01:04:24 CEST 2017
+Summary: Compilation fails with Qt 4.7.1 otherwise
+
+--- a/src/plugins/qbsprojectmanager/qbsnodetreebuilder.cpp
++++ b/src/plugins/qbsprojectmanager/qbsnodetreebuilder.cpp
+@@ -189,11 +189,11 @@ QStringList unreferencedBuildSystemFiles
+ {
+     QStringList result;
+     if (!p.isValid())
+         return result;
+ 
+-    const std::set<QString> &available = p.buildSystemFiles();
++    const QSet<QString> &available = p.buildSystemFiles();
+     QList<QString> referenced = referencedBuildSystemFiles(p.projectData()).toList();
+     Utils::sort(referenced);
+     std::set_difference(available.begin(), available.end(), referenced.begin(), referenced.end(),
+                         std::back_inserter(result));
+     return result;
+--- a/src/plugins/qbsprojectmanager/qbsproject.cpp
++++ b/src/plugins/qbsprojectmanager/qbsproject.cpp
+@@ -408,11 +408,11 @@ bool QbsProject::checkCancelStatus()
+     m_qbsProjectParser = 0;
+     parseCurrentBuildConfiguration();
+     return true;
+ }
+ 
+-static QSet<QString> toQStringSet(const std::set<QString> &src)
++static QSet<QString> toQStringSet(const QSet<QString> &src)
+ {
+     QSet<QString> result;
+     result.reserve(int(src.size()));
+     std::copy(src.begin(), src.end(), Utils::inserter(result));
+     return result;
diff --git a/debian/patches/remove_libexec.diff b/debian/patches/remove_libexec.diff
index 7e0a7c3..dff93d8 100644
--- a/debian/patches/remove_libexec.diff
+++ b/debian/patches/remove_libexec.diff
@@ -1,6 +1,8 @@
 --- a/qtcreator.pri
 +++ b/qtcreator.pri
-@@ -138,7 +138,7 @@ osx {
+@@ -136,22 +136,22 @@ osx {
+     IDE_DOC_PATH     = $$IDE_OUTPUT_PATH/share/doc/qtcreator
+     IDE_BIN_PATH     = $$IDE_OUTPUT_PATH/bin
      win32: \
          IDE_LIBEXEC_PATH = $$IDE_OUTPUT_PATH/bin
      else: \
@@ -9,7 +11,10 @@
      !isEqual(IDE_SOURCE_TREE, $$IDE_OUTPUT_PATH):copydata = 1
  
      LINK_LIBRARY_PATH = $$IDE_BUILD_TREE/$$IDE_LIBRARY_BASENAME/qtcreator
-@@ -149,7 +149,7 @@ osx {
+     LINK_PLUGIN_PATH  = $$LINK_LIBRARY_PATH/plugins
+ 
+     INSTALL_LIBRARY_PATH = $$QTC_PREFIX/$$IDE_LIBRARY_BASENAME/qtcreator
+     INSTALL_PLUGIN_PATH  = $$INSTALL_LIBRARY_PATH/plugins
      win32: \
          INSTALL_LIBEXEC_PATH = $$QTC_PREFIX/bin
      else: \
@@ -18,3 +23,5 @@
      INSTALL_DATA_PATH    = $$QTC_PREFIX/share/qtcreator
      INSTALL_DOC_PATH     = $$QTC_PREFIX/share/doc/qtcreator
      INSTALL_BIN_PATH     = $$QTC_PREFIX/bin
+     INSTALL_APP_PATH     = $$QTC_PREFIX/bin
+ }
diff --git a/debian/patches/series b/debian/patches/series
index ba9b1d7..388fc59 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,5 @@ always_autotect_qt_versions
 fix_qt_version_autodetection.diff
 missing_header.diff
 remove_libexec.diff
+qbs_set.diff
+fix_documentation_path.diff

-- 
qtcreator packaging