Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (d0ad6b0d61892f5a999c2c2b50e597e448cf8c8c)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (d0ad6b0d61892f5a999c2c2b50e597e448cf8c8c)
  • Date: Wed, 12 Sep 2018 12:34:43 +0000

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

qt5/qtbase/HISTORY | 3 +
qt5/qtbase/patches/0003-libressl-2.8.0-fixes.patch | 49
+++++++++++++++++++++
video/pipewire/DETAILS | 4 -
video/pipewire/HISTORY | 3 +
4 files changed, 57 insertions(+), 2 deletions(-)

New commits:
commit d0ad6b0d61892f5a999c2c2b50e597e448cf8c8c
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

qtbase - libressl-2.8.0-fixes

commit ed211a54f94df0730d641c9bd58af5f28d17a417
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

pipewire: => 0.2.3

diff --git a/qt5/qtbase/HISTORY b/qt5/qtbase/HISTORY
index c7f11f8..b8fad8d 100644
--- a/qt5/qtbase/HISTORY
+++ b/qt5/qtbase/HISTORY
@@ -1,3 +1,6 @@
+2018-09-12 Treeve Jelbert <treeve AT sourcemage.org>
+ * patches/0003-libressl-2.8.0-fixes.patch: added
+
2018-09-10 Ismael Luceno <ismael AT iodev.co.uk>
* patches/qt5-qtbase-glibc.patch,
patches/0015-Check-glibc-version-for-renameat2-statx-on-non-boots.patch:
replace the glibc patch with a better version that doesn't break
other builds
diff --git a/qt5/qtbase/patches/0003-libressl-2.8.0-fixes.patch
b/qt5/qtbase/patches/0003-libressl-2.8.0-fixes.patch
new file mode 100644
index 0000000..72c99ca
--- /dev/null
+++ b/qt5/qtbase/patches/0003-libressl-2.8.0-fixes.patch
@@ -0,0 +1,49 @@
+From 2b2bf3a5d6d0ab3876b04b0583abfe14ab72c4a5 Mon Sep 17 00:00:00 2001
+From: Treeve Jelbert <treeve AT sourcemage.org>
+Date: Mon, 10 Sep 2018 20:53:25 +0200
+Subject: [PATCH 3/3] libressl-2.8.0 fixes
+
+---
+ src/network/ssl/qsslsocket_openssl_symbols.cpp | 5 +++++
+ src/network/ssl/qsslsocket_opensslpre11_symbols_p.h | 5 +++++
+ 2 files changed, 10 insertions(+)
+
+diff --git a/src/network/ssl/qsslsocket_openssl_symbols.cpp
b/src/network/ssl/qsslsocket_openssl_symbols.cpp
+index f5adc6b2e0..5f42cf5949 100644
+--- a/src/network/ssl/qsslsocket_openssl_symbols.cpp
++++ b/src/network/ssl/qsslsocket_openssl_symbols.cpp
+@@ -190,8 +190,13 @@ DEFINEFUNC3(void *, ASN1_dup, i2d_of_void *a, a,
d2i_of_void *b, b, char *c, c,
+ #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)
++#ifdef LIBRESSL_VERSION_NUMBER
++DEFINEFUNC(BIO *, BIO_new, const BIO_METHOD *a, a, return 0, return)
++DEFINEFUNC(const BIO_METHOD *, BIO_s_mem, void, DUMMYARG, return 0, return)
++#else
+ DEFINEFUNC(BIO *, BIO_new, BIO_METHOD *a, a, return 0, return)
+ DEFINEFUNC(BIO_METHOD *, BIO_s_mem, void, DUMMYARG, return 0, return)
++#endif //libressl
+ 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)
+diff --git a/src/network/ssl/qsslsocket_opensslpre11_symbols_p.h
b/src/network/ssl/qsslsocket_opensslpre11_symbols_p.h
+index 9686d22b98..92083382e0 100644
+--- a/src/network/ssl/qsslsocket_opensslpre11_symbols_p.h
++++ b/src/network/ssl/qsslsocket_opensslpre11_symbols_p.h
+@@ -78,8 +78,13 @@
+ 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();
++#ifdef LIBRESSL_VERSION_NUMBER
++Q_AUTOTEST_EXPORT BIO *q_BIO_new(const BIO_METHOD *a);
++Q_AUTOTEST_EXPORT const BIO_METHOD *q_BIO_s_mem();
++#else
+ Q_AUTOTEST_EXPORT BIO *q_BIO_new(BIO_METHOD *a);
+ Q_AUTOTEST_EXPORT BIO_METHOD *q_BIO_s_mem();
++#endif
+ 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.18.0
+
diff --git a/video/pipewire/DETAILS b/video/pipewire/DETAILS
index fc08ebe..612d464 100755
--- a/video/pipewire/DETAILS
+++ b/video/pipewire/DETAILS
@@ -1,7 +1,7 @@
source $GRIMOIRE/MESON_FUNCTIONS
SPELL=pipewire
- VERSION=0.2.2
-
SOURCE_HASH=sha512:cb310984fbe099e726f5bf651d834bfe75cbac2f5d8c6876caa6b9a3a4dd233b43292acb037bf52c0a23cfafb46a74c316cddd18bca0a909546e9e0729e55b03
+ VERSION=0.2.3
+
SOURCE_HASH=sha512:04877c6dc842ccde8ef18f068aea530b832771aa171ee6d07dd22285b9905e0ea773e9e6e31e7bfeb2d9c5ac60dedf325cb347d5bcdd5d87a14523ef15faec4f
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=https://pipewire.org
diff --git a/video/pipewire/HISTORY b/video/pipewire/HISTORY
index 393b630..df0079a 100644
--- a/video/pipewire/HISTORY
+++ b/video/pipewire/HISTORY
@@ -1,3 +1,6 @@
+2018-09-12 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.2.3
+
2018-08-18 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.2.2




  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (d0ad6b0d61892f5a999c2c2b50e597e448cf8c8c), Treeve Jelbert, 09/12/2018

Archive powered by MHonArc 2.6.24.

Top of Page