diff options
-rw-r--r-- | .SRCINFO | 8 | ||||
-rw-r--r-- | PKGBUILD | 20 | ||||
-rw-r--r-- | qt.patch | 26 |
3 files changed, 9 insertions, 45 deletions
@@ -1,6 +1,6 @@ pkgbase = bitcoin-abc-qt pkgdesc = Bitcoin ABC with bitcoind, bitcoin-cli, bitcoin-tx, and bitcoin-qt - pkgver = 0.18.6 + pkgver = 0.18.7 pkgrel = 1 url = https://bitcoinabc.org install = bitcoin.install @@ -28,20 +28,18 @@ pkgbase = bitcoin-abc-qt conflicts = bitcoin-qt backup = etc/bitcoin/bitcoin.conf backup = etc/logrotate.d/bitcoin - source = https://github.com/Bitcoin-ABC/bitcoin-abc/archive/v0.18.6.tar.gz + source = https://github.com/Bitcoin-ABC/bitcoin-abc/archive/v0.18.7.tar.gz source = bitcoin.conf source = bitcoin.logrotate source = bitcoin.service source = bitcoin-reindex.service source = bitcoin.install - source = qt.patch - sha256sums = 1b79591afcd98687a56576a95c9a3d3dcff5972010af4dcb22afac9780109ab9 + sha256sums = 56eb135960794d092938d5d025eeb56ddf73adf9d577994f3f4a28d0ee7d765d sha256sums = b1908344281498d39bfa40c3b9725f9c95bf22602cd46e6120a1f17bad9dae35 sha256sums = 8f05207b586916d489b7d25a68eaacf6e678d7cbb5bfbac551903506b32f904f sha256sums = 9643eed2c20d78a9c7347df64099765773615f79d3b8a95693d871c933516880 sha256sums = 35ff9331d7df8b90adfc7d82752cca4f8b7ff23a29e5d10b07e4e3fc78050679 sha256sums = 6db7458a85a0b469ab95ad78e431d0a5db078d8809a5f4340ee040f304a9dc0d - sha256sums = d201f40404fbf4370329d19d9f0f4431b1872a5c761ac38a41f555841bc9a0eb pkgname = bitcoin-abc-qt @@ -1,7 +1,7 @@ # Maintainer: Josh Ellithorpe <quest@mac.com> pkgname=bitcoin-abc-qt -pkgver=0.18.6 +pkgver=0.18.7 pkgrel=1 pkgdesc="Bitcoin ABC with bitcoind, bitcoin-cli, bitcoin-tx, and bitcoin-qt" arch=('i686' 'x86_64') @@ -14,15 +14,13 @@ source=(https://github.com/Bitcoin-ABC/bitcoin-abc/archive/v$pkgver.tar.gz bitcoin.logrotate bitcoin.service bitcoin-reindex.service - bitcoin.install - qt.patch) -sha256sums=('1b79591afcd98687a56576a95c9a3d3dcff5972010af4dcb22afac9780109ab9' + bitcoin.install) +sha256sums=('56eb135960794d092938d5d025eeb56ddf73adf9d577994f3f4a28d0ee7d765d' 'b1908344281498d39bfa40c3b9725f9c95bf22602cd46e6120a1f17bad9dae35' '8f05207b586916d489b7d25a68eaacf6e678d7cbb5bfbac551903506b32f904f' '9643eed2c20d78a9c7347df64099765773615f79d3b8a95693d871c933516880' '35ff9331d7df8b90adfc7d82752cca4f8b7ff23a29e5d10b07e4e3fc78050679' - '6db7458a85a0b469ab95ad78e431d0a5db078d8809a5f4340ee040f304a9dc0d' - 'd201f40404fbf4370329d19d9f0f4431b1872a5c761ac38a41f555841bc9a0eb') + '6db7458a85a0b469ab95ad78e431d0a5db078d8809a5f4340ee040f304a9dc0d') backup=('etc/bitcoin/bitcoin.conf' 'etc/logrotate.d/bitcoin') provides=('bitcoin-cli' 'bitcoin-daemon' 'bitcoin-tx' 'bitcoin-qt') @@ -46,17 +44,11 @@ build() { --with-incompatible-bdb \ --disable-maintainer-mode \ --enable-reduce-exports \ - --disable-gui-tests + --disable-gui-tests \ + --enable-static make } -prepare() { - cd "$srcdir/bitcoin-abc-$pkgver" - cat ../qt.patch - - patch -Np1 < ../qt.patch -} - check() { cd "$srcdir/bitcoin-abc-$pkgver" diff --git a/qt.patch b/qt.patch deleted file mode 100644 index 3aff69a51c40..000000000000 --- a/qt.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp -index d3ec67e4418b..edb6e9bc8173 100644 ---- a/src/qt/bitcoin.cpp -+++ b/src/qt/bitcoin.cpp -@@ -49,7 +49,6 @@ - #include <QLocale> - #include <QMessageBox> - #include <QSettings> --#include <QSslConfiguration> - #include <QStringList> - #include <QThread> - #include <QTimer> -@@ -608,13 +608,6 @@ int main(int argc, char *argv[]) - #ifdef Q_OS_MAC - QApplication::setAttribute(Qt::AA_DontShowIconsInMenus); - #endif --#if QT_VERSION >= 0x050500 -- // Because of the POODLE attack it is recommended to disable SSLv3 -- // (https://disablessl3.com/), so set SSL protocols to TLS1.0+. -- QSslConfiguration sslconf = QSslConfiguration::defaultConfiguration(); -- sslconf.setProtocol(QSsl::TlsV1_0OrLater); -- QSslConfiguration::setDefaultConfiguration(sslconf); --#endif - - // Register meta types used for QMetaObject::invokeMethod - qRegisterMetaType<bool *>(); |