From 5173f8ea2ef97d88f898267b38ea59cd02ea0354 Mon Sep 17 00:00:00 2001 From: Leo Date: Mon, 25 May 2020 03:32:36 -0300 Subject: [PATCH] main/mariadb-connector-c: upgrade to 3.1.8 --- main/mariadb-connector-c/APKBUILD | 8 +++----- main/mariadb-connector-c/cmake.patch | 16 ---------------- 2 files changed, 3 insertions(+), 21 deletions(-) delete mode 100644 main/mariadb-connector-c/cmake.patch diff --git a/main/mariadb-connector-c/APKBUILD b/main/mariadb-connector-c/APKBUILD index 7abe735e3c..250c700745 100644 --- a/main/mariadb-connector-c/APKBUILD +++ b/main/mariadb-connector-c/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa pkgname=mariadb-connector-c -pkgver=3.1.7 -pkgrel=1 +pkgver=3.1.8 +pkgrel=0 pkgdesc="The MariaDB Native Client library (C driver)" url="https://mariadb.org/" arch="all" @@ -11,7 +11,6 @@ makedepends="$depends_dev cmake" replaces="mariadb-client-libs" subpackages="$pkgname-dev" source="https://downloads.mariadb.org/interstitial/connector-c-$pkgver/mariadb-connector-c-$pkgver-src.tar.gz - cmake.patch fix-ucontext-header.patch " builddir="$srcdir/mariadb-connector-c-$pkgver-src" @@ -55,6 +54,5 @@ dev() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ } -sha512sums="0b7f6497b6b88b2bbcb870b7c3a8f3fe0bf547c6b5d9b95cc99423aa8ea02ac510c5fb71079e7cd79a49741c7f26f3e68c39e245b18fab46754e8640f79ff670 mariadb-connector-c-3.1.7-src.tar.gz -a3a1ec5fa984cd4a3545436c8a6f3cd5495bc2c0644ed11dd8957df399f72c9b4545f65b255909d31732b73513fe40bac98f2bffd3180ecfff22efd5ce1d38f0 cmake.patch +sha512sums="005fdacd7e7b353b97b5c1305f973a90744e495d7bf5d407fc6c75d49323e13a743e6c3877c00ada2b3fc49a0f33e5c2dcd70b1f8fe8eb8f579af1bce3b3e6b9 mariadb-connector-c-3.1.8-src.tar.gz 757a2d3531ee271cf5473671bf4d0ac07dc8eb94ab4b6ede848ba7a55415a77f90e7275103be91c73e343e94cdbf2cd652eb6cef6ed48917991733d60d3b8777 fix-ucontext-header.patch" diff --git a/main/mariadb-connector-c/cmake.patch b/main/mariadb-connector-c/cmake.patch deleted file mode 100644 index 8e47ac3102..0000000000 --- a/main/mariadb-connector-c/cmake.patch +++ /dev/null @@ -1,16 +0,0 @@ -Summary: Fix include and libs path in mariadb_config ----- - ---- a/mariadb_config/mariadb_config.c.in -+++ b/mariadb_config/mariadb_config.c.in -@@ -5,8 +5,8 @@ - - static char *mariadb_progname; - --#define INCLUDE "-I@CMAKE_INSTALL_PREFIX@/@INSTALL_INCLUDEDIR@ -I@CMAKE_INSTALL_PREFIX@/@INSTALL_INCLUDEDIR@/mysql" --#define LIBS "-L@CMAKE_INSTALL_PREFIX@/@INSTALL_LIBDIR@/ -lmariadb" -+#define INCLUDE "-I@INSTALL_INCLUDEDIR@ -I@INSTALL_INCLUDEDIR@/mysql" -+#define LIBS "-L@INSTALL_LIBDIR@/ -lmariadb" - #define LIBS_SYS "@extra_dynamic_LDFLAGS@" - #define CFLAGS INCLUDE - #define VERSION "@MARIADB_CLIENT_VERSION@" -- GitLab