[neon/qt6/qtcreator/Neon/unstable] debian/patches: tidy up patches

Carlos De Maine null at kde.org
Wed Oct 4 23:40:47 BST 2023 

Git commit 957115cf84c846755856170fe987bbd5ad0b267f by Carlos De Maine.
Committed on 05/10/2023 at 00:40.
Pushed by carlosdem into branch 'Neon/unstable'.

tidy up patches

M  +12   -12   debian/patches/qt-creator-litehtml.patch
A  +17   -0    debian/patches/qt-creator_qmake-names.patch
M  +4    -1    debian/patches/series
A  +46   -0    debian/patches/upstream_ClangTools-Add-support-for-yaml-cpp-0.8.patch

https://invent.kde.org/neon/qt6/qtcreator/-/commit/957115cf84c846755856170fe987bbd5ad0b267f

diff --git a/debian/patches/qt-creator-litehtml.patch b/debian/patches/qt-creator-litehtml.patch
index 524cdb6..4330147 100644
--- a/debian/patches/qt-creator-litehtml.patch
+++ b/debian/patches/qt-creator-litehtml.patch
@@ -1,6 +1,6 @@
-diff -rupN --no-dereference qt-creator-opensource-src-11.0.2/src/libs/qlitehtml/src/container_qpainter.cpp qt-creator-opensource-src-11.0.2-new/src/libs/qlitehtml/src/container_qpainter.cpp
---- qt-creator-opensource-src-11.0.2/src/libs/qlitehtml/src/container_qpainter.cpp	2023-08-14 03:53:10.000000000 +0200
-+++ qt-creator-opensource-src-11.0.2-new/src/libs/qlitehtml/src/container_qpainter.cpp	2023-08-15 13:35:53.905035525 +0200
+diff -rupN --no-dereference qt-creator-opensource-src-11.0.3/src/libs/qlitehtml/src/container_qpainter.cpp qt-creator-opensource-src-11.0.3-new/src/libs/qlitehtml/src/container_qpainter.cpp
+--- qt-creator-opensource-src-11.0.3/src/libs/qlitehtml/src/container_qpainter.cpp	2023-09-27 09:28:12.000000000 +0200
++++ qt-creator-opensource-src-11.0.3-new/src/libs/qlitehtml/src/container_qpainter.cpp	2023-10-04 01:00:38.504683717 +0200
 @@ -160,7 +160,7 @@ static Selection::Element selectionDetai
      // shortcut, which _might_ not really be correct
      if (element->get_children_count() > 0)
@@ -313,9 +313,9 @@ diff -rupN --no-dereference qt-creator-opensource-src-11.0.2/src/libs/qlitehtml/
 -{
 -    d->context.load_master_stylesheet(css.toUtf8().constData());
 -}
-diff -rupN --no-dereference qt-creator-opensource-src-11.0.2/src/libs/qlitehtml/src/container_qpainter.h qt-creator-opensource-src-11.0.2-new/src/libs/qlitehtml/src/container_qpainter.h
---- qt-creator-opensource-src-11.0.2/src/libs/qlitehtml/src/container_qpainter.h	2023-08-14 03:53:10.000000000 +0200
-+++ qt-creator-opensource-src-11.0.2-new/src/libs/qlitehtml/src/container_qpainter.h	2023-08-15 13:35:53.905035525 +0200
+diff -rupN --no-dereference qt-creator-opensource-src-11.0.3/src/libs/qlitehtml/src/container_qpainter.h qt-creator-opensource-src-11.0.3-new/src/libs/qlitehtml/src/container_qpainter.h
+--- qt-creator-opensource-src-11.0.3/src/libs/qlitehtml/src/container_qpainter.h	2023-09-27 09:28:12.000000000 +0200
++++ qt-creator-opensource-src-11.0.3-new/src/libs/qlitehtml/src/container_qpainter.h	2023-10-04 01:00:38.505683714 +0200
 @@ -19,22 +19,6 @@
  #include <memory>
  
@@ -357,9 +357,9 @@ diff -rupN --no-dereference qt-creator-opensource-src-11.0.2/src/libs/qlitehtml/
  private:
      std::unique_ptr<DocumentContainerPrivate> d;
  };
-diff -rupN --no-dereference qt-creator-opensource-src-11.0.2/src/libs/qlitehtml/src/container_qpainter_p.h qt-creator-opensource-src-11.0.2-new/src/libs/qlitehtml/src/container_qpainter_p.h
---- qt-creator-opensource-src-11.0.2/src/libs/qlitehtml/src/container_qpainter_p.h	2023-08-14 03:53:10.000000000 +0200
-+++ qt-creator-opensource-src-11.0.2-new/src/libs/qlitehtml/src/container_qpainter_p.h	2023-08-15 13:35:53.906035546 +0200
+diff -rupN --no-dereference qt-creator-opensource-src-11.0.3/src/libs/qlitehtml/src/container_qpainter_p.h qt-creator-opensource-src-11.0.3-new/src/libs/qlitehtml/src/container_qpainter_p.h
+--- qt-creator-opensource-src-11.0.3/src/libs/qlitehtml/src/container_qpainter_p.h	2023-09-27 09:28:12.000000000 +0200
++++ qt-creator-opensource-src-11.0.3-new/src/libs/qlitehtml/src/container_qpainter_p.h	2023-10-04 01:00:38.505683714 +0200
 @@ -58,55 +58,53 @@ struct Index
  class DocumentContainerPrivate final : public litehtml::document_container
  {
@@ -448,9 +448,9 @@ diff -rupN --no-dereference qt-creator-opensource-src-11.0.2/src/libs/qlitehtml/
 -    litehtml::context context;
 +    QString m_masterStyleSheet;
  };
-diff -rupN --no-dereference qt-creator-opensource-src-11.0.2/src/libs/qlitehtml/src/qlitehtmlwidget.cpp qt-creator-opensource-src-11.0.2-new/src/libs/qlitehtml/src/qlitehtmlwidget.cpp
---- qt-creator-opensource-src-11.0.2/src/libs/qlitehtml/src/qlitehtmlwidget.cpp	2023-08-14 03:53:10.000000000 +0200
-+++ qt-creator-opensource-src-11.0.2-new/src/libs/qlitehtml/src/qlitehtmlwidget.cpp	2023-08-15 13:35:53.906035546 +0200
+diff -rupN --no-dereference qt-creator-opensource-src-11.0.3/src/libs/qlitehtml/src/qlitehtmlwidget.cpp qt-creator-opensource-src-11.0.3-new/src/libs/qlitehtml/src/qlitehtmlwidget.cpp
+--- qt-creator-opensource-src-11.0.3/src/libs/qlitehtml/src/qlitehtmlwidget.cpp	2023-09-27 09:28:11.000000000 +0200
++++ qt-creator-opensource-src-11.0.3-new/src/libs/qlitehtml/src/qlitehtmlwidget.cpp	2023-10-04 01:00:38.505683714 +0200
 @@ -346,7 +346,6 @@ class QLiteHtmlWidgetPrivate
  {
  public:
diff --git a/debian/patches/qt-creator_qmake-names.patch b/debian/patches/qt-creator_qmake-names.patch
new file mode 100644
index 0000000..529c9c7
--- /dev/null
+++ b/debian/patches/qt-creator_qmake-names.patch
@@ -0,0 +1,17 @@
+diff -rupN --no-dereference qt-creator-opensource-src-11.0.3/src/libs/utils/buildablehelperlibrary.cpp qt-creator-opensource-src-11.0.3-new/src/libs/utils/buildablehelperlibrary.cpp
+--- qt-creator-opensource-src-11.0.3/src/libs/utils/buildablehelperlibrary.cpp	2023-09-27 09:28:11.000000000 +0200
++++ qt-creator-opensource-src-11.0.3-new/src/libs/utils/buildablehelperlibrary.cpp	2023-10-04 01:00:29.246712300 +0200
+@@ -155,7 +155,12 @@ QStringList BuildableHelperLibrary::poss
+     // On Unix some distributions renamed qmake with a postfix to avoid clashes
+     // On OS X, Qt 4 binary packages also has renamed qmake. There are also symbolic links that are
+     // named "qmake", but the file dialog always checks against resolved links (native Cocoa issue)
+-    QStringList commands(HostOsInfo::withExecutableSuffix("qmake*"));
++    QStringList commands = QStringList()
++        << HostOsInfo::withExecutableSuffix("qmake-qt6")
++        << HostOsInfo::withExecutableSuffix("qmake-qt5")
++        << HostOsInfo::withExecutableSuffix("qmake-qt4")
++        << HostOsInfo::withExecutableSuffix("qmake-qt3")
++        << HostOsInfo::withExecutableSuffix("qmake");
+ 
+     // Qt 6 CMake built targets, such as Android, are dependent on the host installation
+     // and use a script wrapper around the host qmake executable
\ No newline at end of file
diff --git a/debian/patches/series b/debian/patches/series
index 5538c64..395890b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,6 +2,7 @@
 
 # Debian patches.
 debian_paths.diff
+upstream_ClangTools-Add-support-for-yaml-cpp-0.8.patch
 
 # Neon patches
 litehtml_includes.diff
@@ -17,4 +18,6 @@ qt-creator-debuginfod.patch
 # https://code.qt.io/cgit/clang/llvm-project.git/commit/?h=release_130-based&id=42879d1f355fde391ef46b96a659afeb4ad7814a
 qt-creator-clangformat.patch
 # Fix build against litehtml-0.8
-qt-creator-litehtml.patch
\ No newline at end of file
+qt-creator-litehtml.patch
+# allow for multiple qmake versions
+qt-creator_qmake-names.patch
\ No newline at end of file
diff --git a/debian/patches/upstream_ClangTools-Add-support-for-yaml-cpp-0.8.patch b/debian/patches/upstream_ClangTools-Add-support-for-yaml-cpp-0.8.patch
new file mode 100644
index 0000000..a15bacb
--- /dev/null
+++ b/debian/patches/upstream_ClangTools-Add-support-for-yaml-cpp-0.8.patch
@@ -0,0 +1,46 @@
+From 170f9acfb41704b68e2ba98690fd6d5e98addd85 Mon Sep 17 00:00:00 2001
+From: Eike Ziller <eike.ziller at qt.io>
+Date: Thu, 24 Aug 2023 13:41:33 +0200
+Subject: [PATCH] ClangTools: Add support for yaml-cpp 0.8
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+They renamed their target from `yaml-cpp`
+to `yaml-cpp::yaml-cpp`
+
+Still support < 0.8 though.
+
+Fixes: QTCREATORBUG-29537
+Change-Id: Iafa6e75998f0120610542b4c744b205aee3392a3
+Reviewed-by: Qt CI Bot <qt_ci_bot at qt-project.org>
+Reviewed-by: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
+Reviewed-by: David Schulz <david.schulz at qt.io>
+---
+ cmake/Findyaml-cpp.cmake | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/cmake/Findyaml-cpp.cmake b/cmake/Findyaml-cpp.cmake
+index e7b3d361d3..0b0e81418a 100644
+--- a/cmake/Findyaml-cpp.cmake
++++ b/cmake/Findyaml-cpp.cmake
+@@ -15,7 +15,15 @@ if (yaml-cpp_FOUND)
+     unset(yaml_cpp_include_dir CACHE)
+     find_path(yaml_cpp_include_dir yaml-cpp/yaml.h)
+   endif()
+-  set_target_properties(yaml-cpp PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${yaml_cpp_include_dir}")
++  if(TARGET yaml-cpp::yaml-cpp)
++    # yaml-cpp >= 0.8
++    set_property(TARGET yaml-cpp::yaml-cpp PROPERTY IMPORTED_GLOBAL TRUE)
++    add_library(yaml-cpp ALIAS yaml-cpp::yaml-cpp)
++    set(yaml-cpp_TARGET yaml-cpp::yaml-cpp)
++  else()
++    set(yaml-cpp_TARGET yaml-cpp)
++  endif()
++  set_target_properties(${yaml-cpp_TARGET} PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${yaml_cpp_include_dir}")
+ else()
+   if(TARGET yaml-cpp)
+     return()
+-- 
+2.40.1
+

More information about the Neon-commits mailing list