Skip to Content.
Sympa Menu

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

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 (7062c3d4ed004f4e687cacdbfaccd7a400592d88)
  • Date: Sat, 16 Dec 2017 15:44:18 +0000

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

qt5/qtbase/HISTORY | 3 +++
qt5/qtbase/patches/0002-libressl-2.6.2-fixes.patch | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)

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

qtbase - fix build with openssl

diff --git a/qt5/qtbase/HISTORY b/qt5/qtbase/HISTORY
index af5d33a..ee3036d 100644
--- a/qt5/qtbase/HISTORY
+++ b/qt5/qtbase/HISTORY
@@ -1,3 +1,6 @@
+2017-12-16 Treeve Jelbert <treeve AT sourcemage.org>
+ * patches/0002-libressl-2.6.2-fixes.patch: fix for openssl
+
2017-12-07 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.10.0
* DEPENDS: do not use ccache
diff --git a/qt5/qtbase/patches/0002-libressl-2.6.2-fixes.patch
b/qt5/qtbase/patches/0002-libressl-2.6.2-fixes.patch
index 26586d7..d765900 100644
--- a/qt5/qtbase/patches/0002-libressl-2.6.2-fixes.patch
+++ b/qt5/qtbase/patches/0002-libressl-2.6.2-fixes.patch
@@ -22,7 +22,7 @@ index aa81b735b9..b17802f5b4 100644
+ q_EVP_CipherFinal_ex(ctx,
reinterpret_cast<unsigned char *>(output.data()) + len, &i);
+#else
-+ q_EVP_CipherFinal(&ctx,
++ q_EVP_CipherFinal(ctx,
+ reinterpret_cast<unsigned char *>(output.data()) + len, &i);
+#endif
len += i;



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (7062c3d4ed004f4e687cacdbfaccd7a400592d88), Treeve Jelbert, 12/16/2017

Archive powered by MHonArc 2.6.24.

Top of Page