Thu Apr 10 12:13:49 2008 UTC ()
update to 2.16.3
This switches to the gnome-2.22 release branch.


(drochner)
diff -r1.131 -r1.132 pkgsrc/devel/glib2/Makefile
diff -r1.38 -r1.39 pkgsrc/devel/glib2/PLIST
diff -r1.93 -r1.94 pkgsrc/devel/glib2/distinfo
diff -r1.40 -r1.41 pkgsrc/devel/glib2/patches/patch-aa
diff -r1.9 -r1.10 pkgsrc/devel/glib2/patches/patch-af
diff -r1.14 -r1.15 pkgsrc/devel/glib2/patches/patch-ag
diff -r0 -r1.1 pkgsrc/devel/glib2/patches/patch-ba
cvs diff -r1.131 -r1.132 pkgsrc/devel/glib2/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/glib2/Makefile 2008/02/21 20:53:54 1.131
+++ pkgsrc/devel/glib2/Makefile 2008/04/10 12:13:49 1.132
@@ -1,66 +1,73 @@ @@ -1,66 +1,73 @@
1# $NetBSD: Makefile,v 1.131 2008/02/21 20:53:54 tnn Exp $ 1# $NetBSD: Makefile,v 1.132 2008/04/10 12:13:49 drochner Exp $
2 2
3# When updating glib2, please apply patch-ak to configure.in 3# When updating glib2, please apply patch-ak to configure.in
4# Then run a matching version of autoconf to regen patch-aa. 4# Then run a matching version of autoconf to regen patch-aa.
5DISTNAME= glib-2.14.6 5DISTNAME= glib-2.16.3
6PKGNAME= ${DISTNAME:S/glib/glib2/} 6PKGNAME= ${DISTNAME:S/glib/glib2/}
7CATEGORIES= devel 7CATEGORIES= devel
8MASTER_SITES= ftp://ftp.gtk.org/pub/glib/2.14/ \ 8MASTER_SITES= ftp://ftp.gtk.org/pub/glib/2.16/ \
9 ftp://ftp.cs.umn.edu/pub/gimp/pub/glib/2.14/ \ 9 ftp://ftp.cs.umn.edu/pub/gimp/pub/glib/2.16/ \
10 ${MASTER_SITE_GNOME:=sources/glib/2.14/} 10 ${MASTER_SITE_GNOME:=sources/glib/2.16/}
11EXTRACT_SUFX= .tar.bz2 11EXTRACT_SUFX= .tar.bz2
12 12
13MAINTAINER= pkgsrc-users@NetBSD.org 13MAINTAINER= pkgsrc-users@NetBSD.org
14HOMEPAGE= http://developer.gnome.org/doc/API/2.0/glib/glib.html 14HOMEPAGE= http://developer.gnome.org/doc/API/2.0/glib/glib.html
15COMMENT= Some useful routines for C programming (glib2) 15COMMENT= Some useful routines for C programming (glib2)
16 16
17PKG_INSTALLATION_TYPES= overwrite pkgviews 17PKG_INSTALLATION_TYPES= overwrite pkgviews
18PKG_DESTDIR_SUPPORT= user-destdir 18PKG_DESTDIR_SUPPORT= user-destdir
19 19
20USE_PKGLOCALEDIR= yes 20USE_PKGLOCALEDIR= yes
21USE_TOOLS+= gmake msgfmt perl:run pkg-config 21USE_TOOLS+= gmake msgfmt perl:run pkg-config
22USE_LANGUAGES= c c++ c99 22USE_LANGUAGES= c c++ c99
23USE_LIBTOOL= yes 23USE_LIBTOOL= yes
24TEST_TARGET= check 24TEST_TARGET= check
25 25
26PKGCONFIG_OVERRIDE= glib-2.0-uninstalled.pc.in 26PKGCONFIG_OVERRIDE= glib-2.0-uninstalled.pc.in
27PKGCONFIG_OVERRIDE+= glib-2.0.pc.in 27PKGCONFIG_OVERRIDE+= glib-2.0.pc.in
28PKGCONFIG_OVERRIDE+= gmodule-2.0-uninstalled.pc.in 28PKGCONFIG_OVERRIDE+= gmodule-2.0-uninstalled.pc.in
29PKGCONFIG_OVERRIDE+= gmodule-2.0.pc.in 29PKGCONFIG_OVERRIDE+= gmodule-2.0.pc.in
30PKGCONFIG_OVERRIDE+= gmodule-export-2.0.pc.in 30PKGCONFIG_OVERRIDE+= gmodule-export-2.0.pc.in
31PKGCONFIG_OVERRIDE+= gmodule-no-export-2.0-uninstalled.pc.in 31PKGCONFIG_OVERRIDE+= gmodule-no-export-2.0-uninstalled.pc.in
32PKGCONFIG_OVERRIDE+= gmodule-no-export-2.0.pc.in 32PKGCONFIG_OVERRIDE+= gmodule-no-export-2.0.pc.in
33PKGCONFIG_OVERRIDE+= gobject-2.0-uninstalled.pc.in 33PKGCONFIG_OVERRIDE+= gobject-2.0-uninstalled.pc.in
34PKGCONFIG_OVERRIDE+= gobject-2.0.pc.in 34PKGCONFIG_OVERRIDE+= gobject-2.0.pc.in
35PKGCONFIG_OVERRIDE+= gthread-2.0-uninstalled.pc.in 35PKGCONFIG_OVERRIDE+= gthread-2.0-uninstalled.pc.in
36PKGCONFIG_OVERRIDE+= gthread-2.0.pc.in 36PKGCONFIG_OVERRIDE+= gthread-2.0.pc.in
 37PKGCONFIG_OVERRIDE+= gio-2.0.pc.in
 38PKGCONFIG_OVERRIDE+= gio-unix-2.0.pc.in
37 39
38GNU_CONFIGURE= yes 40GNU_CONFIGURE= yes
39CONFIGURE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR:Q} 41CONFIGURE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR:Q}
40CONFIGURE_ARGS+= --includedir=${PREFIX}/include/glib 42CONFIGURE_ARGS+= --includedir=${PREFIX}/include/glib
41CONFIGURE_ARGS+= ${CONFIGURE_ARGS.${ICONV_TYPE}-iconv} 43CONFIGURE_ARGS+= ${CONFIGURE_ARGS.${ICONV_TYPE}-iconv}
42CONFIGURE_ARGS.gnu-iconv+= --with-libiconv=gnu 44CONFIGURE_ARGS.gnu-iconv+= --with-libiconv=gnu
43CONFIGURE_ARGS+= --with-pcre=system 45CONFIGURE_ARGS+= --with-pcre=system
44# need pcre utf8 + unicode-properties 46# need pcre utf8 + unicode-properties
45BUILDLINK_API_DEPENDS.pcre+= pcre>=7.4nb1 47BUILDLINK_API_DEPENDS.pcre+= pcre>=7.4nb1
46 48
47# Avoid an ICE in gcc2 on sparc64 49# Avoid an ICE in gcc2 on sparc64
48CONFIGURE_ENV+= F77=${FALSE:Q} 50CONFIGURE_ENV+= F77=${FALSE:Q}
49 51
50CONFIGURE_ENV+= PERL_PATH=${PERL5:Q} 52CONFIGURE_ENV+= PERL_PATH=${PERL5:Q}
51 53
52.include "../../mk/bsd.prefs.mk" 54.include "../../mk/bsd.prefs.mk"
53 55
 56.if ${OPSYS} == "NetBSD"
 57# configure detects wrongly
 58CONFIGURE_ENV+= ac_cv_func_statfs=no
 59.endif
 60
54CPPFLAGS+= -DPREFIX="\"${PREFIX}\"" 61CPPFLAGS+= -DPREFIX="\"${PREFIX}\""
55CPPFLAGS+= -DPKGLOCALEDIR="\"${PKGLOCALEDIR}\"" 62CPPFLAGS+= -DPKGLOCALEDIR="\"${PKGLOCALEDIR}\""
56CPPFLAGS+= -DPKG_SYSCONFDIR="\"${PKG_SYSCONFDIR}\"" 63CPPFLAGS+= -DPKG_SYSCONFDIR="\"${PKG_SYSCONFDIR}\""
57 64
58.if ${OPSYS} == "FreeBSD" 65.if ${OPSYS} == "FreeBSD"
59 66
60SUBST_CLASSES+= thr 67SUBST_CLASSES+= thr
61SUBST_STAGE.thr= post-patch 68SUBST_STAGE.thr= post-patch
62SUBST_FILES.thr= gthread/Makefile.in 69SUBST_FILES.thr= gthread/Makefile.in
63. if ${OS_VERSION:R} >= 5 70. if ${OS_VERSION:R} >= 5
64SUBST_SED.thr+= -e "s|@G_THREAD_LIBS_FOR_GTHREAD@|-lpthread|g" 71SUBST_SED.thr+= -e "s|@G_THREAD_LIBS_FOR_GTHREAD@|-lpthread|g"
65. else 72. else
66SUBST_SED.thr+= -e "s|@G_THREAD_LIBS_FOR_GTHREAD@|-Wc,-lc_r|g" 73SUBST_SED.thr+= -e "s|@G_THREAD_LIBS_FOR_GTHREAD@|-Wc,-lc_r|g"
@@ -81,15 +88,16 @@ CONFIGURE_ENV+= ac_cv_func_mmap_fixed_m @@ -81,15 +88,16 @@ CONFIGURE_ENV+= ac_cv_func_mmap_fixed_m
81PRINT_PLIST_AWK+= /^@dirrm include\/glib$$/ \ 88PRINT_PLIST_AWK+= /^@dirrm include\/glib$$/ \
82 { print "@unexec $${RMDIR} %D/" $$2 \ 89 { print "@unexec $${RMDIR} %D/" $$2 \
83 " 2>/dev/null || $${TRUE}"; next; } 90 " 2>/dev/null || $${TRUE}"; next; }
84 91
85.include "../../converters/libiconv/buildlink3.mk" 92.include "../../converters/libiconv/buildlink3.mk"
86.include "../../devel/gettext-lib/buildlink3.mk" 93.include "../../devel/gettext-lib/buildlink3.mk"
87.include "../../mk/dlopen.buildlink3.mk" 94.include "../../mk/dlopen.buildlink3.mk"
88.if !empty(MACHINE_PLATFORM:MIRIX-5*) 95.if !empty(MACHINE_PLATFORM:MIRIX-5*)
89CONFIGURE_ARGS+= --disable-threads 96CONFIGURE_ARGS+= --disable-threads
90.else 97.else
91.include "../../mk/pthread.buildlink3.mk" 98.include "../../mk/pthread.buildlink3.mk"
92.endif 99.endif
93.include "../../devel/pcre/buildlink3.mk" 100.include "../../devel/pcre/buildlink3.mk"
 101.include "../../mk/fam.buildlink3.mk"
94 102
95.include "../../mk/bsd.pkg.mk" 103.include "../../mk/bsd.pkg.mk"
cvs diff -r1.38 -r1.39 pkgsrc/devel/glib2/PLIST (expand / switch to unified diff)

--- pkgsrc/devel/glib2/PLIST 2007/09/18 17:37:02 1.38
+++ pkgsrc/devel/glib2/PLIST 2008/04/10 12:13:49 1.39
@@ -1,28 +1,75 @@ @@ -1,28 +1,75 @@
1@comment $NetBSD: PLIST,v 1.38 2007/09/18 17:37:02 tnn Exp $ 1@comment $NetBSD: PLIST,v 1.39 2008/04/10 12:13:49 drochner Exp $
2bin/glib-genmarshal 2bin/glib-genmarshal
3bin/glib-gettextize 3bin/glib-gettextize
4bin/glib-mkenums 4bin/glib-mkenums
5bin/gobject-query 5bin/gobject-query
 6bin/gtester
 7bin/gtester-report
 8include/glib/gio-unix-2.0/gio/gdesktopappinfo.h
 9include/glib/gio-unix-2.0/gio/gunixinputstream.h
 10include/glib/gio-unix-2.0/gio/gunixmounts.h
 11include/glib/gio-unix-2.0/gio/gunixoutputstream.h
 12include/glib/glib-2.0/gio/gappinfo.h
 13include/glib/glib-2.0/gio/gasyncresult.h
 14include/glib/glib-2.0/gio/gbufferedinputstream.h
 15include/glib/glib-2.0/gio/gbufferedoutputstream.h
 16include/glib/glib-2.0/gio/gcancellable.h
 17include/glib/glib-2.0/gio/gcontenttype.h
 18include/glib/glib-2.0/gio/gdatainputstream.h
 19include/glib/glib-2.0/gio/gdataoutputstream.h
 20include/glib/glib-2.0/gio/gdrive.h
 21include/glib/glib-2.0/gio/gfile.h
 22include/glib/glib-2.0/gio/gfileattribute.h
 23include/glib/glib-2.0/gio/gfileenumerator.h
 24include/glib/glib-2.0/gio/gfileicon.h
 25include/glib/glib-2.0/gio/gfileinfo.h
 26include/glib/glib-2.0/gio/gfileinputstream.h
 27include/glib/glib-2.0/gio/gfilemonitor.h
 28include/glib/glib-2.0/gio/gfilenamecompleter.h
 29include/glib/glib-2.0/gio/gfileoutputstream.h
 30include/glib/glib-2.0/gio/gfilterinputstream.h
 31include/glib/glib-2.0/gio/gfilteroutputstream.h
 32include/glib/glib-2.0/gio/gicon.h
 33include/glib/glib-2.0/gio/ginputstream.h
 34include/glib/glib-2.0/gio/gio.h
 35include/glib/glib-2.0/gio/gioenumtypes.h
 36include/glib/glib-2.0/gio/gioerror.h
 37include/glib/glib-2.0/gio/giomodule.h
 38include/glib/glib-2.0/gio/gioscheduler.h
 39include/glib/glib-2.0/gio/gloadableicon.h
 40include/glib/glib-2.0/gio/gmemoryinputstream.h
 41include/glib/glib-2.0/gio/gmemoryoutputstream.h
 42include/glib/glib-2.0/gio/gmount.h
 43include/glib/glib-2.0/gio/gmountoperation.h
 44include/glib/glib-2.0/gio/gnativevolumemonitor.h
 45include/glib/glib-2.0/gio/goutputstream.h
 46include/glib/glib-2.0/gio/gseekable.h
 47include/glib/glib-2.0/gio/gsimpleasyncresult.h
 48include/glib/glib-2.0/gio/gthemedicon.h
 49include/glib/glib-2.0/gio/gvfs.h
 50include/glib/glib-2.0/gio/gvolume.h
 51include/glib/glib-2.0/gio/gvolumemonitor.h
6include/glib/glib-2.0/glib-object.h 52include/glib/glib-2.0/glib-object.h
7include/glib/glib-2.0/glib.h 53include/glib/glib-2.0/glib.h
8include/glib/glib-2.0/glib/galloca.h 54include/glib/glib-2.0/glib/galloca.h
9include/glib/glib-2.0/glib/garray.h 55include/glib/glib-2.0/glib/garray.h
10include/glib/glib-2.0/glib/gasyncqueue.h 56include/glib/glib-2.0/glib/gasyncqueue.h
11include/glib/glib-2.0/glib/gatomic.h 57include/glib/glib-2.0/glib/gatomic.h
12include/glib/glib-2.0/glib/gbacktrace.h 58include/glib/glib-2.0/glib/gbacktrace.h
13include/glib/glib-2.0/glib/gbase64.h 59include/glib/glib-2.0/glib/gbase64.h
14include/glib/glib-2.0/glib/gbookmarkfile.h 60include/glib/glib-2.0/glib/gbookmarkfile.h
15include/glib/glib-2.0/glib/gcache.h 61include/glib/glib-2.0/glib/gcache.h
 62include/glib/glib-2.0/glib/gchecksum.h
16include/glib/glib-2.0/glib/gcompletion.h 63include/glib/glib-2.0/glib/gcompletion.h
17include/glib/glib-2.0/glib/gconvert.h 64include/glib/glib-2.0/glib/gconvert.h
18include/glib/glib-2.0/glib/gdataset.h 65include/glib/glib-2.0/glib/gdataset.h
19include/glib/glib-2.0/glib/gdate.h 66include/glib/glib-2.0/glib/gdate.h
20include/glib/glib-2.0/glib/gdir.h 67include/glib/glib-2.0/glib/gdir.h
21include/glib/glib-2.0/glib/gerror.h 68include/glib/glib-2.0/glib/gerror.h
22include/glib/glib-2.0/glib/gfileutils.h 69include/glib/glib-2.0/glib/gfileutils.h
23include/glib/glib-2.0/glib/ghash.h 70include/glib/glib-2.0/glib/ghash.h
24include/glib/glib-2.0/glib/ghook.h 71include/glib/glib-2.0/glib/ghook.h
25include/glib/glib-2.0/glib/gi18n-lib.h 72include/glib/glib-2.0/glib/gi18n-lib.h
26include/glib/glib-2.0/glib/gi18n.h 73include/glib/glib-2.0/glib/gi18n.h
27include/glib/glib-2.0/glib/giochannel.h 74include/glib/glib-2.0/glib/giochannel.h
28include/glib/glib-2.0/glib/gkeyfile.h 75include/glib/glib-2.0/glib/gkeyfile.h
@@ -34,94 +81,175 @@ include/glib/glib-2.0/glib/gmarkup.h @@ -34,94 +81,175 @@ include/glib/glib-2.0/glib/gmarkup.h
34include/glib/glib-2.0/glib/gmem.h 81include/glib/glib-2.0/glib/gmem.h
35include/glib/glib-2.0/glib/gmessages.h 82include/glib/glib-2.0/glib/gmessages.h
36include/glib/glib-2.0/glib/gnode.h 83include/glib/glib-2.0/glib/gnode.h
37include/glib/glib-2.0/glib/goption.h 84include/glib/glib-2.0/glib/goption.h
38include/glib/glib-2.0/glib/gpattern.h 85include/glib/glib-2.0/glib/gpattern.h
39include/glib/glib-2.0/glib/gprimes.h 86include/glib/glib-2.0/glib/gprimes.h
40include/glib/glib-2.0/glib/gprintf.h 87include/glib/glib-2.0/glib/gprintf.h
41include/glib/glib-2.0/glib/gqsort.h 88include/glib/glib-2.0/glib/gqsort.h
42include/glib/glib-2.0/glib/gquark.h 89include/glib/glib-2.0/glib/gquark.h
43include/glib/glib-2.0/glib/gqueue.h 90include/glib/glib-2.0/glib/gqueue.h
44include/glib/glib-2.0/glib/grand.h 91include/glib/glib-2.0/glib/grand.h
45include/glib/glib-2.0/glib/gregex.h 92include/glib/glib-2.0/glib/gregex.h
46include/glib/glib-2.0/glib/grel.h 93include/glib/glib-2.0/glib/grel.h
47include/glib/glib-2.0/glib/gsequence.h 
48include/glib/glib-2.0/glib/gscanner.h 94include/glib/glib-2.0/glib/gscanner.h
 95include/glib/glib-2.0/glib/gsequence.h
49include/glib/glib-2.0/glib/gshell.h 96include/glib/glib-2.0/glib/gshell.h
50include/glib/glib-2.0/glib/gslice.h 97include/glib/glib-2.0/glib/gslice.h
51include/glib/glib-2.0/glib/gslist.h 98include/glib/glib-2.0/glib/gslist.h
52include/glib/glib-2.0/glib/gspawn.h 99include/glib/glib-2.0/glib/gspawn.h
53include/glib/glib-2.0/glib/gstdio.h 100include/glib/glib-2.0/glib/gstdio.h
54include/glib/glib-2.0/glib/gstrfuncs.h 101include/glib/glib-2.0/glib/gstrfuncs.h
55include/glib/glib-2.0/glib/gstring.h 102include/glib/glib-2.0/glib/gstring.h
 103include/glib/glib-2.0/glib/gtestutils.h
56include/glib/glib-2.0/glib/gthread.h 104include/glib/glib-2.0/glib/gthread.h
57include/glib/glib-2.0/glib/gthreadpool.h 105include/glib/glib-2.0/glib/gthreadpool.h
58include/glib/glib-2.0/glib/gtimer.h 106include/glib/glib-2.0/glib/gtimer.h
59include/glib/glib-2.0/glib/gtree.h 107include/glib/glib-2.0/glib/gtree.h
60include/glib/glib-2.0/glib/gtypes.h 108include/glib/glib-2.0/glib/gtypes.h
61include/glib/glib-2.0/glib/gunicode.h 109include/glib/glib-2.0/glib/gunicode.h
 110include/glib/glib-2.0/glib/gurifuncs.h
62include/glib/glib-2.0/glib/gutils.h 111include/glib/glib-2.0/glib/gutils.h
63include/glib/glib-2.0/glib/gwin32.h 112include/glib/glib-2.0/glib/gwin32.h
64include/glib/glib-2.0/gmodule.h 113include/glib/glib-2.0/gmodule.h
65include/glib/glib-2.0/gobject/gboxed.h 114include/glib/glib-2.0/gobject/gboxed.h
66include/glib/glib-2.0/gobject/gclosure.h 115include/glib/glib-2.0/gobject/gclosure.h
67include/glib/glib-2.0/gobject/genums.h 116include/glib/glib-2.0/gobject/genums.h
68include/glib/glib-2.0/gobject/gmarshal.h 117include/glib/glib-2.0/gobject/gmarshal.h
69include/glib/glib-2.0/gobject/gobject.h 118include/glib/glib-2.0/gobject/gobject.h
70include/glib/glib-2.0/gobject/gobjectnotifyqueue.c 119include/glib/glib-2.0/gobject/gobjectnotifyqueue.c
71include/glib/glib-2.0/gobject/gparam.h 120include/glib/glib-2.0/gobject/gparam.h
72include/glib/glib-2.0/gobject/gparamspecs.h 121include/glib/glib-2.0/gobject/gparamspecs.h
73include/glib/glib-2.0/gobject/gsignal.h 122include/glib/glib-2.0/gobject/gsignal.h
74include/glib/glib-2.0/gobject/gsourceclosure.h 123include/glib/glib-2.0/gobject/gsourceclosure.h
75include/glib/glib-2.0/gobject/gtype.h 124include/glib/glib-2.0/gobject/gtype.h
76include/glib/glib-2.0/gobject/gtypemodule.h 125include/glib/glib-2.0/gobject/gtypemodule.h
77include/glib/glib-2.0/gobject/gtypeplugin.h 126include/glib/glib-2.0/gobject/gtypeplugin.h
78include/glib/glib-2.0/gobject/gvalue.h 127include/glib/glib-2.0/gobject/gvalue.h
79include/glib/glib-2.0/gobject/gvaluearray.h 128include/glib/glib-2.0/gobject/gvaluearray.h
80include/glib/glib-2.0/gobject/gvaluecollector.h 129include/glib/glib-2.0/gobject/gvaluecollector.h
81include/glib/glib-2.0/gobject/gvaluetypes.h 130include/glib/glib-2.0/gobject/gvaluetypes.h
 131lib/gio/modules/libgiofam.la
82lib/glib-2.0/include/glibconfig.h 132lib/glib-2.0/include/glibconfig.h
 133lib/libgio-2.0.la
83lib/libglib-2.0.la 134lib/libglib-2.0.la
84lib/libgmodule-2.0.la 135lib/libgmodule-2.0.la
85lib/libgobject-2.0.la 136lib/libgobject-2.0.la
86lib/libgthread-2.0.la 137lib/libgthread-2.0.la
 138lib/pkgconfig/gio-2.0.pc
 139lib/pkgconfig/gio-unix-2.0.pc
87lib/pkgconfig/glib-2.0.pc 140lib/pkgconfig/glib-2.0.pc
88lib/pkgconfig/gmodule-2.0.pc 141lib/pkgconfig/gmodule-2.0.pc
89lib/pkgconfig/gmodule-export-2.0.pc 142lib/pkgconfig/gmodule-export-2.0.pc
90lib/pkgconfig/gmodule-no-export-2.0.pc 143lib/pkgconfig/gmodule-no-export-2.0.pc
91lib/pkgconfig/gobject-2.0.pc 144lib/pkgconfig/gobject-2.0.pc
92lib/pkgconfig/gthread-2.0.pc 145lib/pkgconfig/gthread-2.0.pc
93man/man1/glib-genmarshal.1 146man/man1/glib-genmarshal.1
94man/man1/glib-gettextize.1 147man/man1/glib-gettextize.1
95man/man1/glib-mkenums.1 148man/man1/glib-mkenums.1
96man/man1/gobject-query.1 149man/man1/gobject-query.1
97share/aclocal/glib-2.0.m4 150share/aclocal/glib-2.0.m4
98share/aclocal/glib-gettext.m4 151share/aclocal/glib-gettext.m4
99share/glib-2.0/gettext/mkinstalldirs 152share/glib-2.0/gettext/mkinstalldirs
100share/glib-2.0/gettext/po/Makefile.in.in 153share/glib-2.0/gettext/po/Makefile.in.in
 154share/gtk-doc/html/gio/GAppInfo.html
 155share/gtk-doc/html/gio/GAsyncResult.html
 156share/gtk-doc/html/gio/GBufferedInputStream.html
 157share/gtk-doc/html/gio/GBufferedOutputStream.html
 158share/gtk-doc/html/gio/GCancellable.html
 159share/gtk-doc/html/gio/GDataInputStream.html
 160share/gtk-doc/html/gio/GDataOutputStream.html
 161share/gtk-doc/html/gio/GDrive.html
 162share/gtk-doc/html/gio/GFile.html
 163share/gtk-doc/html/gio/GFileEnumerator.html
 164share/gtk-doc/html/gio/GFileIcon.html
 165share/gtk-doc/html/gio/GFileInfo.html
 166share/gtk-doc/html/gio/GFileInputStream.html
 167share/gtk-doc/html/gio/GFileMonitor.html
 168share/gtk-doc/html/gio/GFileOutputStream.html
 169share/gtk-doc/html/gio/GFilenameCompleter.html
 170share/gtk-doc/html/gio/GFilterInputStream.html
 171share/gtk-doc/html/gio/GFilterOutputStream.html
 172share/gtk-doc/html/gio/GIOModule.html
 173share/gtk-doc/html/gio/GIcon.html
 174share/gtk-doc/html/gio/GInputStream.html
 175share/gtk-doc/html/gio/GLoadableIcon.html
 176share/gtk-doc/html/gio/GMemoryInputStream.html
 177share/gtk-doc/html/gio/GMemoryOutputStream.html
 178share/gtk-doc/html/gio/GMount.html
 179share/gtk-doc/html/gio/GMountOperation.html
 180share/gtk-doc/html/gio/GOutputStream.html
 181share/gtk-doc/html/gio/GSeekable.html
 182share/gtk-doc/html/gio/GSimpleAsyncResult.html
 183share/gtk-doc/html/gio/GThemedIcon.html
 184share/gtk-doc/html/gio/GUnixInputStream.html
 185share/gtk-doc/html/gio/GUnixOutputStream.html
 186share/gtk-doc/html/gio/GVfs.html
 187share/gtk-doc/html/gio/GVolume.html
 188share/gtk-doc/html/gio/GVolumeMonitor.html
 189share/gtk-doc/html/gio/async.html
 190share/gtk-doc/html/gio/ch01.html
 191share/gtk-doc/html/gio/ch02.html
 192share/gtk-doc/html/gio/ch03.html
 193share/gtk-doc/html/gio/ch14.html
 194share/gtk-doc/html/gio/ch15.html
 195share/gtk-doc/html/gio/ch15s02.html
 196share/gtk-doc/html/gio/ch15s03.html
 197share/gtk-doc/html/gio/extending.html
 198share/gtk-doc/html/gio/file_mon.html
 199share/gtk-doc/html/gio/file_ops.html
 200share/gtk-doc/html/gio/gio-Desktop-file-based-GAppInfo.html
 201share/gtk-doc/html/gio/gio-Extension-Points.html
 202share/gtk-doc/html/gio/gio-GContentType.html
 203share/gtk-doc/html/gio/gio-GFileAttribute.html
 204share/gtk-doc/html/gio/gio-GIOError.html
 205share/gtk-doc/html/gio/gio-GIOScheduler.html
 206share/gtk-doc/html/gio/gio-Unix-Mounts.html
 207share/gtk-doc/html/gio/gio-extension-points.html
 208share/gtk-doc/html/gio/gio-hierarchy.html
 209share/gtk-doc/html/gio/gio.devhelp
 210share/gtk-doc/html/gio/gio.devhelp2
 211share/gtk-doc/html/gio/gvfs-overview.png
 212share/gtk-doc/html/gio/home.png
 213share/gtk-doc/html/gio/icons.html
 214share/gtk-doc/html/gio/index.html
 215share/gtk-doc/html/gio/index.sgml
 216share/gtk-doc/html/gio/ix01.html
 217share/gtk-doc/html/gio/left.png
 218share/gtk-doc/html/gio/migrating.html
 219share/gtk-doc/html/gio/pt01.html
 220share/gtk-doc/html/gio/pt02.html
 221share/gtk-doc/html/gio/right.png
 222share/gtk-doc/html/gio/streaming.html
 223share/gtk-doc/html/gio/style.css
 224share/gtk-doc/html/gio/types.html
 225share/gtk-doc/html/gio/up.png
 226share/gtk-doc/html/gio/utils.html
 227share/gtk-doc/html/gio/volume_mon.html
101share/gtk-doc/html/glib/file-name-encodings.png 228share/gtk-doc/html/glib/file-name-encodings.png
102share/gtk-doc/html/glib/glib-Arrays.html 229share/gtk-doc/html/glib/glib-Arrays.html
103share/gtk-doc/html/glib/glib-Asynchronous-Queues.html 230share/gtk-doc/html/glib/glib-Asynchronous-Queues.html
104share/gtk-doc/html/glib/glib-Atomic-Operations.html 231share/gtk-doc/html/glib/glib-Atomic-Operations.html
105share/gtk-doc/html/glib/glib-Automatic-String-Completion.html 232share/gtk-doc/html/glib/glib-Automatic-String-Completion.html
106share/gtk-doc/html/glib/glib-Balanced-Binary-Trees.html 233share/gtk-doc/html/glib/glib-Balanced-Binary-Trees.html
107share/gtk-doc/html/glib/glib-Base64-Encoding.html 234share/gtk-doc/html/glib/glib-Base64-Encoding.html
108share/gtk-doc/html/glib/glib-Basic-Types.html 235share/gtk-doc/html/glib/glib-Basic-Types.html
109share/gtk-doc/html/glib/glib-Bookmark-file-parser.html 236share/gtk-doc/html/glib/glib-Bookmark-file-parser.html
110share/gtk-doc/html/glib/glib-Byte-Arrays.html 237share/gtk-doc/html/glib/glib-Byte-Arrays.html
111share/gtk-doc/html/glib/glib-Byte-Order-Macros.html 238share/gtk-doc/html/glib/glib-Byte-Order-Macros.html
112share/gtk-doc/html/glib/glib-Caches.html 239share/gtk-doc/html/glib/glib-Caches.html
113share/gtk-doc/html/glib/glib-Character-Set-Conversion.html 240share/gtk-doc/html/glib/glib-Character-Set-Conversion.html
114share/gtk-doc/html/glib/glib-Commandline-option-parser.html 241share/gtk-doc/html/glib/glib-Commandline-option-parser.html
 242share/gtk-doc/html/glib/glib-Data-Checksums.html
115share/gtk-doc/html/glib/glib-Datasets.html 243share/gtk-doc/html/glib/glib-Datasets.html
116share/gtk-doc/html/glib/glib-Date-and-Time-Functions.html 244share/gtk-doc/html/glib/glib-Date-and-Time-Functions.html
117share/gtk-doc/html/glib/glib-Double-ended-Queues.html 245share/gtk-doc/html/glib/glib-Double-ended-Queues.html
118share/gtk-doc/html/glib/glib-Doubly-Linked-Lists.html 246share/gtk-doc/html/glib/glib-Doubly-Linked-Lists.html
119share/gtk-doc/html/glib/glib-Dynamic-Loading-of-Modules.html 247share/gtk-doc/html/glib/glib-Dynamic-Loading-of-Modules.html
120share/gtk-doc/html/glib/glib-Error-Reporting.html 248share/gtk-doc/html/glib/glib-Error-Reporting.html
121share/gtk-doc/html/glib/glib-File-Utilities.html 249share/gtk-doc/html/glib/glib-File-Utilities.html
122share/gtk-doc/html/glib/glib-Glob-style-pattern-matching.html 250share/gtk-doc/html/glib/glib-Glob-style-pattern-matching.html
123share/gtk-doc/html/glib/glib-Hash-Tables.html 251share/gtk-doc/html/glib/glib-Hash-Tables.html
124share/gtk-doc/html/glib/glib-Hook-Functions.html 252share/gtk-doc/html/glib/glib-Hook-Functions.html
125share/gtk-doc/html/glib/glib-I18N.html 253share/gtk-doc/html/glib/glib-I18N.html
126share/gtk-doc/html/glib/glib-IO-Channels.html 254share/gtk-doc/html/glib/glib-IO-Channels.html
127share/gtk-doc/html/glib/glib-Key-value-file-parser.html 255share/gtk-doc/html/glib/glib-Key-value-file-parser.html
@@ -141,78 +269,81 @@ share/gtk-doc/html/glib/glib-Perl-compat @@ -141,78 +269,81 @@ share/gtk-doc/html/glib/glib-Perl-compat
141share/gtk-doc/html/glib/glib-Pointer-Arrays.html 269share/gtk-doc/html/glib/glib-Pointer-Arrays.html
142share/gtk-doc/html/glib/glib-Quarks.html 270share/gtk-doc/html/glib/glib-Quarks.html
143share/gtk-doc/html/glib/glib-Random-Numbers.html 271share/gtk-doc/html/glib/glib-Random-Numbers.html
144share/gtk-doc/html/glib/glib-Relations-and-Tuples.html 272share/gtk-doc/html/glib/glib-Relations-and-Tuples.html
145share/gtk-doc/html/glib/glib-Sequences.html 273share/gtk-doc/html/glib/glib-Sequences.html
146share/gtk-doc/html/glib/glib-Shell-related-Utilities.html 274share/gtk-doc/html/glib/glib-Shell-related-Utilities.html
147share/gtk-doc/html/glib/glib-Simple-XML-Subset-Parser.html 275share/gtk-doc/html/glib/glib-Simple-XML-Subset-Parser.html
148share/gtk-doc/html/glib/glib-Singly-Linked-Lists.html 276share/gtk-doc/html/glib/glib-Singly-Linked-Lists.html
149share/gtk-doc/html/glib/glib-Spawning-Processes.html 277share/gtk-doc/html/glib/glib-Spawning-Processes.html
150share/gtk-doc/html/glib/glib-Standard-Macros.html 278share/gtk-doc/html/glib/glib-Standard-Macros.html
151share/gtk-doc/html/glib/glib-String-Chunks.html 279share/gtk-doc/html/glib/glib-String-Chunks.html
152share/gtk-doc/html/glib/glib-String-Utility-Functions.html 280share/gtk-doc/html/glib/glib-String-Utility-Functions.html
153share/gtk-doc/html/glib/glib-Strings.html 281share/gtk-doc/html/glib/glib-Strings.html
 282share/gtk-doc/html/glib/glib-Testing.html
154share/gtk-doc/html/glib/glib-The-Main-Event-Loop.html 283share/gtk-doc/html/glib/glib-The-Main-Event-Loop.html
155share/gtk-doc/html/glib/glib-Thread-Pools.html 284share/gtk-doc/html/glib/glib-Thread-Pools.html
156share/gtk-doc/html/glib/glib-Threads.html 285share/gtk-doc/html/glib/glib-Threads.html
157share/gtk-doc/html/glib/glib-Timers.html 286share/gtk-doc/html/glib/glib-Timers.html
158share/gtk-doc/html/glib/glib-Trash-Stacks.html 287share/gtk-doc/html/glib/glib-Trash-Stacks.html
159share/gtk-doc/html/glib/glib-Type-Conversion-Macros.html 288share/gtk-doc/html/glib/glib-Type-Conversion-Macros.html
 289share/gtk-doc/html/glib/glib-URI-Functions.html
160share/gtk-doc/html/glib/glib-Unicode-Manipulation.html 290share/gtk-doc/html/glib/glib-Unicode-Manipulation.html
161share/gtk-doc/html/glib/glib-Version-Information.html 291share/gtk-doc/html/glib/glib-Version-Information.html
162share/gtk-doc/html/glib/glib-Warnings-and-Assertions.html 292share/gtk-doc/html/glib/glib-Warnings-and-Assertions.html
163share/gtk-doc/html/glib/glib-Windows-Compatibility-Functions.html 293share/gtk-doc/html/glib/glib-Windows-Compatibility-Functions.html
164share/gtk-doc/html/glib/glib-building.html 294share/gtk-doc/html/glib/glib-building.html
165share/gtk-doc/html/glib/glib-changes.html 295share/gtk-doc/html/glib/glib-changes.html
166share/gtk-doc/html/glib/glib-compiling.html 296share/gtk-doc/html/glib/glib-compiling.html
167share/gtk-doc/html/glib/glib-core.html 297share/gtk-doc/html/glib/glib-core.html
168share/gtk-doc/html/glib/glib-cross-compiling.html 298share/gtk-doc/html/glib/glib-cross-compiling.html
169share/gtk-doc/html/glib/glib-data-types.html 299share/gtk-doc/html/glib/glib-data-types.html
170share/gtk-doc/html/glib/glib-fundamentals.html 300share/gtk-doc/html/glib/glib-fundamentals.html
171share/gtk-doc/html/glib/glib-gettextize.html 301share/gtk-doc/html/glib/glib-gettextize.html
172share/gtk-doc/html/glib/glib-resources.html 
173share/gtk-doc/html/glib/glib-regex-syntax.html 302share/gtk-doc/html/glib/glib-regex-syntax.html
 303share/gtk-doc/html/glib/glib-resources.html
174share/gtk-doc/html/glib/glib-running.html 304share/gtk-doc/html/glib/glib-running.html
175share/gtk-doc/html/glib/glib-utilities.html 305share/gtk-doc/html/glib/glib-utilities.html
176share/gtk-doc/html/glib/glib.devhelp 306share/gtk-doc/html/glib/glib.devhelp
177share/gtk-doc/html/glib/glib.devhelp2 307share/gtk-doc/html/glib/glib.devhelp2
178share/gtk-doc/html/glib/glib.html 308share/gtk-doc/html/glib/glib.html
179share/gtk-doc/html/glib/home.png 309share/gtk-doc/html/glib/home.png
180share/gtk-doc/html/glib/index.html 310share/gtk-doc/html/glib/index.html
181share/gtk-doc/html/glib/index.sgml 311share/gtk-doc/html/glib/index.sgml
182share/gtk-doc/html/glib/ix01.html 312share/gtk-doc/html/glib/ix01.html
183share/gtk-doc/html/glib/ix02.html 313share/gtk-doc/html/glib/ix02.html
184share/gtk-doc/html/glib/ix03.html 314share/gtk-doc/html/glib/ix03.html
185share/gtk-doc/html/glib/ix04.html 315share/gtk-doc/html/glib/ix04.html
186share/gtk-doc/html/glib/ix05.html 316share/gtk-doc/html/glib/ix05.html
187share/gtk-doc/html/glib/ix06.html 317share/gtk-doc/html/glib/ix06.html
188share/gtk-doc/html/glib/ix07.html 318share/gtk-doc/html/glib/ix07.html
189share/gtk-doc/html/glib/ix08.html 319share/gtk-doc/html/glib/ix08.html
190share/gtk-doc/html/glib/ix09.html 320share/gtk-doc/html/glib/ix09.html
 321share/gtk-doc/html/glib/ix10.html
191share/gtk-doc/html/glib/left.png 322share/gtk-doc/html/glib/left.png
192share/gtk-doc/html/glib/mainloop-states.gif 323share/gtk-doc/html/glib/mainloop-states.gif
193share/gtk-doc/html/glib/right.png 324share/gtk-doc/html/glib/right.png
194share/gtk-doc/html/glib/style.css 325share/gtk-doc/html/glib/style.css
195share/gtk-doc/html/glib/tools.html 326share/gtk-doc/html/glib/tools.html
196share/gtk-doc/html/glib/up.png 327share/gtk-doc/html/glib/up.png
197share/gtk-doc/html/gobject/GTypeModule.html 328share/gtk-doc/html/gobject/GTypeModule.html
198share/gtk-doc/html/gobject/GTypePlugin.html 329share/gtk-doc/html/gobject/GTypePlugin.html
199share/gtk-doc/html/gobject/ch01s02.html 330share/gtk-doc/html/gobject/ch01s02.html
200share/gtk-doc/html/gobject/ch06s03.html 331share/gtk-doc/html/gobject/ch06s03.html
201share/gtk-doc/html/gobject/ch07s02.html 332share/gtk-doc/html/gobject/ch07s02.html
202share/gtk-doc/html/gobject/ch07s03.html 333share/gtk-doc/html/gobject/ch07s03.html
203share/gtk-doc/html/gobject/chapter-intro.html 
204share/gtk-doc/html/gobject/chapter-gobject.html 334share/gtk-doc/html/gobject/chapter-gobject.html
205share/gtk-doc/html/gobject/chapter-gtype.html 335share/gtk-doc/html/gobject/chapter-gtype.html
 336share/gtk-doc/html/gobject/chapter-intro.html
206share/gtk-doc/html/gobject/chapter-signal.html 337share/gtk-doc/html/gobject/chapter-signal.html
207share/gtk-doc/html/gobject/glib-genmarshal.html 338share/gtk-doc/html/gobject/glib-genmarshal.html
208share/gtk-doc/html/gobject/glib-mkenums.html 339share/gtk-doc/html/gobject/glib-mkenums.html
209share/gtk-doc/html/gobject/glue.png 340share/gtk-doc/html/gobject/glue.png
210share/gtk-doc/html/gobject/gobject-Boxed-Types.html 341share/gtk-doc/html/gobject/gobject-Boxed-Types.html
211share/gtk-doc/html/gobject/gobject-Closures.html 342share/gtk-doc/html/gobject/gobject-Closures.html
212share/gtk-doc/html/gobject/gobject-Enumeration-and-Flag-Types.html 343share/gtk-doc/html/gobject/gobject-Enumeration-and-Flag-Types.html
213share/gtk-doc/html/gobject/gobject-GParamSpec.html 344share/gtk-doc/html/gobject/gobject-GParamSpec.html
214share/gtk-doc/html/gobject/gobject-Generic-values.html 345share/gtk-doc/html/gobject/gobject-Generic-values.html
215share/gtk-doc/html/gobject/gobject-Signals.html 346share/gtk-doc/html/gobject/gobject-Signals.html
216share/gtk-doc/html/gobject/gobject-Standard-Parameter-and-Value-Types.html 347share/gtk-doc/html/gobject/gobject-Standard-Parameter-and-Value-Types.html
217share/gtk-doc/html/gobject/gobject-The-Base-Object-Type.html 348share/gtk-doc/html/gobject/gobject-The-Base-Object-Type.html
218share/gtk-doc/html/gobject/gobject-Type-Information.html 349share/gtk-doc/html/gobject/gobject-Type-Information.html
@@ -302,59 +433,66 @@ share/locale/id/LC_MESSAGES/glib20.mo @@ -302,59 +433,66 @@ share/locale/id/LC_MESSAGES/glib20.mo
302share/locale/is/LC_MESSAGES/glib20.mo 433share/locale/is/LC_MESSAGES/glib20.mo
303share/locale/it/LC_MESSAGES/glib20.mo 434share/locale/it/LC_MESSAGES/glib20.mo
304share/locale/ja/LC_MESSAGES/glib20.mo 435share/locale/ja/LC_MESSAGES/glib20.mo
305share/locale/ka/LC_MESSAGES/glib20.mo 436share/locale/ka/LC_MESSAGES/glib20.mo
306share/locale/kn/LC_MESSAGES/glib20.mo 437share/locale/kn/LC_MESSAGES/glib20.mo
307share/locale/ko/LC_MESSAGES/glib20.mo 438share/locale/ko/LC_MESSAGES/glib20.mo
308share/locale/ku/LC_MESSAGES/glib20.mo 439share/locale/ku/LC_MESSAGES/glib20.mo
309share/locale/lt/LC_MESSAGES/glib20.mo 440share/locale/lt/LC_MESSAGES/glib20.mo
310share/locale/lv/LC_MESSAGES/glib20.mo 441share/locale/lv/LC_MESSAGES/glib20.mo
311share/locale/mg/LC_MESSAGES/glib20.mo 442share/locale/mg/LC_MESSAGES/glib20.mo
312share/locale/mk/LC_MESSAGES/glib20.mo 443share/locale/mk/LC_MESSAGES/glib20.mo
313share/locale/ml/LC_MESSAGES/glib20.mo 444share/locale/ml/LC_MESSAGES/glib20.mo
314share/locale/mn/LC_MESSAGES/glib20.mo 445share/locale/mn/LC_MESSAGES/glib20.mo
 446share/locale/mr/LC_MESSAGES/glib20.mo
315share/locale/ms/LC_MESSAGES/glib20.mo 447share/locale/ms/LC_MESSAGES/glib20.mo
316share/locale/nb/LC_MESSAGES/glib20.mo 448share/locale/nb/LC_MESSAGES/glib20.mo
317share/locale/ne/LC_MESSAGES/glib20.mo 449share/locale/ne/LC_MESSAGES/glib20.mo
318share/locale/nl/LC_MESSAGES/glib20.mo 450share/locale/nl/LC_MESSAGES/glib20.mo
319share/locale/nn/LC_MESSAGES/glib20.mo 451share/locale/nn/LC_MESSAGES/glib20.mo
320share/locale/oc/LC_MESSAGES/glib20.mo 452share/locale/oc/LC_MESSAGES/glib20.mo
321share/locale/or/LC_MESSAGES/glib20.mo 453share/locale/or/LC_MESSAGES/glib20.mo
322share/locale/pa/LC_MESSAGES/glib20.mo 454share/locale/pa/LC_MESSAGES/glib20.mo
323share/locale/pl/LC_MESSAGES/glib20.mo 455share/locale/pl/LC_MESSAGES/glib20.mo
324share/locale/pt/LC_MESSAGES/glib20.mo 456share/locale/pt/LC_MESSAGES/glib20.mo
325share/locale/pt_BR/LC_MESSAGES/glib20.mo 457share/locale/pt_BR/LC_MESSAGES/glib20.mo
326share/locale/ro/LC_MESSAGES/glib20.mo 458share/locale/ro/LC_MESSAGES/glib20.mo
327share/locale/ru/LC_MESSAGES/glib20.mo 459share/locale/ru/LC_MESSAGES/glib20.mo
328share/locale/rw/LC_MESSAGES/glib20.mo 460share/locale/rw/LC_MESSAGES/glib20.mo
 461share/locale/si/LC_MESSAGES/glib20.mo
329share/locale/sk/LC_MESSAGES/glib20.mo 462share/locale/sk/LC_MESSAGES/glib20.mo
330share/locale/sl/LC_MESSAGES/glib20.mo 463share/locale/sl/LC_MESSAGES/glib20.mo
331share/locale/sq/LC_MESSAGES/glib20.mo 464share/locale/sq/LC_MESSAGES/glib20.mo
332share/locale/sr/LC_MESSAGES/glib20.mo 465share/locale/sr/LC_MESSAGES/glib20.mo
333share/locale/sr@Latn/LC_MESSAGES/glib20.mo 466share/locale/sr@Latn/LC_MESSAGES/glib20.mo
334share/locale/sr@ije/LC_MESSAGES/glib20.mo 467share/locale/sr@ije/LC_MESSAGES/glib20.mo
335share/locale/sv/LC_MESSAGES/glib20.mo 468share/locale/sv/LC_MESSAGES/glib20.mo
336share/locale/ta/LC_MESSAGES/glib20.mo 469share/locale/ta/LC_MESSAGES/glib20.mo
337share/locale/te/LC_MESSAGES/glib20.mo 470share/locale/te/LC_MESSAGES/glib20.mo
338share/locale/th/LC_MESSAGES/glib20.mo 471share/locale/th/LC_MESSAGES/glib20.mo
339share/locale/tl/LC_MESSAGES/glib20.mo 472share/locale/tl/LC_MESSAGES/glib20.mo
340share/locale/tr/LC_MESSAGES/glib20.mo 473share/locale/tr/LC_MESSAGES/glib20.mo
341share/locale/tt/LC_MESSAGES/glib20.mo 474share/locale/tt/LC_MESSAGES/glib20.mo
342share/locale/uk/LC_MESSAGES/glib20.mo 475share/locale/uk/LC_MESSAGES/glib20.mo
343share/locale/vi/LC_MESSAGES/glib20.mo 476share/locale/vi/LC_MESSAGES/glib20.mo
344share/locale/wa/LC_MESSAGES/glib20.mo 477share/locale/wa/LC_MESSAGES/glib20.mo
345share/locale/xh/LC_MESSAGES/glib20.mo 478share/locale/xh/LC_MESSAGES/glib20.mo
346share/locale/yi/LC_MESSAGES/glib20.mo 479share/locale/yi/LC_MESSAGES/glib20.mo
347share/locale/zh_CN/LC_MESSAGES/glib20.mo 480share/locale/zh_CN/LC_MESSAGES/glib20.mo
348share/locale/zh_HK/LC_MESSAGES/glib20.mo 481share/locale/zh_HK/LC_MESSAGES/glib20.mo
349share/locale/zh_TW/LC_MESSAGES/glib20.mo 482share/locale/zh_TW/LC_MESSAGES/glib20.mo
350@dirrm share/gtk-doc/html/gobject 483@dirrm share/gtk-doc/html/gobject
351@dirrm share/gtk-doc/html/glib 484@dirrm share/gtk-doc/html/glib
 485@dirrm share/gtk-doc/html/gio
352@dirrm share/glib-2.0/gettext/po 486@dirrm share/glib-2.0/gettext/po
353@dirrm share/glib-2.0/gettext 487@dirrm share/glib-2.0/gettext
354@dirrm share/glib-2.0 488@dirrm share/glib-2.0
355@dirrm lib/glib-2.0/include 489@dirrm lib/glib-2.0/include
356@dirrm lib/glib-2.0 490@dirrm lib/glib-2.0
 491@dirrm lib/gio/modules
357@dirrm include/glib/glib-2.0/gobject 492@dirrm include/glib/glib-2.0/gobject
358@dirrm include/glib/glib-2.0/glib 493@dirrm include/glib/glib-2.0/glib
 494@dirrm include/glib/glib-2.0/gio
359@dirrm include/glib/glib-2.0 495@dirrm include/glib/glib-2.0
 496@dirrm include/glib/gio-unix-2.0/gio
 497@dirrm include/glib/gio-unix-2.0
360@unexec ${RMDIR} %D/include/glib 2>/dev/null || ${TRUE} 498@unexec ${RMDIR} %D/include/glib 2>/dev/null || ${TRUE}
cvs diff -r1.93 -r1.94 pkgsrc/devel/glib2/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/glib2/distinfo 2008/02/13 19:30:00 1.93
+++ pkgsrc/devel/glib2/distinfo 2008/04/10 12:13:49 1.94
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1$NetBSD: distinfo,v 1.93 2008/02/13 19:30:00 drochner Exp $ 1$NetBSD: distinfo,v 1.94 2008/04/10 12:13:49 drochner Exp $
2 2
3SHA1 (glib-2.14.6.tar.bz2) = f2e2a5323357516ccb813d9e7f3921ef1e490079 3SHA1 (glib-2.16.3.tar.bz2) = f73fd53130a46f21ff4ee9faa69b9956787c571e
4RMD160 (glib-2.14.6.tar.bz2) = a5ba2792f16c1e0dafc3190e71e3f529cd687c2f 4RMD160 (glib-2.16.3.tar.bz2) = 72260f5f9022ee3f97b79b5705ad6117adc279fd
5Size (glib-2.14.6.tar.bz2) = 3406651 bytes 5Size (glib-2.16.3.tar.bz2) = 4540919 bytes
6SHA1 (patch-aa) = 00c909d37493fb27ce5faf26621266e9e21dcd61 6SHA1 (patch-aa) = 8b7c478e2e88e2b8ea380878d5219569d9c9a068
7SHA1 (patch-ab) = e84c4928b5288b83f2203b4ffd28cdb9de730e98 7SHA1 (patch-ab) = e84c4928b5288b83f2203b4ffd28cdb9de730e98
8SHA1 (patch-ac) = 43a30df9822e90e0f84df4458cc20de286509961 8SHA1 (patch-ac) = 43a30df9822e90e0f84df4458cc20de286509961
9SHA1 (patch-ad) = c926d96bdc9ddf4f434fc57af0adbe11002cffc3 9SHA1 (patch-ad) = c926d96bdc9ddf4f434fc57af0adbe11002cffc3
10SHA1 (patch-ae) = 09f16e8e14bdea3ee0e478d335f65cb66939e5f5 10SHA1 (patch-ae) = 09f16e8e14bdea3ee0e478d335f65cb66939e5f5
11SHA1 (patch-af) = a60aefb2e9e381984e001cd28fb714ff58edd6ee 11SHA1 (patch-af) = 8fb1aef7f51789398ebf8fb3617923fd876ec20b
12SHA1 (patch-ag) = c1a10b07f22c20199e35989eac950819284eb4af 12SHA1 (patch-ag) = 503661e5ac1cd9cba50615146421cebd753dc932
13SHA1 (patch-ah) = 76c7337b707de496591dd881ce4cd32f3222f53b 13SHA1 (patch-ah) = 76c7337b707de496591dd881ce4cd32f3222f53b
14SHA1 (patch-ai) = e615c6b37cc9d6247940023aefb7bf75bcddc7a5 14SHA1 (patch-ai) = e615c6b37cc9d6247940023aefb7bf75bcddc7a5
15SHA1 (patch-aj) = a8c4e79113828e6dadf0b158777bb860aa44de3e 15SHA1 (patch-aj) = a8c4e79113828e6dadf0b158777bb860aa44de3e
16SHA1 (patch-ak) = 4eee3ce549ba0972ab5d5d8166d37d2b61320e68 16SHA1 (patch-ak) = 4eee3ce549ba0972ab5d5d8166d37d2b61320e68
17SHA1 (patch-al) = aa2dbd63d53298aab3a30ec6d27e836717c960e3 17SHA1 (patch-al) = aa2dbd63d53298aab3a30ec6d27e836717c960e3
 18SHA1 (patch-ba) = 43dda2f4d89a82e645ef8f24d62f13ca9e4ddd9d
cvs diff -r1.40 -r1.41 pkgsrc/devel/glib2/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/devel/glib2/patches/Attic/patch-aa 2008/02/13 19:30:00 1.40
+++ pkgsrc/devel/glib2/patches/Attic/patch-aa 2008/04/10 12:13:49 1.41
@@ -1,34 +1,34 @@ @@ -1,34 +1,34 @@
1$NetBSD: patch-aa,v 1.40 2008/02/13 19:30:00 drochner Exp $ 1$NetBSD: patch-aa,v 1.41 2008/04/10 12:13:49 drochner Exp $
2 2
3--- configure.orig 2008-02-07 06:41:30.000000000 +0100 3--- configure.orig 2008-04-08 05:51:40.000000000 +0200
4+++ configure 4+++ configure
5@@ -945,6 +945,7 @@ G_MODULE_PLUGIN_LIBS 5@@ -959,6 +959,7 @@ G_MODULE_PLUGIN_LIBS
6 G_MODULE_LDFLAGS 6 G_MODULE_LDFLAGS
7 G_MODULE_HAVE_DLERROR 7 G_MODULE_HAVE_DLERROR
8 G_MODULE_BROKEN_RTLD_GLOBAL 8 G_MODULE_BROKEN_RTLD_GLOBAL
9+G_MODULE_BROKEN_DLOPEN_NULL 9+G_MODULE_BROKEN_DLOPEN_NULL
10 G_MODULE_NEED_USCORE 10 G_MODULE_NEED_USCORE
11 GLIB_DEBUG_FLAGS 11 GLIB_DEBUG_FLAGS
12 GSPAWN 12 GSPAWN
13@@ -33910,6 +33911,7 @@ else 13@@ -36598,6 +36599,7 @@ else
14 fi 14 fi
15 G_MODULE_NEED_USCORE=0 15 G_MODULE_NEED_USCORE=0
16 G_MODULE_BROKEN_RTLD_GLOBAL=0 16 G_MODULE_BROKEN_RTLD_GLOBAL=0
17+G_MODULE_BROKEN_DLOPEN_NULL=0 17+G_MODULE_BROKEN_DLOPEN_NULL=0
18 G_MODULE_HAVE_DLERROR=0 18 G_MODULE_HAVE_DLERROR=0
19 if test -z "$G_MODULE_IMPL"; then 19 if test -z "$G_MODULE_IMPL"; then
20 case "$host" in 20 case "$host" in
21@@ -34705,6 +34707,84 @@ fi 21@@ -37393,6 +37395,84 @@ fi
22  22
23 LIBS="$LIBS_orig" 23 LIBS="$LIBS_orig"
24 fi 24 fi
25+ { echo "$as_me:$LINENO: checking for dlopen(NULL, 0) brokenness" >&5 25+ { echo "$as_me:$LINENO: checking for dlopen(NULL, 0) brokenness" >&5
26+echo $ECHO_N "checking for dlopen(NULL, 0) brokenness... $ECHO_C" >&6; } 26+echo $ECHO_N "checking for dlopen(NULL, 0) brokenness... $ECHO_C" >&6; }
27+if test "${glib_cv_dlopennull_broken+set}" = set; then 27+if test "${glib_cv_dlopennull_broken+set}" = set; then
28+ echo $ECHO_N "(cached) $ECHO_C" >&6 28+ echo $ECHO_N "(cached) $ECHO_C" >&6
29+else 29+else
30+ 30+
31+ if test "$cross_compiling" = yes; then 31+ if test "$cross_compiling" = yes; then
32+ glib_cv_dlopennull_broken=no 32+ glib_cv_dlopennull_broken=no
33+else 33+else
34+ cat >conftest.$ac_ext <<_ACEOF 34+ cat >conftest.$ac_ext <<_ACEOF
@@ -93,36 +93,36 @@ $NetBSD: patch-aa,v 1.40 2008/02/13 19:3 @@ -93,36 +93,36 @@ $NetBSD: patch-aa,v 1.40 2008/02/13 19:3
93+ 93+
94+ 94+
95+fi 95+fi
96+{ echo "$as_me:$LINENO: result: $glib_cv_dlopennull_broken" >&5 96+{ echo "$as_me:$LINENO: result: $glib_cv_dlopennull_broken" >&5
97+echo "${ECHO_T}$glib_cv_dlopennull_broken" >&6; } 97+echo "${ECHO_T}$glib_cv_dlopennull_broken" >&6; }
98+ if test "x$glib_cv_dlopennull_broken" = "xyes"; then 98+ if test "x$glib_cv_dlopennull_broken" = "xyes"; then
99+ G_MODULE_BROKEN_DLOPEN_NULL=1 99+ G_MODULE_BROKEN_DLOPEN_NULL=1
100+ else 100+ else
101+ G_MODULE_BROKEN_DLOPEN_NULL=0 101+ G_MODULE_BROKEN_DLOPEN_NULL=0
102+ fi 102+ fi
103 if test -z "$G_MODULE_IMPL"; then 103 if test -z "$G_MODULE_IMPL"; then
104 G_MODULE_IMPL=0 104 G_MODULE_IMPL=0
105 G_MODULE_SUPPORTED=false 105 G_MODULE_SUPPORTED=false
106@@ -34741,6 +34821,8 @@ fi 106@@ -37429,6 +37509,8 @@ fi
107  107
108  108
109  109
110+ 110+
111+ 111+
112 { echo "$as_me:$LINENO: checking for gspawn implementation" >&5 112 { echo "$as_me:$LINENO: checking for gspawn implementation" >&5
113 echo $ECHO_N "checking for gspawn implementation... $ECHO_C" >&6; } 113 echo $ECHO_N "checking for gspawn implementation... $ECHO_C" >&6; }
114 case "$host" in 114 case "$host" in
115@@ -35088,110 +35170,8 @@ if test x"$have_threads" != xno; then 115@@ -39087,110 +39169,8 @@ if test x"$have_threads" != xno; then
116 G_THREAD_LIBS="-lpthread -lthread" 116 G_THREAD_LIBS="-lpthread -lthread"
117 ;; 117 ;;
118 *) 118 *)
119- for flag in pthread pthreads mt; do 119- for flag in pthread pthreads mt; do
120- glib_save_CFLAGS="$CFLAGS" 120- glib_save_CFLAGS="$CFLAGS"
121- CFLAGS="$CFLAGS -$flag" 121- CFLAGS="$CFLAGS -$flag"
122- if test "$cross_compiling" = yes; then 122- if test "$cross_compiling" = yes; then
123- cat >conftest.$ac_ext <<_ACEOF 123- cat >conftest.$ac_ext <<_ACEOF
124- 124-
125-#include <pthread.h> 125-#include <pthread.h>
126-int check_me = 0; 126-int check_me = 0;
127-void* func(void* data) {check_me = 42; return &check_me;} 127-void* func(void* data) {check_me = 42; return &check_me;}
128-int main() 128-int main()
@@ -215,57 +215,53 @@ $NetBSD: patch-aa,v 1.40 2008/02/13 19:3 @@ -215,57 +215,53 @@ $NetBSD: patch-aa,v 1.40 2008/02/13 19:3
215- 215-
216- CFLAGS="$glib_save_CFLAGS" 216- CFLAGS="$glib_save_CFLAGS"
217- if test $glib_flag_works = yes ; then 217- if test $glib_flag_works = yes ; then
218- G_THREAD_CFLAGS=-$flag 218- G_THREAD_CFLAGS=-$flag
219- G_THREAD_LIBS=-$flag 219- G_THREAD_LIBS=-$flag
220- break; 220- break;
221- fi 221- fi
222- done 222- done
223+ G_THREAD_LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" 223+ G_THREAD_LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}"
224+ G_THREAD_CFLAGS="${PTHREAD_CFLAGS}" 224+ G_THREAD_CFLAGS="${PTHREAD_CFLAGS}"
225 ;; 225 ;;
226 esac 226 esac
227 fi 227 fi
228@@ -37152,6 +37132,10 @@ case $host in 228@@ -41303,6 +41283,10 @@ case $host in
229 *) 229 *)
230 G_THREAD_LIBS_FOR_GTHREAD="$G_THREAD_LIBS" 230 G_THREAD_LIBS_FOR_GTHREAD="$G_THREAD_LIBS"
231 ;; 231 ;;
232+ *-*-netbsd*) 232+ *-*-netbsd*)
233+ # On NetBSD, pkgsrc's libtool does the right thing. 233+ # On NetBSD, pkgsrc's libtool does the right thing.
234+ G_THREAD_LIBS_FOR_GTHREAD="$G_THREAD_LIBS" 234+ G_THREAD_LIBS_FOR_GTHREAD="$G_THREAD_LIBS"
235+ ;; 235+ ;;
236 esac 236 esac
237  237
238  238
239@@ -42228,6 +42212,7 @@ G_MODULE_PLUGIN_LIBS!$G_MODULE_PLUGIN_LI 239@@ -46418,10 +46402,10 @@ G_MODULE_PLUGIN_LIBS!$G_MODULE_PLUGIN_LI
240 G_MODULE_LDFLAGS!$G_MODULE_LDFLAGS$ac_delim 240 G_MODULE_LDFLAGS!$G_MODULE_LDFLAGS$ac_delim
241 G_MODULE_HAVE_DLERROR!$G_MODULE_HAVE_DLERROR$ac_delim 241 G_MODULE_HAVE_DLERROR!$G_MODULE_HAVE_DLERROR$ac_delim
242 G_MODULE_BROKEN_RTLD_GLOBAL!$G_MODULE_BROKEN_RTLD_GLOBAL$ac_delim 242 G_MODULE_BROKEN_RTLD_GLOBAL!$G_MODULE_BROKEN_RTLD_GLOBAL$ac_delim
243+G_MODULE_BROKEN_DLOPEN_NULL!$G_MODULE_BROKEN_DLOPEN_NULL$ac_delim 243+G_MODULE_BROKEN_DLOPEN_NULL!$G_MODULE_BROKEN_DLOPEN_NULL$ac_delim
244 G_MODULE_NEED_USCORE!$G_MODULE_NEED_USCORE$ac_delim 244 G_MODULE_NEED_USCORE!$G_MODULE_NEED_USCORE$ac_delim
245 GLIB_DEBUG_FLAGS!$GLIB_DEBUG_FLAGS$ac_delim 245 GLIB_DEBUG_FLAGS!$GLIB_DEBUG_FLAGS$ac_delim
246 GSPAWN!$GSPAWN$ac_delim 246 GSPAWN!$GSPAWN$ac_delim
247@@ -42245,7 +42230,6 @@ G_THREAD_LIBS_EXTRA!$G_THREAD_LIBS_EXTRA 247-GIO!$GIO$ac_delim
248 ENABLE_REGEX_TRUE!$ENABLE_REGEX_TRUE$ac_delim 
249 ENABLE_REGEX_FALSE!$ENABLE_REGEX_FALSE$ac_delim 
250 USE_SYSTEM_PCRE_TRUE!$USE_SYSTEM_PCRE_TRUE$ac_delim 
251-USE_SYSTEM_PCRE_FALSE!$USE_SYSTEM_PCRE_FALSE$ac_delim 
252 _ACEOF 248 _ACEOF
253  249
254 if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then 250 if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
255@@ -42287,6 +42271,7 @@ _ACEOF 251@@ -46463,6 +46447,7 @@ _ACEOF
256 ac_delim='%!_!# ' 252 ac_delim='%!_!# '
257 for ac_last_try in false false false false false :; do 253 for ac_last_try in false false false false false :; do
258 cat >conf$$subs.sed <<_ACEOF 254 cat >conf$$subs.sed <<_ACEOF
259+USE_SYSTEM_PCRE_FALSE!$USE_SYSTEM_PCRE_FALSE$ac_delim 255+GIO!$GIO$ac_delim
260 PCRE_CFLAGS!$PCRE_CFLAGS$ac_delim 256 GIO_MODULE_DIR!$GIO_MODULE_DIR$ac_delim
261 PCRE_LIBS!$PCRE_LIBS$ac_delim 257 SELINUX_LIBS!$SELINUX_LIBS$ac_delim
262 PCRE_REQUIRES!$PCRE_REQUIRES$ac_delim 258 HAVE_INOTIFY_TRUE!$HAVE_INOTIFY_TRUE$ac_delim
263@@ -42310,7 +42295,7 @@ LIBOBJS!$LIBOBJS$ac_delim 259@@ -46508,7 +46493,7 @@ LIBOBJS!$LIBOBJS$ac_delim
264 LTLIBOBJS!$LTLIBOBJS$ac_delim 260 LTLIBOBJS!$LTLIBOBJS$ac_delim
265 _ACEOF 261 _ACEOF
266  262
267- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 21; then 263- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 43; then
268+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 22; then 264+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 44; then
269 break 265 break
270 elif $ac_last_try; then 266 elif $ac_last_try; then
271 { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 267 { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
cvs diff -r1.9 -r1.10 pkgsrc/devel/glib2/patches/Attic/patch-af (expand / switch to unified diff)

--- pkgsrc/devel/glib2/patches/Attic/patch-af 2007/11/25 23:38:52 1.9
+++ pkgsrc/devel/glib2/patches/Attic/patch-af 2008/04/10 12:13:49 1.10
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1$NetBSD: patch-af,v 1.9 2007/11/25 23:38:52 wiz Exp $ 1$NetBSD: patch-af,v 1.10 2008/04/10 12:13:49 drochner Exp $
2 2
3--- glib/libcharset/Makefile.in.orig 2007-11-24 06:41:56.000000000 +0000 3--- glib/libcharset/Makefile.in.orig 2008-03-11 01:41:07.000000000 +0100
4+++ glib/libcharset/Makefile.in 4+++ glib/libcharset/Makefile.in
5@@ -556,18 +556,6 @@ uninstall-am: uninstall-info-am uninstal 5@@ -598,18 +598,6 @@ test-report perf-report full-report: ${T
6 uninstall-am uninstall-info-am uninstall-local 6 # run make test as part of make check
7  7 check-local: test
8 install-exec-local: all-local 8 install-exec-local: all-local
9- $(mkinstalldirs) $(DESTDIR)$(libdir) 9- $(mkinstalldirs) $(DESTDIR)$(libdir)
10- if test -f $(charset_alias); then \ 10- if test -f $(charset_alias); then \
11- sed -f ref-add.sed $(charset_alias) > $(charset_tmp) ; \ 11- sed -f ref-add.sed $(charset_alias) > $(charset_tmp) ; \
12- $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \ 12- $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \
13- rm -f $(charset_tmp) ; \ 13- rm -f $(charset_tmp) ; \
14- else \ 14- else \
15- if test @GLIBC21@ = no; then \ 15- if test @GLIBC21@ = no; then \
16- sed -f ref-add.sed charset.alias > $(charset_tmp) ; \ 16- sed -f ref-add.sed charset.alias > $(charset_tmp) ; \
17- $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \ 17- $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \
18- rm -f $(charset_tmp) ; \ 18- rm -f $(charset_tmp) ; \
19- fi ; \ 19- fi ; \
20- fi 20- fi
cvs diff -r1.14 -r1.15 pkgsrc/devel/glib2/patches/Attic/patch-ag (expand / switch to unified diff)

--- pkgsrc/devel/glib2/patches/Attic/patch-ag 2008/01/08 23:31:56 1.14
+++ pkgsrc/devel/glib2/patches/Attic/patch-ag 2008/04/10 12:13:49 1.15
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-ag,v 1.14 2008/01/08 23:31:56 tnn Exp $ 1$NetBSD: patch-ag,v 1.15 2008/04/10 12:13:49 drochner Exp $
2 2
3--- glib/gutils.h.orig 2008-01-08 02:39:49.000000000 +0100 3--- glib/gutils.h.orig 2008-03-31 22:45:04.000000000 +0200
4+++ glib/gutils.h 4+++ glib/gutils.h
5@@ -108,6 +108,8 @@ G_BEGIN_DECLS 5@@ -96,6 +96,8 @@ G_BEGIN_DECLS
6 #ifdef G_IMPLEMENT_INLINES 6 #ifdef G_IMPLEMENT_INLINES
7 # define G_INLINE_FUNC 7 # define G_INLINE_FUNC
8 # undef G_CAN_INLINE 8 # undef G_CAN_INLINE
9+#elif defined (__APPLE__) 9+#elif defined (__APPLE__)
10+# define G_INLINE_FUNC static inline 10+# define G_INLINE_FUNC static inline
11 #elif defined (__GNUC__)  11 #elif defined (__GNUC__)
12 # if __GNUC_PREREQ (4,2) && defined (__STDC_VERSION__) \ 12 # if defined (__GNUC_STDC_INLINE__) || defined (__GNUC_GNU_INLINE__)
13 && __STDC_VERSION__ >= 199901L 13 # define G_INLINE_FUNC extern inline __attribute__ ((__gnu_inline__))
File Added: pkgsrc/devel/glib2/patches/Attic/patch-ba
$NetBSD: patch-ba,v 1.1 2008/04/10 12:13:49 drochner Exp $

--- gio/gunixmounts.c.orig	2008-04-01 15:51:11.000000000 +0200
+++ gio/gunixmounts.c
@@ -561,7 +561,11 @@ get_mtab_monitor_file (void)
 static GList *
 _g_get_unix_mounts (void)
 {
+#ifdef __NetBSD__
+  struct statvfs *mntent = NULL;
+#else
   struct statfs *mntent = NULL;
+#endif
   int num_mounts, i;
   GUnixMountEntry *mount_entry;
   GList *return_list;
@@ -579,8 +583,13 @@ _g_get_unix_mounts (void)
       mount_entry->mount_path = g_strdup (mntent[i].f_mntonname);
       mount_entry->device_path = g_strdup (mntent[i].f_mntfromname);
       mount_entry->filesystem_type = g_strdup (mntent[i].f_fstypename);
+#ifdef __NetBSD__
+      if (mntent[i].f_flag & MNT_RDONLY)
+	mount_entry->is_read_only = TRUE;
+#else
       if (mntent[i].f_flags & MNT_RDONLY)
 	mount_entry->is_read_only = TRUE;
+#endif
 
       mount_entry->is_system_internal =
 	guess_system_internal (mount_entry->mount_path,