[testing] falkon: try to fix build again

This commit is contained in:
Jeff Huang 2019-01-24 06:34:23 +01:00
parent 878cf55c0a
commit fd4b832a6c
2 changed files with 45 additions and 0 deletions

View File

@ -16,10 +16,12 @@ categories=('network')
source=("https://download.kde.org/stable/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz"
'start-white.png'
falkon-pyside2.patch::"https://cgit.kde.org/falkon.git/patch/?id=4c83ba3d"
falkon-pyside2-5.12.patch
falkon-webinspector.patch::"https://cgit.kde.org/falkon.git/patch/?id=48ca42d6")
sha1sums=('1c3b75b8c156b4f28ebb3c30e60e72c57233d47c'
'6ec67993bda3054d4210cc08177b124f873774e3'
'e1cf4433e58c0daa08f75a1dbb74bd9fc105bd31'
'b7318862e8e43efd158fdd1bd1225024bc1b52ae'
'c318adf83653cad781c452e3a2b26dd9ec450f8e')
prepare() {
@ -43,6 +45,7 @@ prepare() {
cd $srcdir/$pkgname-$pkgver
patch -p1 -i ../falkon-pyside2.patch # Fix build with Pyside2 5.11.0
patch -p1 -i ../falkon-pyside2-5.12.patch # Fix build with Pyside2 5.12.0
patch -p1 -i ../falkon-webinspector.patch # Fix WebInspector with Qt 5.11
}

View File

@ -0,0 +1,42 @@
From 1c4a8ddd6f8e896787c837d37e9ad596c973e436 Mon Sep 17 00:00:00 2001
From: David Rosca <nowrep@gmail.com>
Date: Wed, 23 Jan 2019 15:55:29 +0100
Subject: PyFalkon: Fix build with PySide 5.12
BUG: 402947
FIXED-IN: 3.1.0
---
src/lib/tools/desktopfile.h | 2 +-
src/plugins/PyFalkon/pyfalkon_global.h | 3 ---
2 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/src/lib/tools/desktopfile.h b/src/lib/tools/desktopfile.h
index baf231a..d41e7e2 100644
--- a/src/lib/tools/desktopfile.h
+++ b/src/lib/tools/desktopfile.h
@@ -26,7 +26,7 @@ class QSettings;
class FALKON_EXPORT DesktopFile
{
public:
- explicit DesktopFile();
+ DesktopFile();
explicit DesktopFile(const QString &filePath);
QString name() const;
diff --git a/src/plugins/PyFalkon/pyfalkon_global.h b/src/plugins/PyFalkon/pyfalkon_global.h
index b064dce..391ef6c 100644
--- a/src/plugins/PyFalkon/pyfalkon_global.h
+++ b/src/plugins/PyFalkon/pyfalkon_global.h
@@ -16,9 +16,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
* ============================================================ */
-// Make "signals:", "slots:" visible as access specifiers
-#define QT_ANNOTATE_ACCESS_SPECIFIER(a) __attribute__((annotate(#a)))
-
// PYSIDE-711
#include <QHstsPolicy>
#include <QWebEngineContextMenuData>
--
cgit v1.1