[gentoo-commits] repo/gentoo:master commit in: dev-db/mydumper/files/, dev-db/mydumper/

[Amy Liffey]

commit:     772b80658ebe20d659319d68d521254725e37a13
Author:     Tomas Mozes <hydrapolic <AT> gmail <DOT> com>
AuthorDate: Wed Oct 25 15:07:43 2017 +0000
Commit:     Amy Liffey <amynka <AT> gentoo <DOT> org>
CommitDate: Wed Oct 25 18:48:40 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=772b8065

dev-db/mydumper: do not use mariadb server headers (bug #635176)

Closes: #6049
Closes: https://bugs.gentoo.org/635176
Package-Manager: Portage-2.3.12, Repoman-2.3.3

 .../mydumper/files/mydumper-mariadb-define.patch   | 28 ++++++++++++++++++++++
 .../files/mydumper-mariadb-include-fix.patch       | 24 -------------------
 ...umper-0.9.3.ebuild => mydumper-0.9.3-r1.ebuild} |  2 +-
 3 files changed, 29 insertions(+), 25 deletions(-)

diff --git a/dev-db/mydumper/files/mydumper-mariadb-define.patch b/dev-db/mydumper/files/mydumper-mariadb-define.patch
new file mode 100644
index 00000000000..ee39a33be81
--- /dev/null
+++ b/dev-db/mydumper/files/mydumper-mariadb-define.patch
@@ -0,0 +1,28 @@
+--- a/mydumper.c	2017-09-07 14:53:02.000000000 +0000
++++ b/mydumper.c	2017-10-25 14:53:46.614729185 +0000
+@@ -22,6 +22,11 @@
+ #define _FILE_OFFSET_BITS 64
+ 
+ #include <mysql.h>
++
++#if defined MARIADB_CLIENT_VERSION_STR && !defined MYSQL_SERVER_VERSION
++  #define MYSQL_SERVER_VERSION MARIADB_CLIENT_VERSION_STR
++#endif
++
+ #include <unistd.h>
+ #include <stdio.h>
+ #include <string.h>
+--- a/myloader.c	2017-09-07 14:53:02.000000000 +0000
++++ b/myloader.c	2017-10-25 14:55:34.677729185 +0000
+@@ -19,6 +19,11 @@
+ #define _FILE_OFFSET_BITS 64
+ 
+ #include <mysql.h>
++
++#if defined MARIADB_CLIENT_VERSION_STR && !defined MYSQL_SERVER_VERSION
++  #define MYSQL_SERVER_VERSION MARIADB_CLIENT_VERSION_STR
++#endif
++
+ #include <unistd.h>
+ #include <stdio.h>
+ #include <string.h>

diff --git a/dev-db/mydumper/files/mydumper-mariadb-include-fix.patch b/dev-db/mydumper/files/mydumper-mariadb-include-fix.patch
deleted file mode 100644
index 0914b3acff6..00000000000
--- a/dev-db/mydumper/files/mydumper-mariadb-include-fix.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/mydumper.c	2017-09-07 14:53:02.000000000 +0000
-+++ b/mydumper.c	2017-10-06 17:39:34.962315949 +0000
-@@ -22,6 +22,9 @@
- #define _FILE_OFFSET_BITS 64
- 
- #include <mysql.h>
-+#if defined(MARIADB_BASE_VERSION) && defined(MARIADB_VERSION_ID)
-+	#include <server/mysql_version.h>
-+#endif
- #include <unistd.h>
- #include <stdio.h>
- #include <string.h>
---- a/myloader.c	2017-09-07 14:53:02.000000000 +0000
-+++ b/myloader.c	2017-10-06 17:39:28.962315949 +0000
-@@ -19,6 +19,9 @@
- #define _FILE_OFFSET_BITS 64
- 
- #include <mysql.h>
-+#if defined(MARIADB_BASE_VERSION) && defined(MARIADB_VERSION_ID)
-+	#include <server/mysql_version.h>
-+#endif
- #include <unistd.h>
- #include <stdio.h>
- #include <string.h>

diff --git a/dev-db/mydumper/mydumper-0.9.3.ebuild b/dev-db/mydumper/mydumper-0.9.3-r1.ebuild
similarity index 94%
rename from dev-db/mydumper/mydumper-0.9.3.ebuild
rename to dev-db/mydumper/mydumper-0.9.3-r1.ebuild
index b4970ec03bf..f95deef1be6 100644
--- a/dev-db/mydumper/mydumper-0.9.3.ebuild
+++ b/dev-db/mydumper/mydumper-0.9.3-r1.ebuild
@@ -23,7 +23,7 @@ DEPEND="${CDEPEND}
 	doc? ( dev-python/sphinx )"
 RDEPEND="${CDEPEND}"
 
-PATCHES=( "${FILESDIR}/${PN}-mariadb-include-fix.patch" )
+PATCHES=( "${FILESDIR}/${PN}-mariadb-define.patch" )
 
 src_prepare() {
 	# respect user cflags; do not expand ${CMAKE_C_FLAGS} (!)