[packages/mysql-workbench] removing the 5.6.0 dependency in cmake rules (required in .spec)

glen glen at pld-linux.org
Tue Jun 21 16:00:28 CEST 2016


commit 6e6f102a122a3e44107c799f64d8d307fa3ce388
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Tue Jun 21 16:59:31 2016 +0300

    removing the 5.6.0 dependency in cmake rules (required in .spec)

 mysql-version.patch | 13 +++++++++++++
 1 file changed, 13 insertions(+)
---
diff --git a/mysql-version.patch b/mysql-version.patch
index db42b3c..5b621aa 100644
--- a/mysql-version.patch
+++ b/mysql-version.patch
@@ -9,6 +9,8 @@ Call Stack (most recent call first):
   build/cmake/Modules/FindMySQL.cmake:90 (find_package_handle_standard_args)
   CMakeLists.txt:108 (find_package)
 
+UPDATE: as the fix did not work, just removing the 5.6.0 dependency for now
+
 --- mysql-workbench-community-6.3.7-src/build/cmake/Modules/FindMySQL.cmake~	2016-06-08 15:51:41.000000000 +0300
 +++ mysql-workbench-community-6.3.7-src/build/cmake/Modules/FindMySQL.cmake	2016-06-21 16:56:45.939252087 +0300
 @@ -73,7 +73,7 @@
@@ -20,3 +22,14 @@ Call Stack (most recent call first):
          
          # Find the library:
          set(MySQL_LIBRARY_NAMES mysqlclient mysqlclient_r)
+--- mysql-workbench-community-6.3.7-src/CMakeLists.txt~	2016-06-08 15:51:42.000000000 +0300
++++ mysql-workbench-community-6.3.7-src/CMakeLists.txt	2016-06-21 16:58:48.408962855 +0300
+@@ -105,7 +105,7 @@
+ if(NOT PY_PARAMIKO)
+   message(WARNING "Paramiko wasn't found, you can still build Workbench, but may not work properly.")
+ endif()
+-find_package(MySQL 5.6.0 REQUIRED)
++find_package(MySQL REQUIRED)
+ if (UNIX)
+ 	set(MYSQL_DEFINITIONS "-DBIG_JOINS=1"  "-fno-strict-aliasing")
+ endif()
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/mysql-workbench.git/commitdiff/6e6f102a122a3e44107c799f64d8d307fa3ce388



More information about the pld-cvs-commit mailing list