diff options
| author | Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> | 2021-05-01 01:50:19 +0000 |
|---|---|---|
| committer | Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> | 2021-05-01 01:50:19 +0000 |
| commit | c390b84ec6ecb835c9dfd02335afe121d85379e3 (patch) | |
| tree | cf9923493c0958e097990a6ed58c342a3b56c060 /dev-db/sqlitestudio | |
| parent | 1209e267748afa2b728894c7c1beab7928150c04 (diff) | |
| download | baldeagleos-repo-c390b84ec6ecb835c9dfd02335afe121d85379e3.tar.gz baldeagleos-repo-c390b84ec6ecb835c9dfd02335afe121d85379e3.tar.xz baldeagleos-repo-c390b84ec6ecb835c9dfd02335afe121d85379e3.zip | |
Adding metadata
Diffstat (limited to 'dev-db/sqlitestudio')
| -rw-r--r-- | dev-db/sqlitestudio/files/sqlitestudio-3.2.1-libressl.patch | 32 | ||||
| -rw-r--r-- | dev-db/sqlitestudio/sqlitestudio-3.2.1-r1.ebuild | 4 |
2 files changed, 1 insertions, 35 deletions
diff --git a/dev-db/sqlitestudio/files/sqlitestudio-3.2.1-libressl.patch b/dev-db/sqlitestudio/files/sqlitestudio-3.2.1-libressl.patch deleted file mode 100644 index 06552942e945..000000000000 --- a/dev-db/sqlitestudio/files/sqlitestudio-3.2.1-libressl.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 64542c8c5cb3ad9249fa353ff4472c405057d743 Mon Sep 17 00:00:00 2001 -From: Stefan Strogin <stefan.strogin@gmail.com> -Date: Mon, 25 Mar 2019 18:07:13 +0200 -Subject: [PATCH] #3505 Fix compilation with LibreSSL >=2.7.0 - -HMAC_CTX_{new,free} were provided by LibreSSL 2.7.0. -Do not redefine them, otherwise it breaks compilation. - -Upstream-Status: Accepted -[https://github.com/pawelsalawa/sqlitestudio/pull/3507] -Signed-off-by: Stefan Strogin <stefan.strogin@gmail.com> ---- - Plugins/DbSqliteCipher/sqlcipher.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/Plugins/DbSqliteCipher/sqlcipher.c b/Plugins/DbSqliteCipher/sqlcipher.c -index 4918cb6f..10c4e5a3 100644 ---- a/Plugins/DbSqliteCipher/sqlcipher.c -+++ b/Plugins/DbSqliteCipher/sqlcipher.c -@@ -21638,7 +21638,8 @@ static unsigned int openssl_external_init = 0; - static unsigned int openssl_init_count = 0; - static sqlcipher_sqlite3_mutex* openssl_rand_mutex = NULL; - --#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || \ -+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) - static HMAC_CTX *HMAC_CTX_new(void) - { - HMAC_CTX *ctx = OPENSSL_malloc(sizeof(*ctx)); --- -2.21.0 - diff --git a/dev-db/sqlitestudio/sqlitestudio-3.2.1-r1.ebuild b/dev-db/sqlitestudio/sqlitestudio-3.2.1-r1.ebuild index af6ff97a5db8..6b5bc1399b7f 100644 --- a/dev-db/sqlitestudio/sqlitestudio-3.2.1-r1.ebuild +++ b/dev-db/sqlitestudio/sqlitestudio-3.2.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -40,8 +40,6 @@ BDEPEND=" dev-qt/linguist-tools:5 " -PATCHES=( "${FILESDIR}"/${P}-libressl.patch ) - S="${WORKDIR}" core_build_dir="${S}/output/build" plugins_build_dir="${core_build_dir}/Plugins" |