[neon/neon-packaging/mauikit-documents/Neon/release] debian/patches: qt6 includes
Carlos De Maine
null at kde.org
Sun Jul 14 14:25:14 BST 2024
Git commit f7821726b8f9fd2e2b8d6f7093412693876e0eb8 by Carlos De Maine.
Committed on 14/07/2024 at 13:25.
Pushed by carlosdem into branch 'Neon/release'.
qt6 includes
(cherry picked from commit 0c25f03c6cd211294160681d5642a0edf59674b0)
Co-authored-by: Carlos De Maine <carlosdemaine at gmail.com>
M +63 -0 debian/patches/fixbuild
https://invent.kde.org/neon/neon-packaging/mauikit-documents/-/commit/f7821726b8f9fd2e2b8d6f7093412693876e0eb8
diff --git a/debian/patches/fixbuild b/debian/patches/fixbuild
index e7a2420..f39ef47 100644
--- a/debian/patches/fixbuild
+++ b/debian/patches/fixbuild
@@ -50,6 +50,69 @@ index 3e5b7be151a17ffc7ae5230dac746d037e3f68cc..e3fa8adf04163db4315294f24368630c
include("${CMAKE_CURRENT_LIST_DIR}/AdvancedComicBookFormatTargets.cmake")
@PACKAGE_INCLUDE_CORE_QCHTARGETS@
+diff --git a/src/code/poppler/code/pdfdocument.h b/src/code/poppler/code/pdfdocument.h
+index 33c03eb938a8812b8493d906aca2a5582919195d..77266bdb15290201547b1efa4dec61b1d3c2d165 100644
+--- a/src/code/poppler/code/pdfdocument.h
++++ b/src/code/poppler/code/pdfdocument.h
+@@ -22,7 +22,7 @@
+
+ #include <QAbstractListModel>
+
+-#include <poppler/qt5/poppler-qt5.h>
++#include <poppler/qt6/poppler-qt6.h>
+
+ #include "pdfitem.h"
+ #include "pdftocmodel.h"
+diff --git a/src/code/poppler/code/pdfimageprovider.h b/src/code/poppler/code/pdfimageprovider.h
+index de4866d914bb30a88526b90a8d4fce26d76a694b..9346fb3f8e751902c879103167f7c8b49df4eabc 100644
+--- a/src/code/poppler/code/pdfimageprovider.h
++++ b/src/code/poppler/code/pdfimageprovider.h
+@@ -21,7 +21,7 @@
+ #define PDFIMAGEPROVIDER_H
+
+ #include <QQuickImageProvider>
+-#include <poppler/qt5/poppler-qt5.h>
++#include <poppler/qt6/poppler-qt6.h>
+
+ class PdfImageProvider : public QQuickImageProvider
+ {
+diff --git a/src/code/poppler/code/pdfitem.h b/src/code/poppler/code/pdfitem.h
+index f2df85a48bc2944842d3a1a3e681ae997919084f..e16af1078b0c856f2183fa2bfdebc57eafba6fe7 100644
+--- a/src/code/poppler/code/pdfitem.h
++++ b/src/code/poppler/code/pdfitem.h
+@@ -19,7 +19,7 @@
+ #ifndef PDFITEM_H
+ #define PDFITEM_H
+
+-#include <poppler/qt5/poppler-qt5.h>
++#include <poppler/qt6/poppler-qt6.h>
+
+ class PdfItem
+ {
+diff --git a/src/code/poppler/code/pdftocmodel.h b/src/code/poppler/code/pdftocmodel.h
+index 1900687e1582299a0105f4a4e8da29bf4306d8d7..f4332cc325a1a9613a8ca8a89525fcc91c6c23db 100644
+--- a/src/code/poppler/code/pdftocmodel.h
++++ b/src/code/poppler/code/pdftocmodel.h
+@@ -21,7 +21,7 @@
+
+ #include <QAbstractListModel>
+
+-#include <poppler/qt5/poppler-qt5.h>
++#include <poppler/qt6/poppler-qt6.h>
+
+ class TocEntry
+ {
+diff --git a/src/code/poppler/code/thumbnailer.cpp b/src/code/poppler/code/thumbnailer.cpp
+index 17d5be98cd3d723e3aab0fcba27d605e0b447d09..faf8839a4acb1e418e4511d58d1899bc5b12f325 100644
+--- a/src/code/poppler/code/thumbnailer.cpp
++++ b/src/code/poppler/code/thumbnailer.cpp
+@@ -1,5 +1,5 @@
+ #include "thumbnailer.h"
+-#include <poppler/qt5/poppler-qt5.h>
++#include <poppler/qt6/poppler-qt6.h>
+ #include <QImage>
+ #include <QUrl>
+
diff --git a/src/controls.5/poppler/PDFViewer.qml b/src/controls.6/poppler/PDFViewer.qml
similarity index 100%
rename from src/controls.5/poppler/PDFViewer.qml
More information about the Neon-commits
mailing list