moritzruth/void-packages
1
0
Fork 0
Code Releases Activity Actions 2

qt5: rebuild against libressl-2.8.

Browse source
This commit is contained in:
Johannes 2018-10-28 11:46:13 +01:00
parent 4c8f6bc590
commit 95f32618e2
2 changed files with 29 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

28
srcpkgs/qt5/patches/libressl-const-bio.patch Normal file
View file

@ -0,0 +1,28 @@
--- qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp.orig
+++ qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
@@ -190,8 +190,8 @@
#endif
DEFINEFUNC2(BIO *, BIO_new_file, const char *filename, filename, const char *mode, mode, return 0, return)
DEFINEFUNC(void, ERR_clear_error, DUMMYARG, DUMMYARG, return, DUMMYARG)
-DEFINEFUNC(BIO *, BIO_new, BIO_METHOD *a, a, return 0, return)
-DEFINEFUNC(BIO_METHOD *, BIO_s_mem, void, DUMMYARG, return 0, return)
+DEFINEFUNC(BIO *, BIO_new, const BIO_METHOD *a, a, return 0, return)
+DEFINEFUNC(const BIO_METHOD *, BIO_s_mem, void, DUMMYARG, return 0, return)
DEFINEFUNC(int, CRYPTO_num_locks, DUMMYARG, DUMMYARG, return 0, return)
DEFINEFUNC(void, CRYPTO_set_locking_callback, void (*a)(int, int, const char *, int), a, return, DUMMYARG)
DEFINEFUNC(void, CRYPTO_set_id_callback, unsigned long (*a)(), a, return, DUMMYARG)
--- qtbase/src/network/ssl/qsslsocket_opensslpre11_symbols_p.h.orig
+++ qtbase/src/network/ssl/qsslsocket_opensslpre11_symbols_p.h
@@ -78,8 +78,8 @@
unsigned char * q_ASN1_STRING_data(ASN1_STRING *a);
BIO *q_BIO_new_file(const char *filename, const char *mode);
void q_ERR_clear_error();
-Q_AUTOTEST_EXPORT BIO *q_BIO_new(BIO_METHOD *a);
-Q_AUTOTEST_EXPORT BIO_METHOD *q_BIO_s_mem();
+Q_AUTOTEST_EXPORT BIO *q_BIO_new(const BIO_METHOD *a);
+Q_AUTOTEST_EXPORT const BIO_METHOD *q_BIO_s_mem();
int q_CRYPTO_num_locks();
void q_CRYPTO_set_locking_callback(void (*a)(int, int, const char *, int));
void q_CRYPTO_set_id_callback(unsigned long (*a)());

2
srcpkgs/qt5/template
View file

@ -1,7 +1,7 @@
# Template file for 'qt5' # Template file for 'qt5'
pkgname=qt5 pkgname=qt5
version=5.10.1 version=5.10.1
revision=13 revision=14
wrksrc="qt-everywhere-src-${version}" wrksrc="qt-everywhere-src-${version}"
build_style=gnu-configure build_style=gnu-configure
hostmakedepends="flex ruby gperf git python perl pkg-config protobuf re2c ninja" hostmakedepends="flex ruby gperf git python perl pkg-config protobuf re2c ninja"