Mercurial > mxe-octave

annotate src/gtk-1-fixes.patch @ 1212:84cc482e2b06

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tidy up handling of staic library dependencies -ldnsapi provided by pkgconfig/gio-2.0.pc. -lwinspool -lcomctl32 -lcomdlg32 provided by pkgconfig/gtk+-2.0.pc Don't need to explicitly mention these building test programs.
author Mark Brand <mabrand@mabrand.nl>
date Wed, 29 Sep 2010 02:00:35 +0200
parents 821fabe85a36
children ffb6a86b8f9a
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1190
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
1 This file is part of mingw-cross-env.
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
2 See doc/index.html for further information.
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
3
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
4 Contains ad hoc patches for cross building.
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
5
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
6 commit 1acd5465c0b9f2f612c5904ea7e652475fb3bee6
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
7 Author: Mark Brand <mabrand@mabrand.nl>
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
8 Date: Fri Sep 24 14:43:43 2010 +0200
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
9
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
10 s,DllMain,static _disabled_DllMain,
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
11
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
12 diff --git a/gdk/win32/gdkmain-win32.c b/gdk/win32/gdkmain-win32.c
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
13 index 94b7ac7..2c01be6 100644
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
14 --- a/gdk/win32/gdkmain-win32.c
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
15 +++ b/gdk/win32/gdkmain-win32.c
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
16 @@ -65,7 +65,7 @@ const GOptionEntry _gdk_windowing_args[] = {
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
17 };
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
18
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
19 int __stdcall
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
20 -DllMain (HINSTANCE hinstDLL,
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
21 +static _disabled_DllMain (HINSTANCE hinstDLL,
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
22 DWORD dwReason,
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
23 LPVOID reserved)
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
24 {
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
25 diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
26 index fdf4730..428fd96 100644
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
27 --- a/gtk/gtkmain.c
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
28 +++ b/gtk/gtkmain.c
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
29 @@ -73,7 +73,7 @@
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
30 static HMODULE gtk_dll;
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
31
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
32 BOOL WINAPI
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
33 -DllMain (HINSTANCE hinstDLL,
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
34 +static _disabled_DllMain (HINSTANCE hinstDLL,
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
35 DWORD fdwReason,
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
36 LPVOID lpvReserved)
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
37 {
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
38
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
39 commit bc446ce0785954ccf28825554c3074a15b4f4071
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
40 Author: Mark Brand <mabrand@mabrand.nl>
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
41 Date: Fri Sep 24 14:46:20 2010 +0200
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
42
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
43 s,__declspec(dllimport),,
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
44
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
45 diff --git a/gdk/gdktypes.h b/gdk/gdktypes.h
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
46 index 506f35d..f40de41 100644
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
47 --- a/gdk/gdktypes.h
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
48 +++ b/gdk/gdktypes.h
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
49 @@ -41,7 +41,7 @@
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
50 # ifdef GDK_COMPILATION
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
51 # define GDKVAR __declspec(dllexport)
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
52 # else
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
53 -# define GDKVAR extern __declspec(dllimport)
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
54 +# define GDKVAR extern
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
55 # endif
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
56 #else
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
57 # define GDKVAR extern
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
58 diff --git a/gtk/gtkdebug.h b/gtk/gtkdebug.h
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
59 index 2190973..0a1c43c 100644
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
60 --- a/gtk/gtkdebug.h
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
61 +++ b/gtk/gtkdebug.h
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
62 @@ -66,7 +66,7 @@ typedef enum {
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
63 # ifdef GTK_COMPILATION
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
64 # define GTKVAR __declspec(dllexport)
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
65 # else
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
66 -# define GTKVAR extern __declspec(dllimport)
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
67 +# define GTKVAR extern
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
68 # endif
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
69 #else
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
70 # define GTKVAR extern
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
71 diff --git a/gtk/gtkmain.h b/gtk/gtkmain.h
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
72 index 21de92e..2c0f94c 100644
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
73 --- a/gtk/gtkmain.h
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
74 +++ b/gtk/gtkmain.h
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
75 @@ -69,7 +69,7 @@ typedef gint (*GtkKeySnoopFunc) (GtkWidget *grab_widget,
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
76 #ifdef GTK_COMPILATION
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
77 #define GTKMAIN_C_VAR __declspec(dllexport)
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
78 #else
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
79 -#define GTKMAIN_C_VAR extern __declspec(dllimport)
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
80 +#define GTKMAIN_C_VAR extern
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
81 #endif
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
82 #else
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
83 #define GTKMAIN_C_VAR extern
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
84 diff --git a/gtk/gtktexttypes.h b/gtk/gtktexttypes.h
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
85 index c624aea..b792ea5 100644
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
86 --- a/gtk/gtktexttypes.h
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
87 +++ b/gtk/gtktexttypes.h
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
88 @@ -46,7 +46,7 @@ typedef struct _GtkTextMarkBody GtkTextMarkBody;
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
89 #ifdef GTK_COMPILATION
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
90 #define VARIABLE __declspec(dllexport)
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
91 #else
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
92 -#define VARIABLE extern __declspec(dllimport)
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
93 +#define VARIABLE extern
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
94 #endif
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
95 #else
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
96 #define VARIABLE extern
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
97
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
98 commit 078f0c210e1706b4028907bf55cc55672d5dc7d3
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
99 Author: Mark Brand <mabrand@mabrand.nl>
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
100 Date: Fri Sep 24 15:03:28 2010 +0200
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
101
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
102 s,__declspec(dllexport),,
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
103
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
104 diff --git a/gdk/gdktypes.h b/gdk/gdktypes.h
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
105 index f40de41..07cfb4e 100644
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
106 --- a/gdk/gdktypes.h
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
107 +++ b/gdk/gdktypes.h
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
108 @@ -39,7 +39,7 @@
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
109
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
110 #ifdef G_OS_WIN32
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
111 # ifdef GDK_COMPILATION
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
112 -# define GDKVAR __declspec(dllexport)
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
113 +# define GDKVAR
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
114 # else
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
115 # define GDKVAR extern
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
116 # endif
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
117 diff --git a/gtk/gtkdebug.h b/gtk/gtkdebug.h
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
118 index 0a1c43c..507ff69 100644
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
119 --- a/gtk/gtkdebug.h
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
120 +++ b/gtk/gtkdebug.h
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
121 @@ -64,7 +64,7 @@ typedef enum {
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
122
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
123 #ifdef G_OS_WIN32
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
124 # ifdef GTK_COMPILATION
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
125 -# define GTKVAR __declspec(dllexport)
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
126 +# define GTKVAR
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
127 # else
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
128 # define GTKVAR extern
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
129 # endif
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
130 diff --git a/gtk/gtkmain.h b/gtk/gtkmain.h
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
131 index 2c0f94c..9c47b57 100644
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
132 --- a/gtk/gtkmain.h
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
133 +++ b/gtk/gtkmain.h
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
134 @@ -67,7 +67,7 @@ typedef gint (*GtkKeySnoopFunc) (GtkWidget *grab_widget,
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
135 */
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
136 #ifdef G_PLATFORM_WIN32
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
137 #ifdef GTK_COMPILATION
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
138 -#define GTKMAIN_C_VAR __declspec(dllexport)
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
139 +#define GTKMAIN_C_VAR
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
140 #else
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
141 #define GTKMAIN_C_VAR extern
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
142 #endif
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
143 diff --git a/gtk/gtktexttypes.h b/gtk/gtktexttypes.h
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
144 index b792ea5..f382a64 100644
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
145 --- a/gtk/gtktexttypes.h
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
146 +++ b/gtk/gtktexttypes.h
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
147 @@ -44,7 +44,7 @@ typedef struct _GtkTextMarkBody GtkTextMarkBody;
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
148
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
149 #ifdef G_OS_WIN32
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
150 #ifdef GTK_COMPILATION
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
151 -#define VARIABLE __declspec(dllexport)
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
152 +#define VARIABLE
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
153 #else
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
154 #define VARIABLE extern
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
155 #endif
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
156
1212
84cc482e2b06 tidy up handling of staic library dependencies
Mark Brand <mabrand@mabrand.nl>
parents: 1190
diff changeset
157 commit 69568bc7c8627d117521548192730665a9623b80
1190
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
158 Author: Mark Brand <mabrand@mabrand.nl>
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
159 Date: Fri Sep 24 14:17:22 2010 +0200
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
160
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
161 fix gtk+-2.0.pc.in
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
162
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
163 diff --git a/gtk+-2.0.pc.in b/gtk+-2.0.pc.in
1212
84cc482e2b06 tidy up handling of staic library dependencies
Mark Brand <mabrand@mabrand.nl>
parents: 1190
diff changeset
164 index 46853e1..7f3eb22 100644
1190
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
165 --- a/gtk+-2.0.pc.in
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
166 +++ b/gtk+-2.0.pc.in
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
167 @@ -11,5 +11,5 @@ Name: GTK+
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
168 Description: GTK+ Graphical UI Library (${target} target)
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
169 Version: @VERSION@
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
170 Requires: gdk-${target}-2.0 @GTK_PACKAGES@
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
171 -Libs: -L${libdir} -lgtk-${target}-@GTK_API_VERSION@ @GTK_EXTRA_LIBS@
1212
84cc482e2b06 tidy up handling of staic library dependencies
Mark Brand <mabrand@mabrand.nl>
parents: 1190
diff changeset
172 +Libs: -L${libdir} -lgtk-${target}-@GTK_API_VERSION@ @GTK_DEP_LIBS@ -lwinspool -lcomctl32 -lcomdlg32
1190
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
173 Cflags: -I${includedir}/gtk-2.0 @GTK_EXTRA_CFLAGS@
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
174
1212
84cc482e2b06 tidy up handling of staic library dependencies
Mark Brand <mabrand@mabrand.nl>
parents: 1190
diff changeset
175 commit 1f60f6943b5c67a199660618e546de5f0faafeef
1190
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
176 Author: Mark Brand <mabrand@mabrand.nl>
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
177 Date: Fri Sep 24 14:48:31 2010 +0200
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
178
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
179 disable gtkbuiltincache
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
180
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
181 diff --git a/gtk/Makefile.in b/gtk/Makefile.in
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
182 index 39a35c2..89bae23 100644
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
183 --- a/gtk/Makefile.in
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
184 +++ b/gtk/Makefile.in
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
185 @@ -2872,7 +2872,7 @@ stamp-icons: $(STOCK_ICONS)
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
186 ) done \
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
187 && touch stamp-icons
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
188
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
189 -gtkbuiltincache.h: @REBUILD@ stamp-icons
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
190 +_disabled_gtkbuiltincache.h: @REBUILD@ stamp-icons
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
191 $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT) $(GTK_UPDATE_ICON_CACHE_MANIFEST)
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
192 $(gtk_update_icon_cache_program) --force --ignore-theme-index \
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
193 --source builtin_icons stock-icons > gtkbuiltincache.h.tmp && \
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
194
1212
84cc482e2b06 tidy up handling of staic library dependencies
Mark Brand <mabrand@mabrand.nl>
parents: 1190
diff changeset
195 commit e24f3fb7d18d0690dddd1fdb1a629a06d49b4c11
1190
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
196 Author: Mark Brand <mabrand@mabrand.nl>
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
197 Date: Fri Sep 24 14:49:50 2010 +0200
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
198
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
199 disable test-inline-pixbufs.h
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
200
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
201 diff --git a/demos/Makefile.in b/demos/Makefile.in
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
202 index 6bffbb8..c866923 100644
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
203 --- a/demos/Makefile.in
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
204 +++ b/demos/Makefile.in
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
205 @@ -433,7 +433,7 @@ LDADDS = \
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
206 $(GTK_DEP_LIBS) \
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
207 $(MATH_LIB)
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
208
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
209 -BUILT_SOURCES = test-inline-pixbufs.h
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
210 +BUILT_SOURCES =
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
211 testpixbuf_DEPENDENCIES = $(DEPS)
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
212 testpixbuf_drawable_DEPENDENCIES = $(DEPS)
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
213 testpixbuf_save_DEPENDENCIES = $(DEPS)
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
214
1212
84cc482e2b06 tidy up handling of staic library dependencies
Mark Brand <mabrand@mabrand.nl>
parents: 1190
diff changeset
215 commit b34df7c9461a798e9a8202eec886ac5e173da3ea
1190
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
216 Author: Mark Brand <mabrand@mabrand.nl>
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
217 Date: Fri Sep 24 14:51:04 2010 +0200
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
218
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
219 permit static building
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
220
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
221 diff --git a/configure b/configure
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
222 index f203b13..51e6619 100755
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
223 --- a/configure
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
224 +++ b/configure
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
225 @@ -4347,9 +4347,9 @@ if test "${enable_static+set}" = set; then :
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
226 enableval=$enable_static; p=${PACKAGE-default}
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
227 case $enableval in
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
228 yes) enable_static=yes ;;
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
229 - no) enable_static=no ;;
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
230 + no) enable_static=yes ;;
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
231 *)
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
232 - enable_static=no
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
233 + enable_static=yes
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
234 # Look at the argument we got. We use all the common list separators.
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
235 lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
236 for pkg in $enableval; do
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
237 @@ -4362,7 +4362,7 @@ if test "${enable_static+set}" = set; then :
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
238 ;;
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
239 esac
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
240 else
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
241 - enable_static=no
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
242 + enable_static=yes
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
243 fi
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
244
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
245
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
246 @@ -4930,15 +4930,15 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
247
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
248 if test "$os_win32" = "yes"; then
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
249 if test x$enable_static = xyes -o x$enable_static = x; then
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
250 - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Disabling static library build, must build as DLL on Windows." >&5
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
251 -$as_echo "$as_me: WARNING: Disabling static library build, must build as DLL on Windows." >&2;}
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
252 - enable_static=no
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
253 + { $as_echo "(disabled warning)" >&5
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
254 +$as_echo "(disabled warning)" >&2;}
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
255 + enable_static=yes
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
256 fi
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
257 if test x$enable_shared = xno; then
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
258 - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Enabling shared library build, must build as DLL on Windows." >&5
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
259 -$as_echo "$as_me: WARNING: Enabling shared library build, must build as DLL on Windows." >&2;}
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
260 + { $as_echo "(disabled warning)" >&5
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
261 +$as_echo "(disabled warning)" >&2;}
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
262 fi
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
263 - enable_shared=yes
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
264 + enable_shared=no
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
265 fi
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
266
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
267 enable_win32_dll=yes
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
268 @@ -8241,7 +8241,7 @@ done
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
269 if test "${enable_shared+set}" = set; then :
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
270 enableval=$enable_shared; p=${PACKAGE-default}
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
271 case $enableval in
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
272 - yes) enable_shared=yes ;;
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
273 + yes) enable_shared=no ;;
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
274 no) enable_shared=no ;;
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
275 *)
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
276 enable_shared=no
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
277 @@ -8250,14 +8250,14 @@ if test "${enable_shared+set}" = set; then :
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
278 for pkg in $enableval; do
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
279 IFS="$lt_save_ifs"
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
280 if test "X$pkg" = "X$p"; then
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
281 - enable_shared=yes
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
282 + enable_shared=no
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
283 fi
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
284 done
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
285 IFS="$lt_save_ifs"
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
286 ;;
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
287 esac
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
288 else
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
289 - enable_shared=yes
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
290 + enable_shared=no
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
291 fi
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
292
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
293
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
294 @@ -11970,7 +11970,7 @@ $as_echo_n "checking whether to build shared libraries... " >&6; }
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
295 # are all built from PIC.
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
296 case $host_os in
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
297 aix3*)
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
298 - test "$enable_shared" = yes && enable_static=no
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
299 + test "$enable_shared" = yes && enable_static=yes
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
300 if test -n "$RANLIB"; then
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
301 archive_cmds="$archive_cmds~\$RANLIB \$lib"
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
302 postinstall_cmds='$RANLIB $lib'
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
303 @@ -11979,7 +11979,7 @@ $as_echo_n "checking whether to build shared libraries... " >&6; }
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
304
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
305 aix[4-9]*)
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
306 if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
307 - test "$enable_shared" = yes && enable_static=no
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
308 + test "$enable_shared" = yes && enable_static=yes
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
309 fi
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
310 ;;
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
311 esac
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
312
1212
84cc482e2b06 tidy up handling of staic library dependencies
Mark Brand <mabrand@mabrand.nl>
parents: 1190
diff changeset
313 commit 831f94ccf7a26662bfc9e8d22b9ae9eaea740bbb
1190
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
314 Author: Mark Brand <mabrand@mabrand.nl>
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
315 Date: Fri Sep 24 14:53:18 2010 +0200
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
316
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
317 no -Wl
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
318
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
319 diff --git a/configure b/configure
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
320 index 51e6619..8c04264 100755
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
321 --- a/configure
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
322 +++ b/configure
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
323 @@ -22951,7 +22951,7 @@ fi
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
324 fi
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
325
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
326 if test "x$gdktarget" = "xwin32"; then
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
327 - GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -lgdi32 -limm32 -lshell32 -lole32 -Wl,-luuid"
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
328 + GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -lgdi32 -limm32 -lshell32 -lole32 -luuid"
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
329 if true; then
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
330 USE_WIN32_TRUE=
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
331 USE_WIN32_FALSE='#'
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
332
1212
84cc482e2b06 tidy up handling of staic library dependencies
Mark Brand <mabrand@mabrand.nl>
parents: 1190
diff changeset
333 commit 2ec5f9d9ea8d7d80758c5272ff2e94fd0e7856e8
1190
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
334 Author: Mark Brand <mabrand@mabrand.nl>
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
335 Date: Fri Sep 24 14:54:15 2010 +0200
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
336
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
337 gio not gio-unix
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
338
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
339 diff --git a/configure b/configure
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
340 index 8c04264..d3e5e21 100755
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
341 --- a/configure
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
342 +++ b/configure
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
343 @@ -23171,9 +23171,9 @@ fi
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
344 CFLAGS="$saved_cflags"
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
345 LDFLAGS="$saved_ldflags"
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
346
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
347 -# Pull in gio-unix for GDesktopAppInfo usage, see at least gdkapplaunchcontext-x11.c
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
348 +# Pull in gio for GDesktopAppInfo usage, see at least gdkapplaunchcontext-x11.c
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
349 if test "x$gdktarget" = "xx11"; then
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
350 - GDK_PACKAGES="$PANGO_PACKAGES gio-unix-2.0 $X_PACKAGES gdk-pixbuf-2.0 cairo-$cairo_backend"
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
351 + GDK_PACKAGES="$PANGO_PACKAGES gio-2.0 $X_PACKAGES gdk-pixbuf-2.0 cairo-$cairo_backend"
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
352 else
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
353 GDK_PACKAGES="$PANGO_PACKAGES gio-2.0 gdk-pixbuf-2.0 cairo-$cairo_backend"
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
354 fi
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
355
1212
84cc482e2b06 tidy up handling of staic library dependencies
Mark Brand <mabrand@mabrand.nl>
parents: 1190
diff changeset
356 commit 3e9c211536912bf78c44172b7f6ecd8860887166
1190
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
357 Author: Mark Brand <mabrand@mabrand.nl>
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
358 Date: Fri Sep 24 14:55:33 2010 +0200
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
359
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
360 set cross_compiling explicitly to avoid Wine interference
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
361
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
362 diff --git a/configure b/configure
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
363 index d3e5e21..7ae7a5d 100755
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
364 --- a/configure
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
365 +++ b/configure
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
366 @@ -555,7 +555,7 @@ ac_default_prefix=/usr/local
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
367 ac_clean_files=
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
368 ac_config_libobj_dir=.
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
369 LIBOBJS=
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
370 -cross_compiling=no
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
371 +cross_compiling=yes
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
372 subdirs=
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
373 MFLAGS=
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
374 MAKEFLAGS=
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
375 @@ -3872,7 +3872,7 @@ $as_echo "$ac_try_echo"; } >&5
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
376 ac_status=$?
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
377 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
378 test $ac_status = 0; }; }; then
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
379 - cross_compiling=no
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
380 + cross_compiling=yes
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
381 else
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
382 if test "$cross_compiling" = maybe; then
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
383 cross_compiling=yes
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
384
1212
84cc482e2b06 tidy up handling of staic library dependencies
Mark Brand <mabrand@mabrand.nl>
parents: 1190
diff changeset
385 commit 01cc2d128be8a19c1434b912e378deae3b1bfcf9
1190
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
386 Author: Mark Brand <mabrand@mabrand.nl>
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
387 Date: Fri Sep 24 15:30:49 2010 +0200
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
388
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
389 removed duplicate _gtk_marshal_OBJECT__VOID()
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
390
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
391 diff --git a/perf/marshalers.c b/perf/marshalers.c
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
392 index f533ab0..0a37ba4 100644
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
393 --- a/perf/marshalers.c
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
394 +++ b/perf/marshalers.c
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
395 @@ -49,43 +49,6 @@
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
396 #endif /* !G_ENABLE_DEBUG */
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
397
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
398
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
399 -/* OBJECT:VOID (./marshalers.list:1) */
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
400 -void
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
401 -_gtk_marshal_OBJECT__VOID (GClosure *closure,
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
402 - GValue *return_value G_GNUC_UNUSED,
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
403 - guint n_param_values,
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
404 - const GValue *param_values,
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
405 - gpointer invocation_hint G_GNUC_UNUSED,
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
406 - gpointer marshal_data)
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
407 -{
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
408 - typedef GObject* (*GMarshalFunc_OBJECT__VOID) (gpointer data1,
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
409 - gpointer data2);
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
410 - register GMarshalFunc_OBJECT__VOID callback;
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
411 - register GCClosure *cc = (GCClosure*) closure;
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
412 - register gpointer data1, data2;
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
413 - GObject* v_return;
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
414 -
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
415 - g_return_if_fail (return_value != NULL);
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
416 - g_return_if_fail (n_param_values == 1);
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
417 -
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
418 - if (G_CCLOSURE_SWAP_DATA (closure))
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
419 - {
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
420 - data1 = closure->data;
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
421 - data2 = g_value_peek_pointer (param_values + 0);
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
422 - }
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
423 - else
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
424 - {
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
425 - data1 = g_value_peek_pointer (param_values + 0);
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
426 - data2 = closure->data;
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
427 - }
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
428 - callback = (GMarshalFunc_OBJECT__VOID) (marshal_data ? marshal_data : cc->callback);
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
429 -
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
430 - v_return = callback (data1,
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
431 - data2);
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
432 -
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
433 - g_value_take_object (return_value, v_return);
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
434 -}
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
435 -
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
436 /* VOID:ENUM,OBJECT,DOUBLE (./marshalers.list:2) */
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
437 void
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
438 _gtk_marshal_VOID__ENUM_OBJECT_DOUBLE (GClosure *closure,