Date: Wednesday, January 23, 2019 @ 15:32:14 Author: arojas Revision: 344624
PySide 5.12 rebuild (FS#61245) Added: falkon/trunk/falkon-pyside2-5.12.patch Modified: falkon/trunk/PKGBUILD ---------------------------+ PKGBUILD | 5 ++++- falkon-pyside2-5.12.patch | 42 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 1 deletion(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2019-01-23 15:24:30 UTC (rev 344623) +++ PKGBUILD 2019-01-23 15:32:14 UTC (rev 344624) @@ -2,7 +2,7 @@ pkgname=falkon pkgver=3.0.1 -pkgrel=5 +pkgrel=6 pkgdesc="Cross-platform QtWebEngine browser" arch=(x86_64) url="https://www.falkon.org/"; @@ -14,10 +14,12 @@ replaces=(qupzilla) source=(https://download.kde.org/stable/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz{,.sig} 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";) sha256sums=('7b6ed54986543dd5462602943fb824df12f15d2061996310c4c4b891433f1a83' 'SKIP' '454750ebdcf4a5f1ae322c3322ccc725b830d2441e9f4a86507e35fc79568206' + '8f31d255314b3b9865829775561712009962db5626ed44453c3f375c3731e2cd' '5f499c1ae86d441450902dd83a394cd9a72f766e4c1e32a1bbc5ba44b6d0ebb8') validpgpkeys=(3CB7B8416EF6778B409FDC43EBC3FC294452C6D8) # David Rosca <[email protected]> @@ -26,6 +28,7 @@ cd $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 } Added: falkon-pyside2-5.12.patch =================================================================== --- falkon-pyside2-5.12.patch (rev 0) +++ falkon-pyside2-5.12.patch 2019-01-23 15:32:14 UTC (rev 344624) @@ -0,0 +1,42 @@ +From 1c4a8ddd6f8e896787c837d37e9ad596c973e436 Mon Sep 17 00:00:00 2001 +From: David Rosca <[email protected]> +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 +
