[packages/mysql-workbench] - fix building with latest gcc and glib2 - rel 5

[baggins]

commit e74b7b0b8e0333d37b89a7cbca18361d71b89730
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sun Nov 3 00:09:13 2019 +0100

    - fix building with latest gcc and glib2
    - rel 5

 glib2.patch          | 31 +++++++++++++++++++++++++++++++
 mysql-workbench.spec |  6 +++++-
 no-Werror.patch      | 13 +++++++++++++
 3 files changed, 49 insertions(+), 1 deletion(-)
---
diff --git a/mysql-workbench.spec b/mysql-workbench.spec
index 641836d..cd5849e 100644
--- a/mysql-workbench.spec
+++ b/mysql-workbench.spec
@@ -14,7 +14,7 @@ Summary:	Extensible modeling tool for MySQL
 Summary(pl.UTF-8):	Narzędzie do modelowania baz danych dla MySQL-a
 Name:		mysql-workbench
 Version:	6.3.10
-Release:	4
+Release:	5
 License:	GPL v2
 Group:		Applications/Databases
 # Source0Download: http://dev.mysql.com/downloads/workbench/
@@ -32,6 +32,8 @@ Patch5:		mysql-version.patch
 Patch6:		ldconfig.patch
 Patch7:		format-string.patch
 Patch8:		types.patch
+Patch9:		glib2.patch
+Patch10:	no-Werror.patch
 URL:		http://wb.mysql.com/
 BuildRequires:	OpenGL-devel
 BuildRequires:	autoconf
@@ -112,6 +114,8 @@ skomplikowanych migracji do MySQL-a.
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
+%patch10 -p1
 cp -p '%{SOURCE2}' res/mysql.profiles
 
 %if %{with system_antlr}
diff --git a/glib2.patch b/glib2.patch
new file mode 100644
index 0000000..96cd2a9
--- /dev/null
+++ b/glib2.patch
@@ -0,0 +1,31 @@
+--- mysql-workbench-community-6.3.10-src/library/base/threaded_timer.cpp~	2017-11-09 17:11:42.000000000 +0100
++++ mysql-workbench-community-6.3.10-src/library/base/threaded_timer.cpp	2019-11-02 23:47:55.439608459 +0100
+@@ -173,7 +173,7 @@
+ /**
+  * Entry point for all pool (worker) threads.
+  */
+-gpointer ThreadedTimer::pool_function(gpointer data, gpointer user_data) {
++void ThreadedTimer::pool_function(gpointer data, gpointer user_data) {
+   ThreadedTimer *timer = static_cast<ThreadedTimer *>(user_data);
+   TimerTask *task = static_cast<TimerTask *>(data);
+ 
+@@ -197,8 +197,6 @@
+     task->scheduled = false;
+     logWarning("Threaded timer: unknown exception in pool function\n");
+   }
+-
+-  return NULL;
+ }
+ 
+ //--------------------------------------------------------------------------------------------------
+--- mysql-workbench-community-6.3.10-src/library/base/base/threaded_timer.h~	2017-11-09 17:11:42.000000000 +0100
++++ mysql-workbench-community-6.3.10-src/library/base/base/threaded_timer.h	2019-11-02 23:55:37.562925708 +0100
+@@ -82,7 +82,7 @@
+   ~ThreadedTimer();
+ 
+   static gpointer start(gpointer data);
+-  static gpointer pool_function(gpointer data, gpointer user_data);
++  static void pool_function(gpointer data, gpointer user_data);
+   void main_loop();
+   void remove(int task_id);
+ };
diff --git a/no-Werror.patch b/no-Werror.patch
new file mode 100644
index 0000000..3ac6c79
--- /dev/null
+++ b/no-Werror.patch
@@ -0,0 +1,13 @@
+--- mysql-workbench-community-6.3.10-src/CMakeLists.txt~	2019-11-02 23:52:15.000000000 +0100
++++ mysql-workbench-community-6.3.10-src/CMakeLists.txt	2019-11-02 23:52:44.896265071 +0100
+@@ -288,8 +288,8 @@
+ 
+ # Add some common compiler flags. TODO: Shouldn't this be done checking if whatever compiler
+ # we use supports each flag to allow for non-gcc compilers in Linux (as above)?
+-set(WB_CXXFLAGS -Werror -Wall -Wextra -Wno-unused-parameter -Wno-deprecated -std=c++11)
+-set(WB_CFLAGS -Werror -Wall -Wextra -Wno-unused-parameter -Wno-deprecated)
++set(WB_CXXFLAGS -Wall -Wextra -Wno-unused-parameter -Wno-deprecated -std=c++11)
++set(WB_CFLAGS -Wall -Wextra -Wno-unused-parameter -Wno-deprecated)
+ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+   if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.7")
+     message(FATAL_ERROR "Insufficient gcc version. You need gcc v4.7 or newer to build this project")
================================================================

---- gitweb:

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