← Back to branch summary

~ubuntu-branches/ubuntu/trusty/mysql-workbench/trusty-proposed

« back to all changes in this revision

Viewing changes to debian/patches/glib-single-include.patch

  • Committer: Package Import Robot
  • Author(s): Dmitry Smirnov
  • Date: 2012-03-27 21:57:45 UTC
  • Revision ID: package-import@ubuntu.com-20120327215745-r9rr4g1kyhce26fo
Tags: 5.2.38+dfsg-2
http://bugs.debian.org/665584
http://bugs.debian.org/665862
* patch to fix FTBFS with glib 2.32
  (Closes: #665584 I:"individual glib headers no longer supported")
* d-rules: get correct number of CPUs for parallel build on Linux
  (Closes: #665862 W:"Build process not is paralleled on some Linux
   architectures")

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/glib-single-include.patch
 
1
Last-Update: 2012-03-27
 
2
Author: Dmitry Smirnov <onlyjob@member.fsf.org>
 
3
Bug-Debian: http://bugs.debian.org/665584
 
4
Bug-Mysql: http://bugs.mysql.com/bug.php?id=63705
 
5
Forwarded: yes
 
6
Description: fix FTBFS with glib 2.32
 
7
 
 
8
 
 
9
--- a/backend/wbprivate/sqlide/wb_live_schema_tree.h
 
10
+++ b/backend/wbprivate/sqlide/wb_live_schema_tree.h
 
11
@@ -24,7 +24,7 @@
 
12
 #include "grtpp.h"
 
13
 #include "workbench/wb_backend_public_interface.h"
 
14
 #include "base/string_utilities.h"
 
15
-#include <glib/gpattern.h>
 
16
+#include <glib.h>
 
17
 
 
18
 namespace wb
 
19
 {
 
20
--- a/backend/wbprivate/workbench/stdafx.h
 
21
+++ b/backend/wbprivate/workbench/stdafx.h
 
22
@@ -56,7 +56,6 @@
 
23
 #include <gl/glu.h>
 
24
 
 
25
 #include <glib.h>
 
26
-#include <glib/gthread.h>
 
27
 
 
28
 #include "grtpp.h"
 
29
 #include "grtpp_util.h"
 
30
--- a/library/canvas/src/mdc_canvas_view.h
 
31
+++ b/library/canvas/src/mdc_canvas_view.h
 
32
@@ -28,7 +28,7 @@
 
33
 #include "mdc_selection.h"
 
34
 
 
35
 #ifndef _WIN32
 
36
-#include <glib/gthread.h>
 
37
+#include <glib.h>
 
38
 #endif
 
39
 
 
40
 BEGIN_MDC_DECLS
 
41
--- a/library/canvas/src/mdc_canvas_view_printing.cpp
 
42
+++ b/library/canvas/src/mdc_canvas_view_printing.cpp
 
43
@@ -21,7 +21,7 @@
 
44
 
 
45
 #include "mdc_canvas_view.h"
 
46
 #include "mdc_canvas_view_printing.h"
 
47
-#include <glib/gmessages.h>
 
48
+#include <glib.h>
 
49
 
 
50
 #ifdef _WIN32
 
51
 #include <cairo/cairo-win32.h>
 
52
--- a/library/canvas/src/stdafx.h
 
53
+++ b/library/canvas/src/stdafx.h
 
54
@@ -52,7 +52,7 @@
 
55
 #include <gl/gl.h>
 
56
 #include <gl/glu.h>
 
57
 
 
58
-#include <glib/gthread.h>
 
59
+#include <glib.h>
 
60
 
 
61
 #endif // _WIN32
 
62
 
 
63
--- a/library/grt/src/grtpp_util.cpp
 
64
+++ b/library/grt/src/grtpp_util.cpp
 
65
@@ -25,7 +25,7 @@
 
66
 #include "grtpp_util.h"
 
67
 #include "base/string_utilities.h"
 
68
 
 
69
-#include <glib/gbase64.h>
 
70
+#include <glib.h>
 
71
 #include <functional>
 
72
 
 
73
 using namespace grt;
 
74
--- a/modules/db.mysql.sqlparser/src/mysql_sql_parser_fe.cpp
 
75
+++ b/modules/db.mysql.sqlparser/src/mysql_sql_parser_fe.cpp
 
76
@@ -20,7 +20,7 @@
 
77
 
 
78
 #include "stdafx.h"
 
79
 
 
80
-#include <glib/gunicode.h>
 
81
+#include <glib.h>
 
82
 #include "grt/common.h"
 
83
 #include "grt/grt_manager.h"
 
84
 #include "grtdb/charset_utils.h"
 
85
--- a/modules/db.mysql.sqlparser/src/stdafx.h
 
86
+++ b/modules/db.mysql.sqlparser/src/stdafx.h
 
87
@@ -32,7 +32,7 @@
 
88
 #include <algorithm>
 
89
 #include <sstream>
 
90
 #include <fstream>
 
91
-#include <glib/gunicode.h>
 
92
+#include <glib.h>
 
93
 #include <map>
 
94
 #include "direct.h"
 
95
 
 
96
--- a/modules/wb.mysql.import/src/stdafx.h
 
97
+++ b/modules/wb.mysql.import/src/stdafx.h
 
98
@@ -10,7 +10,7 @@
 
99
 #include <algorithm>
 
100
 #include <sstream>
 
101
 #include <fstream>
 
102
-#include <glib/gunicode.h>
 
103
+#include <glib.h>
 
104
 #include <map>
 
105
 #include "direct.h"
 
106
 
 
107
--- a/plugins/db.mysql/backend/db_plugin_be.cpp
 
108
+++ b/plugins/db.mysql/backend/db_plugin_be.cpp
 
109
@@ -31,7 +31,7 @@
 
110
 #include "grts/structs.db.h"
 
111
 #include "base/string_utilities.h"
 
112
 
 
113
-#include <glib/gunicode.h>
 
114
+#include <glib.h>
 
115
 
 
116
 void Db_plugin::grtm(bec::GRTManager *grtm)
 
117
 {
 
118
--- a/plugins/wb.printing/backend/stdafx.h
 
119
+++ b/plugins/wb.printing/backend/stdafx.h
 
120
@@ -44,7 +44,7 @@
 
121
 #include <gl/gl.h>
 
122
 #include <gl/glu.h>
 
123
 
 
124
-#include <glib/gthread.h>
 
125
+#include <glib.h>
 
126
 
 
127
 #ifndef _WIN32
 
128
 #include <sys/time.h>