| 1 |
commit: 02a0659d4ac4c6ad621d4655781c8ef2acba1697 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Nov 29 19:55:17 2020 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Nov 29 20:04:28 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02a0659d |
| 7 |
|
| 8 |
kde-apps/kompare: Fix build with Qt 5.15.2 |
| 9 |
|
| 10 |
Upstream commit 68d3eee36c48a2f44ccfd3f9e5a36311b829104b |
| 11 |
|
| 12 |
Reported-by: Sergej Petrushkin <psn8402 <AT> gmail.com> |
| 13 |
Closes: https://bugs.gentoo.org/757621 |
| 14 |
Package-Manager: Portage-3.0.11, Repoman-3.0.2 |
| 15 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 16 |
|
| 17 |
.../kompare/files/kompare-20.08.3-qt-5.15.2.patch | 44 ++++++++++++++++++++++ |
| 18 |
kde-apps/kompare/kompare-20.08.3.ebuild | 2 + |
| 19 |
2 files changed, 46 insertions(+) |
| 20 |
|
| 21 |
diff --git a/kde-apps/kompare/files/kompare-20.08.3-qt-5.15.2.patch b/kde-apps/kompare/files/kompare-20.08.3-qt-5.15.2.patch |
| 22 |
new file mode 100644 |
| 23 |
index 00000000000..c29f957d70d |
| 24 |
--- /dev/null |
| 25 |
+++ b/kde-apps/kompare/files/kompare-20.08.3-qt-5.15.2.patch |
| 26 |
@@ -0,0 +1,44 @@ |
| 27 |
+From 68d3eee36c48a2f44ccfd3f9e5a36311b829104b Mon Sep 17 00:00:00 2001 |
| 28 |
+From: =?UTF-8?q?=C3=96mer=20Fad=C4=B1l=20USTA?= <omerusta@×××××.com> |
| 29 |
+Date: Thu, 17 Sep 2020 22:12:57 +0300 |
| 30 |
+Subject: [PATCH] Portaway from Obsolete methods of QPrinter |
| 31 |
+ |
| 32 |
+setOrientation -> setPageOrientation |
| 33 |
+QPrinter::Landscape -> QPageLayout::Landscape |
| 34 |
+--- |
| 35 |
+ komparepart/kompare_part.cpp | 5 +++-- |
| 36 |
+ 1 file changed, 3 insertions(+), 2 deletions(-) |
| 37 |
+ |
| 38 |
+diff --git a/komparepart/kompare_part.cpp b/komparepart/kompare_part.cpp |
| 39 |
+index 42d3120..88346d6 100644 |
| 40 |
+--- a/komparepart/kompare_part.cpp |
| 41 |
++++ b/komparepart/kompare_part.cpp |
| 42 |
+@@ -26,6 +26,7 @@ |
| 43 |
+ #include <QMenu> |
| 44 |
+ #include <QPainter> |
| 45 |
+ #include <QPrinter> |
| 46 |
++#include <QPageLayout> |
| 47 |
+ #include <QPrintDialog> |
| 48 |
+ #include <QPrintPreviewDialog> |
| 49 |
+ #include <QTemporaryDir> |
| 50 |
+@@ -610,7 +611,7 @@ void KomparePart::saveDiff() |
| 51 |
+ void KomparePart::slotFilePrint() |
| 52 |
+ { |
| 53 |
+ QPrinter printer; |
| 54 |
+- printer.setOrientation(QPrinter::Landscape); |
| 55 |
++ printer.setPageOrientation(QPageLayout::Landscape); |
| 56 |
+ QPrintDialog* dlg = new QPrintDialog(&printer, nullptr); |
| 57 |
+ |
| 58 |
+ if (dlg->exec() == QDialog::Accepted) |
| 59 |
+@@ -625,7 +626,7 @@ void KomparePart::slotFilePrint() |
| 60 |
+ void KomparePart::slotFilePrintPreview() |
| 61 |
+ { |
| 62 |
+ QPrinter printer; |
| 63 |
+- printer.setOrientation(QPrinter::Landscape); |
| 64 |
++ printer.setPageOrientation(QPageLayout::Landscape); |
| 65 |
+ QPrintPreviewDialog dlg(&printer); |
| 66 |
+ |
| 67 |
+ connect(&dlg, &QPrintPreviewDialog::paintRequested, this, &KomparePart::slotPaintRequested); |
| 68 |
+-- |
| 69 |
+GitLab |
| 70 |
+ |
| 71 |
|
| 72 |
diff --git a/kde-apps/kompare/kompare-20.08.3.ebuild b/kde-apps/kompare/kompare-20.08.3.ebuild |
| 73 |
index 528c7be9361..bd56709d12e 100644 |
| 74 |
--- a/kde-apps/kompare/kompare-20.08.3.ebuild |
| 75 |
+++ b/kde-apps/kompare/kompare-20.08.3.ebuild |
| 76 |
@@ -38,3 +38,5 @@ DEPEND=" |
| 77 |
>=kde-frameworks/kxmlgui-${KFMIN}:5 |
| 78 |
" |
| 79 |
RDEPEND="${DEPEND}" |
| 80 |
+ |
| 81 |
+PATCHES=( "${FILESDIR}/${P}-qt-5.15.2.patch" ) |
Archives