[mysql-workbench] update patch for latest glib2

[Remi Collet]

commit 8805ce640b41a61feb33b91c2c8d687c100c5714
Author: remi <fedora at famillecollet.com>
Date:   Sat Dec 10 10:50:50 2011 +0100

    update patch for latest glib2

 mysql-workbench-5.2.36-glib.patch |   71 +++++++++++++++++++++++++++++++++++-
 mysql-workbench.spec              |    6 +++-
 2 files changed, 74 insertions(+), 3 deletions(-)
---
diff --git a/mysql-workbench-5.2.36-glib.patch b/mysql-workbench-5.2.36-glib.patch
index fc0bc48..0472b29 100644
--- a/mysql-workbench-5.2.36-glib.patch
+++ b/mysql-workbench-5.2.36-glib.patch
@@ -1,6 +1,18 @@
+diff -up mysql-workbench-gpl-5.2.36-src/backend/wbprivate/sqlide/wb_live_schema_tree.h.glib mysql-workbench-gpl-5.2.36-src/backend/wbprivate/sqlide/wb_live_schema_tree.h
+--- mysql-workbench-gpl-5.2.36-src/backend/wbprivate/sqlide/wb_live_schema_tree.h.glib	2011-12-10 10:18:15.000000000 +0100
++++ mysql-workbench-gpl-5.2.36-src/backend/wbprivate/sqlide/wb_live_schema_tree.h	2011-12-10 10:18:32.000000000 +0100
+@@ -24,7 +24,7 @@
+ #include "grtpp.h"
+ #include "workbench/wb_backend_public_interface.h"
+ #include "base/string_utilities.h"
+-#include <glib/gpattern.h>
++#include <glib.h>
+ 
+ namespace wb
+ {
 diff -up mysql-workbench-gpl-5.2.36-src/library/canvas/src/mdc_canvas_view.h.glib mysql-workbench-gpl-5.2.36-src/library/canvas/src/mdc_canvas_view.h
---- mysql-workbench-gpl-5.2.36-src/library/canvas/src/mdc_canvas_view.h.glib	2011-12-10 09:00:39.421398804 +0100
-+++ mysql-workbench-gpl-5.2.36-src/library/canvas/src/mdc_canvas_view.h	2011-12-10 09:00:45.328417380 +0100
+--- mysql-workbench-gpl-5.2.36-src/library/canvas/src/mdc_canvas_view.h.glib	2011-12-10 09:45:33.000000000 +0100
++++ mysql-workbench-gpl-5.2.36-src/library/canvas/src/mdc_canvas_view.h	2011-12-10 09:45:40.000000000 +0100
 @@ -28,7 +28,7 @@
  #include "mdc_selection.h"
  
@@ -10,3 +22,58 @@ diff -up mysql-workbench-gpl-5.2.36-src/library/canvas/src/mdc_canvas_view.h.gli
  #endif
  
  BEGIN_MDC_DECLS
+diff -up mysql-workbench-gpl-5.2.36-src/library/canvas/src/mdc_canvas_view_printing.cpp.glib mysql-workbench-gpl-5.2.36-src/library/canvas/src/mdc_canvas_view_printing.cpp
+--- mysql-workbench-gpl-5.2.36-src/library/canvas/src/mdc_canvas_view_printing.cpp.glib	2011-12-10 09:46:27.000000000 +0100
++++ mysql-workbench-gpl-5.2.36-src/library/canvas/src/mdc_canvas_view_printing.cpp	2011-12-10 09:46:36.000000000 +0100
+@@ -21,7 +21,7 @@
+ 
+ #include "mdc_canvas_view.h"
+ #include "mdc_canvas_view_printing.h"
+-#include <glib/gmessages.h>
++#include <glib.h>
+ 
+ #ifdef _WIN32
+ #include <cairo/cairo-win32.h>
+diff -up mysql-workbench-gpl-5.2.36-src/library/grt/src/grtpp_util.cpp.glib mysql-workbench-gpl-5.2.36-src/library/grt/src/grtpp_util.cpp
+--- mysql-workbench-gpl-5.2.36-src/library/grt/src/grtpp_util.cpp.glib	2011-12-10 09:48:51.000000000 +0100
++++ mysql-workbench-gpl-5.2.36-src/library/grt/src/grtpp_util.cpp	2011-12-10 09:49:00.000000000 +0100
+@@ -25,7 +25,7 @@
+ #include "grtpp_util.h"
+ #include "base/string_utilities.h"
+ 
+-#include <glib/gbase64.h>
++#include <glib.h>
+ #include <functional>
+ 
+ using namespace grt;
+diff -up mysql-workbench-gpl-5.2.36-src/modules/db.mysql.sqlparser/src/mysql_sql_parser_fe.cpp.glib mysql-workbench-gpl-5.2.36-src/modules/db.mysql.sqlparser/src/mysql_sql_parser_fe.cpp
+--- mysql-workbench-gpl-5.2.36-src/modules/db.mysql.sqlparser/src/mysql_sql_parser_fe.cpp.glib	2011-12-10 10:28:39.000000000 +0100
++++ mysql-workbench-gpl-5.2.36-src/modules/db.mysql.sqlparser/src/mysql_sql_parser_fe.cpp	2011-12-10 10:29:11.000000000 +0100
+@@ -20,7 +20,7 @@
+ 
+ #include "stdafx.h"
+ 
+-#include <glib/gunicode.h>
++#include <glib.h>
+ #include "grt/common.h"
+ #include "grt/grt_manager.h"
+ #include "grtdb/charset_utils.h"
+@@ -651,4 +651,4 @@ std::string Mysql_sql_parser_fe::get_fir
+     return versioning_comment_subst_token;
+   else
+     return token;
+-}
+\ No newline at end of file
++}
+diff -up mysql-workbench-gpl-5.2.36-src/plugins/db.mysql/backend/db_plugin_be.cpp.glib mysql-workbench-gpl-5.2.36-src/plugins/db.mysql/backend/db_plugin_be.cpp
+--- mysql-workbench-gpl-5.2.36-src/plugins/db.mysql/backend/db_plugin_be.cpp.glib	2011-12-10 10:38:08.000000000 +0100
++++ mysql-workbench-gpl-5.2.36-src/plugins/db.mysql/backend/db_plugin_be.cpp	2011-12-10 10:38:22.000000000 +0100
+@@ -31,7 +31,7 @@
+ #include "grts/structs.db.h"
+ #include "base/string_utilities.h"
+ 
+-#include <glib/gunicode.h>
++#include <glib.h>
+ 
+ void Db_plugin::grtm(bec::GRTManager *grtm)
+ {
diff --git a/mysql-workbench.spec b/mysql-workbench.spec
index 8a897dd..646452a 100644
--- a/mysql-workbench.spec
+++ b/mysql-workbench.spec
@@ -13,7 +13,7 @@
 Summary:   A MySQL visual database modeling, administration and querying tool
 Name:      mysql-workbench
 Version:   %{mw_version}
-Release:   1%{?dist}
+Release:   2%{?dist}
 Group:     Applications/Databases
 License:   GPLv2 with exceptions
 
@@ -30,6 +30,7 @@ Patch2:    %{name}-5.2.32-ctemplate.patch
 Patch3:    %{name}-5.2.36-tinyxml.patch
 # redirect man page to /usr/share
 Patch5:    %{name}-5.2.34-man.patch
+# http://bugs.mysql.com/63705
 # Only <glib.h> can be included directly
 Patch6:    %{name}-5.2.36-glib.patch
 
@@ -242,6 +243,9 @@ update-desktop-database &> /dev/null || :
 
 
 %changelog
+* Sat Dec 10 2011 Remi Collet <remi at fedoraproject.org> 5.2.36-2
+- patch for http://bugs.mysql.com/63705 (only include glib.h)
+
 * Sat Dec 10 2011 Remi Collet <remi at fedoraproject.org> 5.2.36-1
 - update to 5.2.36 Community (OSS) Edition (GPL)
   http://dev.mysql.com/doc/workbench/en/wb-news-5-2-36.html