From 224ebbe0f4b5581b6854967e08273a80456d92ae Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Mon, 4 Mar 2019 22:51:11 +0100 Subject: [PATCH] mariadb: Update from 10.3.12 to 10.3.13 --- packages/mariadb/build.sh | 5 ++-- packages/mariadb/client-CMakeLists.txt.patch | 25 -------------------- 2 files changed, 2 insertions(+), 28 deletions(-) delete mode 100644 packages/mariadb/client-CMakeLists.txt.patch diff --git a/packages/mariadb/build.sh b/packages/mariadb/build.sh index 18e09aa67..4af1bfb94 100644 --- a/packages/mariadb/build.sh +++ b/packages/mariadb/build.sh @@ -1,9 +1,8 @@ TERMUX_PKG_HOMEPAGE=https://mariadb.org TERMUX_PKG_DESCRIPTION="A drop-in replacement for mysql server" TERMUX_PKG_LICENSE="GPL-2.0" -TERMUX_PKG_VERSION=10.3.12 -TERMUX_PKG_REVISION=3 -TERMUX_PKG_SHA256=f7449a34c25e0455928d7983dae83fd2069fe1f16c4c5f4aeed9ed9d3f081ff6 +TERMUX_PKG_VERSION=10.3.13 +TERMUX_PKG_SHA256=b2aa857ef5b84f85a7ea60a1eac7b34c0ca5151c71a0d44ce2d7fb028d71459a TERMUX_PKG_SRCURL=https://ftp.osuosl.org/pub/mariadb/mariadb-$TERMUX_PKG_VERSION/source/mariadb-$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" -DBISON_EXECUTABLE=$(which bison) diff --git a/packages/mariadb/client-CMakeLists.txt.patch b/packages/mariadb/client-CMakeLists.txt.patch deleted file mode 100644 index 8cb170710..000000000 --- a/packages/mariadb/client-CMakeLists.txt.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -u -r ../mariadb-10.2.7/client/CMakeLists.txt ./client/CMakeLists.txt ---- ../mariadb-10.2.7/client/CMakeLists.txt 2017-07-10 10:53:27.000000000 +0000 -+++ ./client/CMakeLists.txt 2017-08-09 23:33:34.537797770 +0000 -@@ -43,12 +43,6 @@ - SET_TARGET_PROPERTIES(mysql PROPERTIES ENABLE_EXPORTS TRUE) - ENDIF(UNIX) - --MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test) --SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS") --TARGET_LINK_LIBRARIES(mysqltest ${CLIENT_LIB} pcre pcreposix) --SET_TARGET_PROPERTIES(mysqltest PROPERTIES ENABLE_EXPORTS TRUE) -- -- - MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c) - TARGET_LINK_LIBRARIES(mysqlcheck ${CLIENT_LIB}) - -@@ -93,7 +87,7 @@ - PROPERTIES HAS_CXX TRUE) - - --FOREACH(t mysql mysqltest mysqltest mysqlcheck mysqldump mysqlimport mysql_upgrade mysqlshow mysql_plugin mysqlbinlog -+FOREACH(t mysql mysqlcheck mysqldump mysqlimport mysql_upgrade mysqlshow mysql_plugin mysqlbinlog - mysqladmin mysqlslap async_example) - ADD_DEPENDENCIES(${t} GenError ${CLIENT_LIB}) - ENDFOREACH()