X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=mysql-cmake.patch;h=2846742b6349e5f376292055280af43933b39441;hb=597679dfcda245060ec36488b09cda848cab0a13;hp=b22b2f1f15baef0fc55e331ae05fe1fbe6814882;hpb=45b681a59f6e61e0324f532f88f1a9addcd14c45;p=packages%2Fmysql.git

diff --git a/mysql-cmake.patch b/mysql-cmake.patch
index b22b2f1..2846742 100644
--- a/mysql-cmake.patch
+++ b/mysql-cmake.patch
@@ -1,7 +1,7 @@
-diff -ruN mysql-5.7.21.orig/cmake/readline.cmake mysql-5.7.21/cmake/readline.cmake
---- mysql-5.7.21.orig/cmake/readline.cmake	2017-12-28 04:46:26.000000000 +0100
-+++ mysql-5.7.21/cmake/readline.cmake	2018-03-31 21:17:28.373826351 +0200
-@@ -110,23 +110,23 @@ ENDMACRO()
+diff -urNpa mysql-8.4.0.orig/cmake/readline.cmake mysql-8.4.0/cmake/readline.cmake
+--- mysql-8.4.0.orig/cmake/readline.cmake	2024-05-09 15:03:55.909198871 +0200
++++ mysql-8.4.0/cmake/readline.cmake	2024-05-09 15:04:09.737390835 +0200
+@@ -130,23 +130,23 @@ ENDMACRO()
  
  MACRO (FIND_SYSTEM_EDITLINE)
    FIND_PATH(FOUND_EDITLINE_READLINE
@@ -29,7 +29,7 @@ diff -ruN mysql-5.7.21.orig/cmake/readline.cmake mysql-5.7.21/cmake/readline.cma
    )
    MARK_AS_ADVANCED(EDITLINE_INCLUDE_DIR EDITLINE_LIBRARY)
  
-@@ -139,7 +139,7 @@ MACRO (FIND_SYSTEM_EDITLINE)
+@@ -162,7 +162,7 @@ MACRO (FIND_SYSTEM_EDITLINE)
      LIST(APPEND CMAKE_REQUIRED_LIBRARIES ${EDITLINE_LIBRARY})
      CHECK_CXX_SOURCE_COMPILES("
      #include <stdio.h>
@@ -38,7 +38,7 @@ diff -ruN mysql-5.7.21.orig/cmake/readline.cmake mysql-5.7.21/cmake/readline.cma
      int main(int argc, char **argv)
      {
         HIST_ENTRY entry;
-@@ -149,14 +149,13 @@ MACRO (FIND_SYSTEM_EDITLINE)
+@@ -172,14 +172,13 @@ MACRO (FIND_SYSTEM_EDITLINE)
  
      CHECK_CXX_SOURCE_COMPILES("
      #include <stdio.h>
@@ -58,7 +58,7 @@ diff -ruN mysql-5.7.21.orig/cmake/readline.cmake mysql-5.7.21/cmake/readline.cma
      }"
      EDITLINE_HAVE_COMPLETION_INT)
  
-@@ -168,7 +167,7 @@ MACRO (FIND_SYSTEM_EDITLINE)
+@@ -191,7 +190,7 @@ MACRO (FIND_SYSTEM_EDITLINE)
        typedef char* MYFunction(const char*, int);
        MYFunction* myf= rl_completion_entry_function;
        char *res= (myf)(NULL, 0);
@@ -67,9 +67,10 @@ diff -ruN mysql-5.7.21.orig/cmake/readline.cmake mysql-5.7.21/cmake/readline.cma
        return res != NULL;
      }"
      EDITLINE_HAVE_COMPLETION_CHAR)
---- mysql-8.1.0/CMakeLists.txt~	2023-06-21 09:52:10.000000000 +0200
-+++ mysql-8.1.0/CMakeLists.txt	2023-10-20 10:08:46.673284042 +0200
-@@ -20,6 +20,8 @@
+diff -urNpa mysql-8.4.0.orig/CMakeLists.txt mysql-8.4.0/CMakeLists.txt
+--- mysql-8.4.0.orig/CMakeLists.txt	2024-05-09 15:03:55.901198760 +0200
++++ mysql-8.4.0/CMakeLists.txt	2024-05-09 15:04:09.737390835 +0200
+@@ -21,6 +21,8 @@
  # along with this program; if not, write to the Free Software
  # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA