Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Leo
aports
Commits
f2648d8d
Commit
f2648d8d
authored
Dec 29, 2020
by
Natanael Copa
Browse files
community/kompare: backport build fix for qt 5.15
parent
90aff07a
Changes
2
Show whitespace changes
Inline
Side-by-side
community/kompare/APKBUILD
View file @
f2648d8d
...
...
@@ -2,13 +2,15 @@
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname
=
kompare
pkgver
=
20.08.3
pkgrel
=
0
pkgrel
=
1
arch
=
"all !armhf !s390x !mips64"
url
=
"https://kde.org/applications/development/org.kde.kompare"
pkgdesc
=
"Graphical File Differences Tool"
license
=
"GPL-2.0-or-later AND GFDL-1.2-only"
makedepends
=
"extra-cmake-modules qt5-qtbase-dev kcoreaddons-dev kcodecs-dev kdoctools-dev kiconthemes-dev kjobwidgets-dev kconfig-dev kparts-dev ktexteditor-dev kwidgetsaddons-dev libkomparediff2-dev"
source
=
"https://download.kde.org/stable/release-service/
$pkgver
/src/kompare-
$pkgver
.tar.xz"
source
=
"https://download.kde.org/stable/release-service/
$pkgver
/src/kompare-
$pkgver
.tar.xz
Portaway-from-Obsolete-methods-of-QPrinter.patch
"
subpackages
=
"
$pkgname
-doc
$pkgname
-lang"
options
=
"!check"
# No tests
...
...
@@ -29,4 +31,5 @@ package() {
DESTDIR
=
"
$pkgdir
"
cmake
--build
build
--target
install
}
sha512sums
=
"0cb169296924e4dad2967052472fd7095092478819ba0925d82482f0e279719b2e29e75db9e732602cd845261918025ae9cf0e024c8ad0a250c04abe022deb4b kompare-20.08.3.tar.xz"
sha512sums
=
"0cb169296924e4dad2967052472fd7095092478819ba0925d82482f0e279719b2e29e75db9e732602cd845261918025ae9cf0e024c8ad0a250c04abe022deb4b kompare-20.08.3.tar.xz
dd1b953af8be55e935dc32b156f020aed77c081ee9f37916ceaf1215f34c1aeb921c883045fae4c4c85fccdac1e734cb7c19344f1440e91d905ebdeadb29ca1e Portaway-from-Obsolete-methods-of-QPrinter.patch"
community/kompare/Portaway-from-Obsolete-methods-of-QPrinter.patch
0 → 100644
View file @
f2648d8d
From 68d3eee36c48a2f44ccfd3f9e5a36311b829104b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=96mer=20Fad=C4=B1l=20USTA?= <omerusta@gmail.com>
Date: Thu, 17 Sep 2020 22:12:57 +0300
Subject: [PATCH] Portaway from Obsolete methods of QPrinter
setOrientation -> setPageOrientation
QPrinter::Landscape -> QPageLayout::Landscape
---
komparepart/kompare_part.cpp | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/komparepart/kompare_part.cpp b/komparepart/kompare_part.cpp
index 42d3120..88346d6 100644
--- a/komparepart/kompare_part.cpp
+++ b/komparepart/kompare_part.cpp
@@ -26,6 +26,7 @@
#include <QMenu>
#include <QPainter>
#include <QPrinter>
+#include <QPageLayout>
#include <QPrintDialog>
#include <QPrintPreviewDialog>
#include <QTemporaryDir>
@@ -610,7 +611,7 @@
void KomparePart::saveDiff()
void KomparePart::slotFilePrint()
{
QPrinter printer;
- printer.setOrientation(QPrinter::Landscape);
+ printer.setPageOrientation(QPageLayout::Landscape);
QPrintDialog* dlg = new QPrintDialog(&printer, nullptr);
if (dlg->exec() == QDialog::Accepted)
@@ -625,7 +626,7 @@
void KomparePart::slotFilePrint()
void KomparePart::slotFilePrintPreview()
{
QPrinter printer;
- printer.setOrientation(QPrinter::Landscape);
+ printer.setPageOrientation(QPageLayout::Landscape);
QPrintPreviewDialog dlg(&printer);
connect(&dlg, &QPrintPreviewDialog::paintRequested, this, &KomparePart::slotPaintRequested);
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment