From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9FBAC139085 for ; Sun, 29 Jan 2017 01:26:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E0D75E0E14; Sun, 29 Jan 2017 01:26:17 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B3809E0E14 for ; Sun, 29 Jan 2017 01:26:17 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EACD3341265 for ; Sun, 29 Jan 2017 01:26:16 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 87A9E393F for ; Sun, 29 Jan 2017 01:26:14 +0000 (UTC) From: "Brian Evans" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Evans" Message-ID: <1485653151.3e33db00d27d450361a6e443d9c555775572378e.grknight@gentoo> Subject: [gentoo-commits] proj/mysql-extras:master commit in: / X-VCS-Repository: proj/mysql-extras X-VCS-Files: 20022_all_mariadb-10.0.29-minizip.patch X-VCS-Directories: / X-VCS-Committer: grknight X-VCS-Committer-Name: Brian Evans X-VCS-Revision: 3e33db00d27d450361a6e443d9c555775572378e X-VCS-Branch: master Date: Sun, 29 Jan 2017 01:26:14 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 3de20b22-4247-46ff-95ec-978079d6dcd0 X-Archives-Hash: 558e1d27a27f62795a34fbf615123038 commit: 3e33db00d27d450361a6e443d9c555775572378e Author: Brian Evans gentoo org> AuthorDate: Sun Jan 29 01:25:51 2017 +0000 Commit: Brian Evans gentoo org> CommitDate: Sun Jan 29 01:25:51 2017 +0000 URL: https://gitweb.gentoo.org/proj/mysql-extras.git/commit/?id=3e33db00 Fix support for minizip in Mariadb ConnectSE 20022_all_mariadb-10.0.29-minizip.patch | 57 +++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/20022_all_mariadb-10.0.29-minizip.patch b/20022_all_mariadb-10.0.29-minizip.patch new file mode 100644 index 0000000..12859d3 --- /dev/null +++ b/20022_all_mariadb-10.0.29-minizip.patch @@ -0,0 +1,57 @@ +diff -aruN a/storage/connect/CMakeLists.txt b/storage/connect/CMakeLists.txt +--- a/storage/connect/CMakeLists.txt 2017-01-11 20:45:20.000000000 -0500 ++++ b/storage/connect/CMakeLists.txt 2017-01-22 21:11:15.000000000 -0500 +@@ -286,8 +286,13 @@ + OPTION(CONNECT_WITH_ZIP "Compile CONNECT storage engine with ZIP support" ON) + + IF(CONNECT_WITH_ZIP) +- SET(CONNECT_SOURCES ${CONNECT_SOURCES} filamzip.cpp tabzip.cpp unzip.c ioapi.c zip.c +- filamzip.h tabzip.h ioapi.h unzip.h zip.h) ++ SET(CONNECT_SOURCES ${CONNECT_SOURCES} filamzip.cpp tabzip.cpp filamzip.h tabzip.h) ++ pkg_check_modules(MINIZIP minizip) ++ if(MINIZIP_FOUND) # Use system version ++ add_definitions(-DMINIZIP_FOUND) ++ else() ++ SET(CONNECT_SOURCES ${CONNECT_SOURCES} unzip.c ioapi.c zip.c ioapi.h unzip.h zip.h) ++ endif(MINIZIP_FOUND) + add_definitions(-DZIP_SUPPORT -DNOCRYPT) + ENDIF(CONNECT_WITH_ZIP) + +@@ -311,5 +316,6 @@ + COMPONENT connect-engine + RECOMPILE_FOR_EMBEDDED + LINK_LIBRARIES ${ZLIB_LIBRARY} ${XML_LIBRARY} ${ICONV_LIBRARY} +- ${ODBC_LIBRARY} ${JDBC_LIBRARY} ${IPHLPAPI_LIBRARY}) ++ ${ODBC_LIBRARY} ${JDBC_LIBRARY} ${IPHLPAPI_LIBRARY} ++ ${MINIZIP_LIBRARIES}) + +diff -aruN a/storage/connect/filamzip.h b/storage/connect/filamzip.h +--- a/storage/connect/filamzip.h 2017-01-11 20:45:20.000000000 -0500 ++++ b/storage/connect/filamzip.h 2017-01-17 22:12:54.000000000 -0500 +@@ -10,7 +10,11 @@ + + #include "block.h" + #include "filamap.h" ++#ifdef MINIZIP_FOUND ++#include "minizip/unzip.h" ++#else + #include "unzip.h" ++#endif + + #define DLLEXPORT extern "C" + +diff -aruN a/storage/connect/tabzip.h b/storage/connect/tabzip.h +--- a/storage/connect/tabzip.h 2017-01-11 20:45:21.000000000 -0500 ++++ b/storage/connect/tabzip.h 2017-01-17 22:13:18.000000000 -0500 +@@ -9,7 +9,11 @@ + #include "block.h" + #include "colblk.h" + #include "xtable.h" ++#ifdef MINIZIP_FOUND ++#include "minizip/unzip.h" ++#else + #include "unzip.h" ++#endif + + typedef class ZIPDEF *PZIPDEF; + typedef class TDBZIP *PTDBZIP;