[SCM] qtcreator packaging branch, master, updated. debian/3.6.1-1-19-g9a43289

Adam Majer adamm at moszumanska.debian.org
Mon May 30 18:04:35 UTC 2016 

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

The following commit has been merged in the master branch:
commit ab8c9c88af2535f05686d8a1ad98b7b8c6f24d1b
Author: Adam Majer <adamm at zombino.com>
Date:   Sun May 29 23:00:09 2016 +0200

    Refresh all the patches
---
 debian/changelog                                 | 10 +++++++++-
 debian/patches/always_autotect_qt_versions       | 13 ++++++-------
 debian/patches/fix_documentation_path.diff       |  8 +++++---
 debian/patches/fix_qt_version_autodetection.diff | 22 ++++++++++++----------
 debian/patches/missing_header.diff               |  6 +++---
 debian/patches/remove_libexec.diff               | 14 +++++++-------
 6 files changed, 42 insertions(+), 31 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3a30ff7..4053bf9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,7 @@ qtcreator (4.0.0-1) UNRELEASED; urgency=medium
 
   [ Lisandro Damián Nicanor Pérez Meyer ]
   * New upstream release.
-    - Bump qbs-dev to 1.5.0.
+    + Bump qbs-dev to 1.5.0.
   * Instruct uscan to repack the original source with xz compression.
   * Remove 02_use_x-terminal-emulator.diff, already present upstream.
   * Refresh botan_system_lib.diff.
@@ -15,6 +15,14 @@ qtcreator (4.0.0-1) UNRELEASED; urgency=medium
   * Make qtcreator recommend clang, as it has added quite interesting tools
     that use it.
 
+  [ Adam Majer ]
+  * Refresh patches:
+    + always_autotect_qt_versions
+    + fix_qt_version_autodetection.diff
+    + missing_header.diff
+    + fix_documentation_path.diff
+    + remove_libexec.diff
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 11 May 2016 14:59:38 -0300
 
 qtcreator (3.6.1-1) unstable; urgency=medium
diff --git a/debian/patches/always_autotect_qt_versions b/debian/patches/always_autotect_qt_versions
index c74f001..276ba3f 100644
--- a/debian/patches/always_autotect_qt_versions
+++ b/debian/patches/always_autotect_qt_versions
@@ -1,8 +1,8 @@
 Index: qtcreator/src/plugins/qtsupport/qtversionmanager.cpp
 ===================================================================
---- qtcreator.orig/src/plugins/qtsupport/qtversionmanager.cpp	2015-08-19 17:05:40.292526401 -0500
-+++ qtcreator/src/plugins/qtsupport/qtversionmanager.cpp	2015-08-19 18:00:11.391353950 -0500
-@@ -102,7 +102,7 @@
+--- qtcreator.orig/src/plugins/qtsupport/qtversionmanager.cpp
++++ qtcreator/src/plugins/qtsupport/qtversionmanager.cpp
+@@ -97,7 +97,7 @@ bool qtVersionNumberCompare(BaseQtVersio
      return a->qtVersion() > b->qtVersion() || (a->qtVersion() == b->qtVersion() && a->uniqueId() < b->uniqueId());
  }
  static bool restoreQtVersions();
@@ -11,7 +11,7 @@ Index: qtcreator/src/plugins/qtsupport/qtversionmanager.cpp
  static void saveQtVersions();
  static void updateDocumentation();
  
-@@ -131,14 +131,11 @@
+@@ -126,14 +126,11 @@ void QtVersionManager::triggerQtVersionR
      disconnect(ProjectExplorer::ToolChainManager::instance(), SIGNAL(toolChainsLoaded()),
                 this, SLOT(triggerQtVersionRestore()));
  
@@ -30,7 +30,7 @@ Index: qtcreator/src/plugins/qtsupport/qtversionmanager.cpp
  
      emit m_instance->qtVersionsLoaded();
      emit m_instance->qtVersionsChanged(m_versions.keys(), QList<int>(), QList<int>());
-@@ -442,23 +439,57 @@
+@@ -433,22 +430,57 @@ static FileNameList gatherQmakePathsFrom
      return foundQMakes.toList();
  }
  
@@ -56,7 +56,6 @@ Index: qtcreator/src/plugins/qtsupport/qtversionmanager.cpp
 +    std::sort(qmakePathsFromQtChooser.begin(), qmakePathsFromQtChooser.end());
  
 -    systemQMakes.append(gatherQmakePathsFromQtChooser());
--    systemQMakes.removeDuplicates();
 +    QMap<QString, int> currentAutoVersions;
 +    for (QMap<int, BaseQtVersion *>::const_iterator i = m_versions.begin(); i != m_versions.end(); ++i) {
 +        if (i.value()->isAutodetected()) {
@@ -64,7 +63,7 @@ Index: qtcreator/src/plugins/qtsupport/qtversionmanager.cpp
 +        }
 +    }
  
--    foreach (const FileName &qmakePath, systemQMakes) {
+-    foreach (const FileName &qmakePath, Utils::filteredUnique(systemQMakes)) {
 -        BaseQtVersion *version
 -                = QtVersionFactory::createQtVersionFromQMakePath(qmakePath, false, QLatin1String("PATH"));
 -        if (version) {
diff --git a/debian/patches/fix_documentation_path.diff b/debian/patches/fix_documentation_path.diff
index eb52ee1..3245ae3 100644
--- a/debian/patches/fix_documentation_path.diff
+++ b/debian/patches/fix_documentation_path.diff
@@ -2,9 +2,11 @@
  src/plugins/coreplugin/icore.cpp |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
---- a/src/plugins/coreplugin/icore.cpp
-+++ b/src/plugins/coreplugin/icore.cpp
-@@ -425,7 +425,7 @@ QString ICore::userResourcePath()
+Index: qtcreator/src/plugins/coreplugin/icore.cpp
+===================================================================
+--- qtcreator.orig/src/plugins/coreplugin/icore.cpp
++++ qtcreator/src/plugins/coreplugin/icore.cpp
+@@ -420,7 +420,7 @@ QString ICore::userResourcePath()
  QString ICore::documentationPath()
  {
      const QString docPath = QLatin1String(Utils::HostOsInfo::isMacHost()
diff --git a/debian/patches/fix_qt_version_autodetection.diff b/debian/patches/fix_qt_version_autodetection.diff
index 5574678..df77fd6 100644
--- a/debian/patches/fix_qt_version_autodetection.diff
+++ b/debian/patches/fix_qt_version_autodetection.diff
@@ -5,10 +5,12 @@ Description: Fix piling up of Qt configurations.
 Last-Update: 2015-11-02
 Forwarded: no
 
---- qtcreator/src/plugins/qtsupport/qtversionmanager.cpp	2015-10-21 17:53:48.000000000 +0200
-+++ qtcreator/src/plugins/qtsupport/qtversionmanager.cpp	2015-10-22 11:50:21.323455563 +0200
-@@ -458,7 +458,7 @@
-
+Index: qtcreator/src/plugins/qtsupport/qtversionmanager.cpp
+===================================================================
+--- qtcreator.orig/src/plugins/qtsupport/qtversionmanager.cpp
++++ qtcreator/src/plugins/qtsupport/qtversionmanager.cpp
+@@ -449,7 +449,7 @@ static void updateSystemQt()
+ 
      QMap<QString, int> currentAutoVersions;
      for (QMap<int, BaseQtVersion *>::const_iterator i = m_versions.begin(); i != m_versions.end(); ++i) {
 -        if (i.value()->isAutodetected()) {
@@ -16,10 +18,11 @@ Forwarded: no
              currentAutoVersions.insert(i.value()->qmakeCommand().toString(), i.key());
          }
      }
-
---- qtcreator/src/libs/utils/buildablehelperlibrary.cpp	2015-08-18 12:02:51.000000000 +0200
-+++ qtcreator/src/libs/utils/buildablehelperlibrary.cpp	2015-11-02 12:36:14.974481823 +0100
-@@ -88,8 +88,15 @@
+Index: qtcreator/src/libs/utils/buildablehelperlibrary.cpp
+===================================================================
+--- qtcreator.orig/src/libs/utils/buildablehelperlibrary.cpp
++++ qtcreator/src/libs/utils/buildablehelperlibrary.cpp
+@@ -83,8 +83,15 @@ FileName BuildableHelperLibrary::findSys
  
          if (dir.exists(qmake)) {
              const QString qmakePath = dir.absoluteFilePath(qmake);
@@ -34,6 +37,5 @@ Forwarded: no
                  return FileName::fromString(qmakePath);
 +            }
          }
-
+ 
          // Prefer qmake-qt5 to qmake-qt4 by sorting the filenames in reverse order.
-
diff --git a/debian/patches/missing_header.diff b/debian/patches/missing_header.diff
index d430ffe..0edcef5 100644
--- a/debian/patches/missing_header.diff
+++ b/debian/patches/missing_header.diff
@@ -1,8 +1,8 @@
 Index: qtcreator/src/libs/ssh/sshcryptofacility.cpp
 ===================================================================
---- qtcreator.orig/src/libs/ssh/sshcryptofacility.cpp	2014-12-25 11:28:21.388740421 -0600
-+++ qtcreator/src/libs/ssh/sshcryptofacility.cpp	2014-12-25 22:10:30.002238360 -0600
-@@ -39,6 +39,7 @@
+--- qtcreator.orig/src/libs/ssh/sshcryptofacility.cpp
++++ qtcreator/src/libs/ssh/sshcryptofacility.cpp
+@@ -35,6 +35,7 @@
  
  #include <botan/botan.h>
  #include <botan/cbc.h>
diff --git a/debian/patches/remove_libexec.diff b/debian/patches/remove_libexec.diff
index 306656d..e06dea3 100644
--- a/debian/patches/remove_libexec.diff
+++ b/debian/patches/remove_libexec.diff
@@ -1,8 +1,8 @@
 Index: qtcreator/qtcreator.pri
 ===================================================================
---- qtcreator.orig/qtcreator.pri	2016-01-26 13:43:49.027802433 -0600
-+++ qtcreator/qtcreator.pri	2016-01-26 13:43:49.023802475 -0600
-@@ -108,7 +108,7 @@
+--- qtcreator.orig/qtcreator.pri
++++ qtcreator/qtcreator.pri
+@@ -108,7 +108,7 @@ osx {
      win32: \
          IDE_LIBEXEC_PATH = $$IDE_OUTPUT_PATH/bin
      else: \
@@ -11,7 +11,7 @@ Index: qtcreator/qtcreator.pri
      !isEqual(IDE_SOURCE_TREE, $$IDE_OUTPUT_PATH):copydata = 1
  
      LINK_LIBRARY_PATH = $$IDE_BUILD_TREE/$$IDE_LIBRARY_BASENAME/qtcreator
-@@ -119,7 +119,7 @@
+@@ -119,7 +119,7 @@ osx {
      win32: \
          INSTALL_LIBEXEC_PATH = $$QTC_PREFIX/bin
      else: \
@@ -22,9 +22,9 @@ Index: qtcreator/qtcreator.pri
      INSTALL_BIN_PATH     = $$QTC_PREFIX/bin
 Index: qtcreator/src/plugins/coreplugin/icore.cpp
 ===================================================================
---- qtcreator.orig/src/plugins/coreplugin/icore.cpp	2016-01-26 13:43:49.027802433 -0600
-+++ qtcreator/src/plugins/coreplugin/icore.cpp	2016-01-26 13:45:30.390560142 -0600
-@@ -446,7 +446,8 @@
+--- qtcreator.orig/src/plugins/coreplugin/icore.cpp
++++ qtcreator/src/plugins/coreplugin/icore.cpp
+@@ -441,7 +441,8 @@ QString ICore::libexecPath()
      case Utils::OsTypeLinux:
      case Utils::OsTypeOtherUnix:
      case Utils::OsTypeOther:

-- 
qtcreator packaging

More information about the pkg-kde-commits mailing list