diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-08-25 07:36:27 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-08-25 07:36:27 +0100 |
commit | 43793fab84041cfc5c60c0151d1591b8a69fb24a (patch) | |
tree | 6208a7f4fc744684fce0f55acbb47511acace498 /x11-misc/qterm/files | |
parent | 28e3d252dc8ac8a5635206dfefe1cfe05058d1db (diff) |
gentoo resync : 25.08.2018
Diffstat (limited to 'x11-misc/qterm/files')
-rw-r--r-- | x11-misc/qterm/files/qterm-0.7.1-headers.patch | 40 | ||||
-rw-r--r-- | x11-misc/qterm/files/qterm-libressl.patch | 60 |
2 files changed, 100 insertions, 0 deletions
diff --git a/x11-misc/qterm/files/qterm-0.7.1-headers.patch b/x11-misc/qterm/files/qterm-0.7.1-headers.patch new file mode 100644 index 000000000000..c442c0ac8b30 --- /dev/null +++ b/x11-misc/qterm/files/qterm-0.7.1-headers.patch @@ -0,0 +1,40 @@ +--- a/src/keydialog.h ++++ b/src/keydialog.h +@@ -10,6 +10,7 @@ + #ifndef KEYDIALOG_H + #define KEYDIALOG_H + ++#include <QButtonGroup> + #include "ui_keydialog.h" + namespace QTerm + { +--- a/src/soundconf.h ++++ b/src/soundconf.h +@@ -1,6 +1,7 @@ + #ifndef SOUNDCONF_H + #define SOUNDCONF_H + ++#include <QButtonGroup> + #include "ui_soundconf.h" + namespace QTerm + { +--- a/src/shortcutsdialog.cpp ++++ b/src/shortcutsdialog.cpp +@@ -3,6 +3,7 @@ + #include <QKeyEvent> + #include <QMessageBox> + #include <QShortcut> ++#include <QAction> + + namespace QTerm { + +--- a/src/shortcutsdialog.h ++++ b/src/shortcutsdialog.h +@@ -3,6 +3,7 @@ + + #include "ui_shortcutsdialog.h" + class QShortcut; ++class QAction; + + namespace QTerm{ + diff --git a/x11-misc/qterm/files/qterm-libressl.patch b/x11-misc/qterm/files/qterm-libressl.patch new file mode 100644 index 000000000000..d0e0ae1f9cb5 --- /dev/null +++ b/x11-misc/qterm/files/qterm-libressl.patch @@ -0,0 +1,60 @@ +--- a/src/ssh/libcrypto-compat.c ++++ b/src/ssh/libcrypto-compat.c +@@ -8,7 +8,7 @@ + */ + + #include "libcrypto-compat.h" +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + #include <string.h> + #include <openssl/engine.h> + +--- a/src/ssh/libcrypto-compat.h ++++ b/src/ssh/libcrypto-compat.h +@@ -9,7 +9,7 @@ + #include <openssl/evp.h> + #include <openssl/hmac.h> + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + + int RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d); + int RSA_set0_factors(RSA *r, BIGNUM *p, BIGNUM *q); +--- a/src/ssh/socket.cpp ++++ b/src/ssh/socket.cpp +@@ -36,7 +36,7 @@ + SSH2SocketPriv::SSH2SocketPriv(SocketPrivate * plainSocket, QByteArray & banner, QObject * parent) + : SSHSocketPriv(parent), m_banner(banner), m_status(Init), m_sessionID(), m_channelList() + { +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + OpenSSL_add_all_ciphers(); + #endif + m_sessionID = NULL; +@@ -56,7 +56,7 @@ + + SSH2SocketPriv::~SSH2SocketPriv() + { +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + EVP_cleanup(); + #endif + } +@@ -133,7 +133,7 @@ + #ifdef SSH_DEBUG + qDebug() << "init ssh1 session"; + #endif +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + OpenSSL_add_all_ciphers(); + #endif + m_inPacket = new SSH1InBuffer(plainSocket, this); +@@ -148,7 +148,7 @@ + + SSH1SocketPriv::~SSH1SocketPriv() + { +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + EVP_cleanup(); + #endif + } |