[neon/qt6/qtcreator/Neon/unstable] debian/patches: refresh patches
Carlos De Maine
null at kde.org
Thu Oct 5 02:05:42 BST 2023
Git commit 60691a1146215e646d551ee9ad40a812f5625838 by Carlos De Maine.
Committed on 05/10/2023 at 03:05.
Pushed by carlosdem into branch 'Neon/unstable'.
refresh patches
M +1 -1 debian/patches/debian_paths.diff
M +18 -23 debian/patches/litehtml_includes.diff
M +7 -9 debian/patches/qt-creator-clangformat.patch
M +5 -6 debian/patches/qt-creator-debuginfod.patch
M +42 -46 debian/patches/qt-creator-litehtml.patch
M +4 -5 debian/patches/qt-creator_desktop.patch
M +4 -5 debian/patches/qt-creator_ninja-build.patch
M +4 -5 debian/patches/qt-creator_qmake-names.patch
M +1 -2 debian/patches/series
D +0 -46 debian/patches/upstream_ClangTools-Add-support-for-yaml-cpp-0.8.patch
https://invent.kde.org/neon/qt6/qtcreator/-/commit/60691a1146215e646d551ee9ad40a812f5625838
diff --git a/debian/patches/debian_paths.diff b/debian/patches/debian_paths.diff
index 931b4c9..896584d 100644
--- a/debian/patches/debian_paths.diff
+++ b/debian/patches/debian_paths.diff
@@ -5,7 +5,7 @@ Last-Update: 2021-08-15
--- a/cmake/QtCreatorAPIInternal.cmake
+++ b/cmake/QtCreatorAPIInternal.cmake
-@@ -79,7 +79,7 @@ else ()
+@@ -83,7 +83,7 @@
set(_IDE_PLUGIN_PATH "${_IDE_LIBRARY_BASE_PATH}/qtcreator/plugins")
set(_IDE_LIBEXEC_PATH "${CMAKE_INSTALL_LIBEXECDIR}/qtcreator")
set(_IDE_DATA_PATH "${CMAKE_INSTALL_DATAROOTDIR}/qtcreator")
diff --git a/debian/patches/litehtml_includes.diff b/debian/patches/litehtml_includes.diff
index 25e9b18..79d35e4 100644
--- a/debian/patches/litehtml_includes.diff
+++ b/debian/patches/litehtml_includes.diff
@@ -1,6 +1,5 @@
-diff -U 3 -H -d -r -N -- a/src/libs/qlitehtml/src/3rdparty/litehtml/containers/cairo/cairo_container.h b/src/libs/qlitehtml/src/3rdparty/litehtml/containers/cairo/cairo_container.h
---- a/src/libs/qlitehtml/src/3rdparty/litehtml/containers/cairo/cairo_container.h 2023-08-14 11:53:10.000000000 +1000
-+++ b/src/libs/qlitehtml/src/3rdparty/litehtml/containers/cairo/cairo_container.h 2023-08-22 10:46:55.925573826 +1000
+--- a/src/libs/qlitehtml/src/3rdparty/litehtml/containers/cairo/cairo_container.h
++++ b/src/libs/qlitehtml/src/3rdparty/litehtml/containers/cairo/cairo_container.h
@@ -9,7 +9,7 @@
#include <vector>
#include <cairo.h>
@@ -9,22 +8,20 @@ diff -U 3 -H -d -r -N -- a/src/libs/qlitehtml/src/3rdparty/litehtml/containers/c
+#include <litehtml/litehtml.h>
#include <dib.h>
#include <txdib.h>
-
-diff -U 3 -H -d -r -N -- a/src/libs/qlitehtml/src/3rdparty/litehtml/containers/cairo/cairo_font.h b/src/libs/qlitehtml/src/3rdparty/litehtml/containers/cairo/cairo_font.h
---- a/src/libs/qlitehtml/src/3rdparty/litehtml/containers/cairo/cairo_font.h 2023-08-14 11:53:10.000000000 +1000
-+++ b/src/libs/qlitehtml/src/3rdparty/litehtml/containers/cairo/cairo_font.h 2023-08-22 10:47:06.545551304 +1000
+
+--- a/src/libs/qlitehtml/src/3rdparty/litehtml/containers/cairo/cairo_font.h
++++ b/src/libs/qlitehtml/src/3rdparty/litehtml/containers/cairo/cairo_font.h
@@ -9,7 +9,7 @@
#include <vector>
#include <cairo.h>
#include <cairo-win32.h>
-#include <litehtml.h>
+#include <litehtml/litehtml.h>
-
+
struct linked_font
{
-diff -U 3 -H -d -r -N -- a/src/libs/qlitehtml/src/3rdparty/litehtml/containers/gdiplus/gdiplus_container.h b/src/libs/qlitehtml/src/3rdparty/litehtml/containers/gdiplus/gdiplus_container.h
---- a/src/libs/qlitehtml/src/3rdparty/litehtml/containers/gdiplus/gdiplus_container.h 2023-08-14 11:53:10.000000000 +1000
-+++ b/src/libs/qlitehtml/src/3rdparty/litehtml/containers/gdiplus/gdiplus_container.h 2023-08-22 10:47:14.601535227 +1000
+--- a/src/libs/qlitehtml/src/3rdparty/litehtml/containers/gdiplus/gdiplus_container.h
++++ b/src/libs/qlitehtml/src/3rdparty/litehtml/containers/gdiplus/gdiplus_container.h
@@ -7,7 +7,7 @@
#include <tchar.h>
#include <mlang.h>
@@ -33,25 +30,23 @@ diff -U 3 -H -d -r -N -- a/src/libs/qlitehtml/src/3rdparty/litehtml/containers/g
+#include <litehtml/litehtml.h>
#include <GdiPlus.h>
#include "..\win32\win32_container.h"
-
-diff -U 3 -H -d -r -N -- a/src/libs/qlitehtml/src/3rdparty/litehtml/containers/win32/win32_container.cpp b/src/libs/qlitehtml/src/3rdparty/litehtml/containers/win32/win32_container.cpp
---- a/src/libs/qlitehtml/src/3rdparty/litehtml/containers/win32/win32_container.cpp 2023-08-14 11:53:10.000000000 +1000
-+++ b/src/libs/qlitehtml/src/3rdparty/litehtml/containers/win32/win32_container.cpp 2023-08-22 10:47:24.289517024 +1000
+
+--- a/src/libs/qlitehtml/src/3rdparty/litehtml/containers/win32/win32_container.cpp
++++ b/src/libs/qlitehtml/src/3rdparty/litehtml/containers/win32/win32_container.cpp
@@ -1,4 +1,4 @@
-#include <litehtml.h>
+#include <litehtml/litehtml.h>
#include "win32_container.h"
-
-
-diff -U 3 -H -d -r -N -- a/src/libs/qlitehtml/src/container_qpainter_p.h b/src/libs/qlitehtml/src/container_qpainter_p.h
---- a/src/libs/qlitehtml/src/container_qpainter_p.h 2023-08-14 11:53:10.000000000 +1000
-+++ b/src/libs/qlitehtml/src/container_qpainter_p.h 2023-08-21 23:36:31.233193945 +1000
+
+
+--- a/src/libs/qlitehtml/src/container_qpainter_p.h
++++ b/src/libs/qlitehtml/src/container_qpainter_p.h
@@ -5,7 +5,7 @@
-
+
#include "container_qpainter.h"
-
+
-#include <litehtml.h>
+#include <litehtml/litehtml.h>
-
+
#include <QPaintDevice>
#include <QPixmap>
diff --git a/debian/patches/qt-creator-clangformat.patch b/debian/patches/qt-creator-clangformat.patch
index 39dbf0b..e85198d 100644
--- a/debian/patches/qt-creator-clangformat.patch
+++ b/debian/patches/qt-creator-clangformat.patch
@@ -1,7 +1,6 @@
-diff -rupN --no-dereference qt-creator-opensource-src-11.0.2/cmake/FindClang.cmake qt-creator-opensource-src-11.0.2-new/cmake/FindClang.cmake
---- qt-creator-opensource-src-11.0.2/cmake/FindClang.cmake 2023-08-14 03:53:08.000000000 +0200
-+++ qt-creator-opensource-src-11.0.2-new/cmake/FindClang.cmake 2023-08-15 13:35:51.063970577 +0200
-@@ -2,9 +2,16 @@ find_package(Clang CONFIG)
+--- a/cmake/FindClang.cmake
++++ b/cmake/FindClang.cmake
+@@ -2,9 +2,16 @@
option(CLANGTOOLING_LINK_CLANG_DYLIB "Force linking of Clang tooling against clang-cpp" NO)
@@ -19,9 +18,8 @@ diff -rupN --no-dereference qt-creator-opensource-src-11.0.2/cmake/FindClang.cma
endif()
if (WIN32 AND TARGET clangTooling)
-diff -rupN --no-dereference qt-creator-opensource-src-11.0.2/src/plugins/clangformat/CMakeLists.txt qt-creator-opensource-src-11.0.2-new/src/plugins/clangformat/CMakeLists.txt
---- qt-creator-opensource-src-11.0.2/src/plugins/clangformat/CMakeLists.txt 2023-08-14 03:53:09.000000000 +0200
-+++ qt-creator-opensource-src-11.0.2-new/src/plugins/clangformat/CMakeLists.txt 2023-08-15 13:35:51.063970577 +0200
+--- a/src/plugins/clangformat/CMakeLists.txt
++++ b/src/plugins/clangformat/CMakeLists.txt
@@ -1,6 +1,6 @@
add_qtc_plugin(ClangFormat
- CONDITION TARGET ${CLANG_FORMAT_LIB} AND LLVM_PACKAGE_VERSION VERSION_GREATER_EQUAL 10.0.0 AND (QTC_CLANG_BUILDMODE_MATCH OR CLANGTOOLING_LINK_CLANG_DYLIB)
@@ -31,7 +29,7 @@ diff -rupN --no-dereference qt-creator-opensource-src-11.0.2/src/plugins/clangfo
PLUGIN_DEPENDS Core TextEditor CppEditor ProjectExplorer
SOURCES
clangformatbaseindenter.cpp clangformatbaseindenter.h
-@@ -20,7 +20,7 @@ add_qtc_plugin(ClangFormat
+@@ -20,7 +20,7 @@
if(TARGET ClangFormat)
# "system" includes, so warnings are ignored
@@ -39,4 +37,4 @@ diff -rupN --no-dereference qt-creator-opensource-src-11.0.2/src/plugins/clangfo
+ target_include_directories(ClangFormat BEFORE PRIVATE "${CLANG_FORMAT_INC_DIR}")
endif()
- if(MSVC AND TARGET ClangFormat)
\ No newline at end of file
+ if(MSVC AND TARGET ClangFormat)
diff --git a/debian/patches/qt-creator-debuginfod.patch b/debian/patches/qt-creator-debuginfod.patch
index acd4e2f..c713ba7 100644
--- a/debian/patches/qt-creator-debuginfod.patch
+++ b/debian/patches/qt-creator-debuginfod.patch
@@ -1,7 +1,6 @@
-diff -rupN --no-dereference qt-creator-opensource-src-11.0.2/cmake/Findelfutils.cmake qt-creator-opensource-src-11.0.2-new/cmake/Findelfutils.cmake
---- qt-creator-opensource-src-11.0.2/cmake/Findelfutils.cmake 2023-08-14 03:53:08.000000000 +0200
-+++ qt-creator-opensource-src-11.0.2-new/cmake/Findelfutils.cmake 2023-08-15 13:35:49.591930302 +0200
-@@ -32,7 +32,7 @@ find_path(ELFUTILS_INCLUDE_DIR
+--- a/cmake/Findelfutils.cmake
++++ b/cmake/Findelfutils.cmake
+@@ -32,7 +32,7 @@
"${ELFUTILS_INSTALL_DIR}" ENV ELFUTILS_INSTALL_DIR "${CMAKE_PREFIX_PATH}"
)
@@ -10,7 +9,7 @@ diff -rupN --no-dereference qt-creator-opensource-src-11.0.2/cmake/Findelfutils.
find_library(ELFUTILS_LIB_${lib}
NAMES ${lib}
PATH_SUFFIXES lib
-@@ -48,7 +48,7 @@ find_package_handle_standard_args(elfuti
+@@ -48,7 +48,7 @@
)
if(elfutils_FOUND)
@@ -18,4 +17,4 @@ diff -rupN --no-dereference qt-creator-opensource-src-11.0.2/cmake/Findelfutils.
+ foreach(lib dw elf debuginfod)
if (NOT TARGET elfutils::${lib})
add_library(elfutils::${lib} UNKNOWN IMPORTED)
- set_target_properties(elfutils::${lib}
\ No newline at end of file
+ set_target_properties(elfutils::${lib}
diff --git a/debian/patches/qt-creator-litehtml.patch b/debian/patches/qt-creator-litehtml.patch
index 4330147..cd2ff2f 100644
--- a/debian/patches/qt-creator-litehtml.patch
+++ b/debian/patches/qt-creator-litehtml.patch
@@ -1,7 +1,6 @@
-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
+--- a/src/libs/qlitehtml/src/container_qpainter.cpp
++++ b/src/libs/qlitehtml/src/container_qpainter.cpp
+@@ -160,7 +160,7 @@
// shortcut, which _might_ not really be correct
if (element->get_children_count() > 0)
return {element, -1, -1}; // everything selected
@@ -10,7 +9,7 @@ diff -rupN --no-dereference qt-creator-opensource-src-11.0.3/src/libs/qlitehtml/
const QFontMetrics fm(font);
int previous = 0;
for (int i = 0; i < text.size(); ++i) {
-@@ -182,7 +182,7 @@ static Selection::Element deepest_child_
+@@ -182,7 +182,7 @@
// the following does not find the "smallest" element, it often consists of children
// with individual words as text...
@@ -19,7 +18,7 @@ diff -rupN --no-dereference qt-creator-opensource-src-11.0.3/src/libs/qlitehtml/
pos.y(),
viewportPos.x(),
viewportPos.y());
-@@ -195,13 +195,14 @@ static Selection::Element deepest_child_
+@@ -195,13 +195,14 @@
Selection::Element result;
for (int i = 0; i < int(element->get_children_count()); ++i) {
const litehtml::element::ptr child = element->get_child(i);
@@ -36,7 +35,7 @@ diff -rupN --no-dereference qt-creator-opensource-src-11.0.3/src/libs/qlitehtml/
element->get_text(text);
if (!text.empty()) {
return mode == Selection::Mode::Free
-@@ -235,9 +236,9 @@ static QFont::Weight cssWeightToQtWeight
+@@ -235,9 +236,9 @@
static QFont::Style toQFontStyle(litehtml::font_style style)
{
switch (style) {
@@ -48,7 +47,7 @@ diff -rupN --no-dereference qt-creator-opensource-src-11.0.3/src/libs/qlitehtml/
return QFont::StyleItalic;
}
// should not happen
-@@ -355,7 +356,7 @@ void Selection::update()
+@@ -355,7 +356,7 @@
{
const auto addElement = [this](const Selection::Element &element,
const Selection::Element &end = {}) {
@@ -57,7 +56,7 @@ diff -rupN --no-dereference qt-creator-opensource-src-11.0.3/src/libs/qlitehtml/
element.element->get_text(elemText);
const QString textStr = QString::fromStdString(elemText);
if (!textStr.isEmpty()) {
-@@ -429,7 +430,7 @@ DocumentContainer::DocumentContainer()
+@@ -429,7 +430,7 @@
DocumentContainer::~DocumentContainer() = default;
@@ -66,7 +65,7 @@ diff -rupN --no-dereference qt-creator-opensource-src-11.0.3/src/libs/qlitehtml/
int size,
int weight,
litehtml::font_style italic,
-@@ -485,14 +486,14 @@ void DocumentContainerPrivate::delete_fo
+@@ -485,14 +486,14 @@
delete font;
}
@@ -83,7 +82,7 @@ diff -rupN --no-dereference qt-creator-opensource-src-11.0.3/src/libs/qlitehtml/
litehtml::uint_ptr hFont,
litehtml::web_color color,
const litehtml::position &pos)
-@@ -514,7 +515,7 @@ int DocumentContainerPrivate::get_defaul
+@@ -514,7 +515,7 @@
return m_defaultFont.pointSize();
}
@@ -92,7 +91,7 @@ diff -rupN --no-dereference qt-creator-opensource-src-11.0.3/src/libs/qlitehtml/
{
return m_defaultFontFamilyName.constData();
}
-@@ -551,8 +552,8 @@ void DocumentContainerPrivate::draw_list
+@@ -551,8 +552,8 @@
}
}
@@ -103,7 +102,7 @@ diff -rupN --no-dereference qt-creator-opensource-src-11.0.3/src/libs/qlitehtml/
bool redraw_on_ready)
{
const auto qtSrc = QString::fromUtf8(src);
-@@ -569,8 +570,8 @@ void DocumentContainerPrivate::load_imag
+@@ -569,8 +570,8 @@
m_pixmaps.insert(url, pixmap);
}
@@ -114,7 +113,7 @@ diff -rupN --no-dereference qt-creator-opensource-src-11.0.3/src/libs/qlitehtml/
litehtml::size &sz)
{
const auto qtSrc = QString::fromUtf8(src);
-@@ -617,8 +618,9 @@ void DocumentContainerPrivate::buildInde
+@@ -617,8 +618,9 @@
m_index.elementToIndex.insert({current, index});
if (!inBody)
inBody = tagName(current).toLower() == "body";
@@ -126,7 +125,7 @@ diff -rupN --no-dereference qt-creator-opensource-src-11.0.3/src/libs/qlitehtml/
current->get_text(text);
if (!text.empty()) {
m_index.indexToElement.push_back({index, current});
-@@ -657,13 +659,14 @@ void DocumentContainerPrivate::clearSele
+@@ -657,13 +659,14 @@
}
void DocumentContainerPrivate::draw_background(litehtml::uint_ptr hdc,
@@ -143,7 +142,7 @@ diff -rupN --no-dereference qt-creator-opensource-src-11.0.3/src/libs/qlitehtml/
painter->save();
painter->setClipRect(toQRect(bg.clip_box));
const QRegion horizontalMiddle(
-@@ -806,12 +809,12 @@ void DocumentContainerPrivate::draw_bord
+@@ -806,12 +809,12 @@
}
}
@@ -158,7 +157,7 @@ diff -rupN --no-dereference qt-creator-opensource-src-11.0.3/src/libs/qlitehtml/
{
m_baseUrl = QString::fromUtf8(base_url);
}
-@@ -825,7 +828,7 @@ void DocumentContainerPrivate::link(cons
+@@ -825,7 +828,7 @@
Q_UNUSED(el)
}
@@ -167,7 +166,7 @@ diff -rupN --no-dereference qt-creator-opensource-src-11.0.3/src/libs/qlitehtml/
const litehtml::element::ptr &el)
{
Q_UNUSED(el)
-@@ -833,12 +836,12 @@ void DocumentContainerPrivate::on_anchor
+@@ -833,12 +836,12 @@
m_linkCallback(resolveUrl(QString::fromUtf8(url), m_baseUrl));
}
@@ -182,7 +181,7 @@ diff -rupN --no-dereference qt-creator-opensource-src-11.0.3/src/libs/qlitehtml/
{
// TODO
qDebug(log) << "transform_text";
-@@ -846,9 +849,9 @@ void DocumentContainerPrivate::transform
+@@ -846,9 +849,9 @@
Q_UNUSED(tt)
}
@@ -195,7 +194,7 @@ diff -rupN --no-dereference qt-creator-opensource-src-11.0.3/src/libs/qlitehtml/
{
const QUrl actualUrl = resolveUrl(QString::fromStdString(url), QString::fromStdString(baseurl));
const QString urlString = actualUrl.toString(QUrl::None);
-@@ -858,16 +861,12 @@ void DocumentContainerPrivate::import_cs
+@@ -858,16 +861,12 @@
}
void DocumentContainerPrivate::set_clip(const litehtml::position &pos,
@@ -213,7 +212,7 @@ diff -rupN --no-dereference qt-creator-opensource-src-11.0.3/src/libs/qlitehtml/
}
void DocumentContainerPrivate::del_clip()
-@@ -882,7 +881,7 @@ void DocumentContainerPrivate::get_clien
+@@ -882,7 +881,7 @@
}
std::shared_ptr<litehtml::element> DocumentContainerPrivate::create_element(
@@ -222,7 +221,7 @@ diff -rupN --no-dereference qt-creator-opensource-src-11.0.3/src/libs/qlitehtml/
const litehtml::string_map &attributes,
const std::shared_ptr<litehtml::document> &doc)
{
-@@ -900,7 +899,7 @@ void DocumentContainerPrivate::get_media
+@@ -900,7 +899,7 @@
qDebug(log) << "get_media_features";
}
@@ -231,7 +230,7 @@ diff -rupN --no-dereference qt-creator-opensource-src-11.0.3/src/libs/qlitehtml/
{
// TODO
qDebug(log) << "get_language";
-@@ -918,11 +917,11 @@ void DocumentContainer::setScrollPositio
+@@ -918,11 +917,11 @@
d->m_scrollPosition = pos;
}
@@ -245,7 +244,7 @@ diff -rupN --no-dereference qt-creator-opensource-src-11.0.3/src/libs/qlitehtml/
d->buildIndex();
}
-@@ -1104,7 +1103,7 @@ QUrl DocumentContainer::linkAt(const QPo
+@@ -1104,7 +1103,7 @@
{
if (!d->m_document)
return {};
@@ -254,7 +253,7 @@ diff -rupN --no-dereference qt-creator-opensource-src-11.0.3/src/libs/qlitehtml/
documentPos.x(), documentPos.y(), viewportPos.x(), viewportPos.y());
if (!element)
return {};
-@@ -1171,10 +1170,10 @@ void DocumentContainer::findText(const Q
+@@ -1171,10 +1170,10 @@
}
const auto fillXPos = [](const Selection::Element &e) {
@@ -267,7 +266,7 @@ diff -rupN --no-dereference qt-creator-opensource-src-11.0.3/src/libs/qlitehtml/
const QFontMetrics fm(font);
return Selection::Element{e.element, e.index, fm.size(0, text.left(e.index)).width()};
};
-@@ -1226,7 +1225,7 @@ void DocumentContainer::setDefaultFont(c
+@@ -1226,7 +1225,7 @@
// we need to trigger the reparse of this info.
if (d->m_document && d->m_document->root()) {
d->m_document->root()->refresh_styles();
@@ -276,7 +275,7 @@ diff -rupN --no-dereference qt-creator-opensource-src-11.0.3/src/libs/qlitehtml/
}
}
-@@ -1260,6 +1259,11 @@ void DocumentContainer::setClipboardCall
+@@ -1260,6 +1259,11 @@
d->m_clipboardCallback = callback;
}
@@ -288,7 +287,7 @@ diff -rupN --no-dereference qt-creator-opensource-src-11.0.3/src/libs/qlitehtml/
static litehtml::element::ptr elementForY(int y, const litehtml::document::ptr &document)
{
if (!document)
-@@ -1268,7 +1272,8 @@ static litehtml::element::ptr elementFor
+@@ -1268,7 +1272,8 @@
const std::function<litehtml::element::ptr(int, litehtml::element::ptr)> recursion =
[&recursion](int y, const litehtml::element::ptr &element) {
litehtml::element::ptr result;
@@ -298,7 +297,7 @@ diff -rupN --no-dereference qt-creator-opensource-src-11.0.3/src/libs/qlitehtml/
if (subY <= 0)
return element;
for (int i = 0; i < int(element->get_children_count()); ++i) {
-@@ -1359,14 +1364,3 @@ Index::Entry Index::findElement(int inde
+@@ -1359,14 +1364,3 @@
return {-1, {}};
return *(upper - 1);
}
@@ -313,9 +312,8 @@ diff -rupN --no-dereference qt-creator-opensource-src-11.0.3/src/libs/qlitehtml/
-{
- d->context.load_master_stylesheet(css.toUtf8().constData());
-}
-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
+--- a/src/libs/qlitehtml/src/container_qpainter.h
++++ b/src/libs/qlitehtml/src/container_qpainter.h
@@ -19,22 +19,6 @@
#include <memory>
@@ -339,7 +337,7 @@ diff -rupN --no-dereference qt-creator-opensource-src-11.0.3/src/libs/qlitehtml/
class QLITEHTML_EXPORT DocumentContainer
{
-@@ -44,7 +28,7 @@ public:
+@@ -44,7 +28,7 @@
public: // outside API
void setPaintDevice(QPaintDevice *paintDevice);
@@ -348,7 +346,7 @@ diff -rupN --no-dereference qt-creator-opensource-src-11.0.3/src/libs/qlitehtml/
bool hasDocument() const;
void setBaseUrl(const QString &url);
void setScrollPosition(const QPoint &pos);
-@@ -100,6 +84,8 @@ public: // outside API
+@@ -100,6 +84,8 @@
int withFixedElementPosition(int y, const std::function<void()> &action);
@@ -357,10 +355,9 @@ diff -rupN --no-dereference qt-creator-opensource-src-11.0.3/src/libs/qlitehtml/
private:
std::unique_ptr<DocumentContainerPrivate> d;
};
-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
+--- a/src/libs/qlitehtml/src/container_qpainter_p.h
++++ b/src/libs/qlitehtml/src/container_qpainter_p.h
+@@ -58,55 +58,53 @@
class DocumentContainerPrivate final : public litehtml::document_container
{
public: // document_container API
@@ -436,7 +433,7 @@ diff -rupN --no-dereference qt-creator-opensource-src-11.0.3/src/libs/qlitehtml/
QPixmap getPixmap(const QString &imageUrl, const QString &baseUrl);
QString serifFont() const;
-@@ -135,10 +133,5 @@ public: // document_container API
+@@ -135,10 +133,5 @@
DocumentContainer::PaletteCallback m_paletteCallback;
DocumentContainer::ClipboardCallback m_clipboardCallback;
bool m_blockLinks = false;
@@ -448,10 +445,9 @@ diff -rupN --no-dereference qt-creator-opensource-src-11.0.3/src/libs/qlitehtml/
- litehtml::context context;
+ QString m_masterStyleSheet;
};
-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
+--- a/src/libs/qlitehtml/src/qlitehtmlwidget.cpp
++++ b/src/libs/qlitehtml/src/qlitehtmlwidget.cpp
+@@ -346,7 +346,6 @@
{
public:
QString html;
@@ -459,7 +455,7 @@ diff -rupN --no-dereference qt-creator-opensource-src-11.0.3/src/libs/qlitehtml/
QUrl url;
DocumentContainer documentContainer;
qreal zoomFactor = 1;
-@@ -376,7 +375,7 @@ QLiteHtmlWidget::QLiteHtmlWidget(QWidget
+@@ -376,7 +375,7 @@
d->documentContainer.setClipboardCallback([this](bool yes) { emit copyAvailable(yes); });
// TODO adapt mastercss to palette (default text & background color)
@@ -468,7 +464,7 @@ diff -rupN --no-dereference qt-creator-opensource-src-11.0.3/src/libs/qlitehtml/
}
QLiteHtmlWidget::~QLiteHtmlWidget()
-@@ -407,7 +406,7 @@ void QLiteHtmlWidget::setHtml(const QStr
+@@ -407,7 +406,7 @@
{
d->html = content;
d->documentContainer.setPaintDevice(viewport());
@@ -476,4 +472,4 @@ diff -rupN --no-dereference qt-creator-opensource-src-11.0.3/src/libs/qlitehtml/
+ d->documentContainer.setDocument(content.toUtf8());
verticalScrollBar()->setValue(0);
horizontalScrollBar()->setValue(0);
- render();
\ No newline at end of file
+ render();
diff --git a/debian/patches/qt-creator_desktop.patch b/debian/patches/qt-creator_desktop.patch
index 0573c0f..f6a83a2 100644
--- a/debian/patches/qt-creator_desktop.patch
+++ b/debian/patches/qt-creator_desktop.patch
@@ -1,10 +1,9 @@
-diff -rupN --no-dereference qt-creator-opensource-src-11.0.2/share/applications/org.qt-project.qtcreator.desktop qt-creator-opensource-src-11.0.2-new/share/applications/org.qt-project.qtcreator.desktop
---- qt-creator-opensource-src-11.0.2/share/applications/org.qt-project.qtcreator.desktop 2023-08-14 03:53:08.000000000 +0200
-+++ qt-creator-opensource-src-11.0.2-new/share/applications/org.qt-project.qtcreator.desktop 2023-08-15 13:35:46.600834824 +0200
-@@ -8,5 +8,5 @@ Icon=QtProject-qtcreator
+--- a/share/applications/org.qt-project.qtcreator.desktop
++++ b/share/applications/org.qt-project.qtcreator.desktop
+@@ -8,5 +8,5 @@
StartupWMClass=qtcreator
Terminal=false
Categories=Development;IDE;Qt;
-MimeType= text/x-c++src;text/x-c++hdr;text/x-xsrc;application/x-designer;application/vnd.qt.qmakeprofile;application/vnd.qt.xml.resource;
+MimeType=text/x-c++src;text/x-c++hdr;text/x-xsrc;application/x-designer;application/vnd.qt.qmakeprofile;application/vnd.qt.xml.resource;
-
\ No newline at end of file
+
diff --git a/debian/patches/qt-creator_ninja-build.patch b/debian/patches/qt-creator_ninja-build.patch
index e89b610..15a18f2 100644
--- a/debian/patches/qt-creator_ninja-build.patch
+++ b/debian/patches/qt-creator_ninja-build.patch
@@ -1,7 +1,6 @@
-diff -rupN --no-dereference qt-creator-opensource-src-11.0.2/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp qt-creator-opensource-src-11.0.2-new/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp
---- qt-creator-opensource-src-11.0.2/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp 2023-08-14 03:53:09.000000000 +0200
-+++ qt-creator-opensource-src-11.0.2-new/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp 2023-08-15 13:35:45.124780710 +0200
-@@ -652,7 +652,7 @@ QVariant CMakeGeneratorKitAspect::defaul
+--- a/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp
++++ b/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp
+@@ -652,7 +652,7 @@
auto settings = Internal::CMakeSpecificSettings::instance();
if (settings->ninjaPath().isEmpty()) {
auto findNinja = [](const Environment &env) -> bool {
@@ -9,4 +8,4 @@ diff -rupN --no-dereference qt-creator-opensource-src-11.0.2/src/plugins/cmakepr
+ return !env.searchInPath("ninja-build").isEmpty();
};
if (!findNinja(tool->filePath().deviceEnvironment()))
- return findNinja(k->buildEnvironment());
\ No newline at end of file
+ return findNinja(k->buildEnvironment());
diff --git a/debian/patches/qt-creator_qmake-names.patch b/debian/patches/qt-creator_qmake-names.patch
index 529c9c7..288bcff 100644
--- a/debian/patches/qt-creator_qmake-names.patch
+++ b/debian/patches/qt-creator_qmake-names.patch
@@ -1,7 +1,6 @@
-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
+--- a/src/libs/utils/buildablehelperlibrary.cpp
++++ b/src/libs/utils/buildablehelperlibrary.cpp
+@@ -155,7 +155,12 @@
// 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)
@@ -14,4 +13,4 @@ diff -rupN --no-dereference qt-creator-opensource-src-11.0.3/src/libs/utils/buil
+ << 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
+ // and use a script wrapper around the host qmake executable
diff --git a/debian/patches/series b/debian/patches/series
index 395890b..dc92eb8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,7 +2,6 @@
# Debian patches.
debian_paths.diff
-upstream_ClangTools-Add-support-for-yaml-cpp-0.8.patch
# Neon patches
litehtml_includes.diff
@@ -20,4 +19,4 @@ qt-creator-clangformat.patch
# Fix build against litehtml-0.8
qt-creator-litehtml.patch
# allow for multiple qmake versions
-qt-creator_qmake-names.patch
\ No newline at end of file
+qt-creator_qmake-names.patch
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
deleted file mode 100644
index a15bacb..0000000
--- a/debian/patches/upstream_ClangTools-Add-support-for-yaml-cpp-0.8.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-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