update to 2.32.1
This is the new major tree, needed for a number of Gnome pkgs. The optional "kqueue" patch isn't ready yet, so the "kqueue" option does not work atm.
This commit is contained in:
drochner
parent
d50194ac0b
commit
508de02cde
21 changed files with 338 additions and 344 deletions
|
|
@ -1,9 +1,8 @@
|
|||
# $NetBSD: Makefile,v 1.198 2012/04/06 10:40:36 taca Exp $
|
||||
# $NetBSD: Makefile,v 1.199 2012/04/30 13:53:48 drochner Exp $
|
||||
|
||||
.include "Makefile.common"
|
||||
.include "options.mk"
|
||||
|
||||
PKGREVISION= 1
|
||||
CATEGORIES= devel
|
||||
|
||||
COMMENT= Some useful routines for C programming (glib2)
|
||||
|
|
@ -51,4 +50,5 @@ LIBS.SunOS+= -lnsl -lsocket
|
|||
.include "../../devel/pcre/buildlink3.mk"
|
||||
.include "../../devel/zlib/buildlink3.mk"
|
||||
.include "../../devel/libffi/buildlink3.mk"
|
||||
.include "../../devel/libelf/buildlink3.mk"
|
||||
.include "../../mk/bsd.pkg.mk"
|
||||
|
|
|
|||
|
|
@ -1,15 +1,15 @@
|
|||
# $NetBSD: Makefile.common,v 1.15 2012/03/21 12:18:33 drochner Exp $
|
||||
# $NetBSD: Makefile.common,v 1.16 2012/04/30 13:53:48 drochner Exp $
|
||||
#
|
||||
# used by devel/glib2/Makefile
|
||||
# used by sysutils/gio-fam/Makefile
|
||||
|
||||
# When updating this package, please apply patch-ak to configure.in and
|
||||
# then run a matching version of autoconf to regen patch-aa.
|
||||
DISTNAME= glib-2.30.3
|
||||
DISTNAME= glib-2.32.1
|
||||
PKGNAME= ${DISTNAME:S/glib/glib2/}
|
||||
CATEGORIES= # empty; redefined in Makefile
|
||||
MASTER_SITES= ftp://ftp.gtk.org/pub/glib/2.30/ \
|
||||
${MASTER_SITE_GNOME:=sources/glib/2.30/}
|
||||
MASTER_SITES= ftp://ftp.gtk.org/pub/glib/2.32/ \
|
||||
${MASTER_SITE_GNOME:=sources/glib/2.32/}
|
||||
EXTRACT_SUFX= .tar.xz
|
||||
|
||||
MAINTAINER= pkgsrc-users@NetBSD.org
|
||||
|
|
|
|||
|
|
@ -1,11 +1,13 @@
|
|||
@comment $NetBSD: PLIST,v 1.65 2012/03/21 12:18:33 drochner Exp $
|
||||
@comment $NetBSD: PLIST,v 1.66 2012/04/30 13:53:48 drochner Exp $
|
||||
bin/gdbus
|
||||
bin/gio-querymodules
|
||||
bin/glib-compile-resources
|
||||
bin/glib-compile-schemas
|
||||
bin/glib-genmarshal
|
||||
bin/glib-gettextize
|
||||
bin/glib-mkenums
|
||||
bin/gobject-query
|
||||
bin/gresource
|
||||
bin/gsettings
|
||||
bin/gtester
|
||||
bin/gtester-report
|
||||
|
|
@ -21,6 +23,8 @@ include/glib/gio-unix-2.0/gio/gunixoutputstream.h
|
|||
include/glib/gio-unix-2.0/gio/gunixsocketaddress.h
|
||||
include/glib/glib-2.0/gio/gaction.h
|
||||
include/glib/glib-2.0/gio/gactiongroup.h
|
||||
include/glib/glib-2.0/gio/gactiongroupexporter.h
|
||||
include/glib/glib-2.0/gio/gactionmap.h
|
||||
include/glib/glib-2.0/gio/gappinfo.h
|
||||
include/glib/glib-2.0/gio/gapplication.h
|
||||
include/glib/glib-2.0/gio/gapplicationcommandline.h
|
||||
|
|
@ -37,6 +41,7 @@ include/glib/glib-2.0/gio/gconverteroutputstream.h
|
|||
include/glib/glib-2.0/gio/gcredentials.h
|
||||
include/glib/glib-2.0/gio/gdatainputstream.h
|
||||
include/glib/glib-2.0/gio/gdataoutputstream.h
|
||||
include/glib/glib-2.0/gio/gdbusactiongroup.h
|
||||
include/glib/glib-2.0/gio/gdbusaddress.h
|
||||
include/glib/glib-2.0/gio/gdbusauthobserver.h
|
||||
include/glib/glib-2.0/gio/gdbusconnection.h
|
||||
|
|
@ -44,6 +49,7 @@ include/glib/glib-2.0/gio/gdbuserror.h
|
|||
include/glib/glib-2.0/gio/gdbusinterface.h
|
||||
include/glib/glib-2.0/gio/gdbusinterfaceskeleton.h
|
||||
include/glib/glib-2.0/gio/gdbusintrospection.h
|
||||
include/glib/glib-2.0/gio/gdbusmenumodel.h
|
||||
include/glib/glib-2.0/gio/gdbusmessage.h
|
||||
include/glib/glib-2.0/gio/gdbusmethodinvocation.h
|
||||
include/glib/glib-2.0/gio/gdbusnameowning.h
|
||||
|
|
@ -74,6 +80,7 @@ include/glib/glib-2.0/gio/gfilterinputstream.h
|
|||
include/glib/glib-2.0/gio/gfilteroutputstream.h
|
||||
include/glib/glib-2.0/gio/gicon.h
|
||||
include/glib/glib-2.0/gio/ginetaddress.h
|
||||
include/glib/glib-2.0/gio/ginetaddressmask.h
|
||||
include/glib/glib-2.0/gio/ginetsocketaddress.h
|
||||
include/glib/glib-2.0/gio/ginitable.h
|
||||
include/glib/glib-2.0/gio/ginputstream.h
|
||||
|
|
@ -88,10 +95,14 @@ include/glib/glib-2.0/gio/giotypes.h
|
|||
include/glib/glib-2.0/gio/gloadableicon.h
|
||||
include/glib/glib-2.0/gio/gmemoryinputstream.h
|
||||
include/glib/glib-2.0/gio/gmemoryoutputstream.h
|
||||
include/glib/glib-2.0/gio/gmenu.h
|
||||
include/glib/glib-2.0/gio/gmenuexporter.h
|
||||
include/glib/glib-2.0/gio/gmenumodel.h
|
||||
include/glib/glib-2.0/gio/gmount.h
|
||||
include/glib/glib-2.0/gio/gmountoperation.h
|
||||
include/glib/glib-2.0/gio/gnativevolumemonitor.h
|
||||
include/glib/glib-2.0/gio/gnetworkaddress.h
|
||||
include/glib/glib-2.0/gio/gnetworkmonitor.h
|
||||
include/glib/glib-2.0/gio/gnetworkservice.h
|
||||
include/glib/glib-2.0/gio/goutputstream.h
|
||||
include/glib/glib-2.0/gio/gpermission.h
|
||||
|
|
@ -101,10 +112,13 @@ include/glib/glib-2.0/gio/gproxy.h
|
|||
include/glib/glib-2.0/gio/gproxyaddress.h
|
||||
include/glib/glib-2.0/gio/gproxyaddressenumerator.h
|
||||
include/glib/glib-2.0/gio/gproxyresolver.h
|
||||
include/glib/glib-2.0/gio/gremoteactiongroup.h
|
||||
include/glib/glib-2.0/gio/gresolver.h
|
||||
include/glib/glib-2.0/gio/gresource.h
|
||||
include/glib/glib-2.0/gio/gseekable.h
|
||||
include/glib/glib-2.0/gio/gsettings.h
|
||||
include/glib/glib-2.0/gio/gsettingsbackend.h
|
||||
include/glib/glib-2.0/gio/gsettingsschema.h
|
||||
include/glib/glib-2.0/gio/gsimpleaction.h
|
||||
include/glib/glib-2.0/gio/gsimpleactiongroup.h
|
||||
include/glib/glib-2.0/gio/gsimpleasyncresult.h
|
||||
|
|
@ -140,6 +154,12 @@ include/glib/glib-2.0/gio/gzlibdecompressor.h
|
|||
include/glib/glib-2.0/glib-object.h
|
||||
include/glib/glib-2.0/glib-unix.h
|
||||
include/glib/glib-2.0/glib.h
|
||||
include/glib/glib-2.0/glib/deprecated/gallocator.h
|
||||
include/glib/glib-2.0/glib/deprecated/gcache.h
|
||||
include/glib/glib-2.0/glib/deprecated/gcompletion.h
|
||||
include/glib/glib-2.0/glib/deprecated/gmain.h
|
||||
include/glib/glib-2.0/glib/deprecated/grel.h
|
||||
include/glib/glib-2.0/glib/deprecated/gthread.h
|
||||
include/glib/glib-2.0/glib/galloca.h
|
||||
include/glib/glib-2.0/glib/garray.h
|
||||
include/glib/glib-2.0/glib/gasyncqueue.h
|
||||
|
|
@ -148,16 +168,18 @@ include/glib/glib-2.0/glib/gbacktrace.h
|
|||
include/glib/glib-2.0/glib/gbase64.h
|
||||
include/glib/glib-2.0/glib/gbitlock.h
|
||||
include/glib/glib-2.0/glib/gbookmarkfile.h
|
||||
include/glib/glib-2.0/glib/gcache.h
|
||||
include/glib/glib-2.0/glib/gbytes.h
|
||||
include/glib/glib-2.0/glib/gcharset.h
|
||||
include/glib/glib-2.0/glib/gchecksum.h
|
||||
include/glib/glib-2.0/glib/gcompletion.h
|
||||
include/glib/glib-2.0/glib/gconvert.h
|
||||
include/glib/glib-2.0/glib/gdataset.h
|
||||
include/glib/glib-2.0/glib/gdate.h
|
||||
include/glib/glib-2.0/glib/gdatetime.h
|
||||
include/glib/glib-2.0/glib/gdir.h
|
||||
include/glib/glib-2.0/glib/genviron.h
|
||||
include/glib/glib-2.0/glib/gerror.h
|
||||
include/glib/glib-2.0/glib/gfileutils.h
|
||||
include/glib/glib-2.0/glib/ggettext.h
|
||||
include/glib/glib-2.0/glib/ghash.h
|
||||
include/glib/glib-2.0/glib/ghmac.h
|
||||
include/glib/glib-2.0/glib/ghook.h
|
||||
|
|
@ -184,7 +206,6 @@ include/glib/glib-2.0/glib/gquark.h
|
|||
include/glib/glib-2.0/glib/gqueue.h
|
||||
include/glib/glib-2.0/glib/grand.h
|
||||
include/glib/glib-2.0/glib/gregex.h
|
||||
include/glib/glib-2.0/glib/grel.h
|
||||
include/glib/glib-2.0/glib/gscanner.h
|
||||
include/glib/glib-2.0/glib/gsequence.h
|
||||
include/glib/glib-2.0/glib/gshell.h
|
||||
|
|
@ -194,11 +215,13 @@ include/glib/glib-2.0/glib/gspawn.h
|
|||
include/glib/glib-2.0/glib/gstdio.h
|
||||
include/glib/glib-2.0/glib/gstrfuncs.h
|
||||
include/glib/glib-2.0/glib/gstring.h
|
||||
include/glib/glib-2.0/glib/gstringchunk.h
|
||||
include/glib/glib-2.0/glib/gtestutils.h
|
||||
include/glib/glib-2.0/glib/gthread.h
|
||||
include/glib/glib-2.0/glib/gthreadpool.h
|
||||
include/glib/glib-2.0/glib/gtimer.h
|
||||
include/glib/glib-2.0/glib/gtimezone.h
|
||||
include/glib/glib-2.0/glib/gtrashstack.h
|
||||
include/glib/glib-2.0/glib/gtree.h
|
||||
include/glib/glib-2.0/glib/gtypes.h
|
||||
include/glib/glib-2.0/glib/gunicode.h
|
||||
|
|
@ -206,6 +229,8 @@ include/glib/glib-2.0/glib/gurifuncs.h
|
|||
include/glib/glib-2.0/glib/gutils.h
|
||||
include/glib/glib-2.0/glib/gvariant.h
|
||||
include/glib/glib-2.0/glib/gvarianttype.h
|
||||
include/glib/glib-2.0/glib/gversion.h
|
||||
include/glib/glib-2.0/glib/gversionmacros.h
|
||||
include/glib/glib-2.0/glib/gwin32.h
|
||||
include/glib/glib-2.0/gmodule.h
|
||||
include/glib/glib-2.0/gobject/gbinding.h
|
||||
|
|
@ -244,19 +269,21 @@ lib/pkgconfig/gthread-2.0.pc
|
|||
man/man1/gdbus-codegen.1
|
||||
man/man1/gdbus.1
|
||||
man/man1/gio-querymodules.1
|
||||
man/man1/glib-compile-resources.1
|
||||
man/man1/glib-compile-schemas.1
|
||||
man/man1/glib-genmarshal.1
|
||||
man/man1/glib-gettextize.1
|
||||
man/man1/glib-mkenums.1
|
||||
man/man1/gobject-query.1
|
||||
man/man1/gresource.1
|
||||
man/man1/gsettings.1
|
||||
man/man1/gtester-report.1
|
||||
man/man1/gtester.1
|
||||
share/aclocal/glib-2.0.m4
|
||||
share/aclocal/glib-gettext.m4
|
||||
share/aclocal/gsettings.m4
|
||||
share/gdb/auto-load/libglib-2.0.so.0.3000.3-gdb.py
|
||||
share/gdb/auto-load/libgobject-2.0.so.0.3000.3-gdb.py
|
||||
share/gdb/auto-load/libglib-2.0.so.0.3200.1-gdb.py
|
||||
share/gdb/auto-load/libgobject-2.0.so.0.3200.1-gdb.py
|
||||
share/glib-2.0/gdb/glib.py
|
||||
share/glib-2.0/gdb/gobject.py
|
||||
share/glib-2.0/gettext/mkinstalldirs
|
||||
|
|
@ -268,6 +295,7 @@ share/gtk-doc/html/gio/ExampleObject.html
|
|||
share/gtk-doc/html/gio/ExampleObjectManagerClient.html
|
||||
share/gtk-doc/html/gio/GAction.html
|
||||
share/gtk-doc/html/gio/GActionGroup.html
|
||||
share/gtk-doc/html/gio/GActionMap.html
|
||||
share/gtk-doc/html/gio/GAppInfo.html
|
||||
share/gtk-doc/html/gio/GApplication.html
|
||||
share/gtk-doc/html/gio/GApplicationCommandLine.html
|
||||
|
|
@ -279,10 +307,12 @@ share/gtk-doc/html/gio/GCancellable.html
|
|||
share/gtk-doc/html/gio/GCharsetConverter.html
|
||||
share/gtk-doc/html/gio/GConverter.html
|
||||
share/gtk-doc/html/gio/GCredentials.html
|
||||
share/gtk-doc/html/gio/GDBusActionGroup.html
|
||||
share/gtk-doc/html/gio/GDBusAuthObserver.html
|
||||
share/gtk-doc/html/gio/GDBusConnection.html
|
||||
share/gtk-doc/html/gio/GDBusInterface.html
|
||||
share/gtk-doc/html/gio/GDBusInterfaceSkeleton.html
|
||||
share/gtk-doc/html/gio/GDBusMenuModel.html
|
||||
share/gtk-doc/html/gio/GDBusMessage.html
|
||||
share/gtk-doc/html/gio/GDBusMethodInvocation.html
|
||||
share/gtk-doc/html/gio/GDBusObject.html
|
||||
|
|
@ -320,9 +350,12 @@ share/gtk-doc/html/gio/GInputStream.html
|
|||
share/gtk-doc/html/gio/GLoadableIcon.html
|
||||
share/gtk-doc/html/gio/GMemoryInputStream.html
|
||||
share/gtk-doc/html/gio/GMemoryOutputStream.html
|
||||
share/gtk-doc/html/gio/GMenu.html
|
||||
share/gtk-doc/html/gio/GMenuModel.html
|
||||
share/gtk-doc/html/gio/GMount.html
|
||||
share/gtk-doc/html/gio/GMountOperation.html
|
||||
share/gtk-doc/html/gio/GNetworkAddress.html
|
||||
share/gtk-doc/html/gio/GNetworkMonitor.html
|
||||
share/gtk-doc/html/gio/GNetworkService.html
|
||||
share/gtk-doc/html/gio/GOutputStream.html
|
||||
share/gtk-doc/html/gio/GPermission.html
|
||||
|
|
@ -331,6 +364,7 @@ share/gtk-doc/html/gio/GPollableOutputStream.html
|
|||
share/gtk-doc/html/gio/GProxy.html
|
||||
share/gtk-doc/html/gio/GProxyAddress.html
|
||||
share/gtk-doc/html/gio/GProxyResolver.html
|
||||
share/gtk-doc/html/gio/GRemoteActionGroup.html
|
||||
share/gtk-doc/html/gio/GResolver.html
|
||||
share/gtk-doc/html/gio/GSeekable.html
|
||||
share/gtk-doc/html/gio/GSettings.html
|
||||
|
|
@ -381,6 +415,7 @@ share/gtk-doc/html/gio/api-index-2-24.html
|
|||
share/gtk-doc/html/gio/api-index-2-26.html
|
||||
share/gtk-doc/html/gio/api-index-2-28.html
|
||||
share/gtk-doc/html/gio/api-index-2-30.html
|
||||
share/gtk-doc/html/gio/api-index-2-32.html
|
||||
share/gtk-doc/html/gio/api-index-deprecated.html
|
||||
share/gtk-doc/html/gio/api-index-full.html
|
||||
share/gtk-doc/html/gio/application.html
|
||||
|
|
@ -388,22 +423,22 @@ share/gtk-doc/html/gio/async.html
|
|||
share/gtk-doc/html/gio/ch01.html
|
||||
share/gtk-doc/html/gio/ch02.html
|
||||
share/gtk-doc/html/gio/ch03.html
|
||||
share/gtk-doc/html/gio/ch26.html
|
||||
share/gtk-doc/html/gio/ch27.html
|
||||
share/gtk-doc/html/gio/ch27s02.html
|
||||
share/gtk-doc/html/gio/ch27s03.html
|
||||
share/gtk-doc/html/gio/ch28.html
|
||||
share/gtk-doc/html/gio/ch28s02.html
|
||||
share/gtk-doc/html/gio/ch28s03.html
|
||||
share/gtk-doc/html/gio/ch28s04.html
|
||||
share/gtk-doc/html/gio/ch28s05.html
|
||||
share/gtk-doc/html/gio/ch28s06.html
|
||||
share/gtk-doc/html/gio/ch28s07.html
|
||||
share/gtk-doc/html/gio/ch29.html
|
||||
share/gtk-doc/html/gio/ch29s02.html
|
||||
share/gtk-doc/html/gio/ch29s03.html
|
||||
share/gtk-doc/html/gio/ch29s04.html
|
||||
share/gtk-doc/html/gio/ch29s05.html
|
||||
share/gtk-doc/html/gio/ch29s06.html
|
||||
share/gtk-doc/html/gio/ch29s07.html
|
||||
share/gtk-doc/html/gio/ch30.html
|
||||
share/gtk-doc/html/gio/ch30s02.html
|
||||
share/gtk-doc/html/gio/ch30s03.html
|
||||
share/gtk-doc/html/gio/ch30s04.html
|
||||
share/gtk-doc/html/gio/ch30s05.html
|
||||
share/gtk-doc/html/gio/conversion.html
|
||||
share/gtk-doc/html/gio/extending-gio.html
|
||||
share/gtk-doc/html/gio/extending.html
|
||||
|
|
@ -421,6 +456,7 @@ share/gtk-doc/html/gio/gio-D-Bus-Introspection-Data.html
|
|||
share/gtk-doc/html/gio/gio-D-Bus-Utilities.html
|
||||
share/gtk-doc/html/gio/gio-Desktop-file-based-GAppInfo.html
|
||||
share/gtk-doc/html/gio/gio-Extension-Points.html
|
||||
share/gtk-doc/html/gio/gio-GActionGroup-exporter.html
|
||||
share/gtk-doc/html/gio/gio-GContentType.html
|
||||
share/gtk-doc/html/gio/gio-GConverterInputstream.html
|
||||
share/gtk-doc/html/gio/gio-GConverterOutputstream.html
|
||||
|
|
@ -428,6 +464,10 @@ share/gtk-doc/html/gio/gio-GDBusError.html
|
|||
share/gtk-doc/html/gio/gio-GFileAttribute.html
|
||||
share/gtk-doc/html/gio/gio-GIOError.html
|
||||
share/gtk-doc/html/gio/gio-GIOScheduler.html
|
||||
share/gtk-doc/html/gio/gio-GInetAddressMask.html
|
||||
share/gtk-doc/html/gio/gio-GMenuModel-exporter.html
|
||||
share/gtk-doc/html/gio/gio-GResource.html
|
||||
share/gtk-doc/html/gio/gio-GSettingsSchema-GSettingsSchemaSource.html
|
||||
share/gtk-doc/html/gio/gio-GWin32InputStream.html
|
||||
share/gtk-doc/html/gio/gio-GWin32OutputStream.html
|
||||
share/gtk-doc/html/gio/gio-Owning-Bus-Names.html
|
||||
|
|
@ -437,7 +477,9 @@ share/gtk-doc/html/gio/gio-Watching-Bus-Names.html
|
|||
share/gtk-doc/html/gio/gio-hierarchy.html
|
||||
share/gtk-doc/html/gio/gio-querymodules.html
|
||||
share/gtk-doc/html/gio/gio.devhelp2
|
||||
share/gtk-doc/html/gio/glib-compile-resources.html
|
||||
share/gtk-doc/html/gio/glib-compile-schemas.html
|
||||
share/gtk-doc/html/gio/gresource-tool.html
|
||||
share/gtk-doc/html/gio/gsettings-tool.html
|
||||
share/gtk-doc/html/gio/gvfs-overview.png
|
||||
share/gtk-doc/html/gio/highlevel-socket.html
|
||||
|
|
@ -446,12 +488,15 @@ share/gtk-doc/html/gio/icons.html
|
|||
share/gtk-doc/html/gio/index.html
|
||||
share/gtk-doc/html/gio/index.sgml
|
||||
share/gtk-doc/html/gio/left.png
|
||||
share/gtk-doc/html/gio/menu-example.png
|
||||
share/gtk-doc/html/gio/menu-model.png
|
||||
share/gtk-doc/html/gio/migrating.html
|
||||
share/gtk-doc/html/gio/networking.html
|
||||
share/gtk-doc/html/gio/permissions.html
|
||||
share/gtk-doc/html/gio/pt01.html
|
||||
share/gtk-doc/html/gio/pt02.html
|
||||
share/gtk-doc/html/gio/resolver.html
|
||||
share/gtk-doc/html/gio/resources.html
|
||||
share/gtk-doc/html/gio/right.png
|
||||
share/gtk-doc/html/gio/settings.html
|
||||
share/gtk-doc/html/gio/streaming.html
|
||||
|
|
@ -475,11 +520,13 @@ share/gtk-doc/html/glib/api-index-2-24.html
|
|||
share/gtk-doc/html/glib/api-index-2-26.html
|
||||
share/gtk-doc/html/glib/api-index-2-28.html
|
||||
share/gtk-doc/html/glib/api-index-2-30.html
|
||||
share/gtk-doc/html/glib/api-index-2-32.html
|
||||
share/gtk-doc/html/glib/api-index-2-4.html
|
||||
share/gtk-doc/html/glib/api-index-2-6.html
|
||||
share/gtk-doc/html/glib/api-index-2-8.html
|
||||
share/gtk-doc/html/glib/api-index-deprecated.html
|
||||
share/gtk-doc/html/glib/api-index-full.html
|
||||
share/gtk-doc/html/glib/deprecated.html
|
||||
share/gtk-doc/html/glib/file-name-encodings.png
|
||||
share/gtk-doc/html/glib/glib-Arrays.html
|
||||
share/gtk-doc/html/glib/glib-Asynchronous-Queues.html
|
||||
|
|
@ -498,6 +545,7 @@ share/gtk-doc/html/glib/glib-Data-Checksums.html
|
|||
share/gtk-doc/html/glib/glib-Data-HMACs.html
|
||||
share/gtk-doc/html/glib/glib-Datasets.html
|
||||
share/gtk-doc/html/glib/glib-Date-and-Time-Functions.html
|
||||
share/gtk-doc/html/glib/glib-Deprecated-Thread-APIs.html
|
||||
share/gtk-doc/html/glib/glib-Double-ended-Queues.html
|
||||
share/gtk-doc/html/glib/glib-Doubly-Linked-Lists.html
|
||||
share/gtk-doc/html/glib/glib-Dynamic-Loading-of-Modules.html
|
||||
|
|
@ -516,10 +564,7 @@ share/gtk-doc/html/glib/glib-IO-Channels.html
|
|||
share/gtk-doc/html/glib/glib-Key-value-file-parser.html
|
||||
share/gtk-doc/html/glib/glib-Keyed-Data-Lists.html
|
||||
share/gtk-doc/html/glib/glib-Lexical-Scanner.html
|
||||
share/gtk-doc/html/glib/glib-Limits-of-Basic-Types.html
|
||||
share/gtk-doc/html/glib/glib-Memory-Allocation.html
|
||||
share/gtk-doc/html/glib/glib-Memory-Allocators.html
|
||||
share/gtk-doc/html/glib/glib-Memory-Chunks.html
|
||||
share/gtk-doc/html/glib/glib-Memory-Slices.html
|
||||
share/gtk-doc/html/glib/glib-Message-Logging.html
|
||||
share/gtk-doc/html/glib/glib-Miscellaneous-Macros.html
|
||||
|
|
@ -594,6 +639,7 @@ share/gtk-doc/html/gobject/api-index-2-24.html
|
|||
share/gtk-doc/html/gobject/api-index-2-26.html
|
||||
share/gtk-doc/html/gobject/api-index-2-28.html
|
||||
share/gtk-doc/html/gobject/api-index-2-30.html
|
||||
share/gtk-doc/html/gobject/api-index-2-32.html
|
||||
share/gtk-doc/html/gobject/api-index-2-4.html
|
||||
share/gtk-doc/html/gobject/api-index-2-6.html
|
||||
share/gtk-doc/html/gobject/api-index-2-8.html
|
||||
|
|
|
|||
|
|
@ -1,42 +1,37 @@
|
|||
$NetBSD: distinfo,v 1.168 2012/04/14 15:43:10 jmmv Exp $
|
||||
$NetBSD: distinfo,v 1.169 2012/04/30 13:53:48 drochner Exp $
|
||||
|
||||
SHA1 (glib-2.30.3.tar.xz) = ec97dd659862dca05d18093a6ea6c309dcff0cdd
|
||||
RMD160 (glib-2.30.3.tar.xz) = 0887b08e2fff75c325ed1fb1123baaf42dc9779b
|
||||
Size (glib-2.30.3.tar.xz) = 5642448 bytes
|
||||
SHA1 (glib-gio-kqueue-2.30.3-v4.1.patch) = d66bc669442a89205a2855623c115f8a1eaf6677
|
||||
RMD160 (glib-gio-kqueue-2.30.3-v4.1.patch) = 2f51d0d838a915df6da7c3853219cc9c78f1637a
|
||||
Size (glib-gio-kqueue-2.30.3-v4.1.patch) = 100410 bytes
|
||||
SHA1 (patch-aa) = 44a3cc4b457ea75a3516d5c49155a3720bde515f
|
||||
SHA1 (patch-ab) = 757cfd7f686d3e3147d13f530d1c85c7835bf762
|
||||
SHA1 (glib-2.32.1.tar.xz) = 3f94733d0e79e5ff10d5ca8735ae5d7f11f2edc0
|
||||
RMD160 (glib-2.32.1.tar.xz) = d56ab662502916574e2286f92c2c56dc8aad210d
|
||||
Size (glib-2.32.1.tar.xz) = 6138200 bytes
|
||||
SHA1 (patch-aa) = 7304a1a0194cc099ebb79a1c397e905da9cfa6a8
|
||||
SHA1 (patch-ab) = 04bde955a2a588011a8c77ada4923d5464a0d544
|
||||
SHA1 (patch-ac) = 96e153339675457356f71e35d20375bed669d337
|
||||
SHA1 (patch-ad) = c926d96bdc9ddf4f434fc57af0adbe11002cffc3
|
||||
SHA1 (patch-ae) = 09f16e8e14bdea3ee0e478d335f65cb66939e5f5
|
||||
SHA1 (patch-af) = 4db7dff19ba34d5a204c12c0c410415fcb077f20
|
||||
SHA1 (patch-ag) = 65e50668eb909353210152ef54dfea923740179b
|
||||
SHA1 (patch-ah) = 239dc3d0734424a7cafc5dd8d8381768cba2d23e
|
||||
SHA1 (patch-ah) = 66761b7994c54651933d50024eb607952565b214
|
||||
SHA1 (patch-aha) = 3249929122a567eec3c421a1efa0ac510f1474b7
|
||||
SHA1 (patch-ai) = a21e04468ea05e29e1d3778f32c2a5da90e23e56
|
||||
SHA1 (patch-aj) = 9e5a7ccf081e3ebdf7888a67b027b696f632177c
|
||||
SHA1 (patch-ak) = 5190e6d3b2a333ac83968a044755e1a139bf4460
|
||||
SHA1 (patch-ak) = cfe9c8d309b4bdedb398a847ed5af98ecffac71e
|
||||
SHA1 (patch-al) = bde29693322c568f9a4ad090f1d469de5f69920e
|
||||
SHA1 (patch-am) = 062d3d295f00485ac3c3839dd4697957ebc66772
|
||||
SHA1 (patch-an) = 9384dca0b98bde4e2d64dbca6584a3aefa0c352c
|
||||
SHA1 (patch-an) = 40536177b1590e02a8ca37893997042fca694d03
|
||||
SHA1 (patch-ap) = eeabf999a65cc51bc792798e4d81fef2ad35837b
|
||||
SHA1 (patch-aq) = dd816807ccbce20ef4ad959d5ee3bc7750491890
|
||||
SHA1 (patch-ar) = 93bf22a9debef8deb97918adeeaee5830280038b
|
||||
SHA1 (patch-as) = 0d9b461d5bf6d267b50eac892d8ad8a82f90be18
|
||||
SHA1 (patch-ar) = 0ff0ddd3323263207a4fa715642dba5aeb4b3cc4
|
||||
SHA1 (patch-as) = 3b83fa24811984e7e00b423cbb35da1e4ab4fa1c
|
||||
SHA1 (patch-at) = f4c4a2fbe84eb8b361fb342f3c3b0b5a226d1794
|
||||
SHA1 (patch-ba) = 832c85a53565d323100da91ad514afd4960b38ca
|
||||
SHA1 (patch-ba) = f4233cd4e0109f9bee5630c655b0ab7b22ba0c61
|
||||
SHA1 (patch-cb) = 0f084c33fb67fbb8e12448034450699da26289ff
|
||||
SHA1 (patch-cc) = dd73079b727bca9013465204dc3b53b76a280e54
|
||||
SHA1 (patch-cd) = 9006b880e94ae4a4fc564c1978178a296dd63024
|
||||
SHA1 (patch-ce) = f21c72e1808845adf22908a9e86d1f58a39d0c21
|
||||
SHA1 (patch-cf) = 41ed2146e19cf088456795d4f0e8dc4af4368e44
|
||||
SHA1 (patch-cg) = f65c5a23102d3dee12bee68bd126385b3c3fe632
|
||||
SHA1 (patch-ch) = df8444835b9954f902936c8b6fab5b44ac350db0
|
||||
SHA1 (patch-ce) = ab978e9acfbfcd4e1249cbc2f9ab7e503d62a53f
|
||||
SHA1 (patch-cf) = 7aec3254eb3edfa71da72f7a9c218d148a036bd4
|
||||
SHA1 (patch-cg) = be18840e9c56bf1c2c4c2759dfc73097d463923a
|
||||
SHA1 (patch-ci) = f0191fd416222617a2e95e95a05c3dcf6b6ce2d2
|
||||
SHA1 (patch-cj) = 041eb127b4454f37be664cb885d84f9342f9680d
|
||||
SHA1 (patch-cj) = e9d10c82a30049b358003b93585280ea26e12e22
|
||||
SHA1 (patch-ck) = 324116cc6fb8dbce8ce8d20f5b237fc469a55cd2
|
||||
SHA1 (patch-cl) = 42eb60fc66b881368f6f5f71d1fc5869f82db1b1
|
||||
SHA1 (patch-cl) = 3e7296d68f1ddf3d2a1b82824848f6bf6c2c8c8d
|
||||
SHA1 (patch-cm) = 7f14ab327d021537714f876fbfbd4b0350d98a6e
|
||||
SHA1 (patch-cn) = b930dc95d44eacc9448f2a3a799a95db2880bfd4
|
||||
SHA1 (patch-glib_goption.c) = 323297aa328b85493f156792b4baa0cb04fa82ad
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
$NetBSD: patch-aa,v 1.50 2010/11/02 14:52:24 drochner Exp $
|
||||
$NetBSD: patch-aa,v 1.51 2012/04/30 13:53:48 drochner Exp $
|
||||
|
||||
--- configure.orig 2010-09-27 16:10:14.000000000 +0000
|
||||
--- configure.orig 2012-03-24 03:02:40.000000000 +0000
|
||||
+++ configure
|
||||
@@ -828,6 +828,7 @@ GIO
|
||||
@@ -697,6 +697,7 @@ GIO
|
||||
GSPAWN
|
||||
GLIB_DEBUG_FLAGS
|
||||
G_MODULE_NEED_USCORE
|
||||
|
|
@ -10,7 +10,7 @@ $NetBSD: patch-aa,v 1.50 2010/11/02 14:52:24 drochner Exp $
|
|||
G_MODULE_BROKEN_RTLD_GLOBAL
|
||||
G_MODULE_HAVE_DLERROR
|
||||
G_MODULE_LDFLAGS
|
||||
@@ -21584,8 +21585,8 @@ else
|
||||
@@ -22442,8 +22443,8 @@ else
|
||||
fi
|
||||
|
||||
|
||||
|
|
@ -21,7 +21,7 @@ $NetBSD: patch-aa,v 1.50 2010/11/02 14:52:24 drochner Exp $
|
|||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
#if defined(__SUNPRO_C) || (__SUNPRO_C >= 0x550)
|
||||
@@ -22829,16 +22830,48 @@ fi
|
||||
@@ -24038,16 +24039,48 @@ fi
|
||||
|
||||
case $host in
|
||||
*-*-solaris* )
|
||||
|
|
@ -71,7 +71,7 @@ $NetBSD: patch-aa,v 1.50 2010/11/02 14:52:24 drochner Exp $
|
|||
esac
|
||||
|
||||
if test "$ac_cv_func_statfs" = yes ; then
|
||||
@@ -23844,10 +23877,11 @@ if test x"$glib_native_win32" = xyes; th
|
||||
@@ -25040,10 +25073,11 @@ if test x"$glib_native_win32" = xyes; th
|
||||
G_MODULE_LDFLAGS=
|
||||
else
|
||||
export SED
|
||||
|
|
@ -84,16 +84,24 @@ $NetBSD: patch-aa,v 1.50 2010/11/02 14:52:24 drochner Exp $
|
|||
G_MODULE_HAVE_DLERROR=0
|
||||
if test -z "$G_MODULE_IMPL"; then
|
||||
case "$host" in
|
||||
@@ -24054,7 +24088,7 @@ if test "$G_MODULE_IMPL" = "G_MODULE_IMP
|
||||
@@ -25250,13 +25284,13 @@ if test "$G_MODULE_IMPL" = "G_MODULE_IMP
|
||||
LIBS="$G_MODULE_LIBS $LIBS"
|
||||
LDFLAGS="$LDFLAGS $G_MODULE_LDFLAGS"
|
||||
echo "void glib_plugin_test(void) { }" > plugin.c
|
||||
- ${SHELL} ./libtool --mode=compile ${CC} -shared \
|
||||
+ ${SHELL} libtool --mode=compile ${CC} -shared \
|
||||
-export-dynamic -o plugin.o plugin.c 2>&1 >/dev/null
|
||||
- ${SHELL} ./libtool --mode=compile --tag=CC ${CC} ${CFLAGS} \
|
||||
+ ${SHELL} libtool --mode=compile --tag=CC ${CC} ${CFLAGS} \
|
||||
${CPPFLAGS} -c -o plugin.lo plugin.c >/dev/null 2>&1
|
||||
- ${SHELL} ./libtool --mode=link --tag=CC ${CC} ${CFLAGS} \
|
||||
+ ${SHELL} libtool --mode=link --tag=CC ${CC} ${CFLAGS} \
|
||||
${LDFLAGS} -module -o plugin.la -export-dynamic \
|
||||
-shrext ".o" -avoid-version plugin.lo \
|
||||
-rpath /dont/care >/dev/null 2>&1
|
||||
- eval `./libtool --config | grep ^objdir`
|
||||
+ eval `libtool --config | grep ^objdir`
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for RTLD_GLOBAL brokenness" >&5
|
||||
$as_echo_n "checking for RTLD_GLOBAL brokenness... " >&6; }
|
||||
@@ -24164,6 +24198,56 @@ fi
|
||||
if ${glib_cv_rtldglobal_broken+:} false; then :
|
||||
@@ -25365,6 +25399,56 @@ fi
|
||||
|
||||
LIBS="$LIBS_orig"
|
||||
fi
|
||||
|
|
@ -150,7 +158,7 @@ $NetBSD: patch-aa,v 1.50 2010/11/02 14:52:24 drochner Exp $
|
|||
if test -z "$G_MODULE_IMPL"; then
|
||||
G_MODULE_IMPL=0
|
||||
G_MODULE_SUPPORTED=false
|
||||
@@ -24174,7 +24258,7 @@ fi
|
||||
@@ -25375,7 +25459,7 @@ fi
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the suffix of module shared libraries" >&5
|
||||
$as_echo_n "checking for the suffix of module shared libraries... " >&6; }
|
||||
export SED
|
||||
|
|
@ -159,7 +167,7 @@ $NetBSD: patch-aa,v 1.50 2010/11/02 14:52:24 drochner Exp $
|
|||
eval $shrext_cmds
|
||||
module=yes eval std_shrext=$shrext_cmds
|
||||
# chop the initial dot
|
||||
@@ -24198,6 +24282,8 @@ fi
|
||||
@@ -25399,6 +25483,8 @@ fi
|
||||
|
||||
|
||||
|
||||
|
|
@ -168,14 +176,14 @@ $NetBSD: patch-aa,v 1.50 2010/11/02 14:52:24 drochner Exp $
|
|||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gspawn implementation" >&5
|
||||
$as_echo_n "checking for gspawn implementation... " >&6; }
|
||||
case "$host" in
|
||||
@@ -24946,62 +25032,8 @@ if test x"$have_threads" != xno; then
|
||||
G_THREAD_LIBS="-lpthread -lthread"
|
||||
;;
|
||||
*)
|
||||
- for flag in pthread pthreads mt; do
|
||||
- glib_save_CFLAGS="$CFLAGS"
|
||||
- CFLAGS="$CFLAGS -$flag"
|
||||
- if test "$cross_compiling" = yes; then :
|
||||
@@ -26147,62 +26233,6 @@ if test x"$have_threads" = xposix; then
|
||||
G_THREAD_LIBS="-lpthread -lthread"
|
||||
;;
|
||||
*)
|
||||
- for flag in pthread pthreads mt; do
|
||||
- glib_save_CFLAGS="$CFLAGS"
|
||||
- CFLAGS="$CFLAGS -$flag"
|
||||
- if test "$cross_compiling" = yes; then :
|
||||
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
-/* end confdefs.h. */
|
||||
-
|
||||
|
|
@ -221,24 +229,13 @@ $NetBSD: patch-aa,v 1.50 2010/11/02 14:52:24 drochner Exp $
|
|||
- conftest.$ac_objext conftest.beam conftest.$ac_ext
|
||||
-fi
|
||||
-
|
||||
- CFLAGS="$glib_save_CFLAGS"
|
||||
- if test $glib_flag_works = yes ; then
|
||||
- G_THREAD_CFLAGS=-$flag
|
||||
- G_THREAD_LIBS=-$flag
|
||||
- break;
|
||||
- fi
|
||||
- done
|
||||
+ G_THREAD_LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}"
|
||||
+ G_THREAD_CFLAGS="${PTHREAD_CFLAGS}"
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
@@ -27599,7 +27631,7 @@ rm -f core conftest.err conftest.$ac_obj
|
||||
- CFLAGS="$glib_save_CFLAGS"
|
||||
- if test $glib_flag_works = yes ; then
|
||||
- G_THREAD_CFLAGS=-$flag
|
||||
- G_THREAD_LIBS=-$flag
|
||||
- break;
|
||||
- fi
|
||||
- done
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
|
||||
|
||||
-if test "x${enable_Bsymbolic}" == "xyes"; then
|
||||
+if test "x${enable_Bsymbolic}" = "xyes"; then
|
||||
GLIB_LINK_FLAGS=-Wl,-Bsymbolic-functions
|
||||
fi
|
||||
|
||||
|
|
|
|||
|
|
@ -1,17 +1,17 @@
|
|||
$NetBSD: patch-ab,v 1.13 2008/09/06 11:07:20 obache Exp $
|
||||
$NetBSD: patch-ab,v 1.14 2012/04/30 13:53:48 drochner Exp $
|
||||
|
||||
http://bugzilla.gnome.org/show_bug.cgi?id=140329
|
||||
|
||||
--- gmodule/gmodule.c.orig 2008-09-02 15:09:12.000000000 +0000
|
||||
--- gmodule/gmodule.c.orig 2012-03-12 00:42:42.000000000 +0000
|
||||
+++ gmodule/gmodule.c
|
||||
@@ -604,6 +604,31 @@ g_module_error (void)
|
||||
return g_static_private_get (&module_error_private);
|
||||
@@ -800,6 +800,31 @@ g_module_error (void)
|
||||
return g_private_get (&module_error_private);
|
||||
}
|
||||
|
||||
+static void
|
||||
+g_module_symbol_aux (GModule *module,
|
||||
+ const gchar *symbol_name,
|
||||
+ gpointer *symbol)
|
||||
+g_module_symbol_aux (GModule *module,
|
||||
+ const gchar *symbol_name,
|
||||
+ gpointer *symbol)
|
||||
+{
|
||||
+ gpointer hdl = module->handle;
|
||||
+#if defined (G_MODULE_BROKEN_DLOPEN_NULL) && defined(__NetBSD__) && defined(RTLD_DEFAULT)
|
||||
|
|
@ -20,25 +20,25 @@ http://bugzilla.gnome.org/show_bug.cgi?id=140329
|
|||
+ hdl = RTLD_DEFAULT;
|
||||
+#endif
|
||||
+
|
||||
+#ifdef G_MODULE_NEED_USCORE
|
||||
+#ifdef G_MODULE_NEED_USCORE
|
||||
+ {
|
||||
+ gchar *name;
|
||||
+
|
||||
+ name = g_strconcat ("_", symbol_name, NULL);
|
||||
+ *symbol = _g_module_symbol (hdl, name);
|
||||
+ *symbol = _g_module_symbol (module->handle, name);
|
||||
+ g_free (name);
|
||||
+ }
|
||||
+#else /* !G_MODULE_NEED_USCORE */
|
||||
+ *symbol = _g_module_symbol (hdl, symbol_name);
|
||||
+#endif /* !G_MODULE_NEED_USCORE */
|
||||
+#else
|
||||
+ *symbol = _g_module_symbol (module->handle, symbol_name);
|
||||
+#endif
|
||||
+}
|
||||
+
|
||||
gboolean
|
||||
g_module_symbol (GModule *module,
|
||||
const gchar *symbol_name,
|
||||
@@ -621,17 +646,28 @@ g_module_symbol (GModule *module,
|
||||
/**
|
||||
* g_module_symbol:
|
||||
* @module: a #GModule
|
||||
@@ -828,17 +853,28 @@ g_module_symbol (GModule *module,
|
||||
|
||||
g_static_rec_mutex_lock (&g_module_global_lock);
|
||||
g_rec_mutex_lock (&g_module_global_lock);
|
||||
|
||||
-#ifdef G_MODULE_NEED_USCORE
|
||||
+#ifdef G_MODULE_BROKEN_DLOPEN_NULL
|
||||
|
|
@ -68,9 +68,9 @@ http://bugzilla.gnome.org/show_bug.cgi?id=140329
|
|||
+ }
|
||||
+ else
|
||||
+ g_module_symbol_aux(module, symbol_name, symbol);
|
||||
+#else /* !G_MODULE_BROKEN_DLOPEN_NULL */
|
||||
+#else /* !G_MODULE_BROKEN_DLOPEN_NULL */
|
||||
+ g_module_symbol_aux(module, symbol_name, symbol);
|
||||
+#endif /* G_MODULE_BROKEN_DLOPEN_NULL */
|
||||
+#endif /* G_MODULE_BROKEN_DLOPEN_NULL */
|
||||
|
||||
module_error = g_module_error ();
|
||||
if (module_error)
|
||||
|
|
|
|||
|
|
@ -1,15 +0,0 @@
|
|||
$NetBSD: patch-ad,v 1.8 2004/04/01 18:13:31 jmmv Exp $
|
||||
|
||||
http://bugzilla.gnome.org/show_bug.cgi?id=134119
|
||||
|
||||
--- gthread/gthread-posix.c.orig 2002-11-04 21:09:47.000000000 +0100
|
||||
+++ gthread/gthread-posix.c
|
||||
@@ -97,7 +97,7 @@ static gboolean posix_check_cmd_prio_war
|
||||
# error This should not happen. Contact the GLib team.
|
||||
#endif
|
||||
|
||||
-#if defined (POSIX_MIN_PRIORITY) && defined (POSIX_MAX_PRIORITY)
|
||||
+#if defined (POSIX_MIN_PRIORITY) && defined (POSIX_MAX_PRIORITY) && defined(_POSIX_THREAD_PRIORITY_SCHEDULING)
|
||||
# define HAVE_PRIORITIES 1
|
||||
static gint priority_normal_value;
|
||||
# ifdef __FreeBSD__
|
||||
|
|
@ -1,18 +0,0 @@
|
|||
$NetBSD: patch-ag,v 1.18 2009/05/20 13:07:36 wiz Exp $
|
||||
|
||||
http://bugzilla.gnome.org/show_bug.cgi?id=583321
|
||||
|
||||
--- glib/gtester.c.orig 2008-11-24 06:45:23.000000000 +0100
|
||||
+++ glib/gtester.c
|
||||
@@ -636,7 +636,11 @@ main (int argc,
|
||||
struct sigaction osa;
|
||||
sa.sa_handler = SIG_DFL;
|
||||
sigfillset (&sa.sa_mask);
|
||||
+#ifdef SA_RESTART
|
||||
sa.sa_flags = SA_RESTART;
|
||||
+#else /* QNX */
|
||||
+ sa.sa_flags = 0;
|
||||
+#endif
|
||||
sigaction (SIGCHLD, &sa, &osa);
|
||||
}
|
||||
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
$NetBSD: patch-ah,v 1.9 2008/09/06 11:07:20 obache Exp $
|
||||
$NetBSD: patch-ah,v 1.10 2012/04/30 13:53:48 drochner Exp $
|
||||
|
||||
--- glib/gutils.c.orig 2008-09-02 16:44:24.000000000 +0000
|
||||
--- glib/gutils.c.orig 2012-03-12 00:42:42.000000000 +0000
|
||||
+++ glib/gutils.c
|
||||
@@ -2694,7 +2694,7 @@ g_get_system_data_dirs (void)
|
||||
@@ -1991,7 +1991,7 @@ g_get_system_data_dirs (void)
|
||||
gchar *data_dirs = (gchar *) g_getenv ("XDG_DATA_DIRS");
|
||||
|
||||
if (!data_dirs || !data_dirs[0])
|
||||
|
|
@ -11,7 +11,7 @@ $NetBSD: patch-ah,v 1.9 2008/09/06 11:07:20 obache Exp $
|
|||
|
||||
data_dir_vector = g_strsplit (data_dirs, G_SEARCHPATH_SEPARATOR_S, 0);
|
||||
#endif
|
||||
@@ -2748,7 +2748,7 @@ g_get_system_config_dirs (void)
|
||||
@@ -2053,7 +2053,7 @@ g_get_system_config_dirs (void)
|
||||
conf_dirs = (gchar *) g_getenv ("XDG_CONFIG_DIRS");
|
||||
|
||||
if (!conf_dirs || !conf_dirs[0])
|
||||
|
|
@ -20,12 +20,3 @@ $NetBSD: patch-ah,v 1.9 2008/09/06 11:07:20 obache Exp $
|
|||
|
||||
conf_dir_vector = g_strsplit (conf_dirs, G_SEARCHPATH_SEPARATOR_S, 0);
|
||||
#endif
|
||||
@@ -2829,7 +2829,7 @@ unalias_lang (char *lang)
|
||||
int i;
|
||||
|
||||
if (!alias_table)
|
||||
- read_aliases ("/usr/share/locale/locale.alias");
|
||||
+ read_aliases (PREFIX "/" PKGLOCALEDIR "/locale/locale.alias");
|
||||
|
||||
i = 0;
|
||||
while ((p = g_hash_table_lookup (alias_table, lang)) && (strcmp (p, lang) != 0))
|
||||
|
|
|
|||
13
devel/glib2/patches/patch-aha
Normal file
13
devel/glib2/patches/patch-aha
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
$NetBSD: patch-aha,v 1.1 2012/04/30 13:53:48 drochner Exp $
|
||||
|
||||
--- glib/gcharset.c.orig 2012-03-31 18:03:03.000000000 +0000
|
||||
+++ glib/gcharset.c
|
||||
@@ -295,7 +295,7 @@ unalias_lang (char *lang)
|
||||
int i;
|
||||
|
||||
if (!alias_table)
|
||||
- read_aliases ("/usr/share/locale/locale.alias");
|
||||
+ read_aliases (PREFIX "/" PKGLOCALEDIR "/locale/locale.alias");
|
||||
|
||||
i = 0;
|
||||
while ((p = g_hash_table_lookup (alias_table, lang)) && (strcmp (p, lang) != 0))
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
$NetBSD: patch-ak,v 1.9 2012/01/29 10:46:53 drochner Exp $
|
||||
$NetBSD: patch-ak,v 1.10 2012/04/30 13:53:48 drochner Exp $
|
||||
|
||||
--- configure.ac.orig 2011-10-14 04:12:40.000000000 +0000
|
||||
--- configure.ac.orig 2012-03-24 03:02:16.000000000 +0000
|
||||
+++ configure.ac
|
||||
@@ -882,7 +882,7 @@ int main (int argc, char **argv)
|
||||
@@ -835,7 +835,7 @@ int main (int argc, char **argv)
|
||||
AC_MSG_RESULT($g_have_gnuc_visibility)
|
||||
AM_CONDITIONAL(HAVE_GNUC_VISIBILITY, [test x$g_have_gnuc_visibility = xyes])
|
||||
|
||||
|
|
@ -11,7 +11,7 @@ $NetBSD: patch-ak,v 1.9 2012/01/29 10:46:53 drochner Exp $
|
|||
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#if defined(__SUNPRO_C) || (__SUNPRO_C >= 0x550)
|
||||
#else
|
||||
# include "error: this is not Sun Studio."
|
||||
@@ -1114,8 +1114,20 @@ AC_SUBST(NETWORK_LIBS)
|
||||
@@ -1086,8 +1086,20 @@ AC_CHECK_TYPE([struct ip_mreqn], [
|
||||
|
||||
case $host in
|
||||
*-*-solaris* )
|
||||
|
|
@ -32,7 +32,7 @@ $NetBSD: patch-ak,v 1.9 2012/01/29 10:46:53 drochner Exp $
|
|||
AC_DEFINE(__EXTENSIONS__, 1, Needed to get declarations for msg_control and msg_controllen on Solaris)
|
||||
;;
|
||||
esac
|
||||
@@ -1509,11 +1521,12 @@ if test x"$glib_native_win32" = xyes; th
|
||||
@@ -1448,11 +1460,12 @@ if test x"$glib_native_win32" = xyes; th
|
||||
G_MODULE_LDFLAGS=
|
||||
else
|
||||
export SED
|
||||
|
|
@ -46,16 +46,24 @@ $NetBSD: patch-ak,v 1.9 2012/01/29 10:46:53 drochner Exp $
|
|||
G_MODULE_HAVE_DLERROR=0
|
||||
dnl *** force native WIN32 shared lib loader
|
||||
if test -z "$G_MODULE_IMPL"; then
|
||||
@@ -1574,7 +1587,7 @@ if test "$G_MODULE_IMPL" = "G_MODULE_IMP
|
||||
@@ -1513,13 +1526,13 @@ if test "$G_MODULE_IMPL" = "G_MODULE_IMP
|
||||
LDFLAGS="$LDFLAGS $G_MODULE_LDFLAGS"
|
||||
dnl *** check for OSF1/5.0 RTLD_GLOBAL brokenness
|
||||
echo "void glib_plugin_test(void) { }" > plugin.c
|
||||
- ${SHELL} ./libtool --mode=compile ${CC} -shared \
|
||||
+ ${SHELL} libtool --mode=compile ${CC} -shared \
|
||||
-export-dynamic -o plugin.o plugin.c 2>&1 >/dev/null
|
||||
- ${SHELL} ./libtool --mode=compile --tag=CC ${CC} ${CFLAGS} \
|
||||
+ ${SHELL} libtool --mode=compile --tag=CC ${CC} ${CFLAGS} \
|
||||
${CPPFLAGS} -c -o plugin.lo plugin.c >/dev/null 2>&1
|
||||
- ${SHELL} ./libtool --mode=link --tag=CC ${CC} ${CFLAGS} \
|
||||
+ ${SHELL} libtool --mode=link --tag=CC ${CC} ${CFLAGS} \
|
||||
${LDFLAGS} -module -o plugin.la -export-dynamic \
|
||||
-shrext ".o" -avoid-version plugin.lo \
|
||||
-rpath /dont/care >/dev/null 2>&1
|
||||
- eval `./libtool --config | grep ^objdir`
|
||||
+ eval `libtool --config | grep ^objdir`
|
||||
AC_CACHE_CHECK([for RTLD_GLOBAL brokenness],
|
||||
glib_cv_rtldglobal_broken,[
|
||||
@@ -1638,6 +1651,38 @@ dnl *** check for having dlerror()
|
||||
AC_TRY_RUN([
|
||||
@@ -1582,6 +1595,38 @@ dnl *** check for having dlerror()
|
||||
[G_MODULE_HAVE_DLERROR=0])
|
||||
LIBS="$LIBS_orig"
|
||||
fi
|
||||
|
|
@ -94,7 +102,7 @@ $NetBSD: patch-ak,v 1.9 2012/01/29 10:46:53 drochner Exp $
|
|||
dnl *** done, have we got an implementation?
|
||||
if test -z "$G_MODULE_IMPL"; then
|
||||
G_MODULE_IMPL=0
|
||||
@@ -1648,7 +1693,7 @@ fi
|
||||
@@ -1592,7 +1637,7 @@ fi
|
||||
|
||||
AC_MSG_CHECKING(for the suffix of module shared libraries)
|
||||
export SED
|
||||
|
|
@ -103,7 +111,7 @@ $NetBSD: patch-ak,v 1.9 2012/01/29 10:46:53 drochner Exp $
|
|||
eval $shrext_cmds
|
||||
module=yes eval std_shrext=$shrext_cmds
|
||||
# chop the initial dot
|
||||
@@ -1667,6 +1712,8 @@ AC_SUBST(G_MODULE_PLUGIN_LIBS)
|
||||
@@ -1611,6 +1656,8 @@ AC_SUBST(G_MODULE_PLUGIN_LIBS)
|
||||
AC_SUBST(G_MODULE_LDFLAGS)
|
||||
AC_SUBST(G_MODULE_HAVE_DLERROR)
|
||||
AC_SUBST(G_MODULE_BROKEN_RTLD_GLOBAL)
|
||||
|
|
@ -112,37 +120,28 @@ $NetBSD: patch-ak,v 1.9 2012/01/29 10:46:53 drochner Exp $
|
|||
AC_SUBST(G_MODULE_NEED_USCORE)
|
||||
AC_SUBST(GLIB_DEBUG_FLAGS)
|
||||
|
||||
@@ -2055,22 +2102,8 @@ if test x"$have_threads" != xno; then
|
||||
G_THREAD_LIBS="-lpthread -lthread"
|
||||
;;
|
||||
*)
|
||||
- for flag in pthread pthreads mt; do
|
||||
- glib_save_CFLAGS="$CFLAGS"
|
||||
- CFLAGS="$CFLAGS -$flag"
|
||||
- AC_TRY_RUN(glib_thread_test(0),
|
||||
- glib_flag_works=yes,
|
||||
- glib_flag_works=no,
|
||||
- [AC_LINK_IFELSE([AC_LANG_SOURCE(glib_thread_test(0))],
|
||||
- glib_flag_works=yes,
|
||||
- glib_flag_works=no)])
|
||||
- CFLAGS="$glib_save_CFLAGS"
|
||||
- if test $glib_flag_works = yes ; then
|
||||
- G_THREAD_CFLAGS=-$flag
|
||||
- G_THREAD_LIBS=-$flag
|
||||
- break;
|
||||
- fi
|
||||
- done
|
||||
+ G_THREAD_LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}"
|
||||
+ G_THREAD_CFLAGS="${PTHREAD_CFLAGS}"
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
@@ -3771,7 +3804,7 @@ AC_ARG_ENABLE(Bsymbolic,
|
||||
enable_Bsymbolic=no)
|
||||
LDFLAGS="${SAVED_LDFLAGS}"])
|
||||
|
||||
-if test "x${enable_Bsymbolic}" == "xyes"; then
|
||||
+if test "x${enable_Bsymbolic}" = "xyes"; then
|
||||
GLIB_LINK_FLAGS=-Wl,-Bsymbolic-functions
|
||||
@@ -1967,22 +2014,8 @@ if test x"$have_threads" = xposix; then
|
||||
G_THREAD_LIBS="-lpthread -lthread"
|
||||
;;
|
||||
*)
|
||||
- for flag in pthread pthreads mt; do
|
||||
- glib_save_CFLAGS="$CFLAGS"
|
||||
- CFLAGS="$CFLAGS -$flag"
|
||||
- AC_TRY_RUN(glib_thread_test(0),
|
||||
- glib_flag_works=yes,
|
||||
- glib_flag_works=no,
|
||||
- [AC_LINK_IFELSE([AC_LANG_SOURCE(glib_thread_test(0))],
|
||||
- glib_flag_works=yes,
|
||||
- glib_flag_works=no)])
|
||||
- CFLAGS="$glib_save_CFLAGS"
|
||||
- if test $glib_flag_works = yes ; then
|
||||
- G_THREAD_CFLAGS=-$flag
|
||||
- G_THREAD_LIBS=-$flag
|
||||
- break;
|
||||
- fi
|
||||
- done
|
||||
+ G_THREAD_LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}"
|
||||
+ G_THREAD_CFLAGS="${PTHREAD_CFLAGS}"
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
|
||||
|
|
|
|||
|
|
@ -1,17 +1,17 @@
|
|||
$NetBSD: patch-an,v 1.6 2012/01/29 17:43:44 drochner Exp $
|
||||
$NetBSD: patch-an,v 1.7 2012/04/30 13:53:48 drochner Exp $
|
||||
|
||||
--- gio/Makefile.in.orig 2011-11-11 22:11:55.000000000 +0000
|
||||
--- gio/Makefile.in.orig 2012-04-13 22:16:59.000000000 +0000
|
||||
+++ gio/Makefile.in
|
||||
@@ -709,7 +709,7 @@ EXTRA_DIST = strinfo.c gio.symbols gioen
|
||||
gschema.dtd $(NULL) $(completion_DATA)
|
||||
@@ -755,7 +755,7 @@ EXTRA_DIST = strinfo.c data-to-c.pl gio.
|
||||
$(NULL) $(completion_DATA)
|
||||
TEST_PROGS =
|
||||
NULL =
|
||||
-SUBDIRS = gdbus-2.0/codegen $(am__append_1) $(am__append_3) \
|
||||
+SUBDIRS = $(am__append_1) $(am__append_3) \
|
||||
$(am__append_7) $(am__append_10) . $(am__append_13) tests
|
||||
-SUBDIRS = gdbus-2.0/codegen $(am__append_1) $(am__append_4) \
|
||||
+SUBDIRS = $(am__append_1) $(am__append_4) \
|
||||
$(am__append_8) $(am__append_11) . $(am__append_14) tests
|
||||
@MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@noinst_DATA = gio-2.0.lib
|
||||
@MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@install_ms_lib_cmd = $(INSTALL) gio-2.0.lib $(DESTDIR)$(libdir)
|
||||
@@ -3377,7 +3377,7 @@ info: info-recursive
|
||||
@@ -3400,7 +3400,7 @@ info: info-recursive
|
||||
|
||||
info-am:
|
||||
|
||||
|
|
|
|||
|
|
@ -1,15 +1,20 @@
|
|||
$NetBSD: patch-ar,v 1.2 2012/03/21 12:18:33 drochner Exp $
|
||||
$NetBSD: patch-ar,v 1.3 2012/04/30 13:53:48 drochner Exp $
|
||||
|
||||
avoid python dependency
|
||||
|
||||
--- gio/tests/Makefile.in.orig 2012-03-11 23:36:24.000000000 +0000
|
||||
--- gio/tests/Makefile.in.orig 2012-03-24 03:02:44.000000000 +0000
|
||||
+++ gio/tests/Makefile.in
|
||||
@@ -49,16 +49,13 @@ noinst_PROGRAMS = $(am__EXEEXT_5) $(am__
|
||||
@OS_UNIX_TRUE@ gdbus-non-socket gdbus-bz627724 appinfo \
|
||||
@OS_UNIX_TRUE@ contenttype file $(NULL) live-g-file \
|
||||
@OS_UNIX_TRUE@ desktop-app-info unix-fd unix-streams \
|
||||
-@OS_UNIX_TRUE@ gapplication gdbus-test-codegen $(NULL)
|
||||
+@OS_UNIX_TRUE@ gapplication $(NULL)
|
||||
@@ -47,20 +47,17 @@ noinst_PROGRAMS = $(am__EXEEXT_5) $(am__
|
||||
@OS_UNIX_TRUE@ gdbus-names gdbus-proxy gdbus-proxy-threads \
|
||||
@OS_UNIX_TRUE@ gdbus-proxy-well-known-name gdbus-introspection \
|
||||
@OS_UNIX_TRUE@ gdbus-threading gdbus-export gdbus-error \
|
||||
-@OS_UNIX_TRUE@ gdbus-peer gdbus-exit-on-close gdbus-non-socket \
|
||||
+@OS_UNIX_TRUE@ gdbus-exit-on-close gdbus-non-socket \
|
||||
@OS_UNIX_TRUE@ gdbus-bz627724 appinfo contenttype mimeapps file \
|
||||
@OS_UNIX_TRUE@ $(NULL) live-g-file desktop-app-info unix-fd \
|
||||
@OS_UNIX_TRUE@ unix-streams gapplication basic-application \
|
||||
-@OS_UNIX_TRUE@ gdbus-test-codegen $(NULL)
|
||||
+@OS_UNIX_TRUE@ $(NULL)
|
||||
@OS_UNIX_TRUE@am__append_2 = \
|
||||
@OS_UNIX_TRUE@ gdbus-example-unix-fd-client \
|
||||
-@OS_UNIX_TRUE@ gdbus-example-objectmanager-server \
|
||||
|
|
@ -22,28 +27,37 @@ avoid python dependency
|
|||
subdir = gio/tests
|
||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||
am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \
|
||||
@@ -97,7 +94,7 @@ am__EXEEXT_1 =
|
||||
@OS_UNIX_TRUE@ $(am__EXEEXT_1) live-g-file$(EXEEXT) \
|
||||
@OS_UNIX_TRUE@ desktop-app-info$(EXEEXT) unix-fd$(EXEEXT) \
|
||||
@OS_UNIX_TRUE@ unix-streams$(EXEEXT) gapplication$(EXEEXT) \
|
||||
@@ -104,7 +101,7 @@ am__EXEEXT_1 =
|
||||
@OS_UNIX_TRUE@ gdbus-proxy-well-known-name$(EXEEXT) \
|
||||
@OS_UNIX_TRUE@ gdbus-introspection$(EXEEXT) \
|
||||
@OS_UNIX_TRUE@ gdbus-threading$(EXEEXT) gdbus-export$(EXEEXT) \
|
||||
-@OS_UNIX_TRUE@ gdbus-error$(EXEEXT) gdbus-peer$(EXEEXT) \
|
||||
+@OS_UNIX_TRUE@ gdbus-error$(EXEEXT) \
|
||||
@OS_UNIX_TRUE@ gdbus-exit-on-close$(EXEEXT) \
|
||||
@OS_UNIX_TRUE@ gdbus-non-socket$(EXEEXT) \
|
||||
@OS_UNIX_TRUE@ gdbus-bz627724$(EXEEXT) appinfo$(EXEEXT) \
|
||||
@@ -113,7 +110,7 @@ am__EXEEXT_1 =
|
||||
@OS_UNIX_TRUE@ live-g-file$(EXEEXT) desktop-app-info$(EXEEXT) \
|
||||
@OS_UNIX_TRUE@ unix-fd$(EXEEXT) unix-streams$(EXEEXT) \
|
||||
@OS_UNIX_TRUE@ gapplication$(EXEEXT) basic-application$(EXEEXT) \
|
||||
-@OS_UNIX_TRUE@ gdbus-test-codegen$(EXEEXT) $(am__EXEEXT_1)
|
||||
+@OS_UNIX_TRUE@ $(am__EXEEXT_1)
|
||||
@OS_WIN32_TRUE@am__EXEEXT_3 = win32-streams$(EXEEXT)
|
||||
@HAVE_DBUS1_TRUE@am__EXEEXT_4 = gdbus-serialization$(EXEEXT)
|
||||
am__EXEEXT_5 = io-stream$(EXEEXT) actions$(EXEEXT) \
|
||||
@@ -116,8 +113,6 @@ am__EXEEXT_5 = io-stream$(EXEEXT) action
|
||||
cancellable$(EXEEXT) $(am__EXEEXT_1) $(am__EXEEXT_2) \
|
||||
$(am__EXEEXT_3) $(am__EXEEXT_4)
|
||||
am__EXEEXT_5 = io-stream$(EXEEXT) memory-input-stream$(EXEEXT) \
|
||||
@@ -133,8 +130,6 @@ am__EXEEXT_5 = io-stream$(EXEEXT) memory
|
||||
gmenumodel$(EXEEXT) resources$(EXEEXT) $(am__EXEEXT_1) \
|
||||
$(am__EXEEXT_2) $(am__EXEEXT_3) $(am__EXEEXT_4)
|
||||
@OS_UNIX_TRUE@am__EXEEXT_6 = gdbus-example-unix-fd-client$(EXEEXT) \
|
||||
-@OS_UNIX_TRUE@ gdbus-example-objectmanager-server$(EXEEXT) \
|
||||
-@OS_UNIX_TRUE@ gdbus-example-objectmanager-client$(EXEEXT) \
|
||||
@OS_UNIX_TRUE@ $(am__EXEEXT_1)
|
||||
am__EXEEXT_7 = resolver$(EXEEXT) socket-server$(EXEEXT) \
|
||||
socket-client$(EXEEXT) echo-server$(EXEEXT) httpd$(EXEEXT) \
|
||||
@@ -912,7 +907,6 @@ TEST_PROGS = io-stream actions memory-in
|
||||
gdbus-addresses network-address gdbus-message socket pollable \
|
||||
tls-certificate tls-interaction cancellable $(NULL) \
|
||||
$(am__append_1) $(am__append_3) $(am__append_4)
|
||||
@@ -964,7 +959,6 @@ TEST_PROGS = io-stream memory-input-stre
|
||||
tls-certificate tls-interaction cancellable vfs \
|
||||
network-monitor fileattributematcher gmenumodel resources \
|
||||
$(NULL) $(am__append_1) $(am__append_3) $(am__append_4)
|
||||
-SUBDIRS = gdbus-object-manager-example
|
||||
INCLUDES = \
|
||||
-g \
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
$NetBSD: patch-as,v 1.1 2012/01/31 18:36:01 drochner Exp $
|
||||
$NetBSD: patch-as,v 1.2 2012/04/30 13:53:48 drochner Exp $
|
||||
|
||||
avoid python dependency
|
||||
|
||||
--- gio/tests/Makefile.am.orig 2011-11-11 17:56:52.000000000 +0000
|
||||
--- gio/tests/Makefile.am.orig 2012-03-21 02:24:32.000000000 +0000
|
||||
+++ gio/tests/Makefile.am
|
||||
@@ -4,7 +4,7 @@ BUILT_SOURCES =
|
||||
|
||||
|
|
@ -13,10 +13,10 @@ avoid python dependency
|
|||
|
||||
INCLUDES = \
|
||||
-g \
|
||||
@@ -115,12 +115,9 @@ TEST_PROGS += \
|
||||
unix-fd \
|
||||
@@ -123,12 +123,9 @@ TEST_PROGS += \
|
||||
unix-streams \
|
||||
gapplication \
|
||||
basic-application \
|
||||
- gdbus-test-codegen \
|
||||
$(NULL)
|
||||
SAMPLE_PROGS += \
|
||||
|
|
@ -26,7 +26,7 @@ avoid python dependency
|
|||
$(NULL)
|
||||
endif
|
||||
|
||||
@@ -286,7 +283,7 @@ gdbus-test-codegen-generated.h gdbus-tes
|
||||
@@ -295,7 +292,7 @@ gdbus-test-codegen-generated.h gdbus-tes
|
||||
$(srcdir)/test-codegen.xml \
|
||||
$(NULL)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,20 +1,20 @@
|
|||
$NetBSD: patch-ba,v 1.9 2012/03/01 15:06:20 ryoon Exp $
|
||||
$NetBSD: patch-ba,v 1.10 2012/04/30 13:53:48 drochner Exp $
|
||||
|
||||
http://bugzilla.gnome.org/show_bug.cgi?id=583330
|
||||
|
||||
--- gio/gunixmounts.c.orig 2011-11-11 17:56:52.000000000 +0000
|
||||
--- gio/gunixmounts.c.orig 2012-03-18 02:35:25.000000000 +0000
|
||||
+++ gio/gunixmounts.c
|
||||
@@ -153,6 +153,9 @@ struct _GUnixMountMonitor {
|
||||
|
||||
@@ -155,6 +155,9 @@ struct _GUnixMountMonitor {
|
||||
GFileMonitor *fstab_monitor;
|
||||
GFileMonitor *mtab_monitor;
|
||||
+
|
||||
|
||||
+ guint mount_poller_source;
|
||||
+ GList *mount_poller_mounts;
|
||||
+
|
||||
GSource *proc_mounts_watch_source;
|
||||
};
|
||||
|
||||
struct _GUnixMountMonitorClass {
|
||||
@@ -164,6 +167,8 @@ static GUnixMountMonitor *the_mount_moni
|
||||
@@ -167,6 +170,8 @@ static GUnixMountMonitor *the_mount_moni
|
||||
static GList *_g_get_unix_mounts (void);
|
||||
static GList *_g_get_unix_mount_points (void);
|
||||
|
||||
|
|
@ -23,7 +23,7 @@ http://bugzilla.gnome.org/show_bug.cgi?id=583330
|
|||
G_DEFINE_TYPE (GUnixMountMonitor, g_unix_mount_monitor, G_TYPE_OBJECT);
|
||||
|
||||
#define MOUNT_POLL_INTERVAL 4000
|
||||
@@ -190,6 +195,7 @@ G_DEFINE_TYPE (GUnixMountMonitor, g_unix
|
||||
@@ -193,6 +198,7 @@ G_DEFINE_TYPE (GUnixMountMonitor, g_unix
|
||||
#endif
|
||||
|
||||
#if (defined(HAVE_GETVFSSTAT) || defined(HAVE_GETFSSTAT)) && defined(HAVE_FSTAB_H) && defined(HAVE_SYS_MOUNT_H)
|
||||
|
|
@ -31,7 +31,7 @@ http://bugzilla.gnome.org/show_bug.cgi?id=583330
|
|||
#include <sys/ucred.h>
|
||||
#include <sys/mount.h>
|
||||
#include <fstab.h>
|
||||
@@ -240,22 +246,30 @@ g_unix_is_mount_path_system_internal (co
|
||||
@@ -243,22 +249,30 @@ g_unix_is_mount_path_system_internal (co
|
||||
"/", /* we already have "Filesystem root" in Nautilus */
|
||||
"/bin",
|
||||
"/boot",
|
||||
|
|
@ -62,7 +62,7 @@ http://bugzilla.gnome.org/show_bug.cgi?id=583330
|
|||
"/var",
|
||||
"/var/crash",
|
||||
"/var/local",
|
||||
@@ -595,7 +609,7 @@ get_mtab_monitor_file (void)
|
||||
@@ -602,7 +616,7 @@ get_mtab_monitor_file (void)
|
||||
static GList *
|
||||
_g_get_unix_mounts (void)
|
||||
{
|
||||
|
|
@ -71,7 +71,7 @@ http://bugzilla.gnome.org/show_bug.cgi?id=583330
|
|||
struct statvfs *mntent = NULL;
|
||||
#elif defined(HAVE_GETFSSTAT)
|
||||
struct statfs *mntent = NULL;
|
||||
@@ -608,7 +622,7 @@ _g_get_unix_mounts (void)
|
||||
@@ -615,7 +629,7 @@ _g_get_unix_mounts (void)
|
||||
GList *return_list;
|
||||
|
||||
/* Pass NOWAIT to avoid blocking trying to update NFS mounts. */
|
||||
|
|
@ -80,7 +80,7 @@ http://bugzilla.gnome.org/show_bug.cgi?id=583330
|
|||
num_mounts = getvfsstat (NULL, 0, ST_NOWAIT);
|
||||
#elif defined(HAVE_GETFSSTAT)
|
||||
num_mounts = getfsstat (NULL, 0, MNT_NOWAIT);
|
||||
@@ -618,7 +632,7 @@ _g_get_unix_mounts (void)
|
||||
@@ -625,7 +639,7 @@ _g_get_unix_mounts (void)
|
||||
|
||||
bufsize = num_mounts * sizeof (*mntent);
|
||||
mntent = g_malloc (bufsize);
|
||||
|
|
@ -89,7 +89,7 @@ http://bugzilla.gnome.org/show_bug.cgi?id=583330
|
|||
num_mounts = getvfsstat (mntent, bufsize, ST_NOWAIT);
|
||||
#elif defined(HAVE_GETFSSTAT)
|
||||
num_mounts = getfsstat (mntent, bufsize, MNT_NOWAIT);
|
||||
@@ -634,9 +648,15 @@ _g_get_unix_mounts (void)
|
||||
@@ -641,9 +655,15 @@ _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);
|
||||
|
|
@ -106,7 +106,7 @@ http://bugzilla.gnome.org/show_bug.cgi?id=583330
|
|||
#elif defined(HAVE_GETFSSTAT)
|
||||
if (mntent[i].f_flags & MNT_RDONLY)
|
||||
#endif
|
||||
@@ -1111,6 +1131,10 @@ get_mounts_timestamp (void)
|
||||
@@ -1122,6 +1142,10 @@ get_mounts_timestamp (void)
|
||||
if (stat (monitor_file, &buf) == 0)
|
||||
return (guint64)buf.st_mtime;
|
||||
}
|
||||
|
|
@ -117,7 +117,7 @@ http://bugzilla.gnome.org/show_bug.cgi?id=583330
|
|||
return 0;
|
||||
}
|
||||
|
||||
@@ -1253,6 +1277,13 @@ g_unix_mount_monitor_finalize (GObject *
|
||||
@@ -1267,6 +1291,13 @@ g_unix_mount_monitor_finalize (GObject *
|
||||
g_object_unref (monitor->mtab_monitor);
|
||||
}
|
||||
|
||||
|
|
@ -131,8 +131,8 @@ http://bugzilla.gnome.org/show_bug.cgi?id=583330
|
|||
the_mount_monitor = NULL;
|
||||
|
||||
G_OBJECT_CLASS (g_unix_mount_monitor_parent_class)->finalize (object);
|
||||
@@ -1333,6 +1364,51 @@ mtab_file_changed (GFileMonitor *mo
|
||||
g_signal_emit (mount_monitor, signals[MOUNTS_CHANGED], 0);
|
||||
@@ -1358,6 +1389,51 @@ proc_mounts_changed (GIOChannel *chann
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
+static gboolean
|
||||
|
|
@ -157,15 +157,15 @@ http://bugzilla.gnome.org/show_bug.cgi?id=583330
|
|||
+ for (i = 0; i < g_list_length (current_mounts); i++)
|
||||
+ {
|
||||
+ GUnixMountEntry *m1;
|
||||
+ GUnixMountEntry *m2;
|
||||
+ GUnixMountEntry *m2;
|
||||
+
|
||||
+ m1 = (GUnixMountEntry *)g_list_nth_data (current_mounts, i);
|
||||
+ m2 = (GUnixMountEntry *)g_list_nth_data (mount_monitor->mount_poller_mounts, i);
|
||||
+ m1 = (GUnixMountEntry *)g_list_nth_data (current_mounts, i);
|
||||
+ m2 = (GUnixMountEntry *)g_list_nth_data (mount_monitor->mount_poller_mounts, i);
|
||||
+ if (! has_changed && g_unix_mount_compare (m1, m2) != 0)
|
||||
+ has_changed = TRUE;
|
||||
+
|
||||
+ g_unix_mount_free (m2);
|
||||
+ }
|
||||
+ g_unix_mount_free (m2);
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ g_list_free (mount_monitor->mount_poller_mounts);
|
||||
|
|
@ -183,9 +183,9 @@ http://bugzilla.gnome.org/show_bug.cgi?id=583330
|
|||
static void
|
||||
g_unix_mount_monitor_init (GUnixMountMonitor *monitor)
|
||||
{
|
||||
@@ -1355,6 +1431,12 @@ g_unix_mount_monitor_init (GUnixMountMon
|
||||
|
||||
g_signal_connect (monitor->mtab_monitor, "changed", (GCallback)mtab_file_changed, monitor);
|
||||
@@ -1412,6 +1488,12 @@ g_unix_mount_monitor_init (GUnixMountMon
|
||||
g_signal_connect (monitor->mtab_monitor, "changed", (GCallback)mtab_file_changed, monitor);
|
||||
}
|
||||
}
|
||||
+ else
|
||||
+ {
|
||||
|
|
|
|||
|
|
@ -1,12 +1,9 @@
|
|||
$NetBSD: patch-ce,v 1.4 2012/04/06 10:40:37 taca Exp $
|
||||
$NetBSD: patch-ce,v 1.5 2012/04/30 13:53:48 drochner Exp $
|
||||
|
||||
* Fix inconsistency of .hidden attributes, leading to link error on amd64,
|
||||
reported by Tobias Nygren.
|
||||
* Make sure to initialize mutex before use it since it is problem on platforms
|
||||
without support of GCC bultin atomic operations, such as NetBSD 4.
|
||||
It looks like this problem dosen't exist on glib 2.31.0 and later.
|
||||
Fix inconsistency of .hidden attributes, leading to link error on amd64,
|
||||
reported by Tobias Nygren.
|
||||
|
||||
--- glib/gatomic.c.orig 2012-03-11 21:43:28.000000000 +0000
|
||||
--- glib/gatomic.c.orig 2012-03-12 00:42:41.000000000 +0000
|
||||
+++ glib/gatomic.c
|
||||
@@ -22,6 +22,7 @@
|
||||
#include "config.h"
|
||||
|
|
@ -16,12 +13,3 @@ $NetBSD: patch-ce,v 1.4 2012/04/06 10:40:37 taca Exp $
|
|||
|
||||
/**
|
||||
* SECTION:atomic_operations
|
||||
@@ -606,7 +606,7 @@ gsize
|
||||
|
||||
#include "gthread.h"
|
||||
|
||||
-static GStaticMutex g_atomic_lock;
|
||||
+static GStaticMutex g_atomic_lock = G_STATIC_MUTEX_INIT;
|
||||
|
||||
gint
|
||||
(g_atomic_int_get) (volatile gint *atomic)
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
$NetBSD: patch-cf,v 1.1 2010/06/01 17:28:31 drochner Exp $
|
||||
$NetBSD: patch-cf,v 1.2 2012/04/30 13:53:48 drochner Exp $
|
||||
|
||||
--- gio/libasyncns/g-asyncns.h.orig 2010-06-01 15:28:52.000000000 +0000
|
||||
+++ gio/libasyncns/g-asyncns.h
|
||||
@@ -27,6 +27,9 @@
|
||||
|
||||
/* asyncns.c removed this for #580301, but that appears to have been wrong */
|
||||
#if HAVE_ARPA_NAMESER_COMPAT_H
|
||||
--- gio/gnetworkingprivate.h.orig 2012-03-31 18:24:51.000000000 +0000
|
||||
+++ gio/gnetworkingprivate.h
|
||||
@@ -51,6 +51,9 @@
|
||||
#include <arpa/inet.h>
|
||||
#include <arpa/nameser.h>
|
||||
#if defined(HAVE_ARPA_NAMESER_COMPAT_H) && !defined(GETSHORT)
|
||||
+#ifdef __NetBSD__
|
||||
+#include <sys/param.h>
|
||||
+#endif
|
||||
#include <arpa/nameser_compat.h>
|
||||
#endif
|
||||
|
||||
#include <net/if.h>
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
$NetBSD: patch-cg,v 1.1 2010/11/03 17:07:47 drochner Exp $
|
||||
$NetBSD: patch-cg,v 1.2 2012/04/30 13:53:48 drochner Exp $
|
||||
|
||||
--- glib/gmem.c.orig 2010-09-13 15:57:51.000000000 +0000
|
||||
--- glib/gmem.c.orig 2012-03-19 00:29:05.000000000 +0000
|
||||
+++ glib/gmem.c
|
||||
@@ -39,6 +39,7 @@
|
||||
@@ -42,6 +42,7 @@
|
||||
#include "gbacktrace.h"
|
||||
#include "gtestutils.h"
|
||||
#include "gthread.h"
|
||||
+#include "gthreadprivate.h"
|
||||
#include "glib_trace.h"
|
||||
|
||||
|
||||
#define MEM_PROFILE_TABLE_SIZE 4096
|
||||
|
|
|
|||
|
|
@ -1,18 +0,0 @@
|
|||
$NetBSD: patch-ch,v 1.1 2010/11/10 20:51:46 tez Exp $
|
||||
|
||||
Fix build on Solaris 10
|
||||
|
||||
--- glib/tests/strfuncs.c.orig 2010-11-10 12:28:34.624022400 -0600
|
||||
+++ glib/tests/strfuncs.c 2010-11-10 12:29:38.527197100 -0600
|
||||
@@ -19,7 +19,11 @@
|
||||
* if advised of the possibility of such damage.
|
||||
*/
|
||||
|
||||
+#ifdef __sun
|
||||
+#define _XOPEN_SOURCE 600
|
||||
+#else
|
||||
#define _XOPEN_SOURCE
|
||||
+#endif
|
||||
#include <ctype.h>
|
||||
#include <errno.h>
|
||||
#include <locale.h>
|
||||
|
|
@ -1,72 +1,73 @@
|
|||
$NetBSD: patch-cj,v 1.7 2012/03/21 12:18:33 drochner Exp $
|
||||
$NetBSD: patch-cj,v 1.8 2012/04/30 13:53:48 drochner Exp $
|
||||
|
||||
The mem-overflow test contains a declaration of an empty struct, which breaks
|
||||
on at least SunPro cc, and presumably some other non-gcc compilers. Skip this
|
||||
test for now, pending a better fix.
|
||||
https://bugzilla.gnome.org/show_bug.cgi?id=641350
|
||||
|
||||
--- glib/tests/Makefile.in.orig 2012-03-11 23:36:24.000000000 +0000
|
||||
--- glib/tests/Makefile.in.orig 2012-03-24 03:02:45.000000000 +0000
|
||||
+++ glib/tests/Makefile.in
|
||||
@@ -69,7 +69,7 @@ am__EXEEXT_2 = testing$(EXEEXT) option-c
|
||||
@@ -71,7 +71,7 @@ am__EXEEXT_3 = testing$(EXEEXT) option-c
|
||||
strfuncs$(EXEEXT) string$(EXEEXT) markup-parse$(EXEEXT) \
|
||||
markup-collect$(EXEEXT) markup-escape$(EXEEXT) \
|
||||
markup-subparser$(EXEEXT) array-test$(EXEEXT) \
|
||||
markup-subparser$(EXEEXT) array-test$(EXEEXT) bytes$(EXEEXT) \
|
||||
- hostutils$(EXEEXT) gvariant$(EXEEXT) mem-overflow$(EXEEXT) \
|
||||
+ hostutils$(EXEEXT) gvariant$(EXEEXT) \
|
||||
utf8-performance$(EXEEXT) utils$(EXEEXT) regex$(EXEEXT) \
|
||||
base64$(EXEEXT) sequence$(EXEEXT) scannerapi$(EXEEXT) \
|
||||
shell$(EXEEXT) collate$(EXEEXT) utf8-pointer$(EXEEXT) \
|
||||
@@ -173,8 +173,6 @@ markup_parse_DEPENDENCIES = $(progs_ldad
|
||||
@@ -229,8 +229,6 @@ markup_parse_DEPENDENCIES = $(progs_ldad
|
||||
markup_subparser_SOURCES = markup-subparser.c
|
||||
markup_subparser_OBJECTS = markup-subparser.$(OBJEXT)
|
||||
markup_subparser_DEPENDENCIES = $(progs_ldadd)
|
||||
-mem_overflow_SOURCES = mem-overflow.c
|
||||
-mem_overflow_OBJECTS = mem-overflow.$(OBJEXT)
|
||||
mem_overflow_DEPENDENCIES = $(progs_ldadd)
|
||||
node_SOURCES = node.c
|
||||
node_OBJECTS = node.$(OBJEXT)
|
||||
@@ -293,7 +291,7 @@ SOURCES = array-test.c atomic.c base64.c
|
||||
$(gdatetime_SOURCES) gvariant.c hash.c hmac.c hostutils.c \
|
||||
$(keyfile_SOURCES) list.c logging.c mappedfile.c \
|
||||
markup-collect.c markup-escape.c markup-parse.c \
|
||||
- markup-subparser.c mem-overflow.c node.c \
|
||||
+ markup-subparser.c node.c \
|
||||
mutex_SOURCES = mutex.c
|
||||
mutex_OBJECTS = mutex.$(OBJEXT)
|
||||
@@ -394,7 +392,7 @@ SOURCES = $(1bit_emufutex_SOURCES) 1bit-
|
||||
$(gwakeup_fallback_SOURCES) hash.c hmac.c hook.c hostutils.c \
|
||||
include.c $(keyfile_SOURCES) list.c logging.c mainloop.c \
|
||||
mappedfile.c markup-collect.c markup-escape.c markup-parse.c \
|
||||
- markup-subparser.c mem-overflow.c mutex.c node.c once.c \
|
||||
+ markup-subparser.c mutex.c node.c once.c \
|
||||
$(option_argv0_SOURCES) $(option_context_SOURCES) pattern.c \
|
||||
$(protocol_SOURCES) queue.c $(rand_SOURCES) regex.c \
|
||||
scannerapi.c sequence.c shell.c slist.c sort.c \
|
||||
@@ -308,7 +306,7 @@ DIST_SOURCES = array-test.c atomic.c bas
|
||||
$(gdatetime_SOURCES) gvariant.c hash.c hmac.c hostutils.c \
|
||||
$(keyfile_SOURCES) list.c logging.c mappedfile.c \
|
||||
markup-collect.c markup-escape.c markup-parse.c \
|
||||
- markup-subparser.c mem-overflow.c node.c \
|
||||
+ markup-subparser.c node.c \
|
||||
$(option_argv0_SOURCES) $(option_context_SOURCES) pattern.c \
|
||||
$(protocol_SOURCES) queue.c $(rand_SOURCES) regex.c \
|
||||
scannerapi.c sequence.c shell.c slist.c sort.c \
|
||||
@@ -567,7 +565,7 @@ EXTRA_DIST = 4096-random-bytes keyfilete
|
||||
private.c $(protocol_SOURCES) queue.c $(rand_SOURCES) \
|
||||
rec-mutex.c regex.c rwlock.c scannerapi.c sequence.c shell.c \
|
||||
@@ -415,7 +413,7 @@ DIST_SOURCES = $(1bit_emufutex_SOURCES)
|
||||
$(am__gwakeup_fallback_SOURCES_DIST) hash.c hmac.c hook.c \
|
||||
hostutils.c include.c $(keyfile_SOURCES) list.c logging.c \
|
||||
mainloop.c mappedfile.c markup-collect.c markup-escape.c \
|
||||
- markup-parse.c markup-subparser.c mem-overflow.c mutex.c \
|
||||
+ markup-parse.c markup-subparser.c mutex.c \
|
||||
node.c once.c $(option_argv0_SOURCES) \
|
||||
$(option_context_SOURCES) pattern.c private.c \
|
||||
$(protocol_SOURCES) queue.c $(rand_SOURCES) rec-mutex.c \
|
||||
@@ -679,7 +677,7 @@ EXTRA_DIST = 4096-random-bytes keyfilete
|
||||
TEST_PROGS = testing option-context option-argv0 keyfile fileutils \
|
||||
test-printf protocol rand strfuncs string markup-parse \
|
||||
markup-collect markup-escape markup-subparser array-test \
|
||||
markup-collect markup-escape markup-subparser array-test bytes \
|
||||
- hostutils gvariant mem-overflow utf8-performance utils regex \
|
||||
+ hostutils gvariant utf8-performance utils regex \
|
||||
base64 sequence scannerapi shell collate utf8-pointer \
|
||||
utf8-validate utf8-misc unicode checksum hmac hash cache date \
|
||||
node convert list slist queue tree uri dir pattern logging \
|
||||
@@ -786,9 +784,6 @@ markup-parse$(EXEEXT): $(markup_parse_OB
|
||||
@@ -973,9 +971,7 @@ markup-parse$(EXEEXT): $(markup_parse_OB
|
||||
markup-subparser$(EXEEXT): $(markup_subparser_OBJECTS) $(markup_subparser_DEPENDENCIES) $(EXTRA_markup_subparser_DEPENDENCIES)
|
||||
@rm -f markup-subparser$(EXEEXT)
|
||||
$(AM_V_CCLD)$(LINK) $(markup_subparser_OBJECTS) $(markup_subparser_LDADD) $(LIBS)
|
||||
-mem-overflow$(EXEEXT): $(mem_overflow_OBJECTS) $(mem_overflow_DEPENDENCIES) $(EXTRA_mem_overflow_DEPENDENCIES)
|
||||
- @rm -f mem-overflow$(EXEEXT)
|
||||
- $(AM_V_CCLD)$(LINK) $(mem_overflow_OBJECTS) $(mem_overflow_LDADD) $(LIBS)
|
||||
node$(EXEEXT): $(node_OBJECTS) $(node_DEPENDENCIES) $(EXTRA_node_DEPENDENCIES)
|
||||
@rm -f node$(EXEEXT)
|
||||
$(AM_V_CCLD)$(LINK) $(node_OBJECTS) $(node_LDADD) $(LIBS)
|
||||
@@ -908,7 +903,6 @@ distclean-compile:
|
||||
+
|
||||
mutex$(EXEEXT): $(mutex_OBJECTS) $(mutex_DEPENDENCIES) $(EXTRA_mutex_DEPENDENCIES)
|
||||
@rm -f mutex$(EXEEXT)
|
||||
$(AM_V_CCLD)$(LINK) $(mutex_OBJECTS) $(mutex_LDADD) $(LIBS)
|
||||
@@ -1142,7 +1138,6 @@ distclean-compile:
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/markup-escape.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/markup-parse.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/markup-subparser.Po@am__quote@
|
||||
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mem-overflow.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mutex.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/node.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/option-argv0.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/option-context.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/once.Po@am__quote@
|
||||
|
|
|
|||
|
|
@ -1,26 +1,27 @@
|
|||
$NetBSD: patch-cl,v 1.4 2012/03/21 12:18:33 drochner Exp $
|
||||
$NetBSD: patch-cl,v 1.5 2012/04/30 13:53:48 drochner Exp $
|
||||
|
||||
--- gio/Makefile.am.orig 2012-03-11 21:44:19.000000000 +0000
|
||||
--- gio/Makefile.am.orig 2012-03-18 02:36:48.000000000 +0000
|
||||
+++ gio/Makefile.am
|
||||
@@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.decl
|
||||
@@ -2,8 +2,6 @@ include $(top_srcdir)/Makefile.decl
|
||||
|
||||
NULL =
|
||||
|
||||
-SUBDIRS = gdbus-2.0/codegen
|
||||
+SUBDIRS =
|
||||
|
||||
-
|
||||
if OS_UNIX
|
||||
SUBDIRS += libasyncns xdgmime
|
||||
@@ -635,12 +635,6 @@ gdbus_SOURCES = gdbus-tool.c
|
||||
gdbus_LDADD = libgio-2.0.la \
|
||||
$(gio_dependency_libs)
|
||||
SUBDIRS += xdgmime
|
||||
endif
|
||||
@@ -692,13 +690,6 @@ gdbus_LDADD = libgio-2.0.la \
|
||||
$(top_builddir)/glib/libglib-2.0.la \
|
||||
$(top_builddir)/gobject/libgobject-2.0.la
|
||||
|
||||
-completiondir = $(sysconfdir)/bash_completion.d
|
||||
-completion_DATA = \
|
||||
- gdbus-bash-completion.sh \
|
||||
- gsettings-bash-completion.sh
|
||||
- gsettings-bash-completion.sh \
|
||||
- gresource-bash-completion.sh
|
||||
-EXTRA_DIST += $(completion_DATA)
|
||||
-
|
||||
# ------------------------------------------------------------------------
|
||||
# gresource tool
|
||||
|
||||
dist-hook: $(BUILT_EXTRA_DIST) ../build/win32/vs9/gio.vcproj ../build/win32/vs10/gio.vcxproj ../build/win32/vs10/gio.vcxproj.filters
|
||||
|
|
|
|||
Loading…
Reference in a new issue