mxe-octave: src/mingw-glib-1-fixes.patch annotate

annotate src/mingw-glib-1-fixes.patch @ 3725:2acaa9943159

qscintilla: update 2.8.4 * src/qscintilla.mk: update to version and checksum for 2.8.4

author	John Donoghue
date	Mon, 20 Oct 2014 11:01:00 -0400
parents	96e96221fe09
children	436a81e04861

rev	line source
2333 f653602a0500 Rebrand to new project name MXE Volker Grabsch <vog@notjusthosting.com> parents: 1887 diff changeset	1 This file is part of MXE.
2353 99516e73b368 Move doc/index.html -> index.html Volker Grabsch <vog@notjusthosting.com> parents: 2333 diff changeset	2 See index.html for further information.
1190 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
3183 96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	6 From 55d5dab8f12c55064b48da8a4a42bfe8fa97f8f9 Mon Sep 17 00:00:00 2001
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	7 From: MXE
1219 ffb6a86b8f9a improved patch layout Mark Brand <mabrand@mabrand.nl> parents: 1193 diff changeset	8 Date: Thu, 23 Sep 2010 21:41:51 +0200
2635 383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	9 Subject: [PATCH 1/8] optional gettext
1219 ffb6a86b8f9a improved patch layout Mark Brand <mabrand@mabrand.nl> parents: 1193 diff changeset	10
1190 821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	11
3183 96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	12 diff -ur a/configure.ac b/configure.ac
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	13 --- a/configure.ac 2013-06-10 00:53:13.000000000 +0200
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	14 +++ b/configure.ac 2013-06-29 05:15:59.920660258 +0200
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	15 @@ -483,8 +483,8 @@
1190 821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	16 GLIB_GNU_GETTEXT
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 if test "$gt_cv_have_gettext" != "yes" ; then
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	19 - AC_MSG_ERROR([
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	20 -*** You must have either have gettext support in your C library, or use the
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	21 + AC_MSG_WARN([
3183 96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	22 +*** You should have either have gettext support in your C library, or use the
1190 821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	23 *** GNU gettext library. (http://www.gnu.org/software/gettext/gettext.html
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 fi
3183 96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	26 diff -ur a/glib/gi18n.h b/glib/gi18n.h
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	27 --- a/glib/gi18n.h 2011-08-16 02:51:30.000000000 +0200
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	28 +++ b/glib/gi18n.h 2013-06-29 05:17:17.620663625 +0200
1190 821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	29 @@ -22,7 +22,12 @@
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	30
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	31 #include <glib.h>
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	32
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	33 +#ifdef ENABLE_NLS
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	34 #include <libintl.h>
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	35 +#else
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	36 +#define gettext(String) (String)
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	37 +#endif
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 #include <string.h>
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 #define _(String) gettext (String)
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
3183 96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	44 From 4dee17aeb7c45a84a44e3fe2dcca4d8bfd1916a3 Mon Sep 17 00:00:00 2001
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	45 From: MXE
1219 ffb6a86b8f9a improved patch layout Mark Brand <mabrand@mabrand.nl> parents: 1193 diff changeset	46 Date: Thu, 23 Sep 2010 21:42:46 +0200
2635 383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	47 Subject: [PATCH 2/8] fix tool paths
1219 ffb6a86b8f9a improved patch layout Mark Brand <mabrand@mabrand.nl> parents: 1193 diff changeset	48
1190 821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	49
3183 96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	50 diff -ur a/glib-2.0.pc.in b/glib-2.0.pc.in
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	51 --- a/glib-2.0.pc.in 2012-03-12 01:42:41.000000000 +0100
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	52 +++ b/glib-2.0.pc.in 2013-06-29 05:18:02.624665578 +0200
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	53 @@ -3,9 +3,9 @@
1190 821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	54 libdir=@libdir@
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	55 includedir=@includedir@
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	56
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	57 -glib_genmarshal=glib-genmarshal
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	58 -gobject_query=gobject-query
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	59 -glib_mkenums=glib-mkenums
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	60 +glib_genmarshal=@bindir@/glib-genmarshal
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	61 +gobject_query=@bindir@/gobject-query
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	62 +glib_mkenums=@bindir@/glib-mkenums
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	63
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	64 Name: GLib
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	65 Description: C Utility Library
2618 54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	66
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	67
3183 96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	68 From 981260cfec055fbd58986d9e1b7ef27cdc036e30 Mon Sep 17 00:00:00 2001
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	69 From: MXE
2618 54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	70 Date: Fri, 15 Jun 2012 15:25:01 +0200
2635 383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	71 Subject: [PATCH 3/8] Avoid DllMain symbol conflict when linking statically
2618 54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	72
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	73
3183 96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	74 diff -ur a/gio/giomodule.c b/gio/giomodule.c
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	75 --- a/gio/giomodule.c 2013-06-03 01:20:49.000000000 +0200
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	76 +++ b/gio/giomodule.c 2013-06-29 05:19:55.560670478 +0200
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	77 @@ -900,14 +900,12 @@
2618 54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	78
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	79 static HMODULE gio_dll = NULL;
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	80
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	81 -#ifdef DLL_EXPORT
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	82 -
3183 96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	83 -BOOL WINAPI DllMain (HINSTANCE hinstDLL,
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	84 +BOOL WINAPI gio_DllMain (HINSTANCE hinstDLL,
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	85 DWORD fdwReason,
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	86 LPVOID lpvReserved);
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	87
2618 54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	88 BOOL WINAPI
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	89 -DllMain (HINSTANCE hinstDLL,
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	90 +gio_DllMain (HINSTANCE hinstDLL,
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	91 DWORD fdwReason,
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	92 LPVOID lpvReserved)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	93 {
3183 96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	94 @@ -917,8 +915,6 @@
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	95 return TRUE;
2618 54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	96 }
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	97
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	98 -#endif
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	99 -
3183 96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	100 void *
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	101 _g_io_win32_get_module (void)
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	102 {
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	103 diff -ur a/glib/glib-init.c b/glib/glib-init.c
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	104 --- a/glib/glib-init.c 2013-06-10 00:03:17.000000000 +0200
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	105 +++ b/glib/glib-init.c 2013-06-29 05:20:43.480672556 +0200
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	106 @@ -223,14 +223,14 @@
2618 54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	107
3183 96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	108 #if defined (G_OS_WIN32)
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	109
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	110 -BOOL WINAPI DllMain (HINSTANCE hinstDLL,
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	111 +BOOL WINAPI glib_DllMain (HINSTANCE hinstDLL,
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	112 DWORD fdwReason,
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	113 LPVOID lpvReserved);
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	114
2618 54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	115 HMODULE glib_dll;
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	116
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	117 BOOL WINAPI
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	118 -DllMain (HINSTANCE hinstDLL,
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	119 +glib_DllMain (HINSTANCE hinstDLL,
3183 96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	120 DWORD fdwReason,
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	121 LPVOID lpvReserved)
2618 54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	122 {
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	123
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	124
3183 96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	125 From 1b51f3ef3e38d5db3c15cde0fe4429dab1f7a6d0 Mon Sep 17 00:00:00 2001
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	126 From: MXE
2618 54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	127 Date: Fri, 15 Jun 2012 15:27:22 +0200
2635 383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	128 Subject: [PATCH 4/8] Allow building without inotify support
2618 54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	129
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	130
3183 96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	131 diff -ur a/configure.ac b/configure.ac
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	132 --- a/configure.ac 2013-06-10 00:53:13.000000000 +0200
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	133 +++ b/configure.ac 2013-06-29 05:23:45.264680443 +0200
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	134 @@ -1726,11 +1726,17 @@
2618 54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	135 dnl Check for inotify (GIO)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	136 dnl *****************************
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	137 inotify_support=no
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	138 -AC_CHECK_HEADERS([sys/inotify.h],
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	139 -[
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	140 +AC_ARG_ENABLE(inotify,
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	141 + AC_HELP_STRING([--disable-inotify],
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	142 + [build without inotify support]))
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	143 +
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	144 +if test "x$enable_inotify" != "xno"; then
3183 96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	145 + AC_CHECK_HEADERS([sys/inotify.h],
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	146 + [
2618 54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	147 inotify_support=yes
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	148 AC_CHECK_FUNCS(inotify_init1)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	149 -])
3183 96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	150 + ])
2618 54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	151 +fi
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	152
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	153 AM_CONDITIONAL(HAVE_INOTIFY, [test "$inotify_support" = "yes"])
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	154
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	155
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	156
3183 96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	157 From 5ec5d101cb75c096f39228da85d2caba52b9002f Mon Sep 17 00:00:00 2001
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	158 From: MXE
2618 54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	159 Date: Fri, 15 Jun 2012 15:28:14 +0200
2635 383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	160 Subject: [PATCH 5/8] Make sure STDC_HEADERS is set for AC_CHECK_ALIGNOF.
2618 54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	161 Backported from upstream
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	162
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	163
3183 96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	164 diff -ur a/configure.ac b/configure.ac
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	165 --- a/configure.ac 2013-06-10 00:53:13.000000000 +0200
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	166 +++ b/configure.ac 2013-06-29 05:24:29.720682366 +0200
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	167 @@ -456,6 +456,8 @@
2618 54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	168
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	169 AC_MSG_RESULT($enable_iconv_cache)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	170
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	171 +# Make sure STDC_HEADERS is set for AC_CHECK_ALIGNOF
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	172 +AS_IF([false], [AC_CHECK_HEADER([stdint.h])])
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	173
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	174 dnl
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	175 dnl zlib support
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	176
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	177
3183 96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	178 From d5c7bf3b57ced0c6dfb416cf7b439fba210d2a8b Mon Sep 17 00:00:00 2001
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	179 From: MXE
2618 54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	180 Date: Fri, 15 Jun 2012 15:29:06 +0200
2635 383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	181 Subject: [PATCH 6/8] Link with dnsapi
2618 54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	182
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	183
3183 96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	184 diff -ur a/gio-2.0.pc.in b/gio-2.0.pc.in
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	185 --- a/gio-2.0.pc.in 2013-01-20 20:48:44.000000000 +0100
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	186 +++ b/gio-2.0.pc.in 2013-06-29 05:25:16.328684390 +0200
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	187 @@ -13,6 +13,6 @@
2618 54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	188 Version: @VERSION@
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	189 Requires: glib-2.0 gobject-2.0
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	190 Requires.private: gmodule-no-export-2.0
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	191 -Libs: -L${libdir} -lgio-2.0
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	192 +Libs: -L${libdir} -lgio-2.0 -ldnsapi
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	193 Libs.private: @ZLIB_LIBS@ @NETWORK_LIBS@
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	194 Cflags:
3183 96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	195
1190 821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	196
821fabe85a36 upgrade packages: glib gtk. new package: gdk-pixbuf Mark Brand <mabrand@mabrand.nl> parents: diff changeset	197
3183 96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	198 From e0338b4fdd95e8273c84ba1daeea660c589d152a Mon Sep 17 00:00:00 2001
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	199 From: MXE
2618 54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	200 Date: Fri, 15 Jun 2012 15:29:38 +0200
2635 383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	201 Subject: [PATCH 7/8] Ensure globals are initialized even when DllMain is not
2618 54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	202 being run
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	203
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	204
3183 96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	205 diff -ur a/glib/gmain.c b/glib/gmain.c
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	206 --- a/glib/gmain.c 2013-06-10 00:03:18.000000000 +0200
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	207 +++ b/glib/gmain.c 2013-06-29 05:33:10.568704963 +0200
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	208 @@ -2490,12 +2490,15 @@
2618 54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	209 #ifdef G_OS_WIN32
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	210 static ULONGLONG (*g_GetTickCount64) (void) = NULL;
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	211 static guint32 g_win32_tick_epoch = 0;
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	212 +static gboolean g_win32_clock_is_initialized;
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	213
3183 96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	214 void
2618 54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	215 g_clock_win32_init (void)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	216 {
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	217 HMODULE kernel32;
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	218
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	219 + g_win32_clock_is_initialized = TRUE;
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	220 +
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	221 g_GetTickCount64 = NULL;
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	222 kernel32 = GetModuleHandle ("KERNEL32.DLL");
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	223 if (kernel32 != NULL)
3183 96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	224 @@ -2614,6 +2617,9 @@
2618 54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	225 * timeBeginPeriod() to increase it as much as they want
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	226 */
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	227
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	228 + if (!g_win32_clock_is_initialized)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	229 + g_clock_win32_init ();
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	230 +
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	231 if (g_GetTickCount64 != NULL)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	232 {
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	233 guint32 ticks_as_32bit;
3183 96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	234 diff -ur a/glib/gthread-win32.c b/glib/gthread-win32.c
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	235 --- a/glib/gthread-win32.c 2013-06-03 01:20:49.000000000 +0200
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	236 +++ b/glib/gthread-win32.c 2013-06-29 05:49:13.580746730 +0200
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	237 @@ -118,18 +118,28 @@
2618 54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	238 void (__stdcall * WakeConditionVariable) (gpointer cond);
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	239 } GThreadImplVtable;
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	240
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	241 +/* Needed for static builds where DllMain initializer doesn't get called */
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	242 +static gboolean g_threads_is_initialized;
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	243 +G_GNUC_INTERNAL void g_thread_win32_init (void);
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	244 +
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	245 static GThreadImplVtable g_thread_impl_vtable;
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	246
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	247 /* {{{1 GMutex */
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	248 void
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	249 g_mutex_init (GMutex *mutex)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	250 {
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	251 + if (!g_threads_is_initialized)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	252 + g_thread_win32_init ();
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	253 +
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	254 g_thread_impl_vtable.InitializeSRWLock (mutex);
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	255 }
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	256
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	257 void
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	258 g_mutex_clear (GMutex *mutex)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	259 {
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	260 + if (!g_threads_is_initialized)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	261 + g_thread_win32_init ();
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	262 +
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	263 if (g_thread_impl_vtable.DeleteSRWLock != NULL)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	264 g_thread_impl_vtable.DeleteSRWLock (mutex);
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	265 }
3183 96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	266 @@ -137,18 +147,27 @@
2618 54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	267 void
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	268 g_mutex_lock (GMutex *mutex)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	269 {
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	270 + if (!g_threads_is_initialized)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	271 + g_thread_win32_init ();
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	272 +
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	273 g_thread_impl_vtable.AcquireSRWLockExclusive (mutex);
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	274 }
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	275
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	276 gboolean
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	277 g_mutex_trylock (GMutex *mutex)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	278 {
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	279 + if (!g_threads_is_initialized)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	280 + g_thread_win32_init ();
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	281 +
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	282 return g_thread_impl_vtable.TryAcquireSRWLockExclusive (mutex);
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	283 }
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	284
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	285 void
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	286 g_mutex_unlock (GMutex *mutex)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	287 {
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	288 + if (!g_threads_is_initialized)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	289 + g_thread_win32_init ();
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	290 +
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	291 g_thread_impl_vtable.ReleaseSRWLockExclusive (mutex);
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	292 }
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	293
3183 96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	294 @@ -159,6 +178,9 @@
2618 54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	295 {
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	296 CRITICAL_SECTION *cs;
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	297
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	298 + if (!g_threads_is_initialized)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	299 + g_thread_win32_init ();
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	300 +
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	301 cs = g_slice_new (CRITICAL_SECTION);
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	302 InitializeCriticalSection (cs);
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	303
3183 96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	304 @@ -169,6 +191,10 @@
2618 54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	305 g_rec_mutex_impl_free (CRITICAL_SECTION *cs)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	306 {
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	307 DeleteCriticalSection (cs);
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	308 +
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	309 + if (!g_threads_is_initialized)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	310 + g_thread_win32_init ();
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	311 +
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	312 g_slice_free (CRITICAL_SECTION, cs);
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	313 }
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	314
3183 96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	315 @@ -177,6 +203,9 @@
2618 54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	316 {
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	317 CRITICAL_SECTION *impl = mutex->p;
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	318
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	319 + if (!g_threads_is_initialized)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	320 + g_thread_win32_init ();
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	321 +
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	322 if G_UNLIKELY (mutex->p == NULL)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	323 {
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	324 impl = g_rec_mutex_impl_new ();
3183 96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	325 @@ -191,30 +220,45 @@
2618 54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	326 void
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	327 g_rec_mutex_init (GRecMutex *mutex)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	328 {
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	329 + if (!g_threads_is_initialized)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	330 + g_thread_win32_init ();
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	331 +
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	332 mutex->p = g_rec_mutex_impl_new ();
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	333 }
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	334
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	335 void
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	336 g_rec_mutex_clear (GRecMutex *mutex)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	337 {
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	338 + if (!g_threads_is_initialized)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	339 + g_thread_win32_init ();
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	340 +
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	341 g_rec_mutex_impl_free (mutex->p);
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	342 }
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	343
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	344 void
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	345 g_rec_mutex_lock (GRecMutex *mutex)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	346 {
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	347 + if (!g_threads_is_initialized)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	348 + g_thread_win32_init ();
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	349 +
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	350 EnterCriticalSection (g_rec_mutex_get_impl (mutex));
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	351 }
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	352
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	353 void
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	354 g_rec_mutex_unlock (GRecMutex *mutex)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	355 {
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	356 + if (!g_threads_is_initialized)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	357 + g_thread_win32_init ();
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	358 +
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	359 LeaveCriticalSection (mutex->p);
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	360 }
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	361
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	362 gboolean
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	363 g_rec_mutex_trylock (GRecMutex *mutex)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	364 {
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	365 + if (!g_threads_is_initialized)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	366 + g_thread_win32_init ();
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	367 +
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	368 return TryEnterCriticalSection (g_rec_mutex_get_impl (mutex));
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	369 }
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	370
3183 96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	371 @@ -223,12 +267,18 @@
2618 54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	372 void
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	373 g_rw_lock_init (GRWLock *lock)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	374 {
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	375 + if (!g_threads_is_initialized)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	376 + g_thread_win32_init ();
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	377 +
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	378 g_thread_impl_vtable.InitializeSRWLock (lock);
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	379 }
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	380
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	381 void
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	382 g_rw_lock_clear (GRWLock *lock)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	383 {
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	384 + if (!g_threads_is_initialized)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	385 + g_thread_win32_init ();
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	386 +
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	387 if (g_thread_impl_vtable.DeleteSRWLock != NULL)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	388 g_thread_impl_vtable.DeleteSRWLock (lock);
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	389 }
3183 96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	390 @@ -236,36 +286,54 @@
2618 54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	391 void
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	392 g_rw_lock_writer_lock (GRWLock *lock)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	393 {
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	394 + if (!g_threads_is_initialized)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	395 + g_thread_win32_init ();
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	396 +
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	397 g_thread_impl_vtable.AcquireSRWLockExclusive (lock);
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	398 }
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	399
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	400 gboolean
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	401 g_rw_lock_writer_trylock (GRWLock *lock)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	402 {
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	403 + if (!g_threads_is_initialized)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	404 + g_thread_win32_init ();
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	405 +
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	406 return g_thread_impl_vtable.TryAcquireSRWLockExclusive (lock);
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	407 }
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	408
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	409 void
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	410 g_rw_lock_writer_unlock (GRWLock *lock)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	411 {
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	412 + if (!g_threads_is_initialized)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	413 + g_thread_win32_init ();
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	414 +
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	415 g_thread_impl_vtable.ReleaseSRWLockExclusive (lock);
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	416 }
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	417
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	418 void
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	419 g_rw_lock_reader_lock (GRWLock *lock)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	420 {
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	421 + if (!g_threads_is_initialized)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	422 + g_thread_win32_init ();
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	423 +
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	424 g_thread_impl_vtable.AcquireSRWLockShared (lock);
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	425 }
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	426
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	427 gboolean
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	428 g_rw_lock_reader_trylock (GRWLock *lock)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	429 {
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	430 + if (!g_threads_is_initialized)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	431 + g_thread_win32_init ();
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	432 +
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	433 return g_thread_impl_vtable.TryAcquireSRWLockShared (lock);
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	434 }
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	435
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	436 void
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	437 g_rw_lock_reader_unlock (GRWLock *lock)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	438 {
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	439 + if (!g_threads_is_initialized)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	440 + g_thread_win32_init ();
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	441 +
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	442 g_thread_impl_vtable.ReleaseSRWLockShared (lock);
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	443 }
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	444
3183 96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	445 @@ -273,12 +341,18 @@
2618 54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	446 void
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	447 g_cond_init (GCond *cond)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	448 {
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	449 + if (!g_threads_is_initialized)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	450 + g_thread_win32_init ();
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	451 +
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	452 g_thread_impl_vtable.InitializeConditionVariable (cond);
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	453 }
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	454
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	455 void
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	456 g_cond_clear (GCond *cond)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	457 {
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	458 + if (!g_threads_is_initialized)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	459 + g_thread_win32_init ();
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	460 +
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	461 if (g_thread_impl_vtable.DeleteConditionVariable)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	462 g_thread_impl_vtable.DeleteConditionVariable (cond);
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	463 }
3183 96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	464 @@ -286,12 +360,18 @@
2618 54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	465 void
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	466 g_cond_signal (GCond *cond)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	467 {
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	468 + if (!g_threads_is_initialized)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	469 + g_thread_win32_init ();
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	470 +
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	471 g_thread_impl_vtable.WakeConditionVariable (cond);
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	472 }
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	473
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	474 void
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	475 g_cond_broadcast (GCond *cond)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	476 {
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	477 + if (!g_threads_is_initialized)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	478 + g_thread_win32_init ();
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	479 +
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	480 g_thread_impl_vtable.WakeAllConditionVariable (cond);
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	481 }
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	482
3183 96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	483 @@ -299,6 +379,9 @@
2618 54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	484 g_cond_wait (GCond *cond,
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	485 GMutex *entered_mutex)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	486 {
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	487 + if (!g_threads_is_initialized)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	488 + g_thread_win32_init ();
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	489 +
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	490 g_thread_impl_vtable.SleepConditionVariableSRW (cond, entered_mutex, INFINITE, 0);
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	491 }
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	492
3183 96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	493 @@ -309,6 +392,9 @@
2618 54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	494 {
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	495 gint64 span;
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	496
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	497 + if (!g_threads_is_initialized)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	498 + g_thread_win32_init ();
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	499 +
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	500 span = end_time - g_get_monotonic_time ();
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	501
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	502 if G_UNLIKELY (span < 0)
3183 96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	503 @@ -341,6 +427,9 @@
2618 54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	504
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	505 if G_UNLIKELY (impl == 0)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	506 {
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	507 + if (!g_threads_is_initialized)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	508 + g_thread_win32_init ();
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	509 +
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	510 EnterCriticalSection (&g_private_lock);
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	511 impl = (DWORD) key->p;
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	512 if (impl == 0)
3183 96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	513 @@ -434,6 +523,9 @@
2618 54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	514 {
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	515 GThreadWin32 wt = (GThreadWin32 ) thread;
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	516
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	517 + if (!g_threads_is_initialized)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	518 + g_thread_win32_init ();
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	519 +
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	520 win32_check_for_error (CloseHandle (wt->handle));
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	521 g_slice_free (GThreadWin32, wt);
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	522 }
3183 96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	523 @@ -441,6 +533,9 @@
2618 54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	524 void
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	525 g_system_thread_exit (void)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	526 {
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	527 + if (!g_threads_is_initialized)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	528 + g_thread_win32_init ();
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	529 +
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	530 _endthreadex (0);
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	531 }
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	532
3183 96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	533 @@ -449,6 +544,9 @@
2618 54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	534 {
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	535 GThreadWin32 *self = data;
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	536
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	537 + if (!g_threads_is_initialized)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	538 + g_thread_win32_init ();
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	539 +
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	540 self->proxy (self);
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	541
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	542 g_system_thread_exit ();
3183 96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	543 @@ -466,6 +564,9 @@
2618 54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	544 GThreadWin32 *thread;
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	545 guint ignore;
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	546
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	547 + if (!g_threads_is_initialized)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	548 + g_thread_win32_init ();
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	549 +
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	550 thread = g_slice_new0 (GThreadWin32);
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	551 thread->proxy = func;
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	552
3183 96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	553 @@ -495,6 +596,9 @@
2618 54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	554 {
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	555 GThreadWin32 wt = (GThreadWin32 ) thread;
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	556
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	557 + if (!g_threads_is_initialized)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	558 + g_thread_win32_init ();
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	559 +
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	560 win32_check_for_error (WAIT_FAILED != WaitForSingleObject (wt->handle, INFINITE));
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	561 }
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	562
3183 96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	563 @@ -986,6 +1090,8 @@
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	564 void
2618 54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	565 g_thread_win32_init (void)
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	566 {
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	567 + g_threads_is_initialized = TRUE;
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	568 +
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	569 if (!g_thread_lookup_native_funcs ())
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	570 g_thread_xp_init ();
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	571
54ebb3d54d97 package glib: gitify patches Mark Brand <mabrand@mabrand.nl> parents: 2615 diff changeset	572
2635 383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	573
3183 96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	574 From ce0f7354ac995f3b21cccabec880413d37f02fb6 Mon Sep 17 00:00:00 2001
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	575 From: MXE
2635 383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	576 Date: Mon, 18 Jun 2012 16:02:12 +0200
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	577 Subject: [PATCH 8/8] kill docs and gtk-doc dependence (mxe-specific)
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	578
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	579
3183 96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	580 diff -urN a/autogen.sh b/autogen.sh
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	581 --- a/autogen.sh 2012-08-18 19:32:04.000000000 +0200
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	582 +++ b/autogen.sh 2013-06-29 05:50:43.972750651 +0200
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	583 @@ -7,18 +7,6 @@
2635 383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	584 olddir=`pwd`
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	585 cd "$srcdir"
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	586
2817 8b3bb715b237 update package glib Mark Brand <mabrand@mabrand.nl> parents: 2635 diff changeset	587 -GTKDOCIZE=$(which gtkdocize 2>/dev/null)
2635 383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	588 -if test -z $GTKDOCIZE; then
2817 8b3bb715b237 update package glib Mark Brand <mabrand@mabrand.nl> parents: 2635 diff changeset	589 - echo "You don't have gtk-doc installed, and thus won't be able to generate the documentation."
8b3bb715b237 update package glib Mark Brand <mabrand@mabrand.nl> parents: 2635 diff changeset	590 - rm -f gtk-doc.make
8b3bb715b237 update package glib Mark Brand <mabrand@mabrand.nl> parents: 2635 diff changeset	591 - cat > gtk-doc.make <<EOF
8b3bb715b237 update package glib Mark Brand <mabrand@mabrand.nl> parents: 2635 diff changeset	592 -EXTRA_DIST =
8b3bb715b237 update package glib Mark Brand <mabrand@mabrand.nl> parents: 2635 diff changeset	593 -CLEANFILES =
8b3bb715b237 update package glib Mark Brand <mabrand@mabrand.nl> parents: 2635 diff changeset	594 -EOF
8b3bb715b237 update package glib Mark Brand <mabrand@mabrand.nl> parents: 2635 diff changeset	595 -else
8b3bb715b237 update package glib Mark Brand <mabrand@mabrand.nl> parents: 2635 diff changeset	596 - gtkdocize \|\| exit $?
2635 383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	597 -fi
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	598 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	599 AUTORECONF=`which autoreconf`
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	600 if test -z $AUTORECONF; then
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	601 echo "* No autoreconf found, please install it *"
3183 96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	602 diff -urN a/configure.ac b/configure.ac
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	603 --- a/configure.ac 2013-06-10 00:53:13.000000000 +0200
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	604 +++ b/configure.ac 2013-06-29 05:52:05.224754174 +0200
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	605 @@ -2645,13 +2645,6 @@
2817 8b3bb715b237 update package glib Mark Brand <mabrand@mabrand.nl> parents: 2635 diff changeset	606 dnl **************************
2635 383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	607 dnl * Checks for gtk-doc *
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	608 dnl **************************
2817 8b3bb715b237 update package glib Mark Brand <mabrand@mabrand.nl> parents: 2635 diff changeset	609 -# gtkdocize greps for ^GTK_DOC_CHECK and parses it, so you need to have
8b3bb715b237 update package glib Mark Brand <mabrand@mabrand.nl> parents: 2635 diff changeset	610 -# it on it's own line.
8b3bb715b237 update package glib Mark Brand <mabrand@mabrand.nl> parents: 2635 diff changeset	611 -m4_ifdef([GTK_DOC_CHECK], [
2635 383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	612 -GTK_DOC_CHECK([1.15], [--flavour no-tmpl])
2817 8b3bb715b237 update package glib Mark Brand <mabrand@mabrand.nl> parents: 2635 diff changeset	613 -],[
8b3bb715b237 update package glib Mark Brand <mabrand@mabrand.nl> parents: 2635 diff changeset	614 -AM_CONDITIONAL([ENABLE_GTK_DOC],[false])
8b3bb715b237 update package glib Mark Brand <mabrand@mabrand.nl> parents: 2635 diff changeset	615 -])
8b3bb715b237 update package glib Mark Brand <mabrand@mabrand.nl> parents: 2635 diff changeset	616
2635 383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	617 AC_ARG_ENABLE(man,
2817 8b3bb715b237 update package glib Mark Brand <mabrand@mabrand.nl> parents: 2635 diff changeset	618 [AS_HELP_STRING([--enable-man],
3183 96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	619 diff -urN a/docs/Makefile.am b/docs/Makefile.am
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	620 --- a/docs/Makefile.am 2013-06-10 00:03:17.000000000 +0200
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	621 +++ b/docs/Makefile.am 1970-01-01 01:00:00.000000000 +0100
2635 383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	622 @@ -1,11 +0,0 @@
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	623 -## Process this file with automake to produce Makefile.in
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	624 -include $(top_srcdir)/Makefile.decl
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	625 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	626 -SUBDIRS = reference
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	627 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	628 -EXTRA_DIST += debugging.txt macros.txt
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	629 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	630 -files:
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	631 - @files=`ls $(DISTFILES) 2> /dev/null `; for p in $$files; do \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	632 - echo $$p; \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	633 - done
3183 96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	634 diff -urN a/docs/reference/gio/gdbus-object-manager-example/Makefile.am b/docs/reference/gio/gdbus-object-manager-example/Makefile.am
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	635 --- a/docs/reference/gio/gdbus-object-manager-example/Makefile.am 2013-06-10 00:03:17.000000000 +0200
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	636 +++ b/docs/reference/gio/gdbus-object-manager-example/Makefile.am 1970-01-01 01:00:00.000000000 +0100
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	637 @@ -1,68 +0,0 @@
2635 383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	638 -include $(top_srcdir)/Makefile.decl
3183 96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	639 -NULL =
2635 383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	640 -
3183 96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	641 -# The name of the module.
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	642 -DOC_MODULE=gdbus-object-manager-example
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	643 -
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	644 -# The top-level SGML file.
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	645 -DOC_MAIN_SGML_FILE=gdbus-object-manager-example-docs.xml
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	646 -
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	647 -# Extra options to supply to gtkdoc-scan
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	648 -SCAN_OPTIONS=--deprecated-guards="G_DISABLE_DEPRECATED"
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	649 -
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	650 -# The directory containing the source code. Relative to $(srcdir)
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	651 -DOC_SOURCE_DIR=$(top_builddir)/gio/tests/gdbus-object-manager-example
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	652 -
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	653 -HFILE_GLOB=$(top_builddir)/gio/tests/gdbus-object-manager-example/*.h
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	654 -CFILE_GLOB=$(top_builddir)/gio/tests/gdbus-object-manager-example/*.c
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	655 -
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	656 -# Headers to ignore
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	657 -IGNORE_HFILES = \
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	658 - $(NULL)
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	659 -
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	660 -# CFLAGS and LDFLAGS for compiling scan program. Only needed
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	661 -# if $(DOC_MODULE).types is non-empty.
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	662 -AM_CPPFLAGS = \
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	663 - $(gio_INCLUDES) \
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	664 - $(GLIB_DEBUG_FLAGS)
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	665 -
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	666 -GTKDOC_LIBS = \
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	667 - $(top_builddir)/glib/libglib-2.0.la \
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	668 - $(top_builddir)/gobject/libgobject-2.0.la \
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	669 - $(top_builddir)/gmodule/libgmodule-2.0.la \
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	670 - $(top_builddir)/gio/libgio-2.0.la \
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	671 - $(top_builddir)/gio/tests/gdbus-object-manager-example/libgdbus-example-objectmanager.la \
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	672 - $(NULL)
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	673 -
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	674 -# Extra options to supply to gtkdoc-mkdb
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	675 -MKDB_OPTIONS = --output-format=xml --sgml-mode --name-space=g \
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	676 - $(NULL)
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	677 -
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	678 -# Images to copy into HTML directory
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	679 -HTML_IMAGES = \
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	680 - $(NULL)
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	681 -
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	682 -content_files = \
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	683 - $(NULL)
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	684 -
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	685 -expand_content_files = \
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	686 - $(NULL)
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	687 -
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	688 -extra_files = \
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	689 - $(NULL)
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	690 -
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	691 -include $(top_srcdir)/gtk-doc.make
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	692 -
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	693 -EXTRA_DIST += \
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	694 - $(NULL)
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	695 -
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	696 -MAINTAINERCLEANFILES = $(BUILT_SOURCES)
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	697 -
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	698 -dist-hook-local: all-local
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	699 -
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	700 -gdbus-object-manager-example-docs-clean: clean
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	701 - cd $(srcdir) && rm -rf xml html
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	702 -
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	703 -# Nuke installed docs (don't know how to avoid installing them)
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	704 -install-data-hook :
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	705 - rm -rf $(DESTDIR)$(datadir)/gtk-doc/html/gdbus-object-manager-example
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	706 diff -urN a/docs/reference/gio/Makefile.am b/docs/reference/gio/Makefile.am
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	707 --- a/docs/reference/gio/Makefile.am 2013-06-10 00:03:17.000000000 +0200
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	708 +++ b/docs/reference/gio/Makefile.am 1970-01-01 01:00:00.000000000 +0100
2817 8b3bb715b237 update package glib Mark Brand <mabrand@mabrand.nl> parents: 2635 diff changeset	709 @@ -1,179 +0,0 @@
2635 383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	710 -include $(top_srcdir)/Makefile.decl
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	711 -NULL =
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	712 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	713 -SUBDIRS = gdbus-object-manager-example
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	714 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	715 -# The name of the module.
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	716 -DOC_MODULE=gio
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	717 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	718 -# The top-level SGML file.
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	719 -DOC_MAIN_SGML_FILE=gio-docs.xml
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	720 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	721 -# Extra options to supply to gtkdoc-scan
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	722 -SCAN_OPTIONS=--deprecated-guards="G_DISABLE_DEPRECATED" \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	723 - --ignore-decorators="G_GNUC_WARN_UNUSED_RESULT"
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	724 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	725 -# The directory containing the source code. Relative to $(srcdir)
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	726 -DOC_SOURCE_DIR=$(top_srcdir)/gio
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	727 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	728 -BUILT_HFILES=gioenumtypes.h
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	729 -HFILE_GLOB=$(top_srcdir)/gio/*.h
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	730 -CFILE_GLOB=$(top_srcdir)/gio/*.c
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	731 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	732 -IGNORE_HFILES = \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	733 - fam \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	734 - fen \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	735 - gdbus-2.0 \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	736 - gvdb \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	737 - inotify \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	738 - libasyncns \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	739 - tests \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	740 - win32 \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	741 - xdgmime \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	742 - gapplicationimpl.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	743 - gasynchelper.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	744 - gcontenttypeprivate.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	745 - gdbusauth.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	746 - gdbusauthmechanismanon.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	747 - gdbusauthmechanismexternal.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	748 - gdbusauthmechanism.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	749 - gdbusauthmechanismsha1.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	750 - gdbusprivate.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	751 - gdelayedsettingsbackend.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	752 - gdummyfile.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	753 - gdummyproxyresolver.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	754 - gdummytlsbackend.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	755 - gfileattribute-priv.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	756 - gfileinfo-priv.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	757 - giomodule-priv.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	758 - glocaldirectorymonitor.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	759 - glocalfileenumerator.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	760 - glocalfile.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	761 - glocalfileinfo.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	762 - glocalfileinputstream.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	763 - glocalfileiostream.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	764 - glocalfilemonitor.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	765 - glocalfileoutputstream.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	766 - glocalvfs.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	767 - gmountprivate.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	768 - gnativevolumemonitor.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	769 - gnetworkingprivate.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	770 - gnetworkmonitorbase.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	771 - gnetworkmonitornetlink.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	772 - gpollfilemonitor.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	773 - gregistrysettingsbackend.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	774 - gsettingsbackendinternal.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	775 - gsettings-mapping.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	776 - gsettingsschema-internal.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	777 - gsocketinputstream.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	778 - gsocketoutputstream.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	779 - gsocks4aproxy.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	780 - gsocks4proxy.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	781 - gsocks5proxy.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	782 - gthreadedresolver.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	783 - gunionvolumemonitor.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	784 - gunixmount.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	785 - gunixresolver.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	786 - gunixvolume.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	787 - gunixvolumemonitor.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	788 - gwin32appinfo.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	789 - gwin32mount.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	790 - gwin32resolver.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	791 - gwin32volumemonitor.h
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	792 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	793 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	794 -# CFLAGS and LDFLAGS for compiling scan program. Only needed
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	795 -# if $(DOC_MODULE).types is non-empty.
3183 96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	796 -AM_CPPFLAGS = \
2635 383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	797 - $(gio_INCLUDES) \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	798 - $(GLIB_DEBUG_FLAGS)
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	799 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	800 -GTKDOC_LIBS = \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	801 - $(top_builddir)/glib/libglib-2.0.la \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	802 - $(top_builddir)/gobject/libgobject-2.0.la \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	803 - $(top_builddir)/gmodule/libgmodule-2.0.la \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	804 - $(top_builddir)/gio/libgio-2.0.la \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	805 - $(NULL)
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	806 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	807 -# Extra options to supply to gtkdoc-mkdb
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	808 -MKDB_OPTIONS = --output-format=xml --sgml-mode --name-space=g \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	809 - --ignore-files='libasyncns tests'
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	810 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	811 -# Images to copy into HTML directory
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	812 -HTML_IMAGES = \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	813 - gvfs-overview.png \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	814 - menu-example.png \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	815 - menu-model.png
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	816 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	817 -content_files = \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	818 - version.xml \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	819 - overview.xml \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	820 - migrating-posix.xml \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	821 - migrating-gnome-vfs.xml \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	822 - migrating-gconf.xml \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	823 - migrating-gdbus.xml \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	824 - gio-querymodules.xml \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	825 - glib-compile-schemas.xml\
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	826 - glib-compile-resources.xml \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	827 - gsettings.xml \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	828 - gresource.xml \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	829 - gdbus.xml \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	830 - gdbus-codegen.xml \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	831 - $(NULL)
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	832 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	833 -expand_content_files = \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	834 - overview.xml \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	835 - migrating-posix.xml \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	836 - migrating-gnome-vfs.xml \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	837 - migrating-gconf.xml \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	838 - migrating-gdbus.xml \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	839 - gdbus-codegen.xml \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	840 - $(NULL)
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	841 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	842 -extra_files = \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	843 - version.xml.in \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	844 - gvfs-overview.odg
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	845 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	846 -# Extra options to supply to gtkdoc-fixref
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	847 -FIXXREF_OPTIONS=--extra-dir=$(srcdir)/../glib/html --extra-dir=$(srcdir)/../gobject/html
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	848 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	849 -include $(top_srcdir)/gtk-doc.make
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	850 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	851 -EXTRA_DIST += \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	852 - version.xml.in
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	853 -
2817 8b3bb715b237 update package glib Mark Brand <mabrand@mabrand.nl> parents: 2635 diff changeset	854 -man_MANS =
8b3bb715b237 update package glib Mark Brand <mabrand@mabrand.nl> parents: 2635 diff changeset	855 -
8b3bb715b237 update package glib Mark Brand <mabrand@mabrand.nl> parents: 2635 diff changeset	856 -if ENABLE_MAN
8b3bb715b237 update package glib Mark Brand <mabrand@mabrand.nl> parents: 2635 diff changeset	857 -
8b3bb715b237 update package glib Mark Brand <mabrand@mabrand.nl> parents: 2635 diff changeset	858 -man_MANS += \
2635 383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	859 - gio-querymodules.1 \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	860 - glib-compile-schemas.1 \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	861 - glib-compile-resources.1 \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	862 - gsettings.1 \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	863 - gresource.1 \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	864 - gdbus.1 \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	865 - gdbus-codegen.1
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	866 -
2817 8b3bb715b237 update package glib Mark Brand <mabrand@mabrand.nl> parents: 2635 diff changeset	867 -XSLTPROC_FLAGS = \
8b3bb715b237 update package glib Mark Brand <mabrand@mabrand.nl> parents: 2635 diff changeset	868 - --nonet \
8b3bb715b237 update package glib Mark Brand <mabrand@mabrand.nl> parents: 2635 diff changeset	869 - --stringparam man.output.quietly 1 \
8b3bb715b237 update package glib Mark Brand <mabrand@mabrand.nl> parents: 2635 diff changeset	870 - --stringparam funcsynopsis.style ansi \
8b3bb715b237 update package glib Mark Brand <mabrand@mabrand.nl> parents: 2635 diff changeset	871 - --stringparam man.th.extra1.suppress 1 \
8b3bb715b237 update package glib Mark Brand <mabrand@mabrand.nl> parents: 2635 diff changeset	872 - --stringparam man.authors.section.enabled 0 \
8b3bb715b237 update package glib Mark Brand <mabrand@mabrand.nl> parents: 2635 diff changeset	873 - --stringparam man.copyright.section.enabled 0
2635 383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	874 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	875 -.xml.1:
2817 8b3bb715b237 update package glib Mark Brand <mabrand@mabrand.nl> parents: 2635 diff changeset	876 - $(AM_V_GEN) $(XSLTPROC) $(XSLTPROC_FLAGS) http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
2635 383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	877 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	878 -endif
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	879 -
2817 8b3bb715b237 update package glib Mark Brand <mabrand@mabrand.nl> parents: 2635 diff changeset	880 -CLEANFILES ?=
8b3bb715b237 update package glib Mark Brand <mabrand@mabrand.nl> parents: 2635 diff changeset	881 -CLEANFILES += $(man_MANS)
2635 383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	882 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	883 -EXTRA_DIST += $(man_MANS)
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	884 -
2817 8b3bb715b237 update package glib Mark Brand <mabrand@mabrand.nl> parents: 2635 diff changeset	885 -dist-hook-local: all-local
2635 383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	886 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	887 -gio-docs-clean: clean
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	888 - cd $(srcdir) && rm -rf xml html
3183 96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	889 diff -urN a/docs/reference/glib/Makefile.am b/docs/reference/glib/Makefile.am
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	890 --- a/docs/reference/glib/Makefile.am 2013-06-10 00:03:17.000000000 +0200
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	891 +++ b/docs/reference/glib/Makefile.am 1970-01-01 01:00:00.000000000 +0100
2817 8b3bb715b237 update package glib Mark Brand <mabrand@mabrand.nl> parents: 2635 diff changeset	892 @@ -1,128 +0,0 @@
2635 383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	893 -## Process this file with automake to produce Makefile.in
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	894 -include $(top_srcdir)/Makefile.decl
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	895 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	896 -AUTOMAKE_OPTIONS = 1.6
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	897 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	898 -# The name of the module.
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	899 -DOC_MODULE=glib
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	900 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	901 -# The top-level SGML file.
2817 8b3bb715b237 update package glib Mark Brand <mabrand@mabrand.nl> parents: 2635 diff changeset	902 -DOC_MAIN_SGML_FILE=glib-docs.xml
2635 383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	903 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	904 -# The directory containing the source code. Relative to $(srcdir)
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	905 -DOC_SOURCE_DIR=$(top_srcdir)/glib $(top_srcdir)/gmodule
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	906 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	907 -# Extra options to supply to gtkdoc-scan
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	908 -SCAN_OPTIONS=--deprecated-guards="G_DISABLE_DEPRECATED" --ignore-decorators="GLIB_VAR\|G_GNUC_WARN_UNUSED_RESULT"
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	909 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	910 -# Extra options to supply to gtkdoc-mkdb
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	911 -MKDB_OPTIONS=--sgml-mode --output-format=xml --name-space=g
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	912 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	913 -# Used for dependencies
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	914 -HFILE_GLOB=$(top_srcdir)/glib/.h $(top_srcdir)/gmodule/.h
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	915 -CFILE_GLOB=$(top_srcdir)/glib/.c $(top_srcdir)/gmodule/.c
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	916 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	917 -# Ignore some private headers
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	918 -IGNORE_HFILES = \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	919 - gallocator.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	920 - gdatasetprivate.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	921 - glibintl.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	922 - gbsearcharray.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	923 - glib-private.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	924 - gmoduleconf.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	925 - gthreadprivate.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	926 - gunibreak.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	927 - gunicomp.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	928 - gunidecomp.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	929 - gunichartables.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	930 - glib_probes.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	931 - glib_trace.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	932 - libcharset.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	933 - gdebug.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	934 - gprintfint.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	935 - gmirroringtable.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	936 - gscripttable.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	937 - glib-mirroring-tab \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	938 - gnulib \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	939 - pcre \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	940 - update-pcre \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	941 - gbytesprivate.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	942 - gvariant-internal.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	943 - gvariant-serialiser.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	944 - gvariant-core.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	945 - gvarianttypeinfo.h \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	946 - gwakeup.h
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	947 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	948 -# Images to copy into HTML directory
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	949 -HTML_IMAGES = \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	950 - file-name-encodings.png \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	951 - mainloop-states.gif
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	952 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	953 -# Extra SGML files that are included by $(DOC_MAIN_SGML_FILE)
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	954 -content_files = \
2817 8b3bb715b237 update package glib Mark Brand <mabrand@mabrand.nl> parents: 2635 diff changeset	955 - cross.xml \
8b3bb715b237 update package glib Mark Brand <mabrand@mabrand.nl> parents: 2635 diff changeset	956 - running.xml \
8b3bb715b237 update package glib Mark Brand <mabrand@mabrand.nl> parents: 2635 diff changeset	957 - building.xml \
8b3bb715b237 update package glib Mark Brand <mabrand@mabrand.nl> parents: 2635 diff changeset	958 - changes.xml \
8b3bb715b237 update package glib Mark Brand <mabrand@mabrand.nl> parents: 2635 diff changeset	959 - compiling.xml \
8b3bb715b237 update package glib Mark Brand <mabrand@mabrand.nl> parents: 2635 diff changeset	960 - programming.xml \
8b3bb715b237 update package glib Mark Brand <mabrand@mabrand.nl> parents: 2635 diff changeset	961 - resources.xml \
8b3bb715b237 update package glib Mark Brand <mabrand@mabrand.nl> parents: 2635 diff changeset	962 - regex-syntax.xml \
2635 383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	963 - version.xml \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	964 - glib-gettextize.xml \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	965 - gtester.xml \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	966 - gtester-report.xml \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	967 - gvariant-varargs.xml \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	968 - gvariant-text.xml
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	969 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	970 -expand_content_files = \
2817 8b3bb715b237 update package glib Mark Brand <mabrand@mabrand.nl> parents: 2635 diff changeset	971 - compiling.xml
2635 383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	972 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	973 -# Extra options to supply to gtkdoc-fixref
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	974 -FIXXREF_OPTIONS=--extra-dir=$(srcdir)/../gobject/html --extra-dir=$(srcdir)/../gio/html
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	975 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	976 -# include common portion ...
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	977 -include $(top_srcdir)/gtk-doc.make
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	978 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	979 -# Other files to distribute
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	980 -EXTRA_DIST += \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	981 - file-name-encodings.png \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	982 - file-name-encodings.sxd \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	983 - mainloop-states.fig \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	984 - mainloop-states.png \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	985 - mainloop-states.eps \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	986 - version.xml.in
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	987 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	988 -########################################################################
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	989 -
2817 8b3bb715b237 update package glib Mark Brand <mabrand@mabrand.nl> parents: 2635 diff changeset	990 -man_MANS =
8b3bb715b237 update package glib Mark Brand <mabrand@mabrand.nl> parents: 2635 diff changeset	991 -
8b3bb715b237 update package glib Mark Brand <mabrand@mabrand.nl> parents: 2635 diff changeset	992 -if ENABLE_MAN
8b3bb715b237 update package glib Mark Brand <mabrand@mabrand.nl> parents: 2635 diff changeset	993 -
8b3bb715b237 update package glib Mark Brand <mabrand@mabrand.nl> parents: 2635 diff changeset	994 -man_MANS += \
2635 383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	995 - glib-gettextize.1 \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	996 - gtester.1 \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	997 - gtester-report.1
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	998 -
2817 8b3bb715b237 update package glib Mark Brand <mabrand@mabrand.nl> parents: 2635 diff changeset	999 -XSLTPROC_FLAGS = \
8b3bb715b237 update package glib Mark Brand <mabrand@mabrand.nl> parents: 2635 diff changeset	1000 - --nonet \
8b3bb715b237 update package glib Mark Brand <mabrand@mabrand.nl> parents: 2635 diff changeset	1001 - --stringparam man.output.quietly 1 \
8b3bb715b237 update package glib Mark Brand <mabrand@mabrand.nl> parents: 2635 diff changeset	1002 - --stringparam funcsynopsis.style ansi \
8b3bb715b237 update package glib Mark Brand <mabrand@mabrand.nl> parents: 2635 diff changeset	1003 - --stringparam man.th.extra1.suppress 1 \
8b3bb715b237 update package glib Mark Brand <mabrand@mabrand.nl> parents: 2635 diff changeset	1004 - --stringparam man.authors.section.enabled 0 \
8b3bb715b237 update package glib Mark Brand <mabrand@mabrand.nl> parents: 2635 diff changeset	1005 - --stringparam man.copyright.section.enabled 0
2635 383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1006 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1007 -.xml.1:
2817 8b3bb715b237 update package glib Mark Brand <mabrand@mabrand.nl> parents: 2635 diff changeset	1008 - $(AM_V_GEN) $(XSLTPROC) $(XSLTPROC_FLAGS) http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
2635 383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1009 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1010 -endif
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1011 -
2817 8b3bb715b237 update package glib Mark Brand <mabrand@mabrand.nl> parents: 2635 diff changeset	1012 -CLEANFILES ?=
8b3bb715b237 update package glib Mark Brand <mabrand@mabrand.nl> parents: 2635 diff changeset	1013 -CLEANFILES += $(man_MANS)
2635 383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1014 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1015 -EXTRA_DIST += $(man_MANS)
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1016 -
2817 8b3bb715b237 update package glib Mark Brand <mabrand@mabrand.nl> parents: 2635 diff changeset	1017 -dist-hook-local: all-local
2635 383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1018 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1019 -glib-docs-clean: clean
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1020 - cd $(srcdir) && rm -rf xml html
3183 96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	1021 diff -urN a/docs/reference/gobject/Makefile.am b/docs/reference/gobject/Makefile.am
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	1022 --- a/docs/reference/gobject/Makefile.am 2013-06-10 00:03:17.000000000 +0200
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	1023 +++ b/docs/reference/gobject/Makefile.am 1970-01-01 01:00:00.000000000 +0100
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	1024 @@ -1,104 +0,0 @@
2635 383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1025 -## Process this file with automake to produce Makefile.in
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1026 -include $(top_srcdir)/Makefile.decl
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1027 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1028 -AUTOMAKE_OPTIONS = 1.6
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1029 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1030 -# The name of the module.
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1031 -DOC_MODULE=gobject
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1032 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1033 -# The top-level SGML file.
2817 8b3bb715b237 update package glib Mark Brand <mabrand@mabrand.nl> parents: 2635 diff changeset	1034 -DOC_MAIN_SGML_FILE=gobject-docs.xml
2635 383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1035 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1036 -# The directory containing the source code. Relative to $(srcdir)
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1037 -DOC_SOURCE_DIR=$(top_srcdir)/gobject
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1038 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1039 -# Extra options to supply to gtkdoc-scan
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1040 -SCAN_OPTIONS=--deprecated-guards="G_DISABLE_DEPRECATED" \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1041 - --ignore-decorators="G_GNUC_INTERNAL\|G_GNUC_WARN_UNUSED_RESULT"
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1042 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1043 -# Extra options to supply to gtkdoc-mkdb
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1044 -MKDB_OPTIONS=--sgml-mode --output-format=xml --name-space=g
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1045 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1046 -# Used for dependencies
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1047 -HFILE_GLOB=$(top_srcdir)/gobject/*.h
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1048 -CFILE_GLOB=$(top_srcdir)/gobject/*.c
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1049 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1050 -# Headers to ignore
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1051 -IGNORE_HFILES = \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1052 - tests \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1053 - gobject_trace.h \
2817 8b3bb715b237 update package glib Mark Brand <mabrand@mabrand.nl> parents: 2635 diff changeset	1054 - gtype-private.h \
2635 383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1055 - gatomicarray.h
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1056 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1057 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1058 -# CFLAGS and LDFLAGS for compiling scan program. Only needed
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1059 -# if $(DOC_MODULE).types is non-empty.
3183 96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	1060 -AM_CPPFLAGS = \
2635 383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1061 - -I$(srcdir) \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1062 - $(gobject_INCLUDES) \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1063 - $(GLIB_DEBUG_FLAGS)
3183 96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	1064 -
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	1065 -GTKDOC_LIBS = \
2635 383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1066 - $(top_builddir)/glib/libglib-2.0.la \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1067 - $(top_builddir)/gobject/libgobject-2.0.la
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1068 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1069 -# Images to copy into HTML directory
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1070 -HTML_IMAGES = \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1071 - images/glue.png
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1072 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1073 -# Extra SGML files that are included by $(DOC_MAIN_SGML_FILE)
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1074 -content_files = version.xml \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1075 - glib-mkenums.xml \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1076 - glib-genmarshal.xml \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1077 - gobject-query.xml \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1078 - tut_gobject.xml \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1079 - tut_gsignal.xml \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1080 - tut_gtype.xml \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1081 - tut_howto.xml \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1082 - tut_intro.xml \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1083 - tut_tools.xml
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1084 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1085 -# Extra options to supply to gtkdoc-fixref
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1086 -FIXXREF_OPTIONS=--extra-dir=$(srcdir)/../glib/html
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1087 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1088 -include $(top_srcdir)/gtk-doc.make
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1089 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1090 -# Other files to distribute
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1091 -EXTRA_DIST += \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1092 - gobject.cI \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1093 - version.xml.in
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1094 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1095 -########################################################################
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1096 -
2817 8b3bb715b237 update package glib Mark Brand <mabrand@mabrand.nl> parents: 2635 diff changeset	1097 -man_MANS =
8b3bb715b237 update package glib Mark Brand <mabrand@mabrand.nl> parents: 2635 diff changeset	1098 -
8b3bb715b237 update package glib Mark Brand <mabrand@mabrand.nl> parents: 2635 diff changeset	1099 -if ENABLE_MAN
8b3bb715b237 update package glib Mark Brand <mabrand@mabrand.nl> parents: 2635 diff changeset	1100 -
8b3bb715b237 update package glib Mark Brand <mabrand@mabrand.nl> parents: 2635 diff changeset	1101 -man_MANS += \
2635 383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1102 - glib-mkenums.1 \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1103 - glib-genmarshal.1 \
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1104 - gobject-query.1
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1105 -
2817 8b3bb715b237 update package glib Mark Brand <mabrand@mabrand.nl> parents: 2635 diff changeset	1106 -
8b3bb715b237 update package glib Mark Brand <mabrand@mabrand.nl> parents: 2635 diff changeset	1107 -XSLTPROC_FLAGS = \
8b3bb715b237 update package glib Mark Brand <mabrand@mabrand.nl> parents: 2635 diff changeset	1108 - --nonet \
8b3bb715b237 update package glib Mark Brand <mabrand@mabrand.nl> parents: 2635 diff changeset	1109 - --stringparam man.output.quietly 1 \
8b3bb715b237 update package glib Mark Brand <mabrand@mabrand.nl> parents: 2635 diff changeset	1110 - --stringparam funcsynopsis.style ansi \
8b3bb715b237 update package glib Mark Brand <mabrand@mabrand.nl> parents: 2635 diff changeset	1111 - --stringparam man.th.extra1.suppress 1 \
8b3bb715b237 update package glib Mark Brand <mabrand@mabrand.nl> parents: 2635 diff changeset	1112 - --stringparam man.authors.section.enabled 0 \
8b3bb715b237 update package glib Mark Brand <mabrand@mabrand.nl> parents: 2635 diff changeset	1113 - --stringparam man.copyright.section.enabled 0
2635 383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1114 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1115 -.xml.1:
2817 8b3bb715b237 update package glib Mark Brand <mabrand@mabrand.nl> parents: 2635 diff changeset	1116 - $(AM_V_GEN) $(XSLTPROC) $(XSLTPROC_FLAGS) http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
2635 383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1117 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1118 -endif
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1119 -
2817 8b3bb715b237 update package glib Mark Brand <mabrand@mabrand.nl> parents: 2635 diff changeset	1120 -CLEANFILES ?=
8b3bb715b237 update package glib Mark Brand <mabrand@mabrand.nl> parents: 2635 diff changeset	1121 -CLEANFILES += $(man_MANS)
2635 383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1122 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1123 -EXTRA_DIST += $(man_MANS)
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1124 -
2817 8b3bb715b237 update package glib Mark Brand <mabrand@mabrand.nl> parents: 2635 diff changeset	1125 -dist-hook-local: all-local
2635 383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1126 -
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1127 -gobject-docs-clean: clean
383ab5d1e69f package glib: remove need for gtk-doc Mark Brand <mabrand@mabrand.nl> parents: 2618 diff changeset	1128 - cd $(srcdir) && rm -rf xml html
3183 96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	1129 diff -urN a/docs/reference/Makefile.am b/docs/reference/Makefile.am
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	1130 --- a/docs/reference/Makefile.am 2013-06-10 00:03:17.000000000 +0200
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	1131 +++ b/docs/reference/Makefile.am 1970-01-01 01:00:00.000000000 +0100
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	1132 @@ -1,3 +0,0 @@
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	1133 -include $(top_srcdir)/Makefile.decl
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	1134 -
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	1135 -SUBDIRS = glib gobject gio
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	1136 diff -urN a/Makefile.am b/Makefile.am
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	1137 --- a/Makefile.am 2013-06-10 00:03:17.000000000 +0200
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	1138 +++ b/Makefile.am 2013-06-29 05:50:18.224749533 +0200
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	1139 @@ -6,7 +6,7 @@
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	1140
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	1141 ACLOCAL_AMFLAGS = -I m4macros ${ACLOCAL_FLAGS}
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	1142
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	1143 -SUBDIRS = . m4macros glib gmodule gthread gobject gio po docs
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	1144 +SUBDIRS = . m4macros glib gmodule gthread gobject gio po
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	1145 DIST_SUBDIRS = $(SUBDIRS) build
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	1146 if BUILD_MODULAR_TESTS
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	1147 SUBDIRS += tests
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	1148 @@ -71,8 +71,7 @@
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	1149 README \
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	1150 INSTALL \
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	1151 ChangeLog \
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	1152 - config.h.win32 \
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	1153 - gtk-doc.make
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	1154 + config.h.win32
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	1155
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	1156 CONFIGURE_DEPENDENCIES = acglib.m4
96e96221fe09 Update glib mingw native and cross compile John Donoghue <john.donoghue@ieee.org> parents: 3132 diff changeset	1157

Mercurial > mxe-octave

annotate src/mingw-glib-1-fixes.patch @ 3725:2acaa9943159