update to 2.30.2
this switches to the 2.30 release branch pkgsrc note: if you use net/libsoup24 with this glib2 version, make sure to use at least version 2.34.3nb1
This commit is contained in:
drochner
parent
9394035265
commit
cb9122662d
13 changed files with 195 additions and 146 deletions
|
|
@ -1,10 +1,8 @@
|
|||
# $NetBSD: Makefile,v 1.190 2012/01/17 16:51:04 jmmv Exp $
|
||||
# $NetBSD: Makefile,v 1.191 2012/01/29 10:46:52 drochner Exp $
|
||||
|
||||
.include "Makefile.common"
|
||||
.include "options.mk"
|
||||
|
||||
PKGREVISION= 4
|
||||
|
||||
CATEGORIES= devel
|
||||
|
||||
COMMENT= Some useful routines for C programming (glib2)
|
||||
|
|
@ -34,6 +32,7 @@ FILES_SUBST+= GLIB_SCHEMAS_DIR=${PREFIX}/share/glib-2.0/schemas
|
|||
# agc doesn't want glib2 to depend on python so we install it
|
||||
# in a broken and useless state.
|
||||
CHECK_INTERPRETER_SKIP+= bin/gtester-report
|
||||
CHECK_INTERPRETER_SKIP+= bin/gdbus-codegen
|
||||
|
||||
# need pcre utf8 + unicode-properties
|
||||
BUILDLINK_API_DEPENDS.pcre+= pcre>=8.11
|
||||
|
|
@ -50,4 +49,5 @@ LIBS.SunOS+= -lnsl -lsocket
|
|||
.include "../../devel/gettext-lib/buildlink3.mk"
|
||||
.include "../../devel/pcre/buildlink3.mk"
|
||||
.include "../../devel/zlib/buildlink3.mk"
|
||||
.include "../../devel/libffi/buildlink3.mk"
|
||||
.include "../../mk/bsd.pkg.mk"
|
||||
|
|
|
|||
|
|
@ -1,15 +1,15 @@
|
|||
# $NetBSD: Makefile.common,v 1.13 2011/08/04 23:52:04 wiz Exp $
|
||||
# $NetBSD: Makefile.common,v 1.14 2012/01/29 10:46:52 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.28.8
|
||||
DISTNAME= glib-2.30.2
|
||||
PKGNAME= ${DISTNAME:S/glib/glib2/}
|
||||
CATEGORIES= # empty; redefined in Makefile
|
||||
MASTER_SITES= ftp://ftp.gtk.org/pub/glib/2.28/ \
|
||||
${MASTER_SITE_GNOME:=sources/glib/2.28/}
|
||||
MASTER_SITES= ftp://ftp.gtk.org/pub/glib/2.30/ \
|
||||
${MASTER_SITE_GNOME:=sources/glib/2.30/}
|
||||
EXTRACT_SUFX= .tar.bz2
|
||||
|
||||
MAINTAINER= pkgsrc-users@NetBSD.org
|
||||
|
|
@ -21,7 +21,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
|
|||
PKG_DESTDIR_SUPPORT= user-destdir
|
||||
|
||||
USE_PKGLOCALEDIR= yes
|
||||
USE_TOOLS+= gmake
|
||||
USE_TOOLS+= gmake pkg-config
|
||||
USE_LANGUAGES= c c++ c99
|
||||
USE_LIBTOOL= yes
|
||||
TEST_TARGET= check
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
@comment $NetBSD: PLIST,v 1.62 2011/06/09 11:16:38 drochner Exp $
|
||||
@comment $NetBSD: PLIST,v 1.63 2012/01/29 10:46:52 drochner Exp $
|
||||
bin/gdbus
|
||||
bin/gdbus-codegen
|
||||
bin/gio-querymodules
|
||||
bin/glib-compile-schemas
|
||||
bin/glib-genmarshal
|
||||
|
|
@ -41,11 +42,19 @@ include/glib/glib-2.0/gio/gdbusaddress.h
|
|||
include/glib/glib-2.0/gio/gdbusauthobserver.h
|
||||
include/glib/glib-2.0/gio/gdbusconnection.h
|
||||
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/gdbusmessage.h
|
||||
include/glib/glib-2.0/gio/gdbusmethodinvocation.h
|
||||
include/glib/glib-2.0/gio/gdbusnameowning.h
|
||||
include/glib/glib-2.0/gio/gdbusnamewatching.h
|
||||
include/glib/glib-2.0/gio/gdbusobject.h
|
||||
include/glib/glib-2.0/gio/gdbusobjectmanager.h
|
||||
include/glib/glib-2.0/gio/gdbusobjectmanagerclient.h
|
||||
include/glib/glib-2.0/gio/gdbusobjectmanagerserver.h
|
||||
include/glib/glib-2.0/gio/gdbusobjectproxy.h
|
||||
include/glib/glib-2.0/gio/gdbusobjectskeleton.h
|
||||
include/glib/glib-2.0/gio/gdbusproxy.h
|
||||
include/glib/glib-2.0/gio/gdbusserver.h
|
||||
include/glib/glib-2.0/gio/gdbusutils.h
|
||||
|
|
@ -119,6 +128,10 @@ include/glib/glib-2.0/gio/gtlsbackend.h
|
|||
include/glib/glib-2.0/gio/gtlscertificate.h
|
||||
include/glib/glib-2.0/gio/gtlsclientconnection.h
|
||||
include/glib/glib-2.0/gio/gtlsconnection.h
|
||||
include/glib/glib-2.0/gio/gtlsdatabase.h
|
||||
include/glib/glib-2.0/gio/gtlsfiledatabase.h
|
||||
include/glib/glib-2.0/gio/gtlsinteraction.h
|
||||
include/glib/glib-2.0/gio/gtlspassword.h
|
||||
include/glib/glib-2.0/gio/gtlsserverconnection.h
|
||||
include/glib/glib-2.0/gio/gvfs.h
|
||||
include/glib/glib-2.0/gio/gvolume.h
|
||||
|
|
@ -126,6 +139,7 @@ include/glib/glib-2.0/gio/gvolumemonitor.h
|
|||
include/glib/glib-2.0/gio/gzlibcompressor.h
|
||||
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/galloca.h
|
||||
include/glib/glib-2.0/glib/garray.h
|
||||
|
|
@ -146,6 +160,7 @@ include/glib/glib-2.0/glib/gdir.h
|
|||
include/glib/glib-2.0/glib/gerror.h
|
||||
include/glib/glib-2.0/glib/gfileutils.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
|
||||
include/glib/glib-2.0/glib/ghostutils.h
|
||||
include/glib/glib-2.0/glib/gi18n-lib.h
|
||||
|
|
@ -198,6 +213,7 @@ include/glib/glib-2.0/gobject/gbinding.h
|
|||
include/glib/glib-2.0/gobject/gboxed.h
|
||||
include/glib/glib-2.0/gobject/gclosure.h
|
||||
include/glib/glib-2.0/gobject/genums.h
|
||||
include/glib/glib-2.0/gobject/glib-types.h
|
||||
include/glib/glib-2.0/gobject/gmarshal.h
|
||||
include/glib/glib-2.0/gobject/gobject.h
|
||||
include/glib/glib-2.0/gobject/gobjectnotifyqueue.c
|
||||
|
|
@ -212,6 +228,30 @@ include/glib/glib-2.0/gobject/gvalue.h
|
|||
include/glib/glib-2.0/gobject/gvaluearray.h
|
||||
include/glib/glib-2.0/gobject/gvaluecollector.h
|
||||
include/glib/glib-2.0/gobject/gvaluetypes.h
|
||||
lib/gdbus-2.0/codegen/__init__.py
|
||||
lib/gdbus-2.0/codegen/__init__.pyc
|
||||
lib/gdbus-2.0/codegen/__init__.pyo
|
||||
lib/gdbus-2.0/codegen/codegen.py
|
||||
lib/gdbus-2.0/codegen/codegen.pyc
|
||||
lib/gdbus-2.0/codegen/codegen.pyo
|
||||
lib/gdbus-2.0/codegen/codegen_docbook.py
|
||||
lib/gdbus-2.0/codegen/codegen_docbook.pyc
|
||||
lib/gdbus-2.0/codegen/codegen_docbook.pyo
|
||||
lib/gdbus-2.0/codegen/codegen_main.py
|
||||
lib/gdbus-2.0/codegen/codegen_main.pyc
|
||||
lib/gdbus-2.0/codegen/codegen_main.pyo
|
||||
lib/gdbus-2.0/codegen/config.py
|
||||
lib/gdbus-2.0/codegen/config.pyc
|
||||
lib/gdbus-2.0/codegen/config.pyo
|
||||
lib/gdbus-2.0/codegen/dbustypes.py
|
||||
lib/gdbus-2.0/codegen/dbustypes.pyc
|
||||
lib/gdbus-2.0/codegen/dbustypes.pyo
|
||||
lib/gdbus-2.0/codegen/parser.py
|
||||
lib/gdbus-2.0/codegen/parser.pyc
|
||||
lib/gdbus-2.0/codegen/parser.pyo
|
||||
lib/gdbus-2.0/codegen/utils.py
|
||||
lib/gdbus-2.0/codegen/utils.pyc
|
||||
lib/gdbus-2.0/codegen/utils.pyo
|
||||
lib/glib-2.0/include/glibconfig.h
|
||||
lib/libgio-2.0.la
|
||||
lib/libglib-2.0.la
|
||||
|
|
@ -226,6 +266,7 @@ lib/pkgconfig/gmodule-export-2.0.pc
|
|||
lib/pkgconfig/gmodule-no-export-2.0.pc
|
||||
lib/pkgconfig/gobject-2.0.pc
|
||||
lib/pkgconfig/gthread-2.0.pc
|
||||
man/man1/gdbus-codegen.1
|
||||
man/man1/gdbus.1
|
||||
man/man1/gio-querymodules.1
|
||||
man/man1/glib-compile-schemas.1
|
||||
|
|
@ -239,13 +280,17 @@ 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.2800.8-gdb.py
|
||||
share/gdb/auto-load/libgobject-2.0.so.0.2800.8-gdb.py
|
||||
share/gdb/auto-load/libglib-2.0.so.0.3000.2-gdb.py
|
||||
share/gdb/auto-load/libgobject-2.0.so.0.3000.2-gdb.py
|
||||
share/glib-2.0/gdb/glib.py
|
||||
share/glib-2.0/gdb/gobject.py
|
||||
share/glib-2.0/gettext/mkinstalldirs
|
||||
share/glib-2.0/gettext/po/Makefile.in.in
|
||||
share/glib-2.0/schemas/gschema.dtd
|
||||
share/gtk-doc/html/gio/ExampleAnimal.html
|
||||
share/gtk-doc/html/gio/ExampleCat.html
|
||||
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/GAppInfo.html
|
||||
|
|
@ -261,9 +306,16 @@ share/gtk-doc/html/gio/GConverter.html
|
|||
share/gtk-doc/html/gio/GCredentials.html
|
||||
share/gtk-doc/html/gio/GDBusAuthObserver.html
|
||||
share/gtk-doc/html/gio/GDBusConnection.html
|
||||
share/gtk-doc/html/gio/GDBusError.html
|
||||
share/gtk-doc/html/gio/GDBusInterface.html
|
||||
share/gtk-doc/html/gio/GDBusInterfaceSkeleton.html
|
||||
share/gtk-doc/html/gio/GDBusMessage.html
|
||||
share/gtk-doc/html/gio/GDBusMethodInvocation.html
|
||||
share/gtk-doc/html/gio/GDBusObject.html
|
||||
share/gtk-doc/html/gio/GDBusObjectManager.html
|
||||
share/gtk-doc/html/gio/GDBusObjectManagerClient.html
|
||||
share/gtk-doc/html/gio/GDBusObjectManagerServer.html
|
||||
share/gtk-doc/html/gio/GDBusObjectProxy.html
|
||||
share/gtk-doc/html/gio/GDBusObjectSkeleton.html
|
||||
share/gtk-doc/html/gio/GDBusProxy.html
|
||||
share/gtk-doc/html/gio/GDBusServer.html
|
||||
share/gtk-doc/html/gio/GDataInputStream.html
|
||||
|
|
@ -329,6 +381,10 @@ share/gtk-doc/html/gio/GTlsBackend.html
|
|||
share/gtk-doc/html/gio/GTlsCertificate.html
|
||||
share/gtk-doc/html/gio/GTlsClientConnection.html
|
||||
share/gtk-doc/html/gio/GTlsConnection.html
|
||||
share/gtk-doc/html/gio/GTlsDatabase.html
|
||||
share/gtk-doc/html/gio/GTlsFileDatabase.html
|
||||
share/gtk-doc/html/gio/GTlsInteraction.html
|
||||
share/gtk-doc/html/gio/GTlsPassword.html
|
||||
share/gtk-doc/html/gio/GTlsServerConnection.html
|
||||
share/gtk-doc/html/gio/GUnixConnection.html
|
||||
share/gtk-doc/html/gio/GUnixCredentialsMessage.html
|
||||
|
|
@ -349,6 +405,7 @@ share/gtk-doc/html/gio/api-index-2-22.html
|
|||
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-deprecated.html
|
||||
share/gtk-doc/html/gio/api-index-full.html
|
||||
share/gtk-doc/html/gio/application.html
|
||||
|
|
@ -372,15 +429,17 @@ 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/conversion.html
|
||||
share/gtk-doc/html/gio/extending-gio.html
|
||||
share/gtk-doc/html/gio/extending.html
|
||||
share/gtk-doc/html/gio/failable_initialization.html
|
||||
share/gtk-doc/html/gio/file_mon.html
|
||||
share/gtk-doc/html/gio/file_ops.html
|
||||
share/gtk-doc/html/gio/gdbus-codegen.html
|
||||
share/gtk-doc/html/gio/gdbus-convenience.html
|
||||
share/gtk-doc/html/gio/gdbus-lowlevel.html
|
||||
share/gtk-doc/html/gio/gdbus-org.gtk.GDBus.Example.ObjectManager.Animal.html
|
||||
share/gtk-doc/html/gio/gdbus-org.gtk.GDBus.Example.ObjectManager.Cat.html
|
||||
share/gtk-doc/html/gio/gdbus.html
|
||||
share/gtk-doc/html/gio/gio-D-Bus-Addresses.html
|
||||
share/gtk-doc/html/gio/gio-D-Bus-Introspection-Data.html
|
||||
|
|
@ -390,6 +449,7 @@ share/gtk-doc/html/gio/gio-Extension-Points.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
|
||||
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
|
||||
|
|
@ -399,7 +459,6 @@ share/gtk-doc/html/gio/gio-Unix-Mounts.html
|
|||
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.devhelp
|
||||
share/gtk-doc/html/gio/gio.devhelp2
|
||||
share/gtk-doc/html/gio/glib-compile-schemas.html
|
||||
share/gtk-doc/html/gio/gsettings-tool.html
|
||||
|
|
@ -438,6 +497,7 @@ share/gtk-doc/html/glib/api-index-2-22.html
|
|||
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-4.html
|
||||
share/gtk-doc/html/glib/api-index-2-6.html
|
||||
share/gtk-doc/html/glib/api-index-2-8.html
|
||||
|
|
@ -458,6 +518,7 @@ share/gtk-doc/html/glib/glib-Caches.html
|
|||
share/gtk-doc/html/glib/glib-Character-Set-Conversion.html
|
||||
share/gtk-doc/html/glib/glib-Commandline-option-parser.html
|
||||
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-Double-ended-Queues.html
|
||||
|
|
@ -509,6 +570,7 @@ share/gtk-doc/html/glib/glib-Threads.html
|
|||
share/gtk-doc/html/glib/glib-Timers.html
|
||||
share/gtk-doc/html/glib/glib-Trash-Stacks.html
|
||||
share/gtk-doc/html/glib/glib-Type-Conversion-Macros.html
|
||||
share/gtk-doc/html/glib/glib-UNIX-specific-utilities-and-integration.html
|
||||
share/gtk-doc/html/glib/glib-URI-Functions.html
|
||||
share/gtk-doc/html/glib/glib-Unicode-Manipulation.html
|
||||
share/gtk-doc/html/glib/glib-Version-Information.html
|
||||
|
|
@ -526,7 +588,6 @@ share/gtk-doc/html/glib/glib-regex-syntax.html
|
|||
share/gtk-doc/html/glib/glib-resources.html
|
||||
share/gtk-doc/html/glib/glib-running.html
|
||||
share/gtk-doc/html/glib/glib-utilities.html
|
||||
share/gtk-doc/html/glib/glib.devhelp
|
||||
share/gtk-doc/html/glib/glib.devhelp2
|
||||
share/gtk-doc/html/glib/glib.html
|
||||
share/gtk-doc/html/glib/gtester-report.html
|
||||
|
|
@ -555,6 +616,7 @@ share/gtk-doc/html/gobject/api-index-2-22.html
|
|||
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-4.html
|
||||
share/gtk-doc/html/gobject/api-index-2-6.html
|
||||
share/gtk-doc/html/gobject/api-index-2-8.html
|
||||
|
|
@ -583,7 +645,6 @@ share/gtk-doc/html/gobject/gobject-Varargs-Value-Collection.html
|
|||
share/gtk-doc/html/gobject/gobject-memory.html
|
||||
share/gtk-doc/html/gobject/gobject-properties.html
|
||||
share/gtk-doc/html/gobject/gobject-query.html
|
||||
share/gtk-doc/html/gobject/gobject.devhelp
|
||||
share/gtk-doc/html/gobject/gobject.devhelp2
|
||||
share/gtk-doc/html/gobject/gtype-conventions.html
|
||||
share/gtk-doc/html/gobject/gtype-instantiable-classed.html
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: buildlink3.mk,v 1.20 2011/04/22 13:42:05 obache Exp $
|
||||
# $NetBSD: buildlink3.mk,v 1.21 2012/01/29 10:46:52 drochner Exp $
|
||||
|
||||
BUILDLINK_TREE+= glib2
|
||||
|
||||
|
|
@ -13,6 +13,7 @@ BUILDLINK_PKGSRCDIR.glib2?= ../../devel/glib2
|
|||
.include "../../devel/gettext-lib/buildlink3.mk"
|
||||
.include "../../devel/pcre/buildlink3.mk"
|
||||
.include "../../devel/zlib/buildlink3.mk"
|
||||
.include "../../devel/libffi/buildlink3.mk"
|
||||
.include "../../mk/pthread.buildlink3.mk"
|
||||
.endif # GLIB2_BUILDLINK3_MK
|
||||
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
$NetBSD: distinfo,v 1.157 2012/01/17 16:51:04 jmmv Exp $
|
||||
$NetBSD: distinfo,v 1.158 2012/01/29 10:46:52 drochner Exp $
|
||||
|
||||
SHA1 (glib-2.28.8.tar.bz2) = 20cd63705a8805260da0320c65b979233f2e3c18
|
||||
RMD160 (glib-2.28.8.tar.bz2) = f087a71445eb40fae5eab45a14cb74d4e239d5e6
|
||||
Size (glib-2.28.8.tar.bz2) = 7017806 bytes
|
||||
SHA1 (glib-2.30.2.tar.bz2) = 70208757905037fa1f8b89797db0097c5e82a140
|
||||
RMD160 (glib-2.30.2.tar.bz2) = efe0d8ae945dd3b20ca4835dcb45696fd0914c06
|
||||
Size (glib-2.30.2.tar.bz2) = 7782266 bytes
|
||||
SHA1 (glib-gio-kqueue-2.28.8-v3.patch) = d50bee14ce72201c3ec2b82d0e498c8828fbd8c2
|
||||
RMD160 (glib-gio-kqueue-2.28.8-v3.patch) = ba4859d4336db50bacb6bdaace995ee761306a85
|
||||
Size (glib-gio-kqueue-2.28.8-v3.patch) = 89920 bytes
|
||||
|
|
@ -14,25 +14,25 @@ SHA1 (patch-ae) = 09f16e8e14bdea3ee0e478d335f65cb66939e5f5
|
|||
SHA1 (patch-af) = 4db7dff19ba34d5a204c12c0c410415fcb077f20
|
||||
SHA1 (patch-ag) = 65e50668eb909353210152ef54dfea923740179b
|
||||
SHA1 (patch-ah) = 239dc3d0734424a7cafc5dd8d8381768cba2d23e
|
||||
SHA1 (patch-ai) = ff1963c05cf82059de692cd5bf08872544297b7f
|
||||
SHA1 (patch-ai) = a21e04468ea05e29e1d3778f32c2a5da90e23e56
|
||||
SHA1 (patch-aj) = 9e5a7ccf081e3ebdf7888a67b027b696f632177c
|
||||
SHA1 (patch-ak) = 29a2adc7d7cd41a28ecad039cb5f46be5e9df974
|
||||
SHA1 (patch-ak) = 5190e6d3b2a333ac83968a044755e1a139bf4460
|
||||
SHA1 (patch-al) = bde29693322c568f9a4ad090f1d469de5f69920e
|
||||
SHA1 (patch-am) = 062d3d295f00485ac3c3839dd4697957ebc66772
|
||||
SHA1 (patch-an) = dd136645f7555f3600562b055cdcb4f60b41ae78
|
||||
SHA1 (patch-ap) = 3df3c29373efb491d1b0e96d57a192b1b30f2cfa
|
||||
SHA1 (patch-an) = 64564657b06e6f763a3fe2819992c594ddb44744
|
||||
SHA1 (patch-ap) = 38a805f95e8f7ca35c73984be9142336c6a3ec4c
|
||||
SHA1 (patch-aq) = aa7087b91c7d0eca9f9895feb6924df95eccb372
|
||||
SHA1 (patch-ba) = b235c2037bce84e0cdd9c87abaac274550ec0c95
|
||||
SHA1 (patch-ba) = 8d50fcbe3e9238bbf7bafee4c0ce627e34c3d9d2
|
||||
SHA1 (patch-cb) = 0f084c33fb67fbb8e12448034450699da26289ff
|
||||
SHA1 (patch-cc) = dd73079b727bca9013465204dc3b53b76a280e54
|
||||
SHA1 (patch-cd) = d1c6fa921be58469adb6b860f4e91f0a7eff067e
|
||||
SHA1 (patch-ce) = 7192ae3bbf27ff92287a66ee090baa80a12cdc79
|
||||
SHA1 (patch-ce) = 5da41dc0807b0594d895af9ec4c285537065f572
|
||||
SHA1 (patch-cf) = 41ed2146e19cf088456795d4f0e8dc4af4368e44
|
||||
SHA1 (patch-cg) = f65c5a23102d3dee12bee68bd126385b3c3fe632
|
||||
SHA1 (patch-ch) = df8444835b9954f902936c8b6fab5b44ac350db0
|
||||
SHA1 (patch-ci) = f0191fd416222617a2e95e95a05c3dcf6b6ce2d2
|
||||
SHA1 (patch-cj) = ef6b6ec1986990df096b342cfd8e9513e42671df
|
||||
SHA1 (patch-cj) = baaa3d2ef2b58d17b81fd8341a28f99b850648a8
|
||||
SHA1 (patch-ck) = 324116cc6fb8dbce8ce8d20f5b237fc469a55cd2
|
||||
SHA1 (patch-cl) = a78266f135dc08e1f4710370c19cc820a6da7eb8
|
||||
SHA1 (patch-cl) = 2b815325c77c7746fc2bce14a35438ef8edd7c5f
|
||||
SHA1 (patch-cm) = 8ddac97b3476c992abea3e5d9383cd3a5c9008f3
|
||||
SHA1 (patch-cn) = b930dc95d44eacc9448f2a3a799a95db2880bfd4
|
||||
|
|
|
|||
|
|
@ -1,18 +1,18 @@
|
|||
$NetBSD: patch-ai,v 1.18 2009/06/05 16:08:25 drochner Exp $
|
||||
$NetBSD: patch-ai,v 1.19 2012/01/29 10:46:53 drochner Exp $
|
||||
|
||||
http://bugzilla.gnome.org/show_bug.cgi?id=583321
|
||||
|
||||
--- glib/gmain.c.orig 2009-05-29 07:18:56.000000000 +0200
|
||||
--- glib/gmain.c.orig 2011-10-14 04:03:10.000000000 +0000
|
||||
+++ glib/gmain.c
|
||||
@@ -3713,7 +3713,11 @@ g_child_watch_source_init_multi_threaded
|
||||
|
||||
action.sa_handler = g_child_watch_signal_handler;
|
||||
@@ -4398,7 +4398,11 @@ ensure_unix_signal_handler_installed_unl
|
||||
|
||||
action.sa_handler = g_unix_signal_handler;
|
||||
sigemptyset (&action.sa_mask);
|
||||
+#ifdef SA_RESTART
|
||||
action.sa_flags = SA_RESTART | SA_NOCLDSTOP;
|
||||
+#else /* QNX */
|
||||
+ action.sa_flags = SA_NOCLDSTOP;
|
||||
+#endif
|
||||
sigaction (SIGCHLD, &action, NULL);
|
||||
sigaction (signum, &action, NULL);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
$NetBSD: patch-ak,v 1.8 2011/10/09 19:40:02 jmmv Exp $
|
||||
$NetBSD: patch-ak,v 1.9 2012/01/29 10:46:53 drochner Exp $
|
||||
|
||||
--- configure.ac.orig 2011-06-05 19:18:49.000000000 -0400
|
||||
+++ configure.ac 2011-10-08 23:50:38.000000000 -0400
|
||||
@@ -825,7 +825,7 @@ int main (int argc, char **argv)
|
||||
--- configure.ac.orig 2011-10-14 04:12:40.000000000 +0000
|
||||
+++ configure.ac
|
||||
@@ -882,7 +882,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.8 2011/10/09 19:40:02 jmmv Exp $
|
|||
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#if defined(__SUNPRO_C) || (__SUNPRO_C >= 0x550)
|
||||
#else
|
||||
# include "error: this is not Sun Studio."
|
||||
@@ -1023,8 +1023,20 @@ fi
|
||||
@@ -1114,8 +1114,20 @@ AC_SUBST(NETWORK_LIBS)
|
||||
|
||||
case $host in
|
||||
*-*-solaris* )
|
||||
|
|
@ -32,7 +32,7 @@ $NetBSD: patch-ak,v 1.8 2011/10/09 19:40:02 jmmv Exp $
|
|||
AC_DEFINE(__EXTENSIONS__, 1, Needed to get declarations for msg_control and msg_controllen on Solaris)
|
||||
;;
|
||||
esac
|
||||
@@ -1379,11 +1391,12 @@ if test x"$glib_native_win32" = xyes; th
|
||||
@@ -1509,11 +1521,12 @@ if test x"$glib_native_win32" = xyes; th
|
||||
G_MODULE_LDFLAGS=
|
||||
else
|
||||
export SED
|
||||
|
|
@ -46,7 +46,7 @@ $NetBSD: patch-ak,v 1.8 2011/10/09 19:40:02 jmmv Exp $
|
|||
G_MODULE_HAVE_DLERROR=0
|
||||
dnl *** force native WIN32 shared lib loader
|
||||
if test -z "$G_MODULE_IMPL"; then
|
||||
@@ -1444,7 +1457,7 @@ if test "$G_MODULE_IMPL" = "G_MODULE_IMP
|
||||
@@ -1574,7 +1587,7 @@ 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
|
||||
|
|
@ -55,7 +55,7 @@ $NetBSD: patch-ak,v 1.8 2011/10/09 19:40:02 jmmv Exp $
|
|||
-export-dynamic -o plugin.o plugin.c 2>&1 >/dev/null
|
||||
AC_CACHE_CHECK([for RTLD_GLOBAL brokenness],
|
||||
glib_cv_rtldglobal_broken,[
|
||||
@@ -1508,6 +1521,38 @@ dnl *** check for having dlerror()
|
||||
@@ -1638,6 +1651,38 @@ dnl *** check for having dlerror()
|
||||
[G_MODULE_HAVE_DLERROR=0])
|
||||
LIBS="$LIBS_orig"
|
||||
fi
|
||||
|
|
@ -94,7 +94,7 @@ $NetBSD: patch-ak,v 1.8 2011/10/09 19:40:02 jmmv Exp $
|
|||
dnl *** done, have we got an implementation?
|
||||
if test -z "$G_MODULE_IMPL"; then
|
||||
G_MODULE_IMPL=0
|
||||
@@ -1518,7 +1563,7 @@ fi
|
||||
@@ -1648,7 +1693,7 @@ fi
|
||||
|
||||
AC_MSG_CHECKING(for the suffix of module shared libraries)
|
||||
export SED
|
||||
|
|
@ -103,7 +103,7 @@ $NetBSD: patch-ak,v 1.8 2011/10/09 19:40:02 jmmv Exp $
|
|||
eval $shrext_cmds
|
||||
module=yes eval std_shrext=$shrext_cmds
|
||||
# chop the initial dot
|
||||
@@ -1537,6 +1582,8 @@ AC_SUBST(G_MODULE_PLUGIN_LIBS)
|
||||
@@ -1667,6 +1712,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,7 +112,7 @@ $NetBSD: patch-ak,v 1.8 2011/10/09 19:40:02 jmmv Exp $
|
|||
AC_SUBST(G_MODULE_NEED_USCORE)
|
||||
AC_SUBST(GLIB_DEBUG_FLAGS)
|
||||
|
||||
@@ -1925,22 +1972,8 @@ if test x"$have_threads" != xno; then
|
||||
@@ -2055,22 +2102,8 @@ if test x"$have_threads" != xno; then
|
||||
G_THREAD_LIBS="-lpthread -lthread"
|
||||
;;
|
||||
*)
|
||||
|
|
@ -122,7 +122,7 @@ $NetBSD: patch-ak,v 1.8 2011/10/09 19:40:02 jmmv Exp $
|
|||
- AC_TRY_RUN(glib_thread_test(0),
|
||||
- glib_flag_works=yes,
|
||||
- glib_flag_works=no,
|
||||
- [AC_LINK_IFELSE(glib_thread_test(0),
|
||||
- [AC_LINK_IFELSE([AC_LANG_SOURCE(glib_thread_test(0))],
|
||||
- glib_flag_works=yes,
|
||||
- glib_flag_works=no)])
|
||||
- CFLAGS="$glib_save_CFLAGS"
|
||||
|
|
@ -137,7 +137,7 @@ $NetBSD: patch-ak,v 1.8 2011/10/09 19:40:02 jmmv Exp $
|
|||
;;
|
||||
esac
|
||||
fi
|
||||
@@ -3638,7 +3671,7 @@ AC_ARG_ENABLE(Bsymbolic,
|
||||
@@ -3771,7 +3804,7 @@ AC_ARG_ENABLE(Bsymbolic,
|
||||
enable_Bsymbolic=no)
|
||||
LDFLAGS="${SAVED_LDFLAGS}"])
|
||||
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
$NetBSD: patch-an,v 1.4 2010/11/02 14:52:24 drochner Exp $
|
||||
$NetBSD: patch-an,v 1.5 2012/01/29 10:46:54 drochner Exp $
|
||||
|
||||
--- gio/Makefile.in.orig 2010-09-27 16:10:12.000000000 +0000
|
||||
--- gio/Makefile.in.orig 2011-10-14 13:31:08.000000000 +0000
|
||||
+++ gio/Makefile.in
|
||||
@@ -1838,7 +1838,7 @@ info: info-recursive
|
||||
@@ -3377,7 +3377,7 @@ info: info-recursive
|
||||
|
||||
info-am:
|
||||
|
||||
-install-data-am: install-completionSCRIPTS install-data-local \
|
||||
-install-data-am: install-completionDATA install-data-local \
|
||||
+install-data-am: install-data-local \
|
||||
install-dist_schemaDATA install-gioincludeHEADERS \
|
||||
install-giounixincludeHEADERS install-giowin32includeHEADERS
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
$NetBSD: patch-ap,v 1.1 2011/03/09 11:22:04 drochner Exp $
|
||||
$NetBSD: patch-ap,v 1.2 2012/01/29 10:46:54 drochner Exp $
|
||||
|
||||
--- gio/gcredentials.c.orig 2011-02-11 15:23:11.000000000 +0000
|
||||
--- gio/gcredentials.c.orig 2011-08-16 00:51:30.000000000 +0000
|
||||
+++ gio/gcredentials.c
|
||||
@@ -27,6 +27,9 @@
|
||||
@@ -32,6 +32,9 @@
|
||||
#include <sys/socket.h>
|
||||
#include <string.h>
|
||||
#endif
|
||||
|
|
@ -12,10 +12,10 @@ $NetBSD: patch-ap,v 1.1 2011/03/09 11:22:04 drochner Exp $
|
|||
#include <stdlib.h>
|
||||
|
||||
#include <gobject/gvaluecollector.h>
|
||||
@@ -82,6 +85,12 @@ struct _GCredentials
|
||||
struct ucred native;
|
||||
#elif defined(__FreeBSD__)
|
||||
@@ -92,6 +95,12 @@ struct _GCredentials
|
||||
struct cmsgcred native;
|
||||
#elif defined(__OpenBSD__)
|
||||
struct sockpeercred native;
|
||||
+#elif defined(__NetBSD__)
|
||||
+ struct {
|
||||
+ pid_t pid;
|
||||
|
|
@ -25,7 +25,7 @@ $NetBSD: patch-ap,v 1.1 2011/03/09 11:22:04 drochner Exp $
|
|||
#else
|
||||
#ifdef __GNUC__
|
||||
#warning Please add GCredentials support for your OS
|
||||
@@ -126,7 +135,7 @@ g_credentials_class_init (GCredentialsCl
|
||||
@@ -136,7 +145,7 @@ g_credentials_class_init (GCredentialsCl
|
||||
static void
|
||||
g_credentials_init (GCredentials *credentials)
|
||||
{
|
||||
|
|
@ -34,7 +34,7 @@ $NetBSD: patch-ap,v 1.1 2011/03/09 11:22:04 drochner Exp $
|
|||
credentials->native.pid = getpid ();
|
||||
credentials->native.uid = geteuid ();
|
||||
credentials->native.gid = getegid ();
|
||||
@@ -178,7 +187,7 @@ g_credentials_to_string (GCredentials *c
|
||||
@@ -192,7 +201,7 @@ g_credentials_to_string (GCredentials *c
|
||||
g_return_val_if_fail (G_IS_CREDENTIALS (credentials), NULL);
|
||||
|
||||
ret = g_string_new ("GCredentials:");
|
||||
|
|
@ -43,7 +43,7 @@ $NetBSD: patch-ap,v 1.1 2011/03/09 11:22:04 drochner Exp $
|
|||
g_string_append (ret, "linux-ucred:");
|
||||
if (credentials->native.pid != -1)
|
||||
g_string_append_printf (ret, "pid=%" G_GINT64_FORMAT ",", (gint64) credentials->native.pid);
|
||||
@@ -233,7 +242,7 @@ g_credentials_is_same_user (GCredentials
|
||||
@@ -257,7 +266,7 @@ g_credentials_is_same_user (GCredentials
|
||||
g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
|
||||
|
||||
ret = FALSE;
|
||||
|
|
@ -52,7 +52,7 @@ $NetBSD: patch-ap,v 1.1 2011/03/09 11:22:04 drochner Exp $
|
|||
if (credentials->native.uid == other_credentials->native.uid)
|
||||
ret = TRUE;
|
||||
#elif defined(__FreeBSD__)
|
||||
@@ -278,7 +287,7 @@ g_credentials_get_native (GCredentials
|
||||
@@ -305,7 +314,7 @@ g_credentials_get_native (GCredentials
|
||||
|
||||
ret = NULL;
|
||||
|
||||
|
|
@ -61,7 +61,7 @@ $NetBSD: patch-ap,v 1.1 2011/03/09 11:22:04 drochner Exp $
|
|||
if (native_type != G_CREDENTIALS_TYPE_LINUX_UCRED)
|
||||
{
|
||||
g_warning ("g_credentials_get_native: Trying to get credentials of type %d but only "
|
||||
@@ -328,7 +337,7 @@ g_credentials_set_native (GCredentials
|
||||
@@ -366,7 +375,7 @@ g_credentials_set_native (GCredentials
|
||||
GCredentialsType native_type,
|
||||
gpointer native)
|
||||
{
|
||||
|
|
@ -70,7 +70,7 @@ $NetBSD: patch-ap,v 1.1 2011/03/09 11:22:04 drochner Exp $
|
|||
if (native_type != G_CREDENTIALS_TYPE_LINUX_UCRED)
|
||||
{
|
||||
g_warning ("g_credentials_set_native: Trying to set credentials of type %d "
|
||||
@@ -337,7 +346,7 @@ g_credentials_set_native (GCredentials
|
||||
@@ -375,7 +384,7 @@ g_credentials_set_native (GCredentials
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -79,7 +79,7 @@ $NetBSD: patch-ap,v 1.1 2011/03/09 11:22:04 drochner Exp $
|
|||
}
|
||||
#elif defined(__FreeBSD__)
|
||||
if (native_type != G_CREDENTIALS_TYPE_FREEBSD_CMSGCRED)
|
||||
@@ -384,7 +393,7 @@ g_credentials_get_unix_user (GCredential
|
||||
@@ -433,7 +442,7 @@ g_credentials_get_unix_user (GCredential
|
||||
g_return_val_if_fail (G_IS_CREDENTIALS (credentials), -1);
|
||||
g_return_val_if_fail (error == NULL || *error == NULL, -1);
|
||||
|
||||
|
|
@ -88,7 +88,7 @@ $NetBSD: patch-ap,v 1.1 2011/03/09 11:22:04 drochner Exp $
|
|||
ret = credentials->native.uid;
|
||||
#elif defined(__FreeBSD__)
|
||||
ret = credentials->native.cmcred_euid;
|
||||
@@ -428,7 +437,7 @@ g_credentials_set_unix_user (GCredential
|
||||
@@ -479,7 +488,7 @@ g_credentials_set_unix_user (GCredential
|
||||
g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
|
||||
|
||||
ret = FALSE;
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
$NetBSD: patch-ba,v 1.7 2009/05/20 13:07:36 wiz Exp $
|
||||
$NetBSD: patch-ba,v 1.8 2012/01/29 10:46:54 drochner Exp $
|
||||
|
||||
http://bugzilla.gnome.org/show_bug.cgi?id=583330
|
||||
|
||||
--- gio/gunixmounts.c.orig 2009-03-13 00:09:53.000000000 -0400
|
||||
--- gio/gunixmounts.c.orig 2011-10-14 03:47:57.000000000 +0000
|
||||
+++ gio/gunixmounts.c
|
||||
@@ -136,6 +136,9 @@ struct _GUnixMountMonitor {
|
||||
@@ -153,6 +153,9 @@ struct _GUnixMountMonitor {
|
||||
|
||||
GFileMonitor *fstab_monitor;
|
||||
GFileMonitor *mtab_monitor;
|
||||
|
|
@ -14,7 +14,7 @@ http://bugzilla.gnome.org/show_bug.cgi?id=583330
|
|||
};
|
||||
|
||||
struct _GUnixMountMonitorClass {
|
||||
@@ -147,6 +150,8 @@ static GUnixMountMonitor *the_mount_moni
|
||||
@@ -164,6 +167,8 @@ static GUnixMountMonitor *the_mount_moni
|
||||
static GList *_g_get_unix_mounts (void);
|
||||
static GList *_g_get_unix_mount_points (void);
|
||||
|
||||
|
|
@ -23,15 +23,15 @@ 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
|
||||
@@ -173,6 +178,7 @@ G_DEFINE_TYPE (GUnixMountMonitor, g_unix
|
||||
@@ -190,6 +195,7 @@ G_DEFINE_TYPE (GUnixMountMonitor, g_unix
|
||||
#endif
|
||||
|
||||
#if defined(HAVE_GETMNTINFO) && defined(HAVE_FSTAB_H) && defined(HAVE_SYS_MOUNT_H)
|
||||
#if (defined(HAVE_GETVFSSTAT) || defined(HAVE_GETFSSTAT)) && defined(HAVE_FSTAB_H) && defined(HAVE_SYS_MOUNT_H)
|
||||
+#include <sys/param.h>
|
||||
#include <sys/ucred.h>
|
||||
#include <sys/mount.h>
|
||||
#include <fstab.h>
|
||||
@@ -223,20 +229,28 @@ g_unix_is_mount_path_system_internal (co
|
||||
@@ -240,22 +246,30 @@ g_unix_is_mount_path_system_internal (co
|
||||
"/", /* we already have "Filesystem root" in Nautilus */
|
||||
"/bin",
|
||||
"/boot",
|
||||
|
|
@ -43,6 +43,8 @@ http://bugzilla.gnome.org/show_bug.cgi?id=583330
|
|||
"/lib",
|
||||
"/lib64",
|
||||
+ "/libexec",
|
||||
"/live/cow",
|
||||
"/live/image",
|
||||
"/media",
|
||||
"/mnt",
|
||||
"/opt",
|
||||
|
|
@ -58,21 +60,9 @@ http://bugzilla.gnome.org/show_bug.cgi?id=583330
|
|||
+ "/usr/ports",
|
||||
+ "/usr/src",
|
||||
"/var",
|
||||
"/var/log/audit", /* https://bugzilla.redhat.com/show_bug.cgi?id=333041 */
|
||||
"/var/tmp", /* https://bugzilla.redhat.com/show_bug.cgi?id=335241 */
|
||||
@@ -570,7 +584,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;
|
||||
@@ -587,8 +605,18 @@ _g_get_unix_mounts (void)
|
||||
"/var/crash",
|
||||
"/var/local",
|
||||
@@ -634,9 +648,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);
|
||||
|
|
@ -81,17 +71,14 @@ http://bugzilla.gnome.org/show_bug.cgi?id=583330
|
|||
+#else
|
||||
mount_entry->filesystem_type = g_strdup (mntent[i].f_fstypename);
|
||||
+#endif
|
||||
+#if defined(__NetBSD__)
|
||||
+ if (mntent[i].f_flag & MNT_RDONLY)
|
||||
#if defined(HAVE_GETVFSSTAT)
|
||||
if (mntent[i].f_flag & ST_RDONLY)
|
||||
+#elif defined(__digital__)
|
||||
+ if (mntent[i].f_flags & M_RDONLY)
|
||||
+#else
|
||||
#elif defined(HAVE_GETFSSTAT)
|
||||
if (mntent[i].f_flags & MNT_RDONLY)
|
||||
+#endif
|
||||
mount_entry->is_read_only = TRUE;
|
||||
|
||||
mount_entry->is_system_internal =
|
||||
@@ -1056,6 +1084,10 @@ get_mounts_timestamp (void)
|
||||
#endif
|
||||
@@ -1111,6 +1131,10 @@ get_mounts_timestamp (void)
|
||||
if (stat (monitor_file, &buf) == 0)
|
||||
return (guint64)buf.st_mtime;
|
||||
}
|
||||
|
|
@ -102,7 +89,7 @@ http://bugzilla.gnome.org/show_bug.cgi?id=583330
|
|||
return 0;
|
||||
}
|
||||
|
||||
@@ -1196,6 +1228,13 @@ g_unix_mount_monitor_finalize (GObject *
|
||||
@@ -1253,6 +1277,13 @@ g_unix_mount_monitor_finalize (GObject *
|
||||
g_object_unref (monitor->mtab_monitor);
|
||||
}
|
||||
|
||||
|
|
@ -116,7 +103,7 @@ http://bugzilla.gnome.org/show_bug.cgi?id=583330
|
|||
the_mount_monitor = NULL;
|
||||
|
||||
G_OBJECT_CLASS (g_unix_mount_monitor_parent_class)->finalize (object);
|
||||
@@ -1276,6 +1315,51 @@ mtab_file_changed (GFileMonitor *mo
|
||||
@@ -1333,6 +1364,51 @@ mtab_file_changed (GFileMonitor *mo
|
||||
g_signal_emit (mount_monitor, signals[MOUNTS_CHANGED], 0);
|
||||
}
|
||||
|
||||
|
|
@ -168,7 +155,7 @@ http://bugzilla.gnome.org/show_bug.cgi?id=583330
|
|||
static void
|
||||
g_unix_mount_monitor_init (GUnixMountMonitor *monitor)
|
||||
{
|
||||
@@ -1298,6 +1382,12 @@ g_unix_mount_monitor_init (GUnixMountMon
|
||||
@@ -1355,6 +1431,12 @@ g_unix_mount_monitor_init (GUnixMountMon
|
||||
|
||||
g_signal_connect (monitor->mtab_monitor, "changed", (GCallback)mtab_file_changed, monitor);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
$NetBSD: patch-ce,v 1.2 2010/11/02 14:52:24 drochner Exp $
|
||||
$NetBSD: patch-ce,v 1.3 2012/01/29 10:46:54 drochner Exp $
|
||||
|
||||
--- glib/gatomic-gcc.c.orig 2010-09-13 15:57:51.000000000 +0000
|
||||
+++ glib/gatomic-gcc.c
|
||||
@@ -21,6 +21,7 @@
|
||||
--- glib/gatomic.c.orig 2011-10-14 03:47:57.000000000 +0000
|
||||
+++ glib/gatomic.c
|
||||
@@ -22,6 +22,7 @@
|
||||
#include "config.h"
|
||||
|
||||
#include "gatomic.h"
|
||||
+#include "gthreadprivate.h"
|
||||
|
||||
gint
|
||||
g_atomic_int_exchange_and_add (volatile gint G_GNUC_MAY_ALIAS *atomic,
|
||||
/**
|
||||
* SECTION:atomic_operations
|
||||
|
|
|
|||
|
|
@ -1,22 +1,22 @@
|
|||
$NetBSD: patch-cj,v 1.5 2011/06/09 11:16:38 drochner Exp $
|
||||
$NetBSD: patch-cj,v 1.6 2012/01/29 10:46:54 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 2011-06-05 23:24:51.000000000 +0000
|
||||
--- glib/tests/Makefile.in.orig 2011-10-14 13:31:09.000000000 +0000
|
||||
+++ glib/tests/Makefile.in
|
||||
@@ -59,7 +59,7 @@ am__EXEEXT_1 = testing$(EXEEXT) option-c
|
||||
string$(EXEEXT) markup-parse$(EXEEXT) markup-collect$(EXEEXT) \
|
||||
markup-escape$(EXEEXT) markup-subparser$(EXEEXT) \
|
||||
array-test$(EXEEXT) hostutils$(EXEEXT) gvariant$(EXEEXT) \
|
||||
- mem-overflow$(EXEEXT) utf8-performance$(EXEEXT) utils$(EXEEXT) \
|
||||
+ utf8-performance$(EXEEXT) utils$(EXEEXT) \
|
||||
regex$(EXEEXT) base64$(EXEEXT) sequence$(EXEEXT) \
|
||||
scannerapi$(EXEEXT) shell$(EXEEXT) collate$(EXEEXT) \
|
||||
utf8-pointer$(EXEEXT) utf8-validate$(EXEEXT) \
|
||||
@@ -139,8 +139,6 @@ markup_parse_DEPENDENCIES = $(progs_ldad
|
||||
@@ -69,7 +69,7 @@ am__EXEEXT_2 = testing$(EXEEXT) option-c
|
||||
strfuncs$(EXEEXT) string$(EXEEXT) markup-parse$(EXEEXT) \
|
||||
markup-collect$(EXEEXT) markup-escape$(EXEEXT) \
|
||||
markup-subparser$(EXEEXT) array-test$(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
|
||||
markup_subparser_SOURCES = markup-subparser.c
|
||||
markup_subparser_OBJECTS = markup-subparser.$(OBJEXT)
|
||||
markup_subparser_DEPENDENCIES = $(progs_ldadd)
|
||||
|
|
@ -25,34 +25,34 @@ https://bugzilla.gnome.org/show_bug.cgi?id=641350
|
|||
mem_overflow_DEPENDENCIES = $(progs_ldadd)
|
||||
node_SOURCES = node.c
|
||||
node_OBJECTS = node.$(OBJEXT)
|
||||
@@ -242,7 +240,7 @@ SOURCES = array-test.c base64.c bookmark
|
||||
$(fileutils_SOURCES) $(gdatetime_SOURCES) gvariant.c hash.c \
|
||||
hostutils.c $(keyfile_SOURCES) list.c logging.c \
|
||||
@@ -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 \
|
||||
$(option_context_SOURCES) pattern.c $(protocol_SOURCES) \
|
||||
queue.c $(rand_SOURCES) regex.c scannerapi.c sequence.c \
|
||||
shell.c slist.c $(strfuncs_SOURCES) $(string_SOURCES) \
|
||||
@@ -254,7 +252,7 @@ DIST_SOURCES = array-test.c base64.c boo
|
||||
$(fileutils_SOURCES) $(gdatetime_SOURCES) gvariant.c hash.c \
|
||||
hostutils.c $(keyfile_SOURCES) list.c logging.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_context_SOURCES) pattern.c $(protocol_SOURCES) \
|
||||
queue.c $(rand_SOURCES) regex.c scannerapi.c sequence.c \
|
||||
shell.c slist.c $(strfuncs_SOURCES) $(string_SOURCES) \
|
||||
@@ -507,7 +505,7 @@ EXTRA_DIST = 4096-random-bytes keyfilete
|
||||
TEST_PROGS = testing option-context keyfile fileutils test-printf \
|
||||
protocol rand strfuncs string markup-parse markup-collect \
|
||||
markup-escape markup-subparser array-test hostutils gvariant \
|
||||
- mem-overflow utf8-performance utils regex base64 sequence \
|
||||
+ utf8-performance utils regex base64 sequence \
|
||||
scannerapi shell collate utf8-pointer utf8-validate utf8-misc \
|
||||
checksum hash date node convert list slist queue tree uri dir \
|
||||
pattern logging error bookmarkfile gdatetime timeout \
|
||||
@@ -692,9 +690,6 @@ markup-parse$(EXEEXT): $(markup_parse_OB
|
||||
$(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
|
||||
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 \
|
||||
- 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 \
|
||||
@@ -785,9 +783,6 @@ markup-parse$(EXEEXT): $(markup_parse_OB
|
||||
markup-subparser$(EXEEXT): $(markup_subparser_OBJECTS) $(markup_subparser_DEPENDENCIES)
|
||||
@rm -f markup-subparser$(EXEEXT)
|
||||
$(AM_V_CCLD)$(LINK) $(markup_subparser_OBJECTS) $(markup_subparser_LDADD) $(LIBS)
|
||||
|
|
@ -62,11 +62,11 @@ https://bugzilla.gnome.org/show_bug.cgi?id=641350
|
|||
node$(EXEEXT): $(node_OBJECTS) $(node_DEPENDENCIES)
|
||||
@rm -f node$(EXEEXT)
|
||||
$(AM_V_CCLD)$(LINK) $(node_OBJECTS) $(node_LDADD) $(LIBS)
|
||||
@@ -793,7 +788,6 @@ distclean-compile:
|
||||
@@ -907,7 +902,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)/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)/pattern.Po@am__quote@
|
||||
|
|
|
|||
|
|
@ -1,16 +1,16 @@
|
|||
$NetBSD: patch-cl,v 1.1 2011/10/09 19:40:02 jmmv Exp $
|
||||
$NetBSD: patch-cl,v 1.2 2012/01/29 10:46:54 drochner Exp $
|
||||
|
||||
--- gio/Makefile.am.orig 2011-10-09 17:21:29.000000000 +0000
|
||||
--- gio/Makefile.am.orig 2011-10-14 03:47:57.000000000 +0000
|
||||
+++ gio/Makefile.am
|
||||
@@ -632,12 +632,6 @@ gdbus_LDADD = libgio-2.0.la \
|
||||
@@ -633,12 +633,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_SCRIPTS = \
|
||||
-completion_DATA = \
|
||||
- gdbus-bash-completion.sh \
|
||||
- gsettings-bash-completion.sh
|
||||
-EXTRA_DIST += $(completion_SCRIPTS)
|
||||
-EXTRA_DIST += $(completion_DATA)
|
||||
-
|
||||
# ------------------------------------------------------------------------
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue