[mysql-workbench] patch to avoid build error: Only <glib.h> can be included directly
Remi Collet
remi at fedoraproject.org
Sat Dec 10 08:06:43 UTC 2011
commit 2da583b3f97b440a2f70ac89e8d33ff9df1d3d54
Author: remi <fedora at famillecollet.com>
Date: Sat Dec 10 09:06:40 2011 +0100
patch to avoid build error: Only <glib.h> can be included directly
mysql-workbench-5.2.36-glib.patch | 12 ++++++++++++
mysql-workbench.spec | 3 +++
2 files changed, 15 insertions(+), 0 deletions(-)
---
diff --git a/mysql-workbench-5.2.36-glib.patch b/mysql-workbench-5.2.36-glib.patch
new file mode 100644
index 0000000..fc0bc48
--- /dev/null
+++ b/mysql-workbench-5.2.36-glib.patch
@@ -0,0 +1,12 @@
+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
+@@ -28,7 +28,7 @@
+ #include "mdc_selection.h"
+
+ #ifndef _WIN32
+-#include <glib/gthread.h>
++#include <glib.h>
+ #endif
+
+ BEGIN_MDC_DECLS
diff --git a/mysql-workbench.spec b/mysql-workbench.spec
index 10b0631..8a897dd 100644
--- a/mysql-workbench.spec
+++ b/mysql-workbench.spec
@@ -30,6 +30,8 @@ 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
+# Only <glib.h> can be included directly
+Patch6: %{name}-5.2.36-glib.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -135,6 +137,7 @@ rm -rf library/tinyxml
%endif
%patch5 -p1 -b .man
+%patch6 -p1 -b .glib
touch -r COPYING .timestamp4rpm
More information about the scm-commits
mailing list