Source Mage code commit list

[Treeve Jelbert <scm AT sourcemage.org>]

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

 kde5-utils/kate/HISTORY                                     |    3 
 kde5-utils/kate/PRE_BUILD                                   |    3 
 kde5-utils/kate/patches/qt5.11.patch                        |   13 +++
 libs/libgit2/DETAILS                                        |    4 -
 libs/libgit2/HISTORY                                        |    4 +
 libs/libgit2/PRE_BUILD                                      |    3 
 libs/libgit2/patches/0001-Fix-build-with-LibreSSL-2.7.patch |   44 
++++++++++++
 7 files changed, 72 insertions(+), 2 deletions(-)

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

    kate - fix for qt-5.11

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

    libgit2 - fix for libresssl-2.7

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

    libgit2: => 0.27.0

diff --git a/kde5-utils/kate/HISTORY b/kde5-utils/kate/HISTORY
index 2092e5a..f08fab4 100644
--- a/kde5-utils/kate/HISTORY
+++ b/kde5-utils/kate/HISTORY
@@ -1,3 +1,6 @@
+2018-04-06 Treeve Jelbert <treeve AT sourcemage.org>
+       * PRE_BUILD qt5.1.patch: added
+
 2018-03-08 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 17.12.3
 
diff --git a/kde5-utils/kate/PRE_BUILD b/kde5-utils/kate/PRE_BUILD
new file mode 100755
index 0000000..922c0ab
--- /dev/null
+++ b/kde5-utils/kate/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build    &&
+cd $SOURCE_DIRECTORY &&
+apply_patch_dir patches
diff --git a/kde5-utils/kate/patches/qt5.11.patch 
b/kde5-utils/kate/patches/qt5.11.patch
new file mode 100644
index 0000000..39956ec
--- /dev/null
+++ b/kde5-utils/kate/patches/qt5.11.patch
@@ -0,0 +1,13 @@
+diff --git a/addons/snippets/editsnippet.cpp 
b/addons/snippets/editsnippet.cpp
+index 63382f7..9565a0c 100644
+--- a/addons/snippets/editsnippet.cpp
++++ b/addons/snippets/editsnippet.cpp
+@@ -38,6 +38,7 @@
+ #include <QToolButton>
+ #include <QPushButton>
+ #include <QWhatsThis>
++#include <QAction>
+ 
+ #include <KTextEditor/Editor>
+ #include <KTextEditor/Document>
+
diff --git a/libs/libgit2/DETAILS b/libs/libgit2/DETAILS
index 8147d59..e4bf56a 100755
--- a/libs/libgit2/DETAILS
+++ b/libs/libgit2/DETAILS
@@ -1,6 +1,6 @@
            SPELL=libgit2
-         VERSION=0.26.3
-     
SOURCE_HASH=sha512:abcd3a904bed05c1f200be2ffbc2c44cebd1b548459ee834d5635c5eaf7bcd551a4993bcc1cb9fbeae9ea990c5ebc07655007ff4e623fa7c697f326c0ce12c3e
+         VERSION=0.27.0
+     
SOURCE_HASH=sha512:1304f0b6182e1e6e7fccbec1a568aefb662e144a1aea4fff5901f3c012ff0f3d28720f17d19b9a1bc6c892c32fe602766fe98a15538a94a468d65d3e4a1680ca
   SECURITY_PATCH=1
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/libs/libgit2/HISTORY b/libs/libgit2/HISTORY
index 0142e71..c64016f 100644
--- a/libs/libgit2/HISTORY
+++ b/libs/libgit2/HISTORY
@@ -1,3 +1,7 @@
+2018-04-06 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 0.27.0
+       * PRE_BUILD 0001-Fix-build-with-LibreSSL-2.7.patch: added
+
 2018-03-22 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 0.26.3
          SECURITY_PATCH=1 fixes CVE-2016-8568 CVE-2016-8569
diff --git a/libs/libgit2/PRE_BUILD b/libs/libgit2/PRE_BUILD
new file mode 100755
index 0000000..922c0ab
--- /dev/null
+++ b/libs/libgit2/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build    &&
+cd $SOURCE_DIRECTORY &&
+apply_patch_dir patches
diff --git a/libs/libgit2/patches/0001-Fix-build-with-LibreSSL-2.7.patch 
b/libs/libgit2/patches/0001-Fix-build-with-LibreSSL-2.7.patch
new file mode 100644
index 0000000..d73f5b8
--- /dev/null
+++ b/libs/libgit2/patches/0001-Fix-build-with-LibreSSL-2.7.patch
@@ -0,0 +1,44 @@
+From 7490d449b518115a1ae86b01397e95c38e39cff1 Mon Sep 17 00:00:00 2001
+From: Bernard Spil <brnrd AT FreeBSD.org>
+Date: Mon, 2 Apr 2018 20:00:07 +0200
+Subject: [PATCH] Fix build with LibreSSL 2.7
+
+LibreSSL 2.7 adds OpenSSL 1.1 API
+
+Signed-off-by: Bernard Spil <brnrd AT FreeBSD.org>
+---
+ src/streams/openssl.c | 3 ++-
+ src/streams/openssl.h | 3 ++-
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/streams/openssl.c b/src/streams/openssl.c
+index 9cbb274..adcb7f1 100644
+--- a/src/streams/openssl.c
++++ b/src/streams/openssl.c
+@@ -104,7 +104,8 @@ int git_openssl_stream_global_init(void)
+       ssl_opts |= SSL_OP_NO_COMPRESSION;
+ #endif
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
++    (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 
0x20700000L)
+       SSL_load_error_strings();
+       OpenSSL_add_ssl_algorithms();
+ #else
+diff --git a/src/streams/openssl.h b/src/streams/openssl.h
+index 2bbad7c..44329ec 100644
+--- a/src/streams/openssl.h
++++ b/src/streams/openssl.h
+@@ -31,7 +31,8 @@ extern int git_openssl__set_cert_location(const char 
*file, const char *path);
+ 
+ 
+ 
+-# if OPENSSL_VERSION_NUMBER < 0x10100000L || 
defined(LIBRESSL_VERSION_NUMBER)
++# if OPENSSL_VERSION_NUMBER < 0x10100000L || \
++     (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 
0x20700000L)
+ 
+ GIT_INLINE(BIO_METHOD*) BIO_meth_new(int type, const char *name)
+ {
+-- 
+2.17.0
+