kiss-community/repo
2
0
Fork 1
mirror of https://codeberg.org/kiss-community/repo synced 2025-02-25 23:56:27 -07:00
Code Issues Wiki

qt5-*: bump to 5.14.1

Browse Source
This commit is contained in:
Dylan Araps 2020-01-27 22:02:31 +02:00
parent f8658f130e
commit 154f4a3e21
No known key found for this signature in database
GPG Key ID: 46D62DD9F1DE636E
24 changed files with 107 additions and 144 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
extra/falkon/checksums
View File

@ -1,4 +1,4 @@
ce743cd80c0e2d525a784e29c9b487f73480119b0567f9ce8ef1f44cca527587 falkon-3.1.0.tar.xz
37734210642c99c6f4b047bbf15fb208348fdd6564b2fcf674e282505770c983 0001-falkon-no-execinfo.patch
22952f0d1a0862692d1561418ea27b66f18e11354066b985c6f02588e7232bac 0002-falkon-open-mpv.patch
19423bae577005bb0491cdbb1161ad021761460e343367528bc11b8cd9e60879 1cecd14fd069ff778224fe778b7117cb4e3bc0ee.tar.gz
6840921795d025f2a02baec8baa5456e245c84f10ecbb06ba85f33f193939af1 0001-falkon-no-karchive.patch
e0a3dadfe241f6407d1c7914359d65230eeb4b119a9458a98a3f70e0ebfe9d4e 0002-falkon-open-mpv.patch
929dc4ee0e1ec87510696894e0ba3d0218707d6fe9903be3cde5c4ff71a50aa2 falkon-privacy

115
extra/falkon/patches/0001-falkon-no-execinfo.patch
View File

@ -1,115 +0,0 @@
From 66d6e81e2336f60d2513159cbff5f3d33b74d83d Mon Sep 17 00:00:00 2001
From: David Rosca <nowrep@gmail.com>
Date: Mon, 22 Apr 2019 09:46:39 +0200
Subject: [PATCH] main: Remove backtrace handler
---
src/main/main.cpp | 81 -----------------------------------------------
1 file changed, 81 deletions(-)
diff --git a/src/main/main.cpp b/src/main/main.cpp
index c1af1b6f..3315ef25 100644
--- a/src/main/main.cpp
+++ b/src/main/main.cpp
@@ -17,84 +17,9 @@
* ============================================================ */
#include "mainapplication.h"
#include "proxystyle.h"
-#include "datapaths.h"
-#include <QMessageBox> // For QT_REQUIRE_VERSION
#include <iostream>
-#if defined(Q_OS_LINUX) || defined(__GLIBC__) || defined(__FreeBSD__) || defined(__HAIKU__)
-#include <signal.h>
-#include <execinfo.h>
-
-#include <QDir>
-#include <QDateTime>
-#include <QTextStream>
-#include <QWebEnginePage>
-
-void falkon_signal_handler(int s)
-{
- if (s != SIGSEGV) {
- return;
- }
-
- static bool sigSegvServed = false;
- if (sigSegvServed) {
- abort();
- }
- sigSegvServed = true;
-
- std::cout << "Falkon: Crashed :( Saving backtrace in " << qPrintable(DataPaths::path(DataPaths::Config)) << "/crashlog ..." << std::endl;
-
- void* array[100];
- int size = backtrace(array, 100);
- char** strings = backtrace_symbols(array, size);
-
- if (size < 0 || !strings) {
- std::cout << "Cannot get backtrace!" << std::endl;
- abort();
- }
-
- QDir dir(DataPaths::path(DataPaths::Config));
- if (!dir.exists()) {
- std::cout << qPrintable(DataPaths::path(DataPaths::Config)) << " does not exist" << std::endl;
- abort();
- }
-
- if (!dir.cd("crashlog")) {
- if (!dir.mkdir("crashlog")) {
- std::cout << "Cannot create " << qPrintable(DataPaths::path(DataPaths::Config)) << "crashlog directory!" << std::endl;
- abort();
- }
-
- dir.cd("crashlog");
- }
-
- const QDateTime currentDateTime = QDateTime::currentDateTime();
-
- QFile file(dir.absoluteFilePath("Crash-" + currentDateTime.toString(Qt::ISODate) + ".txt"));
- if (!file.open(QFile::WriteOnly | QFile::Truncate)) {
- std::cout << "Cannot open file " << qPrintable(file.fileName()) << " for writing!" << std::endl;
- abort();
- }
-
- QTextStream stream(&file);
- stream << "Time: " << currentDateTime.toString() << endl;
- stream << "Qt version: " << qVersion() << " (compiled with " << QT_VERSION_STR << ")" << endl;
- stream << "Falkon version: " << Qz::VERSION << endl;
- stream << "Rendering engine: QtWebEngine" << endl;
- stream << endl;
- stream << "============== BACKTRACE ==============" << endl;
-
- for (int i = 0; i < size; ++i) {
- stream << "#" << i << ": " << strings[i] << endl;
- }
-
- file.close();
-
- std::cout << "Backtrace successfully saved in " << qPrintable(dir.absoluteFilePath(file.fileName())) << std::endl;
-}
-#endif // defined(Q_OS_LINUX) || defined(__GLIBC__) || defined(__FreeBSD__)
-
#ifndef Q_OS_WIN
void msgHandler(QtMsgType type, const QMessageLogContext &context, const QString &msg)
{
@@ -123,16 +48,10 @@ void msgHandler(QtMsgType type, const QMessageLogContext &context, const QString
int main(int argc, char* argv[])
{
- QT_REQUIRE_VERSION(argc, argv, "5.8.0");
-
#ifndef Q_OS_WIN
qInstallMessageHandler(&msgHandler);
#endif
-#if defined(Q_OS_LINUX) || defined(__GLIBC__) || defined(__FreeBSD__)
- signal(SIGSEGV, falkon_signal_handler);
-#endif
-
// Hack to fix QT_STYLE_OVERRIDE with QProxyStyle
const QByteArray style = qgetenv("QT_STYLE_OVERRIDE");
if (!style.isEmpty()) {

78
extra/falkon/patches/0001-falkon-no-karchive.patch Normal file
View File

@ -0,0 +1,78 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 207c90a5..46484769 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -55,7 +55,7 @@ endif()
if (UNIX AND NOT APPLE AND NOT NO_X11)
add_definitions(-DQZ_WS_X11)
- find_package(XCB REQUIRED COMPONENTS XCB UTIL)
+ find_package(XCB REQUIRED COMPONENTS XCB)
find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS X11Extras)
endif()
if (WIN32)
@@ -88,9 +88,6 @@ endif()
# Mandatory: OpenSSL
find_package(OpenSSL REQUIRED)
-# Mandatory: KF5
-find_package(KF5 REQUIRED COMPONENTS Archive)
-
# KF5I18n: Mandatory with downloaded translations (only for ki18n_install)
if (EXISTS "${CMAKE_SOURCE_DIR}/po")
find_package(KF5I18n REQUIRED)
diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt
index 3b7efff0..70416b47 100644
--- a/src/lib/CMakeLists.txt
+++ b/src/lib/CMakeLists.txt
@@ -156,7 +156,6 @@ set(SRCS ${SRCS}
plugins/pluginproxy.cpp
plugins/plugins.cpp
plugins/speeddial.cpp
- plugins/ocssupport.cpp
plugins/qml/qmlpluginloader.cpp
plugins/qml/qmlplugin.cpp
plugins/qml/qmlplugins.cpp
@@ -352,7 +351,6 @@ target_link_libraries(FalkonPrivate
Qt5::PrintSupport
Qt5::QuickWidgets
Qt5::WebChannel
- KF5::Archive
${OPENSSL_CRYPTO_LIBRARY}
)
diff --git a/src/lib/app/browserwindow.cpp b/src/lib/app/browserwindow.cpp
index 5481f369..368bae43 100644
--- a/src/lib/app/browserwindow.cpp
+++ b/src/lib/app/browserwindow.cpp
@@ -81,7 +81,6 @@
#ifdef QZ_WS_X11
#include <QX11Info>
#include <xcb/xcb.h>
-#include <xcb/xcb_atom.h>
#endif
static const int savedWindowVersion = 2;
diff --git a/src/lib/webengine/webpage.cpp b/src/lib/webengine/webpage.cpp
index 5037b1cb..af1461f8 100644
--- a/src/lib/webengine/webpage.cpp
+++ b/src/lib/webengine/webpage.cpp
@@ -42,7 +42,6 @@
#include "ui_jsprompt.h"
#include "passwordmanager.h"
#include "scripts.h"
-#include "ocssupport.h"
#include <iostream>
@@ -454,10 +453,6 @@ bool WebPage::acceptNavigationRequest(const QUrl &url, QWebEnginePage::Navigatio
}
}
- if (url.scheme() == QL1S("ocs") && OcsSupport::instance()->handleUrl(url)) {
- return false;
- }
-
const bool result = QWebEnginePage::acceptNavigationRequest(url, type, isMainFrame);
if (result) {

8
extra/falkon/patches/0002-falkon-open-mpv.patch
View File

@ -1,5 +1,5 @@
diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt
index 54b28ba9..bcd42cc9 100644
index bfcf593..21b4db6 100644
--- a/src/plugins/CMakeLists.txt
+++ b/src/plugins/CMakeLists.txt
@@ -8,6 +8,7 @@ add_subdirectory(PIM)
@ -8,8 +8,8 @@ index 54b28ba9..bcd42cc9 100644
add_subdirectory(VerticalTabs)
+add_subdirectory(OpenInMpv)
if (GNOME_KEYRING_FOUND)
add_subdirectory(GnomeKeyringPasswords)
if (ENABLE_KDE_FRAMEWORKS_INTEGRATION_PLUGIN)
add_subdirectory(KDEFrameworksIntegration)
diff --git a/src/plugins/OpenInMpv/CMakeLists.txt b/src/plugins/OpenInMpv/CMakeLists.txt
new file mode 100644
index 00000000..5f7d66a6
@ -375,7 +375,7 @@ index 00000000..1b4ab0d4
+public:
+ explicit OpenInMpv();
+
+ DesktopFile metaData() const override;
+ DesktopFile metaData() const;
+ void init(InitState state, const QString &settingsPath) override;
+ void unload() override;
+ bool testPlugin() override;

4
extra/falkon/sources
View File

@ -1,4 +1,4 @@
https://download.kde.org/stable/falkon/3.1/falkon-3.1.0.tar.xz
patches/0001-falkon-no-execinfo.patch
https://github.com/KDE/falkon/archive/1cecd14fd069ff778224fe778b7117cb4e3bc0ee.tar.gz
patches/0001-falkon-no-karchive.patch
patches/0002-falkon-open-mpv.patch
files/falkon-privacy

2
extra/falkon/version
View File

@ -1 +1 @@
3.1.0 2
1cecd14fd069ff778224fe778b7117cb4e3bc0ee 1

2
extra/qt5-declarative/checksums
View File

@ -1 +1 @@
bbf11ee33d6f0d6bd6c4dc641d4f2aafbc7c6cd3b421a658955302d441dc9d8e qtdeclarative-everywhere-src-5.14.0.tar.xz
762fe495d2f97fd70f06dc7d3929506ea3b5e3151ad813e0629209b7bc504c8a qtdeclarative-everywhere-src-5.14.1.tar.xz

2
extra/qt5-declarative/sources
View File

@ -1 +1 @@
https://download.qt.io/official_releases/qt/5.14/5.14.0/submodules/qtdeclarative-everywhere-src-5.14.0.tar.xz
https://download.qt.io/official_releases/qt/5.14/5.14.1/submodules/qtdeclarative-everywhere-src-5.14.1.tar.xz

2
extra/qt5-declarative/version
View File

@ -1 +1 @@
5.14.0 1
5.14.1 1

2
extra/qt5-svg/checksums
View File

@ -1 +1 @@
1ee51a66e1996f96bf7fd4c696079c4cb22ea2bc710d47535c1daf3638d8f393 qtsvg-everywhere-src-5.14.0.tar.xz
8540a57312f815f81a45b891b49959d776727fde17579bb6bf1a537996bc9359 qtsvg-everywhere-src-5.14.1.tar.xz

2
extra/qt5-svg/sources
View File

@ -1 +1 @@
https://download.qt.io/official_releases/qt/5.14/5.14.0/submodules/qtsvg-everywhere-src-5.14.0.tar.xz
https://download.qt.io/official_releases/qt/5.14/5.14.1/submodules/qtsvg-everywhere-src-5.14.1.tar.xz

2
extra/qt5-svg/version
View File

@ -1 +1 @@
5.14.0 1
5.14.1 1

2
extra/qt5-webchannel/checksums
View File

@ -1 +1 @@
0cb8dd07b34da8d44f8a14701409ce87fce5010f9b57273b357717c2dfd35383 qtwebchannel-everywhere-src-5.14.0.tar.xz
3af5262fde14c7dfe7bcc12d5796a482837bd09f0878851fd8de5db0b1985e6a qtwebchannel-everywhere-src-5.14.1.tar.xz

2
extra/qt5-webchannel/sources
View File

@ -1 +1 @@
https://download.qt.io/official_releases/qt/5.14/5.14.0/submodules/qtwebchannel-everywhere-src-5.14.0.tar.xz
https://download.qt.io/official_releases/qt/5.14/5.14.1/submodules/qtwebchannel-everywhere-src-5.14.1.tar.xz

2
extra/qt5-webchannel/version
View File

@ -1 +1 @@
5.14.0 1
5.14.1 1

2
extra/qt5-webengine/checksums
View File

@ -1,4 +1,4 @@
74f8c11cc318612c8d9dc87cf791badb1efe7080c10d8b3ed5843b249a942d32 qtwebengine-everywhere-src-5.14.0.tar.xz
4ec77040a876a83aa2a833ebfe7b3e88dcc167ceb317095eb226a0b8d455e887 qtwebengine-everywhere-src-5.14.1.tar.xz
908735d4f7e4fc9307e177ac9da3419e5801a7740094073c03f9f33600b9767e 0002-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch
1be1f8e2851f6420f0676fb4f1562368125f93da8bff977be741f85bb453a9fe 0004-mkspecs-Allow-builds-with-libc-glibc.patch
9cd813f5a0b39795dd8f8822f30f9fd4fd4952bad4b4037cf0bf0f2918a56541 0011-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch

2
extra/qt5-webengine/sources
View File

@ -1,4 +1,4 @@
http://download.qt-project.org/official_releases/qt/5.14/5.14.0/submodules/qtwebengine-everywhere-src-5.14.0.tar.xz
http://download.qt-project.org/official_releases/qt/5.14/5.14.1/submodules/qtwebengine-everywhere-src-5.14.1.tar.xz
patches/0002-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch
patches/0004-mkspecs-Allow-builds-with-libc-glibc.patch
patches/0011-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch

2
extra/qt5-webengine/version
View File

@ -1 +1 @@
5.14.0 2
5.14.1 1

2
extra/qt5-x11extras/checksums
View File

@ -1 +1 @@
7a06de3b49d34b72fa773800f049c06c04c51eb3440833779f1e9300a94947b1 qtx11extras-everywhere-src-5.14.0.tar.xz
b268907deb06570671c1f584feb1508e7fded129209a268183decc122bfac181 qtx11extras-everywhere-src-5.14.1.tar.xz

2
extra/qt5-x11extras/sources
View File

@ -1 +1 @@
https://download.qt.io/official_releases/qt/5.14/5.14.0/submodules/qtx11extras-everywhere-src-5.14.0.tar.xz
https://download.qt.io/official_releases/qt/5.14/5.14.1/submodules/qtx11extras-everywhere-src-5.14.1.tar.xz

2
extra/qt5-x11extras/version
View File

@ -1 +1 @@
5.14.0 1
5.14.1 1

2
extra/qt5/checksums
View File

@ -1 +1 @@
4ef921c0f208a1624439801da8b3f4344a3793b660ce1095f2b7f5c4246b9463 qtbase-everywhere-src-5.14.0.tar.xz
d9d423a6e7bcf1055c0372fc029f14a6fe67dd62c67b83095cde68b60b762cf7 qtbase-everywhere-src-5.14.1.tar.xz

2
extra/qt5/sources
View File

@ -1 +1 @@
http://download.qt-project.org/official_releases/qt/5.14/5.14.0/submodules/qtbase-everywhere-src-5.14.0.tar.xz
http://download.qt-project.org/official_releases/qt/5.14/5.14.1/submodules/qtbase-everywhere-src-5.14.1.tar.xz

2
extra/qt5/version
View File

@ -1 +1 @@
5.14.0 1
5.14.1 1