From ec6cbd8d3d5323a9afb9786e4dedb0bf2a10a7a3 Mon Sep 17 00:00:00 2001 From: Nathan Owens Date: Mon, 16 Nov 2020 22:12:52 -0600 Subject: [PATCH] libgda: update to 5.2.10 --- srcpkgs/libgda/patches/0001-libressl.patch | 25 ++++++++++++++++++++++ srcpkgs/libgda/template | 10 ++++----- 2 files changed, 29 insertions(+), 6 deletions(-) create mode 100644 srcpkgs/libgda/patches/0001-libressl.patch diff --git a/srcpkgs/libgda/patches/0001-libressl.patch b/srcpkgs/libgda/patches/0001-libressl.patch new file mode 100644 index 00000000000..5658b6b42f4 --- /dev/null +++ b/srcpkgs/libgda/patches/0001-libressl.patch @@ -0,0 +1,25 @@ +From 8e638760f2df56c2f67cf62604c39b33489bff59 Mon Sep 17 00:00:00 2001 +From: Nathan Owens +Date: Mon, 16 Nov 2020 22:04:21 -0600 +Subject: [PATCH] libressl + +--- + providers/sqlcipher/sqlite3.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git providers/sqlcipher/sqlite3.c providers/sqlcipher/sqlite3.c +index cc40a9f..74082db 100644 +--- providers/sqlcipher/sqlite3.c ++++ providers/sqlcipher/sqlite3.c +@@ -21638,7 +21638,7 @@ static unsigned int openssl_external_init = 0; + static unsigned int openssl_init_count = 0; + static sqlite3_mutex* openssl_rand_mutex = NULL; + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || !defined(LIBRESSL_VERSION_NUMBER) + static HMAC_CTX *HMAC_CTX_new(void) + { + HMAC_CTX *ctx = OPENSSL_malloc(sizeof(*ctx)); +-- +2.29.2 + diff --git a/srcpkgs/libgda/template b/srcpkgs/libgda/template index 098a7236b4a..15b5dc2643d 100644 --- a/srcpkgs/libgda/template +++ b/srcpkgs/libgda/template @@ -1,7 +1,7 @@ # Template file for 'libgda' pkgname=libgda -version=5.2.9 -revision=2 +version=5.2.10 +revision=1 build_style=gnu-configure build_helper="gir" configure_args="--with-ui --with-gtksourceview --with-graphviz --enable-json @@ -17,8 +17,8 @@ maintainer="Orphaned " license="GPL-2.0-only" homepage="http://www.gnome-db.org/" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=59caed8ca72b1ac6437c9844f0677f8a296d52cfd1c0049116026abfb1d87d9b -python_version=2 #unverified +checksum=6f6cdf7b8053f553b907e0c88a6064eb48cf2751852eb24323dcf027792334c8 +python_version=3 if [ "$CROSS_BUILD" ]; then configure_args+=" --disable-binreloc" @@ -29,8 +29,6 @@ post_extract() { echo "${f}" recode ISO-8859-1..UTF-8 "${f}" done - #Fix LibreSSL build error - vsed -e 's,defined(LIBRESSL,!defined(LIBRESSL,' -i providers/sqlcipher/sqlite3.c } libgda-devel_package() {