Mercurial > mxe-octave

annotate src/gtk2-1-fixes.patch @ 5893:53a6c7df43f8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Mesa 3D: Update to version 21.1.8. * src/mesa.mk: Update version and checksum. * src/mesa-2-uninitialized.patch: Remove file. * dist-files.mk: Remove file from list.
author Markus Mützel <markus.muetzel@gmx.de>
date Thu, 16 Sep 2021 22:37:45 +0200
parents 207751177c95
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2333
f653602a0500 Rebrand to new project name MXE
Volker Grabsch <vog@notjusthosting.com>
parents: 2154
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.
1594
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
3
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
4 Contains ad hoc patches for cross building.
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
5
2154
58ea60dca393 packages gtk2 gtkglextmm pango: replace wine workaround patches
Mark Brand <mabrand@mabrand.nl>
parents: 1594
diff changeset
6 From 2e42ff35296c81959a8fab06aa8d3dacf19632d8 Mon Sep 17 00:00:00 2001
2333
f653602a0500 Rebrand to new project name MXE
Volker Grabsch <vog@notjusthosting.com>
parents: 2154
diff changeset
7 From: MXE
1594
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
8 Date: Fri, 24 Sep 2010 14:43:43 +0200
2154
58ea60dca393 packages gtk2 gtkglextmm pango: replace wine workaround patches
Mark Brand <mabrand@mabrand.nl>
parents: 1594
diff changeset
9 Subject: [PATCH 01/10] s,DllMain,static _disabled_DllMain,
1594
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
10
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
11
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
12 diff --git a/gdk/win32/gdkmain-win32.c b/gdk/win32/gdkmain-win32.c
2154
58ea60dca393 packages gtk2 gtkglextmm pango: replace wine workaround patches
Mark Brand <mabrand@mabrand.nl>
parents: 1594
diff changeset
13 index dc139be..be2a7ee 100644
1594
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
14 --- a/gdk/win32/gdkmain-win32.c
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
15 +++ b/gdk/win32/gdkmain-win32.c
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
16 @@ -65,7 +65,7 @@ const GOptionEntry _gdk_windowing_args[] = {
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
17 };
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
18
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
19 int __stdcall
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
20 -DllMain (HINSTANCE hinstDLL,
2397
207751177c95 gtk2: rename DllMains to gtk_DllMain/gdk_DllMain
Matthias Gehre <M.Gehre@gmx.de>
parents: 2353
diff changeset
21 +gdk_DllMain (HINSTANCE hinstDLL,
1594
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
22 DWORD dwReason,
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
23 LPVOID reserved)
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
24 {
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
25 diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
2154
58ea60dca393 packages gtk2 gtkglextmm pango: replace wine workaround patches
Mark Brand <mabrand@mabrand.nl>
parents: 1594
diff changeset
26 index d081f70..aa2973d 100644
1594
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
27 --- a/gtk/gtkmain.c
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
28 +++ b/gtk/gtkmain.c
2154
58ea60dca393 packages gtk2 gtkglextmm pango: replace wine workaround patches
Mark Brand <mabrand@mabrand.nl>
parents: 1594
diff changeset
29 @@ -74,7 +74,7 @@
1594
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
30 static HMODULE gtk_dll;
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
31
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
32 BOOL WINAPI
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
33 -DllMain (HINSTANCE hinstDLL,
2397
207751177c95 gtk2: rename DllMains to gtk_DllMain/gdk_DllMain
Matthias Gehre <M.Gehre@gmx.de>
parents: 2353
diff changeset
34 +gtk_DllMain (HINSTANCE hinstDLL,
1594
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
35 DWORD fdwReason,
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
36 LPVOID lpvReserved)
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
37 {
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
38 --
2154
58ea60dca393 packages gtk2 gtkglextmm pango: replace wine workaround patches
Mark Brand <mabrand@mabrand.nl>
parents: 1594
diff changeset
39 1.7.7.3
1594
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
40
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
41
2154
58ea60dca393 packages gtk2 gtkglextmm pango: replace wine workaround patches
Mark Brand <mabrand@mabrand.nl>
parents: 1594
diff changeset
42 From 86527a238545e47b4770531c79f5f2ead59aab85 Mon Sep 17 00:00:00 2001
2333
f653602a0500 Rebrand to new project name MXE
Volker Grabsch <vog@notjusthosting.com>
parents: 2154
diff changeset
43 From: MXE
1594
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
44 Date: Fri, 24 Sep 2010 14:46:20 +0200
2154
58ea60dca393 packages gtk2 gtkglextmm pango: replace wine workaround patches
Mark Brand <mabrand@mabrand.nl>
parents: 1594
diff changeset
45 Subject: [PATCH 02/10] s,__declspec(dllimport),,
1594
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
46
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
47
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
48 diff --git a/gdk/gdktypes.h b/gdk/gdktypes.h
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
49 index 506f35d..f40de41 100644
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
50 --- a/gdk/gdktypes.h
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
51 +++ b/gdk/gdktypes.h
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
52 @@ -41,7 +41,7 @@
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
53 # ifdef GDK_COMPILATION
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
54 # define GDKVAR __declspec(dllexport)
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
55 # else
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
56 -# define GDKVAR extern __declspec(dllimport)
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
57 +# define GDKVAR extern
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
58 # endif
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
59 #else
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
60 # define GDKVAR extern
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
61 diff --git a/gtk/gtkdebug.h b/gtk/gtkdebug.h
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
62 index 2190973..0a1c43c 100644
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
63 --- a/gtk/gtkdebug.h
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
64 +++ b/gtk/gtkdebug.h
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
65 @@ -66,7 +66,7 @@ typedef enum {
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
66 # ifdef GTK_COMPILATION
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
67 # define GTKVAR __declspec(dllexport)
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
68 # else
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
69 -# define GTKVAR extern __declspec(dllimport)
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
70 +# define GTKVAR extern
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
71 # endif
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
72 #else
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
73 # define GTKVAR extern
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
74 diff --git a/gtk/gtkmain.h b/gtk/gtkmain.h
2154
58ea60dca393 packages gtk2 gtkglextmm pango: replace wine workaround patches
Mark Brand <mabrand@mabrand.nl>
parents: 1594
diff changeset
75 index bbea9cd..059d7d0 100644
1594
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
76 --- a/gtk/gtkmain.h
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
77 +++ b/gtk/gtkmain.h
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
78 @@ -69,7 +69,7 @@ typedef gint (*GtkKeySnoopFunc) (GtkWidget *grab_widget,
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
79 #ifdef GTK_COMPILATION
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
80 #define GTKMAIN_C_VAR __declspec(dllexport)
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
81 #else
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
82 -#define GTKMAIN_C_VAR extern __declspec(dllimport)
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
83 +#define GTKMAIN_C_VAR extern
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
84 #endif
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
85 #else
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
86 #define GTKMAIN_C_VAR extern
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
87 diff --git a/gtk/gtktexttypes.h b/gtk/gtktexttypes.h
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
88 index c624aea..b792ea5 100644
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
89 --- a/gtk/gtktexttypes.h
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
90 +++ b/gtk/gtktexttypes.h
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
91 @@ -46,7 +46,7 @@ typedef struct _GtkTextMarkBody GtkTextMarkBody;
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
92 #ifdef GTK_COMPILATION
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
93 #define VARIABLE __declspec(dllexport)
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
94 #else
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
95 -#define VARIABLE extern __declspec(dllimport)
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
96 +#define VARIABLE extern
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
97 #endif
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
98 #else
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
99 #define VARIABLE extern
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
100 --
2154
58ea60dca393 packages gtk2 gtkglextmm pango: replace wine workaround patches
Mark Brand <mabrand@mabrand.nl>
parents: 1594
diff changeset
101 1.7.7.3
1594
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
102
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
103
2154
58ea60dca393 packages gtk2 gtkglextmm pango: replace wine workaround patches
Mark Brand <mabrand@mabrand.nl>
parents: 1594
diff changeset
104 From 7277a7022eb4ffb498475d969057d3a57e687222 Mon Sep 17 00:00:00 2001
2333
f653602a0500 Rebrand to new project name MXE
Volker Grabsch <vog@notjusthosting.com>
parents: 2154
diff changeset
105 From: MXE
1594
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
106 Date: Fri, 24 Sep 2010 15:03:28 +0200
2154
58ea60dca393 packages gtk2 gtkglextmm pango: replace wine workaround patches
Mark Brand <mabrand@mabrand.nl>
parents: 1594
diff changeset
107 Subject: [PATCH 03/10] s,__declspec(dllexport),,
1594
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
108
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
109
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
110 diff --git a/gdk/gdktypes.h b/gdk/gdktypes.h
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
111 index f40de41..07cfb4e 100644
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
112 --- a/gdk/gdktypes.h
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
113 +++ b/gdk/gdktypes.h
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
114 @@ -39,7 +39,7 @@
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
115
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
116 #ifdef G_OS_WIN32
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
117 # ifdef GDK_COMPILATION
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
118 -# define GDKVAR __declspec(dllexport)
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
119 +# define GDKVAR
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
120 # else
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
121 # define GDKVAR extern
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
122 # endif
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
123 diff --git a/gtk/gtkdebug.h b/gtk/gtkdebug.h
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
124 index 0a1c43c..507ff69 100644
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
125 --- a/gtk/gtkdebug.h
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
126 +++ b/gtk/gtkdebug.h
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
127 @@ -64,7 +64,7 @@ typedef enum {
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
128
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
129 #ifdef G_OS_WIN32
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
130 # ifdef GTK_COMPILATION
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
131 -# define GTKVAR __declspec(dllexport)
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
132 +# define GTKVAR
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
133 # else
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
134 # define GTKVAR extern
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
135 # endif
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
136 diff --git a/gtk/gtkmain.h b/gtk/gtkmain.h
2154
58ea60dca393 packages gtk2 gtkglextmm pango: replace wine workaround patches
Mark Brand <mabrand@mabrand.nl>
parents: 1594
diff changeset
137 index 059d7d0..8c360d0 100644
1594
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
138 --- a/gtk/gtkmain.h
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
139 +++ b/gtk/gtkmain.h
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
140 @@ -67,7 +67,7 @@ typedef gint (*GtkKeySnoopFunc) (GtkWidget *grab_widget,
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
141 */
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
142 #ifdef G_PLATFORM_WIN32
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
143 #ifdef GTK_COMPILATION
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
144 -#define GTKMAIN_C_VAR __declspec(dllexport)
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
145 +#define GTKMAIN_C_VAR
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
146 #else
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
147 #define GTKMAIN_C_VAR extern
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
148 #endif
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
149 diff --git a/gtk/gtktexttypes.h b/gtk/gtktexttypes.h
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
150 index b792ea5..f382a64 100644
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
151 --- a/gtk/gtktexttypes.h
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
152 +++ b/gtk/gtktexttypes.h
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
153 @@ -44,7 +44,7 @@ typedef struct _GtkTextMarkBody GtkTextMarkBody;
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
154
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
155 #ifdef G_OS_WIN32
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
156 #ifdef GTK_COMPILATION
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
157 -#define VARIABLE __declspec(dllexport)
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
158 +#define VARIABLE
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
159 #else
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
160 #define VARIABLE extern
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
161 #endif
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
162 --
2154
58ea60dca393 packages gtk2 gtkglextmm pango: replace wine workaround patches
Mark Brand <mabrand@mabrand.nl>
parents: 1594
diff changeset
163 1.7.7.3
1594
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
164
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
165
2154
58ea60dca393 packages gtk2 gtkglextmm pango: replace wine workaround patches
Mark Brand <mabrand@mabrand.nl>
parents: 1594
diff changeset
166 From 604fcdb64972a82c6a430c36debc9f66c7f05d90 Mon Sep 17 00:00:00 2001
2333
f653602a0500 Rebrand to new project name MXE
Volker Grabsch <vog@notjusthosting.com>
parents: 2154
diff changeset
167 From: MXE
1594
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
168 Date: Fri, 24 Sep 2010 14:17:22 +0200
2154
58ea60dca393 packages gtk2 gtkglextmm pango: replace wine workaround patches
Mark Brand <mabrand@mabrand.nl>
parents: 1594
diff changeset
169 Subject: [PATCH 04/10] fix gtk+-2.0.pc.in
1594
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
170
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
171
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
172 diff --git a/gtk+-2.0.pc.in b/gtk+-2.0.pc.in
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
173 index 46853e1..7f3eb22 100644
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
174 --- a/gtk+-2.0.pc.in
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
175 +++ b/gtk+-2.0.pc.in
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
176 @@ -11,5 +11,5 @@ Name: GTK+
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
177 Description: GTK+ Graphical UI Library (${target} target)
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
178 Version: @VERSION@
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
179 Requires: gdk-${target}-2.0 @GTK_PACKAGES@
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
180 -Libs: -L${libdir} -lgtk-${target}-@GTK_API_VERSION@ @GTK_EXTRA_LIBS@
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
181 +Libs: -L${libdir} -lgtk-${target}-@GTK_API_VERSION@ @GTK_DEP_LIBS@ -lwinspool -lcomctl32 -lcomdlg32
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
182 Cflags: -I${includedir}/gtk-2.0 @GTK_EXTRA_CFLAGS@
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
183 --
2154
58ea60dca393 packages gtk2 gtkglextmm pango: replace wine workaround patches
Mark Brand <mabrand@mabrand.nl>
parents: 1594
diff changeset
184 1.7.7.3
1594
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
185
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
186
2154
58ea60dca393 packages gtk2 gtkglextmm pango: replace wine workaround patches
Mark Brand <mabrand@mabrand.nl>
parents: 1594
diff changeset
187 From a778e96b43b556389f1e3a6712072eaee9e2adb2 Mon Sep 17 00:00:00 2001
2333
f653602a0500 Rebrand to new project name MXE
Volker Grabsch <vog@notjusthosting.com>
parents: 2154
diff changeset
188 From: MXE
1594
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
189 Date: Fri, 24 Sep 2010 14:48:31 +0200
2154
58ea60dca393 packages gtk2 gtkglextmm pango: replace wine workaround patches
Mark Brand <mabrand@mabrand.nl>
parents: 1594
diff changeset
190 Subject: [PATCH 05/10] disable gtkbuiltincache
1594
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
191
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
192
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
193 diff --git a/gtk/Makefile.in b/gtk/Makefile.in
2154
58ea60dca393 packages gtk2 gtkglextmm pango: replace wine workaround patches
Mark Brand <mabrand@mabrand.nl>
parents: 1594
diff changeset
194 index 76981d8..b6d170f 100644
1594
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
195 --- a/gtk/Makefile.in
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
196 +++ b/gtk/Makefile.in
2154
58ea60dca393 packages gtk2 gtkglextmm pango: replace wine workaround patches
Mark Brand <mabrand@mabrand.nl>
parents: 1594
diff changeset
197 @@ -2888,7 +2888,7 @@ stamp-icons: $(STOCK_ICONS)
1594
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
198 ) done \
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
199 && touch stamp-icons
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
200
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
201 -gtkbuiltincache.h: @REBUILD@ stamp-icons
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
202 +_disabled_gtkbuiltincache.h: @REBUILD@ stamp-icons
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
203 $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT) $(GTK_UPDATE_ICON_CACHE_MANIFEST)
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
204 $(gtk_update_icon_cache_program) --force --ignore-theme-index \
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
205 --source builtin_icons stock-icons > gtkbuiltincache.h.tmp && \
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
206 --
2154
58ea60dca393 packages gtk2 gtkglextmm pango: replace wine workaround patches
Mark Brand <mabrand@mabrand.nl>
parents: 1594
diff changeset
207 1.7.7.3
1594
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
208
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
209
2154
58ea60dca393 packages gtk2 gtkglextmm pango: replace wine workaround patches
Mark Brand <mabrand@mabrand.nl>
parents: 1594
diff changeset
210 From 58310acc28f8e6994281eacac1989e8e6c51c150 Mon Sep 17 00:00:00 2001
2333
f653602a0500 Rebrand to new project name MXE
Volker Grabsch <vog@notjusthosting.com>
parents: 2154
diff changeset
211 From: MXE
1594
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
212 Date: Fri, 24 Sep 2010 14:49:50 +0200
2154
58ea60dca393 packages gtk2 gtkglextmm pango: replace wine workaround patches
Mark Brand <mabrand@mabrand.nl>
parents: 1594
diff changeset
213 Subject: [PATCH 06/10] disable test-inline-pixbufs.h
1594
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
214
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
215
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
216 diff --git a/demos/Makefile.in b/demos/Makefile.in
2154
58ea60dca393 packages gtk2 gtkglextmm pango: replace wine workaround patches
Mark Brand <mabrand@mabrand.nl>
parents: 1594
diff changeset
217 index 9f90d09..2e4f967 100644
1594
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
218 --- a/demos/Makefile.in
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
219 +++ b/demos/Makefile.in
2154
58ea60dca393 packages gtk2 gtkglextmm pango: replace wine workaround patches
Mark Brand <mabrand@mabrand.nl>
parents: 1594
diff changeset
220 @@ -432,7 +432,7 @@ LDADDS = \
1594
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
221 $(GTK_DEP_LIBS) \
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
222 $(MATH_LIB)
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
223
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
224 -BUILT_SOURCES = test-inline-pixbufs.h
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
225 +BUILT_SOURCES =
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
226 testpixbuf_DEPENDENCIES = $(DEPS)
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
227 testpixbuf_drawable_DEPENDENCIES = $(DEPS)
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
228 testpixbuf_save_DEPENDENCIES = $(DEPS)
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
229 --
2154
58ea60dca393 packages gtk2 gtkglextmm pango: replace wine workaround patches
Mark Brand <mabrand@mabrand.nl>
parents: 1594
diff changeset
230 1.7.7.3
1594
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
231
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
232
2154
58ea60dca393 packages gtk2 gtkglextmm pango: replace wine workaround patches
Mark Brand <mabrand@mabrand.nl>
parents: 1594
diff changeset
233 From 7532813f3bfe95fe088c06ce11d31c0d3d66c559 Mon Sep 17 00:00:00 2001
2333
f653602a0500 Rebrand to new project name MXE
Volker Grabsch <vog@notjusthosting.com>
parents: 2154
diff changeset
234 From: MXE
1594
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
235 Date: Fri, 24 Sep 2010 14:51:04 +0200
2154
58ea60dca393 packages gtk2 gtkglextmm pango: replace wine workaround patches
Mark Brand <mabrand@mabrand.nl>
parents: 1594
diff changeset
236 Subject: [PATCH 07/10] permit static building
1594
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
237
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
238
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
239 diff --git a/configure b/configure
2154
58ea60dca393 packages gtk2 gtkglextmm pango: replace wine workaround patches
Mark Brand <mabrand@mabrand.nl>
parents: 1594
diff changeset
240 index 5eedff6..6380da5 100755
1594
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
241 --- a/configure
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
242 +++ b/configure
2154
58ea60dca393 packages gtk2 gtkglextmm pango: replace wine workaround patches
Mark Brand <mabrand@mabrand.nl>
parents: 1594
diff changeset
243 @@ -4361,9 +4361,9 @@ if test "${enable_static+set}" = set; then :
1594
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
244 enableval=$enable_static; p=${PACKAGE-default}
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
245 case $enableval in
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
246 yes) enable_static=yes ;;
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
247 - no) enable_static=no ;;
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
248 + no) enable_static=yes ;;
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
249 *)
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
250 - enable_static=no
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
251 + enable_static=yes
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
252 # Look at the argument we got. We use all the common list separators.
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
253 lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
254 for pkg in $enableval; do
2154
58ea60dca393 packages gtk2 gtkglextmm pango: replace wine workaround patches
Mark Brand <mabrand@mabrand.nl>
parents: 1594
diff changeset
255 @@ -4376,7 +4376,7 @@ if test "${enable_static+set}" = set; then :
1594
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
256 ;;
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
257 esac
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
258 else
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
259 - enable_static=no
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
260 + enable_static=yes
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
261 fi
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
262
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
263
2154
58ea60dca393 packages gtk2 gtkglextmm pango: replace wine workaround patches
Mark Brand <mabrand@mabrand.nl>
parents: 1594
diff changeset
264 @@ -4944,15 +4944,15 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
1594
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
265
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
266 if test "$os_win32" = "yes"; then
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
267 if test x$enable_static = xyes -o x$enable_static = x; then
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
268 - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Disabling static library build, must build as DLL on Windows." >&5
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
269 -$as_echo "$as_me: WARNING: Disabling static library build, must build as DLL on Windows." >&2;}
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
270 - enable_static=no
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
271 + { $as_echo "(disabled warning)" >&5
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
272 +$as_echo "(disabled warning)" >&2;}
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
273 + enable_static=yes
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
274 fi
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
275 if test x$enable_shared = xno; then
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
276 - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Enabling shared library build, must build as DLL on Windows." >&5
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
277 -$as_echo "$as_me: WARNING: Enabling shared library build, must build as DLL on Windows." >&2;}
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
278 + { $as_echo "(disabled warning)" >&5
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
279 +$as_echo "(disabled warning)" >&2;}
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
280 fi
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
281 - enable_shared=yes
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
282 + enable_shared=no
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
283 fi
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
284
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
285 enable_win32_dll=yes
2154
58ea60dca393 packages gtk2 gtkglextmm pango: replace wine workaround patches
Mark Brand <mabrand@mabrand.nl>
parents: 1594
diff changeset
286 @@ -8752,7 +8752,7 @@ func_stripname_cnf ()
1594
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
287 if test "${enable_shared+set}" = set; then :
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
288 enableval=$enable_shared; p=${PACKAGE-default}
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
289 case $enableval in
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
290 - yes) enable_shared=yes ;;
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
291 + yes) enable_shared=no ;;
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
292 no) enable_shared=no ;;
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
293 *)
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
294 enable_shared=no
2154
58ea60dca393 packages gtk2 gtkglextmm pango: replace wine workaround patches
Mark Brand <mabrand@mabrand.nl>
parents: 1594
diff changeset
295 @@ -8761,14 +8761,14 @@ if test "${enable_shared+set}" = set; then :
1594
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
296 for pkg in $enableval; do
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
297 IFS="$lt_save_ifs"
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
298 if test "X$pkg" = "X$p"; then
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
299 - enable_shared=yes
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
300 + enable_shared=no
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
301 fi
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
302 done
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
303 IFS="$lt_save_ifs"
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
304 ;;
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
305 esac
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
306 else
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
307 - enable_shared=yes
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
308 + enable_shared=no
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
309 fi
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
310
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
311
2154
58ea60dca393 packages gtk2 gtkglextmm pango: replace wine workaround patches
Mark Brand <mabrand@mabrand.nl>
parents: 1594
diff changeset
312 @@ -12632,7 +12632,7 @@ $as_echo_n "checking whether to build shared libraries... " >&6; }
1594
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
313 # are all built from PIC.
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
314 case $host_os in
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
315 aix3*)
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
316 - test "$enable_shared" = yes && enable_static=no
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
317 + test "$enable_shared" = yes && enable_static=yes
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
318 if test -n "$RANLIB"; then
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
319 archive_cmds="$archive_cmds~\$RANLIB \$lib"
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
320 postinstall_cmds='$RANLIB $lib'
2154
58ea60dca393 packages gtk2 gtkglextmm pango: replace wine workaround patches
Mark Brand <mabrand@mabrand.nl>
parents: 1594
diff changeset
321 @@ -12641,7 +12641,7 @@ $as_echo_n "checking whether to build shared libraries... " >&6; }
1594
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
322
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
323 aix[4-9]*)
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
324 if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
325 - test "$enable_shared" = yes && enable_static=no
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
326 + test "$enable_shared" = yes && enable_static=yes
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
327 fi
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
328 ;;
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
329 esac
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
330 --
2154
58ea60dca393 packages gtk2 gtkglextmm pango: replace wine workaround patches
Mark Brand <mabrand@mabrand.nl>
parents: 1594
diff changeset
331 1.7.7.3
1594
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
332
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
333
2154
58ea60dca393 packages gtk2 gtkglextmm pango: replace wine workaround patches
Mark Brand <mabrand@mabrand.nl>
parents: 1594
diff changeset
334 From 821882bb862fc86b7152eba82966163d054b488e Mon Sep 17 00:00:00 2001
2333
f653602a0500 Rebrand to new project name MXE
Volker Grabsch <vog@notjusthosting.com>
parents: 2154
diff changeset
335 From: MXE
1594
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
336 Date: Fri, 24 Sep 2010 14:53:18 +0200
2154
58ea60dca393 packages gtk2 gtkglextmm pango: replace wine workaround patches
Mark Brand <mabrand@mabrand.nl>
parents: 1594
diff changeset
337 Subject: [PATCH 08/10] no -Wl
1594
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
338
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
339
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
340 diff --git a/configure b/configure
2154
58ea60dca393 packages gtk2 gtkglextmm pango: replace wine workaround patches
Mark Brand <mabrand@mabrand.nl>
parents: 1594
diff changeset
341 index 6380da5..7283f17 100755
1594
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
342 --- a/configure
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
343 +++ b/configure
2154
58ea60dca393 packages gtk2 gtkglextmm pango: replace wine workaround patches
Mark Brand <mabrand@mabrand.nl>
parents: 1594
diff changeset
344 @@ -23788,7 +23788,7 @@ fi
1594
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
345 fi
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
346
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
347 if test "x$gdktarget" = "xwin32"; then
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
348 - GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -lgdi32 -limm32 -lshell32 -lole32 -Wl,-luuid"
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
349 + GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -lgdi32 -limm32 -lshell32 -lole32 -luuid"
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
350 if true; then
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
351 USE_WIN32_TRUE=
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
352 USE_WIN32_FALSE='#'
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
353 --
2154
58ea60dca393 packages gtk2 gtkglextmm pango: replace wine workaround patches
Mark Brand <mabrand@mabrand.nl>
parents: 1594
diff changeset
354 1.7.7.3
1594
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
355
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
356
2154
58ea60dca393 packages gtk2 gtkglextmm pango: replace wine workaround patches
Mark Brand <mabrand@mabrand.nl>
parents: 1594
diff changeset
357 From 80745459d75da07c53dbb83c6a79c3d9896e5fd3 Mon Sep 17 00:00:00 2001
2333
f653602a0500 Rebrand to new project name MXE
Volker Grabsch <vog@notjusthosting.com>
parents: 2154
diff changeset
358 From: MXE
1594
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
359 Date: Fri, 24 Sep 2010 14:54:15 +0200
2154
58ea60dca393 packages gtk2 gtkglextmm pango: replace wine workaround patches
Mark Brand <mabrand@mabrand.nl>
parents: 1594
diff changeset
360 Subject: [PATCH 09/10] gio not gio-unix
1594
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
361
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
362
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
363 diff --git a/configure b/configure
2154
58ea60dca393 packages gtk2 gtkglextmm pango: replace wine workaround patches
Mark Brand <mabrand@mabrand.nl>
parents: 1594
diff changeset
364 index 7283f17..50e6a86 100755
1594
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
365 --- a/configure
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
366 +++ b/configure
2154
58ea60dca393 packages gtk2 gtkglextmm pango: replace wine workaround patches
Mark Brand <mabrand@mabrand.nl>
parents: 1594
diff changeset
367 @@ -24008,9 +24008,9 @@ fi
1594
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
368 CFLAGS="$saved_cflags"
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
369 LDFLAGS="$saved_ldflags"
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
370
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
371 -# Pull in gio-unix for GDesktopAppInfo usage, see at least gdkapplaunchcontext-x11.c
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
372 +# Pull in gio for GDesktopAppInfo usage, see at least gdkapplaunchcontext-x11.c
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
373 if test "x$gdktarget" = "xx11"; then
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
374 - GDK_PACKAGES="$PANGO_PACKAGES gio-unix-2.0 $X_PACKAGES gdk-pixbuf-2.0 cairo-$cairo_backend"
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
375 + GDK_PACKAGES="$PANGO_PACKAGES gio-2.0 $X_PACKAGES gdk-pixbuf-2.0 cairo-$cairo_backend"
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
376 else
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
377 GDK_PACKAGES="$PANGO_PACKAGES gio-2.0 gdk-pixbuf-2.0 cairo-$cairo_backend"
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
378 fi
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
379 --
2154
58ea60dca393 packages gtk2 gtkglextmm pango: replace wine workaround patches
Mark Brand <mabrand@mabrand.nl>
parents: 1594
diff changeset
380 1.7.7.3
1594
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
381
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
382
2154
58ea60dca393 packages gtk2 gtkglextmm pango: replace wine workaround patches
Mark Brand <mabrand@mabrand.nl>
parents: 1594
diff changeset
383 From 337e54ef8aa5a4d131e9d9007dedcc42b164e68c Mon Sep 17 00:00:00 2001
2333
f653602a0500 Rebrand to new project name MXE
Volker Grabsch <vog@notjusthosting.com>
parents: 2154
diff changeset
384 From: MXE
1594
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
385 Date: Fri, 24 Sep 2010 15:30:49 +0200
2154
58ea60dca393 packages gtk2 gtkglextmm pango: replace wine workaround patches
Mark Brand <mabrand@mabrand.nl>
parents: 1594
diff changeset
386 Subject: [PATCH 10/10] removed duplicate _gtk_marshal_OBJECT__VOID()
1594
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
387
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
388
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
389 diff --git a/perf/marshalers.c b/perf/marshalers.c
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
390 index f533ab0..0a37ba4 100644
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
391 --- a/perf/marshalers.c
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
392 +++ b/perf/marshalers.c
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
393 @@ -49,43 +49,6 @@
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
394 #endif /* !G_ENABLE_DEBUG */
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
395
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
396
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
397 -/* OBJECT:VOID (./marshalers.list:1) */
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
398 -void
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
399 -_gtk_marshal_OBJECT__VOID (GClosure *closure,
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
400 - GValue *return_value G_GNUC_UNUSED,
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
401 - guint n_param_values,
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
402 - const GValue *param_values,
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
403 - gpointer invocation_hint G_GNUC_UNUSED,
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
404 - gpointer marshal_data)
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
405 -{
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
406 - typedef GObject* (*GMarshalFunc_OBJECT__VOID) (gpointer data1,
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
407 - gpointer data2);
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
408 - register GMarshalFunc_OBJECT__VOID callback;
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
409 - register GCClosure *cc = (GCClosure*) closure;
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
410 - register gpointer data1, data2;
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
411 - GObject* v_return;
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
412 -
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
413 - g_return_if_fail (return_value != NULL);
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
414 - g_return_if_fail (n_param_values == 1);
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
415 -
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
416 - if (G_CCLOSURE_SWAP_DATA (closure))
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
417 - {
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
418 - data1 = closure->data;
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
419 - data2 = g_value_peek_pointer (param_values + 0);
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
420 - }
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
421 - else
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
422 - {
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
423 - data1 = g_value_peek_pointer (param_values + 0);
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
424 - data2 = closure->data;
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
425 - }
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
426 - callback = (GMarshalFunc_OBJECT__VOID) (marshal_data ? marshal_data : cc->callback);
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
427 -
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
428 - v_return = callback (data1,
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
429 - data2);
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
430 -
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
431 - g_value_take_object (return_value, v_return);
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
432 -}
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
433 -
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
434 /* VOID:ENUM,OBJECT,DOUBLE (./marshalers.list:2) */
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
435 void
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
436 _gtk_marshal_VOID__ENUM_OBJECT_DOUBLE (GClosure *closure,
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
437 --
2154
58ea60dca393 packages gtk2 gtkglextmm pango: replace wine workaround patches
Mark Brand <mabrand@mabrand.nl>
parents: 1594
diff changeset
438 1.7.7.3
1594
68ccbdf94db3 rename gtk-->gtk2 in preparation for gtk3
Tony Theodore <tonyt@logyst.com>
parents:
diff changeset
439