mxe-octave: src/gtk-1-fixes.patch annotate

annotate src/gtk-1-fixes.patch @ 1219:ffb6a86b8f9a

improved patch layout Use "git format-patch" instead of "git log -p --reverse" to generate patches which can be imported with with "git am". Also set author/from to "mingw-cross-env" since attribution is done in the mingw-cross-env repository.

author	Mark Brand <mabrand@mabrand.nl>
date	Wed, 29 Sep 2010 19:42:33 +0200
parents	84cc482e2b06
children

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
1219 ffb6a86b8f9a improved patch layout Mark Brand <mabrand@mabrand.nl> parents: 1212 diff changeset	6 From 1acd5465c0b9f2f612c5904ea7e652475fb3bee6 Mon Sep 17 00:00:00 2001
ffb6a86b8f9a improved patch layout Mark Brand <mabrand@mabrand.nl> parents: 1212 diff changeset	7 From: mingw-cross-env
ffb6a86b8f9a improved patch layout Mark Brand <mabrand@mabrand.nl> parents: 1212 diff changeset	8 Date: Fri, 24 Sep 2010 14:43:43 +0200
ffb6a86b8f9a improved patch layout Mark Brand <mabrand@mabrand.nl> parents: 1212 diff changeset	9 Subject: [PATCH 01/11] s,DllMain,static _disabled_DllMain,
1190 821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	10
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 {
1219 ffb6a86b8f9a improved patch layout Mark Brand <mabrand@mabrand.nl> parents: 1212 diff changeset	38 --
ffb6a86b8f9a improved patch layout Mark Brand <mabrand@mabrand.nl> parents: 1212 diff changeset	39 1.7.1
1190 821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	40
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	41
1219 ffb6a86b8f9a improved patch layout Mark Brand <mabrand@mabrand.nl> parents: 1212 diff changeset	42 From bc446ce0785954ccf28825554c3074a15b4f4071 Mon Sep 17 00:00:00 2001
ffb6a86b8f9a improved patch layout Mark Brand <mabrand@mabrand.nl> parents: 1212 diff changeset	43 From: mingw-cross-env
ffb6a86b8f9a improved patch layout Mark Brand <mabrand@mabrand.nl> parents: 1212 diff changeset	44 Date: Fri, 24 Sep 2010 14:46:20 +0200
ffb6a86b8f9a improved patch layout Mark Brand <mabrand@mabrand.nl> parents: 1212 diff changeset	45 Subject: [PATCH 02/11] s,__declspec(dllimport),,
ffb6a86b8f9a improved patch layout Mark Brand <mabrand@mabrand.nl> parents: 1212 diff changeset	46
1190 821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	47
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	48 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	49 index 506f35d..f40de41 100644
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	50 --- a/gdk/gdktypes.h
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	51 +++ b/gdk/gdktypes.h
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	52 @@ -41,7 +41,7 @@
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	53 # ifdef GDK_COMPILATION
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	54 # define GDKVAR __declspec(dllexport)
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	55 # else
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	56 -# define GDKVAR extern __declspec(dllimport)
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 # endif
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	59 #else
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	60 # define GDKVAR extern
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	61 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	62 index 2190973..0a1c43c 100644
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	63 --- a/gtk/gtkdebug.h
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	64 +++ b/gtk/gtkdebug.h
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	65 @@ -66,7 +66,7 @@ typedef enum {
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	66 # ifdef GTK_COMPILATION
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	67 # define GTKVAR __declspec(dllexport)
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	68 # else
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	69 -# define GTKVAR extern __declspec(dllimport)
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 # endif
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	72 #else
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	73 # define GTKVAR extern
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	74 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	75 index 21de92e..2c0f94c 100644
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	76 --- a/gtk/gtkmain.h
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	77 +++ b/gtk/gtkmain.h
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	78 @@ -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	79 #ifdef GTK_COMPILATION
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	80 #define GTKMAIN_C_VAR __declspec(dllexport)
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	81 #else
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	82 -#define GTKMAIN_C_VAR extern __declspec(dllimport)
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 #endif
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	85 #else
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	86 #define GTKMAIN_C_VAR extern
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	87 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	88 index c624aea..b792ea5 100644
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	89 --- a/gtk/gtktexttypes.h
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	90 +++ b/gtk/gtktexttypes.h
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	91 @@ -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	92 #ifdef GTK_COMPILATION
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	93 #define VARIABLE __declspec(dllexport)
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	94 #else
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	95 -#define VARIABLE extern __declspec(dllimport)
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 #endif
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	98 #else
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	99 #define VARIABLE extern
1219 ffb6a86b8f9a improved patch layout Mark Brand <mabrand@mabrand.nl> parents: 1212 diff changeset	100 --
ffb6a86b8f9a improved patch layout Mark Brand <mabrand@mabrand.nl> parents: 1212 diff changeset	101 1.7.1
1190 821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	102
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	103
1219 ffb6a86b8f9a improved patch layout Mark Brand <mabrand@mabrand.nl> parents: 1212 diff changeset	104 From 078f0c210e1706b4028907bf55cc55672d5dc7d3 Mon Sep 17 00:00:00 2001
ffb6a86b8f9a improved patch layout Mark Brand <mabrand@mabrand.nl> parents: 1212 diff changeset	105 From: mingw-cross-env
ffb6a86b8f9a improved patch layout Mark Brand <mabrand@mabrand.nl> parents: 1212 diff changeset	106 Date: Fri, 24 Sep 2010 15:03:28 +0200
ffb6a86b8f9a improved patch layout Mark Brand <mabrand@mabrand.nl> parents: 1212 diff changeset	107 Subject: [PATCH 03/11] s,__declspec(dllexport),,
ffb6a86b8f9a improved patch layout Mark Brand <mabrand@mabrand.nl> parents: 1212 diff changeset	108
1190 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 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	111 index f40de41..07cfb4e 100644
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	112 --- a/gdk/gdktypes.h
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	113 +++ b/gdk/gdktypes.h
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	114 @@ -39,7 +39,7 @@
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	115
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	116 #ifdef G_OS_WIN32
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	117 # ifdef GDK_COMPILATION
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	118 -# define GDKVAR __declspec(dllexport)
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	119 +# define GDKVAR
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	120 # else
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	121 # define GDKVAR extern
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	122 # endif
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	123 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	124 index 0a1c43c..507ff69 100644
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	125 --- a/gtk/gtkdebug.h
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	126 +++ b/gtk/gtkdebug.h
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	127 @@ -64,7 +64,7 @@ typedef enum {
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	128
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	129 #ifdef G_OS_WIN32
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	130 # ifdef GTK_COMPILATION
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	131 -# define GTKVAR __declspec(dllexport)
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	132 +# define GTKVAR
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	133 # else
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	134 # define GTKVAR extern
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	135 # endif
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	136 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	137 index 2c0f94c..9c47b57 100644
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	138 --- a/gtk/gtkmain.h
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	139 +++ b/gtk/gtkmain.h
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	140 @@ -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	141 */
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	142 #ifdef G_PLATFORM_WIN32
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	143 #ifdef GTK_COMPILATION
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	144 -#define GTKMAIN_C_VAR __declspec(dllexport)
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	145 +#define GTKMAIN_C_VAR
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	146 #else
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	147 #define GTKMAIN_C_VAR extern
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	148 #endif
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	149 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	150 index b792ea5..f382a64 100644
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	151 --- a/gtk/gtktexttypes.h
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	152 +++ b/gtk/gtktexttypes.h
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	153 @@ -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	154
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	155 #ifdef G_OS_WIN32
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	156 #ifdef GTK_COMPILATION
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	157 -#define VARIABLE __declspec(dllexport)
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	158 +#define VARIABLE
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	159 #else
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	160 #define VARIABLE extern
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	161 #endif
1219 ffb6a86b8f9a improved patch layout Mark Brand <mabrand@mabrand.nl> parents: 1212 diff changeset	162 --
ffb6a86b8f9a improved patch layout Mark Brand <mabrand@mabrand.nl> parents: 1212 diff changeset	163 1.7.1
1190 821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	164
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	165
1219 ffb6a86b8f9a improved patch layout Mark Brand <mabrand@mabrand.nl> parents: 1212 diff changeset	166 From 69568bc7c8627d117521548192730665a9623b80 Mon Sep 17 00:00:00 2001
ffb6a86b8f9a improved patch layout Mark Brand <mabrand@mabrand.nl> parents: 1212 diff changeset	167 From: mingw-cross-env
ffb6a86b8f9a improved patch layout Mark Brand <mabrand@mabrand.nl> parents: 1212 diff changeset	168 Date: Fri, 24 Sep 2010 14:17:22 +0200
ffb6a86b8f9a improved patch layout Mark Brand <mabrand@mabrand.nl> parents: 1212 diff changeset	169 Subject: [PATCH 04/11] fix gtk+-2.0.pc.in
ffb6a86b8f9a improved patch layout Mark Brand <mabrand@mabrand.nl> parents: 1212 diff changeset	170
1190 821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	171
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	172 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	173 index 46853e1..7f3eb22 100644
1190 821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	174 --- a/gtk+-2.0.pc.in
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	175 +++ b/gtk+-2.0.pc.in
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	176 @@ -11,5 +11,5 @@ Name: GTK+
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	177 Description: GTK+ Graphical UI Library (${target} target)
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	178 Version: @VERSION@
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	179 Requires: gdk-${target}-2.0 @GTK_PACKAGES@
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	180 -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	181 +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	182 Cflags: -I${includedir}/gtk-2.0 @GTK_EXTRA_CFLAGS@
1219 ffb6a86b8f9a improved patch layout Mark Brand <mabrand@mabrand.nl> parents: 1212 diff changeset	183 --
ffb6a86b8f9a improved patch layout Mark Brand <mabrand@mabrand.nl> parents: 1212 diff changeset	184 1.7.1
1190 821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	185
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	186
1219 ffb6a86b8f9a improved patch layout Mark Brand <mabrand@mabrand.nl> parents: 1212 diff changeset	187 From 1f60f6943b5c67a199660618e546de5f0faafeef Mon Sep 17 00:00:00 2001
ffb6a86b8f9a improved patch layout Mark Brand <mabrand@mabrand.nl> parents: 1212 diff changeset	188 From: mingw-cross-env
ffb6a86b8f9a improved patch layout Mark Brand <mabrand@mabrand.nl> parents: 1212 diff changeset	189 Date: Fri, 24 Sep 2010 14:48:31 +0200
ffb6a86b8f9a improved patch layout Mark Brand <mabrand@mabrand.nl> parents: 1212 diff changeset	190 Subject: [PATCH 05/11] disable gtkbuiltincache
ffb6a86b8f9a improved patch layout Mark Brand <mabrand@mabrand.nl> parents: 1212 diff changeset	191
1190 821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	192
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	193 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	194 index 39a35c2..89bae23 100644
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	195 --- a/gtk/Makefile.in
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	196 +++ b/gtk/Makefile.in
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	197 @@ -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	198 ) done \
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	199 && touch stamp-icons
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 -gtkbuiltincache.h: @REBUILD@ stamp-icons
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	202 +_disabled_gtkbuiltincache.h: @REBUILD@ stamp-icons
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	203 $(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	204 $(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	205 --source builtin_icons stock-icons > gtkbuiltincache.h.tmp && \
1219 ffb6a86b8f9a improved patch layout Mark Brand <mabrand@mabrand.nl> parents: 1212 diff changeset	206 --
ffb6a86b8f9a improved patch layout Mark Brand <mabrand@mabrand.nl> parents: 1212 diff changeset	207 1.7.1
1190 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
1219 ffb6a86b8f9a improved patch layout Mark Brand <mabrand@mabrand.nl> parents: 1212 diff changeset	210 From e24f3fb7d18d0690dddd1fdb1a629a06d49b4c11 Mon Sep 17 00:00:00 2001
ffb6a86b8f9a improved patch layout Mark Brand <mabrand@mabrand.nl> parents: 1212 diff changeset	211 From: mingw-cross-env
ffb6a86b8f9a improved patch layout Mark Brand <mabrand@mabrand.nl> parents: 1212 diff changeset	212 Date: Fri, 24 Sep 2010 14:49:50 +0200
ffb6a86b8f9a improved patch layout Mark Brand <mabrand@mabrand.nl> parents: 1212 diff changeset	213 Subject: [PATCH 06/11] disable test-inline-pixbufs.h
ffb6a86b8f9a improved patch layout Mark Brand <mabrand@mabrand.nl> parents: 1212 diff changeset	214
1190 821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	215
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	216 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	217 index 6bffbb8..c866923 100644
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	218 --- a/demos/Makefile.in
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	219 +++ b/demos/Makefile.in
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	220 @@ -433,7 +433,7 @@ LDADDS = \
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	221 $(GTK_DEP_LIBS) \
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	222 $(MATH_LIB)
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	223
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	224 -BUILT_SOURCES = test-inline-pixbufs.h
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	225 +BUILT_SOURCES =
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	226 testpixbuf_DEPENDENCIES = $(DEPS)
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	227 testpixbuf_drawable_DEPENDENCIES = $(DEPS)
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	228 testpixbuf_save_DEPENDENCIES = $(DEPS)
1219 ffb6a86b8f9a improved patch layout Mark Brand <mabrand@mabrand.nl> parents: 1212 diff changeset	229 --
ffb6a86b8f9a improved patch layout Mark Brand <mabrand@mabrand.nl> parents: 1212 diff changeset	230 1.7.1
1190 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
1219 ffb6a86b8f9a improved patch layout Mark Brand <mabrand@mabrand.nl> parents: 1212 diff changeset	233 From b34df7c9461a798e9a8202eec886ac5e173da3ea Mon Sep 17 00:00:00 2001
ffb6a86b8f9a improved patch layout Mark Brand <mabrand@mabrand.nl> parents: 1212 diff changeset	234 From: mingw-cross-env
ffb6a86b8f9a improved patch layout Mark Brand <mabrand@mabrand.nl> parents: 1212 diff changeset	235 Date: Fri, 24 Sep 2010 14:51:04 +0200
ffb6a86b8f9a improved patch layout Mark Brand <mabrand@mabrand.nl> parents: 1212 diff changeset	236 Subject: [PATCH 07/11] permit static building
ffb6a86b8f9a improved patch layout Mark Brand <mabrand@mabrand.nl> parents: 1212 diff changeset	237
1190 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 diff --git a/configure b/configure
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	240 index f203b13..51e6619 100755
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	241 --- a/configure
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	242 +++ b/configure
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	243 @@ -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	244 enableval=$enable_static; p=${PACKAGE-default}
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	245 case $enableval in
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	246 yes) enable_static=yes ;;
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	247 - no) enable_static=no ;;
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	248 + no) enable_static=yes ;;
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	249 *)
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	250 - enable_static=no
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	251 + enable_static=yes
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	252 # 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	253 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	254 for pkg in $enableval; do
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	255 @@ -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	256 ;;
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	257 esac
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	258 else
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	259 - enable_static=no
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	260 + enable_static=yes
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	261 fi
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	262
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	263
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	264 @@ -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	265
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	266 if test "$os_win32" = "yes"; then
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	267 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	268 - { $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	269 -$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	270 - enable_static=no
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	271 + { $as_echo "(disabled warning)" >&5
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	272 +$as_echo "(disabled warning)" >&2;}
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	273 + enable_static=yes
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	274 fi
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	275 if test x$enable_shared = xno; then
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	276 - { $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	277 -$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	278 + { $as_echo "(disabled warning)" >&5
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	279 +$as_echo "(disabled warning)" >&2;}
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	280 fi
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
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	285 enable_win32_dll=yes
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	286 @@ -8241,7 +8241,7 @@ done
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	287 if test "${enable_shared+set}" = set; then :
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	288 enableval=$enable_shared; p=${PACKAGE-default}
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	289 case $enableval in
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	290 - yes) enable_shared=yes ;;
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	291 + yes) enable_shared=no ;;
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	292 no) enable_shared=no ;;
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 enable_shared=no
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	295 @@ -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	296 for pkg in $enableval; do
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	297 IFS="$lt_save_ifs"
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	298 if test "X$pkg" = "X$p"; then
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	299 - enable_shared=yes
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	300 + enable_shared=no
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	301 fi
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	302 done
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	303 IFS="$lt_save_ifs"
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 esac
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	306 else
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	307 - enable_shared=yes
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	308 + enable_shared=no
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
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	312 @@ -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	313 # are all built from PIC.
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	314 case $host_os in
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	315 aix3*)
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	316 - test "$enable_shared" = yes && enable_static=no
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	317 + test "$enable_shared" = yes && enable_static=yes
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	318 if test -n "$RANLIB"; then
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	319 archive_cmds="$archive_cmds~\$RANLIB \$lib"
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	320 postinstall_cmds='$RANLIB $lib'
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	321 @@ -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	322
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	323 aix[4-9]*)
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	324 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	325 - test "$enable_shared" = yes && enable_static=no
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	326 + test "$enable_shared" = yes && enable_static=yes
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	327 fi
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	328 ;;
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	329 esac
1219 ffb6a86b8f9a improved patch layout Mark Brand <mabrand@mabrand.nl> parents: 1212 diff changeset	330 --
ffb6a86b8f9a improved patch layout Mark Brand <mabrand@mabrand.nl> parents: 1212 diff changeset	331 1.7.1
1190 821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	332
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	333
1219 ffb6a86b8f9a improved patch layout Mark Brand <mabrand@mabrand.nl> parents: 1212 diff changeset	334 From 831f94ccf7a26662bfc9e8d22b9ae9eaea740bbb Mon Sep 17 00:00:00 2001
ffb6a86b8f9a improved patch layout Mark Brand <mabrand@mabrand.nl> parents: 1212 diff changeset	335 From: mingw-cross-env
ffb6a86b8f9a improved patch layout Mark Brand <mabrand@mabrand.nl> parents: 1212 diff changeset	336 Date: Fri, 24 Sep 2010 14:53:18 +0200
ffb6a86b8f9a improved patch layout Mark Brand <mabrand@mabrand.nl> parents: 1212 diff changeset	337 Subject: [PATCH 08/11] no -Wl
ffb6a86b8f9a improved patch layout Mark Brand <mabrand@mabrand.nl> parents: 1212 diff changeset	338
1190 821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	339
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	340 diff --git a/configure b/configure
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	341 index 51e6619..8c04264 100755
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	342 --- a/configure
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	343 +++ b/configure
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	344 @@ -22951,7 +22951,7 @@ fi
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	345 fi
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 if test "x$gdktarget" = "xwin32"; then
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	348 - 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	349 + 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	350 if true; then
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	351 USE_WIN32_TRUE=
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	352 USE_WIN32_FALSE='#'
1219 ffb6a86b8f9a improved patch layout Mark Brand <mabrand@mabrand.nl> parents: 1212 diff changeset	353 --
ffb6a86b8f9a improved patch layout Mark Brand <mabrand@mabrand.nl> parents: 1212 diff changeset	354 1.7.1
1190 821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	355
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	356
1219 ffb6a86b8f9a improved patch layout Mark Brand <mabrand@mabrand.nl> parents: 1212 diff changeset	357 From 2ec5f9d9ea8d7d80758c5272ff2e94fd0e7856e8 Mon Sep 17 00:00:00 2001
ffb6a86b8f9a improved patch layout Mark Brand <mabrand@mabrand.nl> parents: 1212 diff changeset	358 From: mingw-cross-env
ffb6a86b8f9a improved patch layout Mark Brand <mabrand@mabrand.nl> parents: 1212 diff changeset	359 Date: Fri, 24 Sep 2010 14:54:15 +0200
ffb6a86b8f9a improved patch layout Mark Brand <mabrand@mabrand.nl> parents: 1212 diff changeset	360 Subject: [PATCH 09/11] gio not gio-unix
ffb6a86b8f9a improved patch layout Mark Brand <mabrand@mabrand.nl> parents: 1212 diff changeset	361
1190 821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	362
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	363 diff --git a/configure b/configure
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	364 index 8c04264..d3e5e21 100755
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	365 --- a/configure
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	366 +++ b/configure
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	367 @@ -23171,9 +23171,9 @@ fi
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	368 CFLAGS="$saved_cflags"
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	369 LDFLAGS="$saved_ldflags"
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	370
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	371 -# 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	372 +# 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	373 if test "x$gdktarget" = "xx11"; then
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	374 - 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	375 + 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	376 else
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	377 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	378 fi
1219 ffb6a86b8f9a improved patch layout Mark Brand <mabrand@mabrand.nl> parents: 1212 diff changeset	379 --
ffb6a86b8f9a improved patch layout Mark Brand <mabrand@mabrand.nl> parents: 1212 diff changeset	380 1.7.1
1190 821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	381
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	382
1219 ffb6a86b8f9a improved patch layout Mark Brand <mabrand@mabrand.nl> parents: 1212 diff changeset	383 From 3e9c211536912bf78c44172b7f6ecd8860887166 Mon Sep 17 00:00:00 2001
ffb6a86b8f9a improved patch layout Mark Brand <mabrand@mabrand.nl> parents: 1212 diff changeset	384 From: mingw-cross-env
ffb6a86b8f9a improved patch layout Mark Brand <mabrand@mabrand.nl> parents: 1212 diff changeset	385 Date: Fri, 24 Sep 2010 14:55:33 +0200
ffb6a86b8f9a improved patch layout Mark Brand <mabrand@mabrand.nl> parents: 1212 diff changeset	386 Subject: [PATCH 10/11] set cross_compiling explicitly to avoid Wine interference
ffb6a86b8f9a improved patch layout Mark Brand <mabrand@mabrand.nl> parents: 1212 diff changeset	387
1190 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 diff --git a/configure b/configure
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	390 index d3e5e21..7ae7a5d 100755
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	391 --- a/configure
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	392 +++ b/configure
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	393 @@ -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	394 ac_clean_files=
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	395 ac_config_libobj_dir=.
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	396 LIBOBJS=
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	397 -cross_compiling=no
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	398 +cross_compiling=yes
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	399 subdirs=
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	400 MFLAGS=
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	401 MAKEFLAGS=
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	402 @@ -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	403 ac_status=$?
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	404 $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	405 test $ac_status = 0; }; }; then
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	406 - cross_compiling=no
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	407 + cross_compiling=yes
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	408 else
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	409 if test "$cross_compiling" = maybe; then
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	410 cross_compiling=yes
1219 ffb6a86b8f9a improved patch layout Mark Brand <mabrand@mabrand.nl> parents: 1212 diff changeset	411 --
ffb6a86b8f9a improved patch layout Mark Brand <mabrand@mabrand.nl> parents: 1212 diff changeset	412 1.7.1
1190 821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	413
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	414
1219 ffb6a86b8f9a improved patch layout Mark Brand <mabrand@mabrand.nl> parents: 1212 diff changeset	415 From 01cc2d128be8a19c1434b912e378deae3b1bfcf9 Mon Sep 17 00:00:00 2001
ffb6a86b8f9a improved patch layout Mark Brand <mabrand@mabrand.nl> parents: 1212 diff changeset	416 From: mingw-cross-env
ffb6a86b8f9a improved patch layout Mark Brand <mabrand@mabrand.nl> parents: 1212 diff changeset	417 Date: Fri, 24 Sep 2010 15:30:49 +0200
ffb6a86b8f9a improved patch layout Mark Brand <mabrand@mabrand.nl> parents: 1212 diff changeset	418 Subject: [PATCH 11/11] removed duplicate _gtk_marshal_OBJECT__VOID()
ffb6a86b8f9a improved patch layout Mark Brand <mabrand@mabrand.nl> parents: 1212 diff changeset	419
1190 821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	420
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	421 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	422 index f533ab0..0a37ba4 100644
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	423 --- a/perf/marshalers.c
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	424 +++ b/perf/marshalers.c
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	425 @@ -49,43 +49,6 @@
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	426 #endif /* !G_ENABLE_DEBUG */
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
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	429 -/* OBJECT:VOID (./marshalers.list:1) */
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	430 -void
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	431 -_gtk_marshal_OBJECT__VOID (GClosure *closure,
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	432 - GValue *return_value G_GNUC_UNUSED,
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	433 - guint n_param_values,
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	434 - const GValue *param_values,
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	435 - gpointer invocation_hint G_GNUC_UNUSED,
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	436 - gpointer marshal_data)
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	437 -{
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	438 - typedef GObject* (*GMarshalFunc_OBJECT__VOID) (gpointer data1,
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	439 - gpointer data2);
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	440 - register GMarshalFunc_OBJECT__VOID callback;
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	441 - register GCClosure cc = (GCClosure) closure;
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	442 - register gpointer data1, data2;
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	443 - GObject* v_return;
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	444 -
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	445 - g_return_if_fail (return_value != NULL);
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	446 - 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	447 -
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	448 - if (G_CCLOSURE_SWAP_DATA (closure))
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	449 - {
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	450 - data1 = closure->data;
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	451 - 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	452 - }
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	453 - else
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	454 - {
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	455 - 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	456 - data2 = closure->data;
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	457 - }
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	458 - 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	459 -
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	460 - v_return = callback (data1,
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	461 - data2);
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	462 -
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	463 - 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	464 -}
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	465 -
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	466 /* VOID:ENUM,OBJECT,DOUBLE (./marshalers.list:2) */
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	467 void
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	468 _gtk_marshal_VOID__ENUM_OBJECT_DOUBLE (GClosure *closure,
1219 ffb6a86b8f9a improved patch layout Mark Brand <mabrand@mabrand.nl> parents: 1212 diff changeset	469 --
ffb6a86b8f9a improved patch layout Mark Brand <mabrand@mabrand.nl> parents: 1212 diff changeset	470 1.7.1
ffb6a86b8f9a improved patch layout Mark Brand <mabrand@mabrand.nl> parents: 1212 diff changeset	471

Mercurial > mxe-octave

annotate src/gtk-1-fixes.patch @ 1219:ffb6a86b8f9a