[arch-commits] Commit in libqtshadowsocks/trunk (2 files)

[Antonio Rojas via arch-commits]

    Date: Saturday, July 20, 2019 @ 09:27:40
  Author: arojas
Revision: 492266

botan 2.11 rebuild

Added:
  libqtshadowsocks/trunk/libqtshadowsocks-botan-2.11.patch
Modified:
  libqtshadowsocks/trunk/PKGBUILD

-----------------------------------+
 PKGBUILD                          |   15 +++++++++++----
 libqtshadowsocks-botan-2.11.patch |   13 +++++++++++++
 2 files changed, 24 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2019-07-20 09:19:03 UTC (rev 492265)
+++ PKGBUILD    2019-07-20 09:27:40 UTC (rev 492266)
@@ -3,7 +3,7 @@
 
 pkgname=libqtshadowsocks
 pkgver=2.1.0
-pkgrel=6
+pkgrel=7
 pkgdesc="A lightweight library for shadowsocks"
 arch=("x86_64")
 url="https://github.com/shadowsocks/libQtShadowsocks";
@@ -10,12 +10,19 @@
 license=("GPL")
 depends=('botan>=2.7.0' 'qt5-base')
 makedepends=('cmake')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/shadowsocks/libQtShadowsocks/archive/v$pkgver.tar.gz";)
-sha512sums=('af5b71ce7e40b593bf95c1000d866e2c4426d17398620083a996b84234524e8418fbae071edd03ac1944817a96d7eee8b0b7a5860872fef41996ebbda8418558')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/shadowsocks/libQtShadowsocks/archive/v$pkgver.tar.gz";
+        libqtshadowsocks-botan-2.11.patch)
+sha512sums=('af5b71ce7e40b593bf95c1000d866e2c4426d17398620083a996b84234524e8418fbae071edd03ac1944817a96d7eee8b0b7a5860872fef41996ebbda8418558'
+            
'ba825507fb714a350e2eeafaad0435f901efb8c65ae8c5bbbba6839c028d698dafc6d665c5c648ded6bbe666a5e35f1721a0ec214df7648e98bd2b5d7076d24f')
 
+prepare() {
+  cd libQtShadowsocks-$pkgver
+  patch -p1 -i ../libqtshadowsocks-botan-2.11.patch # Fix build with botan 2.11
+}
+
 build() {
   cd libQtShadowsocks-$pkgver
-  cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release .
+  cmake -DCMAKE_INSTALL_PREFIX=/usr .
   make
 }
 

Added: libqtshadowsocks-botan-2.11.patch
===================================================================
--- libqtshadowsocks-botan-2.11.patch                           (rev 0)
+++ libqtshadowsocks-botan-2.11.patch   2019-07-20 09:27:40 UTC (rev 492266)
@@ -0,0 +1,13 @@
+diff --git a/lib/crypto/cipher.cpp b/lib/crypto/cipher.cpp
+index 561d677..f1bab7c 100644
+--- a/lib/crypto/cipher.cpp
++++ b/lib/crypto/cipher.cpp
+@@ -26,7 +26,7 @@
+ #include <stdexcept>
+ 
+ #include <botan/auto_rng.h>
+-#include <botan/key_filt.h>
++#include <botan/filters.h>
+ #include <botan/lookup.h>
+ #include <botan/md5.h>
+ #include <botan/pipe.h>