Mercurial > mxe-octave
annotate src/gtkglext-1-fixes.patch @ 3707:12aaa396be7c
sqlite: update to 3.8.6
* src/sqlite.mk: update version/checksum for 3.8.6
author | John Donoghue |
---|---|
date | Wed, 03 Sep 2014 12:20:08 -0400 |
parents | 99516e73b368 |
children |
rev | line source |
---|---|
2333
f653602a0500
Rebrand to new project name MXE
Volker Grabsch <vog@notjusthosting.com>
parents:
1240
diff
changeset
|
1 This file is part of MXE. |
2353
99516e73b368
Move doc/index.html -> index.html
Volker Grabsch <vog@notjusthosting.com>
parents:
2333
diff
changeset
|
2 See index.html for further information. |
1240
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
3 |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
4 Contains ad hoc patches for cross building. |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
5 |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
6 From c79e894db7f1a5cbd6ba57352f79d68595175666 Mon Sep 17 00:00:00 2001 |
2333
f653602a0500
Rebrand to new project name MXE
Volker Grabsch <vog@notjusthosting.com>
parents:
1240
diff
changeset
|
7 From: MXE |
1240
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
8 Date: Fri, 1 Oct 2010 14:43:15 +0200 |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
9 Subject: [PATCH 1/4] remove pangox dependency |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
10 |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
11 |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
12 diff --git a/configure.in b/configure.in |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
13 index e5b678c..54bb867 100644 |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
14 --- a/configure.in |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
15 +++ b/configure.in |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
16 @@ -349,7 +349,6 @@ PKG_CHECK_MODULES([BASE_DEPENDENCIES], [\ |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
17 gtk_pkg >= gtk_required_version \ |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
18 gdk_pkg >= gdk_required_version \ |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
19 pango_pkg >= pango_required_version \ |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
20 -pangox_pkg >= pangox_required_version \ |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
21 gmodule_pkg >= gmodule_required_version \ |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
22 ]) |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
23 |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
24 @@ -794,7 +793,7 @@ LIBS="$save_LIBS" |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
25 # CFLAGS and LIBS |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
26 ################################################## |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
27 |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
28 -GDKGLEXT_PACKAGES="gdk_pkg pango_pkg pangox_pkg gmodule_pkg" |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
29 +GDKGLEXT_PACKAGES="gdk_pkg pango_pkg gmodule_pkg" |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
30 GDKGLEXT_EXTRA_CFLAGS="$GL_CFLAGS $GDKGLEXT_WIN_CFLAGS" |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
31 GDKGLEXT_EXTRA_LIBS="$GL_LIBS $GDKGLEXT_WIN_LIBS" |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
32 GDKGLEXT_DEP_CFLAGS="$GDKGLEXT_EXTRA_CFLAGS `$PKG_CONFIG --cflags $GDKGLEXT_PACKAGES`" |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
33 -- |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
34 1.7.1 |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
35 |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
36 |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
37 From a6894898cad4238a3676cf6fbfe6c378217317ca Mon Sep 17 00:00:00 2001 |
2333
f653602a0500
Rebrand to new project name MXE
Volker Grabsch <vog@notjusthosting.com>
parents:
1240
diff
changeset
|
38 From: MXE |
1240
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
39 Date: Fri, 1 Oct 2010 14:44:37 +0200 |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
40 Subject: [PATCH 2/4] use correct glib mkenums patch |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
41 |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
42 This patch has been taken from: |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
43 https://bugzilla.gnome.org/show_bug.cgi?id=618599 |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
44 |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
45 diff --git a/gdk/Makefile.am b/gdk/Makefile.am |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
46 index 525bfc2..fbeae34 100644 |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
47 --- a/gdk/Makefile.am |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
48 +++ b/gdk/Makefile.am |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
49 @@ -157,7 +157,7 @@ $(libgdkglext_x11_@API_MJ@_@API_MI@_la_OBJECTS) $(libgdkglext_win32_@API_MJ@_@AP |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
50 $(srcdir)/gdkglenumtypes.h: stamp-gdkglenumtypes-h |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
51 @true |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
52 stamp-gdkglenumtypes-h: @REBUILD@ $(gdkglext_public_h_sources) Makefile |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
53 - ( cd $(srcdir) && glib-mkenums \ |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
54 + ( cd $(srcdir) && $(GLIB_MKENUMS) \ |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
55 --fhead "#ifndef __GDK_GL_ENUM_TYPES_H__\n#define __GDK_GL_ENUM_TYPES_H__\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \ |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
56 --fprod "/* enumerations from \"@filename@\" */\n" \ |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
57 --vhead "GType @enum_name@_get_type (void);\n#define GDK_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \ |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
58 @@ -167,7 +167,7 @@ stamp-gdkglenumtypes-h: @REBUILD@ $(gdkglext_public_h_sources) Makefile |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
59 && rm -f xgen-geth \ |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
60 && echo timestamp > $(@F) |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
61 $(srcdir)/gdkglenumtypes.c: @REBUILD@ $(gdkglext_public_h_sources) Makefile |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
62 - ( cd $(srcdir) && glib-mkenums \ |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
63 + ( cd $(srcdir) && $(GLIB_MKENUMS) \ |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
64 --fhead "#include \"gdkgl.h\"" \ |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
65 --fprod "\n/* enumerations from \"@filename@\" */" \ |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
66 --vhead "GType\n@enum_name@_get_type (void)\n{\n static GType etype = 0;\n if (etype == 0) {\n static const G@Type@Value values[] = {" \ |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
67 diff --git a/gdk/Makefile.in b/gdk/Makefile.in |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
68 index 005bd1b..ace11c7 100644 |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
69 --- a/gdk/Makefile.in |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
70 +++ b/gdk/Makefile.in |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
71 @@ -844,7 +844,7 @@ $(libgdkglext_x11_@API_MJ@_@API_MI@_la_OBJECTS) $(libgdkglext_win32_@API_MJ@_@AP |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
72 $(srcdir)/gdkglenumtypes.h: stamp-gdkglenumtypes-h |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
73 @true |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
74 stamp-gdkglenumtypes-h: @REBUILD@ $(gdkglext_public_h_sources) Makefile |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
75 - ( cd $(srcdir) && glib-mkenums \ |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
76 + ( cd $(srcdir) && $(GLIB_MKENUMS) \ |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
77 --fhead "#ifndef __GDK_GL_ENUM_TYPES_H__\n#define __GDK_GL_ENUM_TYPES_H__\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \ |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
78 --fprod "/* enumerations from \"@filename@\" */\n" \ |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
79 --vhead "GType @enum_name@_get_type (void);\n#define GDK_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \ |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
80 @@ -854,7 +854,7 @@ stamp-gdkglenumtypes-h: @REBUILD@ $(gdkglext_public_h_sources) Makefile |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
81 && rm -f xgen-geth \ |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
82 && echo timestamp > $(@F) |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
83 $(srcdir)/gdkglenumtypes.c: @REBUILD@ $(gdkglext_public_h_sources) Makefile |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
84 - ( cd $(srcdir) && glib-mkenums \ |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
85 + ( cd $(srcdir) && $(GLIB_MKENUMS) \ |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
86 --fhead "#include \"gdkgl.h\"" \ |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
87 --fprod "\n/* enumerations from \"@filename@\" */" \ |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
88 --vhead "GType\n@enum_name@_get_type (void)\n{\n static GType etype = 0;\n if (etype == 0) {\n static const G@Type@Value values[] = {" \ |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
89 -- |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
90 1.7.1 |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
91 |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
92 |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
93 From 9080ce06af85a0beee38f0d391ee8fab8dc07fdf Mon Sep 17 00:00:00 2001 |
2333
f653602a0500
Rebrand to new project name MXE
Volker Grabsch <vog@notjusthosting.com>
parents:
1240
diff
changeset
|
94 From: MXE |
1240
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
95 Date: Fri, 1 Oct 2010 14:47:30 +0200 |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
96 Subject: [PATCH 3/4] don't use deprecated functions |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
97 |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
98 This patch has been taken from: |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
99 https://bugzilla.gnome.org/show_bug.cgi?id=618601 |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
100 |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
101 diff --git a/gtk/gtkglwidget.c b/gtk/gtkglwidget.c |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
102 index ecb41ef..2a31c5a 100644 |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
103 --- a/gtk/gtkglwidget.c |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
104 +++ b/gtk/gtkglwidget.c |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
105 @@ -127,7 +127,7 @@ gtk_gl_widget_size_allocate (GtkWidget *widget, |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
106 * Synchronize OpenGL and window resizing request streams. |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
107 */ |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
108 |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
109 - if (GTK_WIDGET_REALIZED (widget) && private->is_realized) |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
110 + if (gtk_widget_get_realized (widget) && private->is_realized) |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
111 { |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
112 gldrawable = gdk_window_get_gl_drawable (widget->window); |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
113 gdk_gl_drawable_wait_gdk (gldrawable); |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
114 @@ -154,7 +154,7 @@ gtk_gl_widget_unrealize (GtkWidget *widget, |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
115 * Remove OpenGL-capability from widget->window. |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
116 */ |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
117 |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
118 - if (GTK_WIDGET_REALIZED (widget)) |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
119 + if (gtk_widget_get_realized (widget)) |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
120 gdk_window_unset_gl_capability (widget->window); |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
121 |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
122 private->is_realized = FALSE; |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
123 @@ -174,7 +174,7 @@ gtk_gl_widget_parent_set (GtkWidget *widget, |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
124 */ |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
125 |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
126 toplevel = gtk_widget_get_toplevel (widget); |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
127 - if (GTK_WIDGET_TOPLEVEL (toplevel) && !GTK_WIDGET_REALIZED (toplevel)) |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
128 + if (gtk_widget_is_toplevel (toplevel) && !gtk_widget_get_realized (toplevel)) |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
129 { |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
130 GTK_GL_NOTE (MISC, |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
131 g_message (" - Install colormap to the top-level window.")); |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
132 @@ -194,7 +194,7 @@ gtk_gl_widget_style_set (GtkWidget *widget, |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
133 * Set a background of "None" on window to avoid AIX X server crash. |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
134 */ |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
135 |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
136 - if (GTK_WIDGET_REALIZED (widget)) |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
137 + if (gtk_widget_get_realized (widget)) |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
138 { |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
139 GTK_GL_NOTE (MISC, |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
140 g_message (" - window->bg_pixmap = %p", |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
141 @@ -250,8 +250,8 @@ gtk_widget_set_gl_capability (GtkWidget *widget, |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
142 GTK_GL_NOTE_FUNC (); |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
143 |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
144 g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE); |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
145 - g_return_val_if_fail (!GTK_WIDGET_NO_WINDOW (widget), FALSE); |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
146 - g_return_val_if_fail (!GTK_WIDGET_REALIZED (widget), FALSE); |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
147 + g_return_val_if_fail (gtk_widget_get_has_window (widget), FALSE); |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
148 + g_return_val_if_fail (!gtk_widget_get_realized (widget), FALSE); |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
149 g_return_val_if_fail (GDK_IS_GL_CONFIG (glconfig), FALSE); |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
150 |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
151 /* |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
152 @@ -432,7 +432,7 @@ gtk_widget_create_gl_context (GtkWidget *widget, |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
153 GTK_GL_NOTE_FUNC (); |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
154 |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
155 g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL); |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
156 - g_return_val_if_fail (GTK_WIDGET_REALIZED (widget), NULL); |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
157 + g_return_val_if_fail (gtk_widget_get_realized (widget), NULL); |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
158 |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
159 gldrawable = gdk_window_get_gl_drawable (widget->window); |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
160 if (gldrawable == NULL) |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
161 @@ -474,7 +474,7 @@ gtk_widget_get_gl_context (GtkWidget *widget) |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
162 GLWidgetPrivate *private; |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
163 |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
164 g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL); |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
165 - g_return_val_if_fail (GTK_WIDGET_REALIZED (widget), NULL); |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
166 + g_return_val_if_fail (gtk_widget_get_realized (widget), NULL); |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
167 |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
168 private = g_object_get_qdata (G_OBJECT (widget), quark_gl_private); |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
169 if (private == NULL) |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
170 @@ -501,7 +501,7 @@ GdkGLWindow * |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
171 gtk_widget_get_gl_window (GtkWidget *widget) |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
172 { |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
173 g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL); |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
174 - g_return_val_if_fail (GTK_WIDGET_REALIZED (widget), NULL); |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
175 + g_return_val_if_fail (gtk_widget_get_realized (widget), NULL); |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
176 |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
177 return gdk_window_get_gl_window (widget->window); |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
178 } |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
179 -- |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
180 1.7.1 |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
181 |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
182 |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
183 From eb64eb053481321cb1b0d3ec9e2fcb46c55c0972 Mon Sep 17 00:00:00 2001 |
2333
f653602a0500
Rebrand to new project name MXE
Volker Grabsch <vog@notjusthosting.com>
parents:
1240
diff
changeset
|
184 From: MXE |
1240
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
185 Date: Fri, 1 Oct 2010 14:50:25 +0200 |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
186 Subject: [PATCH 4/4] removed import declarations |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
187 |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
188 |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
189 diff --git a/gdk/gdkgldefs.h b/gdk/gdkgldefs.h |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
190 index 1120822..62a84c2 100644 |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
191 --- a/gdk/gdkgldefs.h |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
192 +++ b/gdk/gdkgldefs.h |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
193 @@ -27,9 +27,9 @@ G_BEGIN_DECLS |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
194 |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
195 #ifdef G_OS_WIN32 |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
196 # ifdef GDK_GL_COMPILATION |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
197 -# define GDK_GL_VAR __declspec(dllexport) |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
198 +# define GDK_GL_VAR |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
199 # else |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
200 -# define GDK_GL_VAR extern __declspec(dllimport) |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
201 +# define GDK_GL_VAR extern |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
202 # endif |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
203 #else |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
204 # define GDK_GL_VAR extern |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
205 diff --git a/gtk/gtkgldefs.h b/gtk/gtkgldefs.h |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
206 index c917007..5ed957e 100644 |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
207 --- a/gtk/gtkgldefs.h |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
208 +++ b/gtk/gtkgldefs.h |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
209 @@ -25,9 +25,9 @@ G_BEGIN_DECLS |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
210 |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
211 #ifdef G_OS_WIN32 |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
212 # ifdef GTK_GL_COMPILATION |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
213 -# define GTK_GL_VAR __declspec(dllexport) |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
214 +# define GTK_GL_VAR |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
215 # else |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
216 -# define GTK_GL_VAR extern __declspec(dllimport) |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
217 +# define GTK_GL_VAR extern |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
218 # endif |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
219 #else |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
220 # define GTK_GL_VAR extern |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
221 -- |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
222 1.7.1 |
a31d23f025f8
package gtkglext: fixed linking
Martin Gerhardy <martin.gerhardy@gmail.com>
parents:
diff
changeset
|
223 |