summaryrefslogtreecommitdiff
path: root/www-client/qupzilla/files
diff options
context:
space:
mode:
Diffstat (limited to 'www-client/qupzilla/files')
-rw-r--r--www-client/qupzilla/files/qupzilla-2.1.2-fullscreen.patch102
-rw-r--r--www-client/qupzilla/files/qupzilla-2.1.2-openssl-1.1.0.patch103
2 files changed, 0 insertions, 205 deletions
diff --git a/www-client/qupzilla/files/qupzilla-2.1.2-fullscreen.patch b/www-client/qupzilla/files/qupzilla-2.1.2-fullscreen.patch
deleted file mode 100644
index c18b4210..00000000
--- a/www-client/qupzilla/files/qupzilla-2.1.2-fullscreen.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-From 5812721e4822ae363866df2cc9fc762b25061c92 Mon Sep 17 00:00:00 2001
-From: David Rosca <nowrep@gmail.com>
-Date: Sat, 19 Aug 2017 18:52:26 +0200
-Subject: [PATCH] BrowserWindow: Fix failing to enter fullscreen sometimes
-
----
- src/lib/app/browserwindow.cpp | 23 ++++++++++++++++-------
- src/lib/app/browserwindow.h | 5 ++++-
- 2 files changed, 20 insertions(+), 8 deletions(-)
-
-diff --git a/src/lib/app/browserwindow.cpp b/src/lib/app/browserwindow.cpp
-index 1eab597d7..2a41fddf2 100644
---- a/src/lib/app/browserwindow.cpp
-+++ b/src/lib/app/browserwindow.cpp
-@@ -683,6 +683,15 @@ void BrowserWindow::showSource(WebView *view)
- view->showSource();
- }
-
-+void BrowserWindow::showNormal()
-+{
-+ if (m_normalWindowState & Qt::WindowMaximized) {
-+ QMainWindow::showMaximized();
-+ } else {
-+ QMainWindow::showNormal();
-+ }
-+}
-+
- SideBar* BrowserWindow::addSideBar()
- {
- if (m_sideBar) {
-@@ -786,9 +795,9 @@ void BrowserWindow::toggleFullScreen()
- }
-
- if (isFullScreen())
-- setWindowState(windowState() & ~Qt::WindowFullScreen);
-+ showNormal();
- else
-- setWindowState(windowState() | Qt::WindowFullScreen);
-+ showFullScreen();
- }
-
- void BrowserWindow::enterHtmlFullScreen()
-@@ -1049,9 +1058,9 @@ bool BrowserWindow::event(QEvent* event)
- case QEvent::WindowStateChange: {
- QWindowStateChangeEvent* ev = static_cast<QWindowStateChangeEvent*>(event);
-
-- if (!(ev->oldState() & Qt::WindowFullScreen) && windowState() & Qt::WindowFullScreen) {
-+ if (!(m_oldWindowState & Qt::WindowFullScreen) && windowState() & Qt::WindowFullScreen) {
- // Enter fullscreen
-- m_windowStates = ev->oldState();
-+ m_normalWindowState = m_oldWindowState;
-
- m_statusBarVisible = statusBar()->isVisible();
- #ifndef Q_OS_MACOS
-@@ -1063,7 +1072,7 @@ bool BrowserWindow::event(QEvent* event)
- m_navigationContainer->hide();
- m_navigationToolbar->buttonExitFullscreen()->show();
- }
-- else if (ev->oldState() & Qt::WindowFullScreen && !(windowState() & Qt::WindowFullScreen)) {
-+ else if (m_oldWindowState & Qt::WindowFullScreen && !(windowState() & Qt::WindowFullScreen)) {
- // Leave fullscreen
- statusBar()->setVisible(m_statusBarVisible);
- #ifndef Q_OS_MACOS
-@@ -1074,13 +1083,13 @@ bool BrowserWindow::event(QEvent* event)
- m_navigationToolbar->setSuperMenuVisible(!m_menuBarVisible);
- m_navigationToolbar->buttonExitFullscreen()->hide();
- m_isHtmlFullScreen = false;
--
-- setWindowState(m_windowStates);
- }
-
- if (m_hideNavigationTimer) {
- m_hideNavigationTimer->stop();
- }
-+
-+ m_oldWindowState = windowState();
- break;
- }
-
-diff --git a/src/lib/app/browserwindow.h b/src/lib/app/browserwindow.h
-index 51d4023ce..5e326fc34 100644
---- a/src/lib/app/browserwindow.h
-+++ b/src/lib/app/browserwindow.h
-@@ -141,6 +141,8 @@ public slots:
- void loadAddress(const QUrl &url);
- void showSource(WebView *view = Q_NULLPTR);
-
-+ void showNormal();
-+
- private slots:
- void addTab();
- void openLocation();
-@@ -211,7 +213,8 @@ private slots:
- bool m_menuBarVisible;
- bool m_statusBarVisible;
- bool m_isHtmlFullScreen;
-- Qt::WindowStates m_windowStates;
-+ Qt::WindowStates m_oldWindowState = Qt::WindowNoState;
-+ Qt::WindowStates m_normalWindowState = Qt::WindowNoState;
- QTimer* m_hideNavigationTimer;
-
- QList<QPointer<QWidget> > m_deleteOnCloseWidgets;
diff --git a/www-client/qupzilla/files/qupzilla-2.1.2-openssl-1.1.0.patch b/www-client/qupzilla/files/qupzilla-2.1.2-openssl-1.1.0.patch
deleted file mode 100644
index 42effa56..00000000
--- a/www-client/qupzilla/files/qupzilla-2.1.2-openssl-1.1.0.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-From efc4725e91e10ccfef257143408d3a683e74a866 Mon Sep 17 00:00:00 2001
-From: Jose Rios <joseriosneto@protonmail.com>
-Date: Mon, 1 May 2017 02:12:26 +0100
-Subject: [PATCH] Fixed compilation for Openssl 1.1.0
-
-Most of libcrypto and libssl internal structures were made
-opaque in this version not allowing to instatiate them in
-the stack.
-
-More info:
- * https://www.openssl.org/news/openssl-1.1.0-notes.html
- * https://github.com/openssl/openssl/issues/962#issuecomment-208792020
----
- src/lib/tools/aesinterface.cpp | 28 ++++++++++++++++------------
- src/lib/tools/aesinterface.h | 4 ++--
- 2 files changed, 18 insertions(+), 14 deletions(-)
-
-diff --git a/src/lib/tools/aesinterface.cpp b/src/lib/tools/aesinterface.cpp
-index fa33eb3..29ed37e 100644
---- a/src/lib/tools/aesinterface.cpp
-+++ b/src/lib/tools/aesinterface.cpp
-@@ -39,14 +39,18 @@ AesInterface::AesInterface(QObject* parent)
- : QObject(parent)
- , m_ok(false)
- {
-- EVP_CIPHER_CTX_init(&m_encodeCTX);
-- EVP_CIPHER_CTX_init(&m_decodeCTX);
-+ m_encodeCTX = EVP_CIPHER_CTX_new();
-+ m_decodeCTX = EVP_CIPHER_CTX_new();
-+ EVP_CIPHER_CTX_init(m_encodeCTX);
-+ EVP_CIPHER_CTX_init(m_decodeCTX);
- }
-
- AesInterface::~AesInterface()
- {
-- EVP_CIPHER_CTX_cleanup(&m_encodeCTX);
-- EVP_CIPHER_CTX_cleanup(&m_decodeCTX);
-+ EVP_CIPHER_CTX_cleanup(m_encodeCTX);
-+ EVP_CIPHER_CTX_cleanup(m_decodeCTX);
-+ EVP_CIPHER_CTX_free(m_encodeCTX);
-+ EVP_CIPHER_CTX_free(m_decodeCTX);
- }
-
- bool AesInterface::isOk()
-@@ -78,10 +82,10 @@ bool AesInterface::init(int evpMode, const QByteArray &password, const QByteArra
- int result = 0;
- if (evpMode == EVP_PKEY_MO_ENCRYPT) {
- m_iVector = createRandomData(EVP_MAX_IV_LENGTH);
-- result = EVP_EncryptInit_ex(&m_encodeCTX, EVP_aes_256_cbc(), NULL, key, (uchar*)m_iVector.constData());
-+ result = EVP_EncryptInit_ex(m_encodeCTX, EVP_aes_256_cbc(), NULL, key, (uchar*)m_iVector.constData());
- }
- else if (evpMode == EVP_PKEY_MO_DECRYPT) {
-- result = EVP_DecryptInit_ex(&m_decodeCTX, EVP_aes_256_cbc(), NULL, key, (uchar*)iVector.constData());
-+ result = EVP_DecryptInit_ex(m_decodeCTX, EVP_aes_256_cbc(), NULL, key, (uchar*)iVector.constData());
- }
-
- if (result == 0) {
-@@ -106,14 +110,14 @@ QByteArray AesInterface::encrypt(const QByteArray &plainData, const QByteArray &
- uchar* ciphertext = (uchar*)malloc(cipherlength);
-
- // allows reusing of 'm_encodeCTX' for multiple encryption cycles
-- EVP_EncryptInit_ex(&m_encodeCTX, NULL, NULL, NULL, NULL);
-+ EVP_EncryptInit_ex(m_encodeCTX, NULL, NULL, NULL, NULL);
-
- // update ciphertext, c_len is filled with the length of ciphertext generated,
- // dataLength is the size of plaintext in bytes
-- EVP_EncryptUpdate(&m_encodeCTX, ciphertext, &cipherlength, (uchar*)plainData.data(), dataLength);
-+ EVP_EncryptUpdate(m_encodeCTX, ciphertext, &cipherlength, (uchar*)plainData.data(), dataLength);
-
- // update ciphertext with the final remaining bytes
-- EVP_EncryptFinal_ex(&m_encodeCTX, ciphertext + cipherlength, &finalLength);
-+ EVP_EncryptFinal_ex(m_encodeCTX, ciphertext + cipherlength, &finalLength);
-
- dataLength = cipherlength + finalLength;
- QByteArray out((char*)ciphertext, dataLength);
-@@ -163,9 +167,9 @@ QByteArray AesInterface::decrypt(const QByteArray &cipherData, const QByteArray
- // because we have padding ON, we must allocate an extra cipher block size of memory
- uchar* plainText = (uchar*)malloc(plainTextLength + AES_BLOCK_SIZE);
-
-- EVP_DecryptInit_ex(&m_decodeCTX, NULL, NULL, NULL, NULL);
-- EVP_DecryptUpdate(&m_decodeCTX, plainText, &plainTextLength, cipherText, cipherLength);
-- int success = EVP_DecryptFinal_ex(&m_decodeCTX, plainText + plainTextLength, &finalLength);
-+ EVP_DecryptInit_ex(m_decodeCTX, NULL, NULL, NULL, NULL);
-+ EVP_DecryptUpdate(m_decodeCTX, plainText, &plainTextLength, cipherText, cipherLength);
-+ int success = EVP_DecryptFinal_ex(m_decodeCTX, plainText + plainTextLength, &finalLength);
-
- cipherLength = plainTextLength + finalLength;
-
-diff --git a/src/lib/tools/aesinterface.h b/src/lib/tools/aesinterface.h
-index e0debc6..c3c940c 100644
---- a/src/lib/tools/aesinterface.h
-+++ b/src/lib/tools/aesinterface.h
-@@ -50,8 +50,8 @@ class QUPZILLA_EXPORT AesInterface : public QObject
- private:
- bool init(int evpMode, const QByteArray &password, const QByteArray &iVector = QByteArray());
-
-- EVP_CIPHER_CTX m_encodeCTX;
-- EVP_CIPHER_CTX m_decodeCTX;
-+ EVP_CIPHER_CTX* m_encodeCTX;
-+ EVP_CIPHER_CTX* m_decodeCTX;
-
- bool m_ok;
- QByteArray m_iVector;
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-27 19:37:26 +0000