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

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

[Conrad Kostecki]

commit:     09bb49eed834e65d920e18c3122a270769a1df92
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Thu Feb 11 17:55:11 2021 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Thu Feb 11 20:28:17 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09bb49ee

dev-db/mydumper: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/19417
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 .../mydumper/files/mydumper-mariadb-define.patch   | 28 ----------------------
 1 file changed, 28 deletions(-)

diff --git a/dev-db/mydumper/files/mydumper-mariadb-define.patch b/dev-db/mydumper/files/mydumper-mariadb-define.patch
deleted file mode 100644
index ee39a33be81..00000000000
--- a/dev-db/mydumper/files/mydumper-mariadb-define.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- 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>

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

[Ionen Wolkens]

commit:     43cc15de69b2ca8d2cc997aa33b9a0394de840a9
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Mon Jan 10 16:58:49 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sun Feb  6 19:33:45 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43cc15de

dev-db/mydumper: remove unused patch

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/23725
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 dev-db/mydumper/files/mydumper-atomic.patch | 27 ---------------------------
 1 file changed, 27 deletions(-)

diff --git a/dev-db/mydumper/files/mydumper-atomic.patch b/dev-db/mydumper/files/mydumper-atomic.patch
deleted file mode 100644
index 405e6883fbcb..000000000000
--- a/dev-db/mydumper/files/mydumper-atomic.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/cmake/modules/FindMySQL.cmake b/cmake/modules/FindMySQL.cmake
-index 23470a8..2b8ae63 100644
---- a/cmake/modules/FindMySQL.cmake
-+++ b/cmake/modules/FindMySQL.cmake
-@@ -85,20 +85,8 @@ find_path(MYSQL_INCLUDE_DIR mysql.h
- 
- set(TMP_MYSQL_LIBRARIES "")
- set(CMAKE_FIND_LIBRARY_SUFFIXES .so .a .lib .so.1)
--foreach(MY_LIB ${MYSQL_ADD_LIBRARIES})
--    find_library("MYSQL_LIBRARIES_${MY_LIB}" NAMES ${MY_LIB}
--        HINTS
--        ${MYSQL_ADD_LIBRARY_PATH}
--        /usr/lib/mysql
--	/usr/lib
--        /usr/local/lib
--        /usr/local/lib/mysql
--        /usr/local/mysql/lib
--    )
--    list(APPEND TMP_MYSQL_LIBRARIES "${MYSQL_LIBRARIES_${MY_LIB}}")
--endforeach(MY_LIB ${MYSQL_ADD_LIBRARIES})
--
--set(MYSQL_LIBRARIES ${TMP_MYSQL_LIBRARIES} CACHE FILEPATH INTERNAL)
-+
-+set(MYSQL_LIBRARIES ${MYSQL_ADD_LIBRARIES} CACHE FILEPATH INTERNAL)
- 
- if(MYSQL_INCLUDE_DIR AND MYSQL_LIBRARIES)
-     set(MYSQL_FOUND TRUE CACHE INTERNAL "MySQL found")

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

[Conrad Kostecki]

commit:     e7a8aa72f4abe582c7b2bf23de7551801332fc48
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Mon Jul 17 21:00:46 2023 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun Jul 23 19:34:35 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7a8aa72

dev-db/mydumper: remove unused patch

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/31936
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 dev-db/mydumper/files/mydumper-0.10.5-atomic.patch | 27 ----------------------
 1 file changed, 27 deletions(-)

diff --git a/dev-db/mydumper/files/mydumper-0.10.5-atomic.patch b/dev-db/mydumper/files/mydumper-0.10.5-atomic.patch
deleted file mode 100644
index 6dc7fb5fd290..000000000000
--- a/dev-db/mydumper/files/mydumper-0.10.5-atomic.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/cmake/modules/FindMySQL.cmake b/cmake/modules/FindMySQL.cmake
-index 23470a8..2b8ae63 100644
---- a/cmake/modules/FindMySQL.cmake
-+++ b/cmake/modules/FindMySQL.cmake
-@@ -85,20 +85,8 @@ find_path(MYSQL_INCLUDE_DIR mysql.h
- 
- set(TMP_MYSQL_LIBRARIES "")
- set(CMAKE_FIND_LIBRARY_SUFFIXES .so .lib .so.1 .dylib .a)
--foreach(MY_LIB ${MYSQL_ADD_LIBRARIES})
--    find_library("MYSQL_LIBRARIES_${MY_LIB}" NAMES ${MY_LIB}
--        HINTS
--        ${MYSQL_ADD_LIBRARY_PATH}
--        /usr/lib/mysql
--	/usr/lib
--        /usr/local/lib
--        /usr/local/lib/mysql
--        /usr/local/mysql/lib
--    )
--    list(APPEND TMP_MYSQL_LIBRARIES "${MYSQL_LIBRARIES_${MY_LIB}}")
--endforeach(MY_LIB ${MYSQL_ADD_LIBRARIES})
--
--set(MYSQL_LIBRARIES ${TMP_MYSQL_LIBRARIES} CACHE FILEPATH INTERNAL)
-+
-+set(MYSQL_LIBRARIES ${MYSQL_ADD_LIBRARIES} CACHE FILEPATH INTERNAL)
- 
- if(MYSQL_INCLUDE_DIR AND MYSQL_LIBRARIES)
-     set(MYSQL_FOUND TRUE CACHE INTERNAL "MySQL found")

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

[Petr Vaněk]

commit:     732e973d1200206c9608ea84598f8dcfb78e051e
Author:     Petr Vaněk <arkamar <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 24 07:59:19 2025 +0000
Commit:     Petr Vaněk <arkamar <AT> gentoo <DOT> org>
CommitDate: Thu Jul 24 08:43:15 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=732e973d

dev-db/mydumper: correct the CFLAGS related patch

The patch was incorrectly rebased/transformed from the original in
commit dbf6bb95317e ("dev-db/mydumper: add 0.18.1.1") and the "-g
-Werror" flags were not removed. This commit fixes the patch and
restores authorship.

Closes: https://bugs.gentoo.org/960600
Signed-off-by: Petr Vaněk <arkamar <AT> gentoo.org>

 .../mydumper-0.18-Do-not-overwrite-the-user-CFLAGS.patch | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/dev-db/mydumper/files/mydumper-0.18-Do-not-overwrite-the-user-CFLAGS.patch b/dev-db/mydumper/files/mydumper-0.18-Do-not-overwrite-the-user-CFLAGS.patch
index 3747d5dda73c..7fc615988538 100644
--- a/dev-db/mydumper/files/mydumper-0.18-Do-not-overwrite-the-user-CFLAGS.patch
+++ b/dev-db/mydumper/files/mydumper-0.18-Do-not-overwrite-the-user-CFLAGS.patch
@@ -1,5 +1,14 @@
+From 846fa909ce6f36df5939927d56d3d0e366770cd6 Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz93@gmail.com>
+Date: Sun, 10 Mar 2024 21:17:16 -0400
+Subject: [PATCH] Do not overwrite the user CFLAGS
+
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3fa5fde..c115b6e 100644
+index 3fa5fde3..f5b9e96d 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -44,7 +44,7 @@ if (MARIADB_FOUND AND NOT MARIADB_SSL AND WITH_SSL)
@@ -7,7 +16,10 @@ index 3fa5fde..c115b6e 100644
  endif()
  
 -set(CMAKE_C_FLAGS "-std=gnu99 -Wall -Wno-deprecated-declarations -Wunused -Wwrite-strings -Wno-strict-aliasing -Wextra -Wshadow -g -Werror ${MYSQL_CFLAGS}")
-+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -Wall -Wno-deprecated-declarations -Wunused -Wwrite-strings -Wno-strict-aliasing -Wextra -Wshadow -g -Werror ${MYSQL_CFLAGS}")
++set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -Wall -Wno-deprecated-declarations -Wunused -Wwrite-strings -Wno-strict-aliasing -Wextra -Wshadow ${MYSQL_CFLAGS}")
  include_directories(${MYDUMPER_SOURCE_DIR} ${MYSQL_INCLUDE_DIR} ${GLIB2_INCLUDE_DIR} ${PCRE2_INCLUDE_DIR} ${ZLIB_INCLUDE_DIRS} )
  
  OPTION(WITH_ASAN "Build with ASAN" OFF)
+-- 
+2.50.1
+

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

[Michael Mair-Keimberger]

commit:     51127f814eb3390291e1dd5c3359aff71b89e6a4
Author:     Michael Mair-Keimberger <mm1ke <AT> gentoo <DOT> org>
AuthorDate: Tue Oct  7 16:30:07 2025 +0000
Commit:     Michael Mair-Keimberger <mm1ke <AT> gentoo <DOT> org>
CommitDate: Tue Oct  7 16:30:07 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51127f81

dev-db/mydumper: remove unused patch

Signed-off-by: Michael Mair-Keimberger <mm1ke <AT> gentoo.org>

 ...per-0.15-Do-not-overwrite-the-user-CFLAGS.patch | 25 ----------------------
 1 file changed, 25 deletions(-)

diff --git a/dev-db/mydumper/files/mydumper-0.15-Do-not-overwrite-the-user-CFLAGS.patch b/dev-db/mydumper/files/mydumper-0.15-Do-not-overwrite-the-user-CFLAGS.patch
deleted file mode 100644
index 5d6ba09a4df4..000000000000
--- a/dev-db/mydumper/files/mydumper-0.15-Do-not-overwrite-the-user-CFLAGS.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 925d052aa05cf7d97fe474d7cf64b8491ced68ae Mon Sep 17 00:00:00 2001
-From: Eli Schwartz <eschwartz93@gmail.com>
-Date: Sun, 10 Mar 2024 21:17:16 -0400
-Subject: [PATCH] Do not overwrite the user CFLAGS
-
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 1fbf228..7741aa9 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -39,7 +39,7 @@ if (MARIADB_FOUND AND NOT MARIADB_SSL AND WITH_SSL)
-     set(WITH_SSL OFF)
- endif()
- 
--set(CMAKE_C_FLAGS "-std=gnu99 -Wall -Wno-deprecated-declarations -Wunused -Wwrite-strings -Wno-strict-aliasing -Wextra -Wshadow -g -Werror ${MYSQL_CFLAGS}")
-+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -Wall -Wno-deprecated-declarations -Wunused -Wwrite-strings -Wextra -Wshadow ${MYSQL_CFLAGS}")
- include_directories(${MYDUMPER_SOURCE_DIR} ${MYSQL_INCLUDE_DIR} ${GLIB2_INCLUDE_DIR} ${PCRE_INCLUDE_DIR} ${ZLIB_INCLUDE_DIRS} )
- 
- OPTION(WITH_ASAN "Build with ASAN" OFF)
--- 
-2.43.2
-