diff --git a/components/library/glib/Makefile b/components/library/glib/Makefile index 2b6867c5de6..2131fd49a49 100644 --- a/components/library/glib/Makefile +++ b/components/library/glib/Makefile @@ -15,23 +15,24 @@ include ../../../make-rules/shared-macros.mk -COMPONENT_NAME= glib -COMPONENT_VERSION= 2.46.2 -COMPONENT_REVISION= 1 +COMPONENT_NAME= glib +COMPONENT_MJR_VERSION= 2.54 +COMPONENT_MNR_VERSION= 3 +COMPONENT_VERSION= $(COMPONENT_MJR_VERSION).$(COMPONENT_MNR_VERSION) COMPONENT_SUMMARY= GNOME core libraries COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION) COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.xz COMPONENT_ARCHIVE_HASH= \ - sha256:5031722e37036719c1a09163cc6cf7c326e4c4f1f1e074b433c156862bd733db + sha256:963fdc6685dc3da8e5381dfb9f15ca4b5709b28be84d9d05a9bb8e446abac0a8 COMPONENT_ARCHIVE_URL= \ - http://ftp.gnome.org/pub/GNOME/sources/$(COMPONENT_NAME)/2.46/$(COMPONENT_ARCHIVE) + http://ftp.gnome.org/pub/GNOME/sources/$(COMPONENT_NAME)/$(COMPONENT_MJR_VERSION)/$(COMPONENT_ARCHIVE) COMPONENT_PROJECT_URL = https://www.gtk.org/ -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/configure.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk -PATH=/usr/gnu/bin:/usr/bin +PATH=$(PATH.gnu) LDFLAGS += -lsocket -lsecdb -lnsl @@ -42,7 +43,8 @@ COMPONENT_PRE_CONFIGURE_ACTION = ( cp -a $(SOURCE_DIR)/* $(@D)) CONFIGURE_SCRIPT = $(@D)/configure # GCC 6 -CFLAGS += -std=gnu89 -Wno-error=format-nonliteral +CFLAGS += -Wno-error=format-nonliteral +CPPFLAGS += $(CPP_XPG6MODE) CONFIGURE_OPTIONS.32 = --sysconfdir=/etc CONFIGURE_OPTIONS.64 = --sysconfdir=/etc/$(MACH64) @@ -52,6 +54,7 @@ CONFIGURE_OPTIONS += --enable-shared CONFIGURE_ENV += PERL=$(PERL) CONFIGURE_ENV += PYTHON=$(PYTHON) +CONFIGURE_ENV += CPPFLAGS="$(CPPFLAGS)" DFLAGS.64 = -64 COMPONENT_BUILD_ENV += DFLAGS=$(DFLAGS.$(BITS)) @@ -59,15 +62,22 @@ COMPONENT_BUILD_ENV += DFLAGS=$(DFLAGS.$(BITS)) # Otherwise tests fail ENV = /usr/bin/env -i +COMPONENT_TEST_TRANSFORMS += \ + '-n ' \ + '-e "/^FAIL:/p" ' \ + '-e "/^ERROR:/p" ' \ + '-e "/^\#/p" ' \ + + build: $(BUILD_32_and_64) install: $(INSTALL_32_and_64) -# Failed tests: gdatetime, convert, strfuncs, string, timer test: $(TEST_32_and_64) REQUIRED_PACKAGES += library/file-monitor/gamin REQUIRED_PACKAGES += library/libffi +REQUIRED_PACKAGES += library/pcre REQUIRED_PACKAGES += library/zlib REQUIRED_PACKAGES += runtime/perl-522 REQUIRED_PACKAGES += runtime/python-27 diff --git a/components/library/glib/glib2.p5m b/components/library/glib/glib2.p5m index c8390915162..e6168671d42 100644 --- a/components/library/glib/glib2.p5m +++ b/components/library/glib/glib2.p5m @@ -32,6 +32,7 @@ depend fmri=library/glib2/charset-alias@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION file path=usr/bin/$(MACH64)/gapplication file path=usr/bin/$(MACH64)/gdbus file path=usr/bin/$(MACH64)/gdbus-codegen pkg.depend.bypass-generate=.*codegen.* +file path=usr/bin/$(MACH64)/gio file path=usr/bin/$(MACH64)/gio-querymodules file path=usr/bin/$(MACH64)/glib-compile-resources file path=usr/bin/$(MACH64)/glib-compile-schemas @@ -46,6 +47,7 @@ file path=usr/bin/$(MACH64)/gtester-report pkg.depend.bypass-generate=.*(content file path=usr/bin/gapplication file path=usr/bin/gdbus file path=usr/bin/gdbus-codegen pkg.depend.bypass-generate=.*codegen.* +file path=usr/bin/gio file path=usr/bin/gio-querymodules file path=usr/bin/glib-compile-resources file path=usr/bin/glib-compile-schemas @@ -86,6 +88,7 @@ file path=usr/include/glib-2.0/gio/gconverter.h file path=usr/include/glib-2.0/gio/gconverterinputstream.h file path=usr/include/glib-2.0/gio/gconverteroutputstream.h file path=usr/include/glib-2.0/gio/gcredentials.h +file path=usr/include/glib-2.0/gio/gdatagrambased.h file path=usr/include/glib-2.0/gio/gdatainputstream.h file path=usr/include/glib-2.0/gio/gdataoutputstream.h file path=usr/include/glib-2.0/gio/gdbusactiongroup.h @@ -111,6 +114,9 @@ file path=usr/include/glib-2.0/gio/gdbusproxy.h file path=usr/include/glib-2.0/gio/gdbusserver.h file path=usr/include/glib-2.0/gio/gdbusutils.h file path=usr/include/glib-2.0/gio/gdrive.h +file path=usr/include/glib-2.0/gio/gdtlsclientconnection.h +file path=usr/include/glib-2.0/gio/gdtlsconnection.h +file path=usr/include/glib-2.0/gio/gdtlsserverconnection.h file path=usr/include/glib-2.0/gio/gemblem.h file path=usr/include/glib-2.0/gio/gemblemedicon.h file path=usr/include/glib-2.0/gio/gfile.h @@ -288,6 +294,7 @@ file path=usr/include/glib-2.0/glib/gtypes.h file path=usr/include/glib-2.0/glib/gunicode.h file path=usr/include/glib-2.0/glib/gurifuncs.h file path=usr/include/glib-2.0/glib/gutils.h +file path=usr/include/glib-2.0/glib/guuid.h file path=usr/include/glib-2.0/glib/gvariant.h file path=usr/include/glib-2.0/glib/gvarianttype.h file path=usr/include/glib-2.0/glib/gversion.h @@ -314,31 +321,27 @@ file path=usr/include/glib-2.0/gobject/gvalue.h file path=usr/include/glib-2.0/gobject/gvaluearray.h file path=usr/include/glib-2.0/gobject/gvaluecollector.h file path=usr/include/glib-2.0/gobject/gvaluetypes.h +#file path=usr/lib/$(MACH64)/charset.alias file path=usr/lib/$(MACH64)/gio/modules/libgiofam.so file path=usr/lib/$(MACH64)/glib-2.0/include/glibconfig.h -file path=usr/lib/$(MACH64)/libgio-2.0.la -link path=usr/lib/$(MACH64)/libgio-2.0.so target=libgio-2.0.so.0.4600.2 -link path=usr/lib/$(MACH64)/libgio-2.0.so.0 target=libgio-2.0.so.0.4600.2 -file path=usr/lib/$(MACH64)/libgio-2.0.so.0.4600.2 -file path=usr/lib/$(MACH64)/libglib-2.0.la -link path=usr/lib/$(MACH64)/libglib-2.0.so target=libglib-2.0.so.0.4600.2 -link path=usr/lib/$(MACH64)/libglib-2.0.so.0 target=libglib-2.0.so.0.4600.2 -file path=usr/lib/$(MACH64)/libglib-2.0.so.0.4600.2 -file path=usr/lib/$(MACH64)/libgmodule-2.0.la -link path=usr/lib/$(MACH64)/libgmodule-2.0.so target=libgmodule-2.0.so.0.4600.2 +link path=usr/lib/$(MACH64)/libgio-2.0.so target=libgio-2.0.so.0.5400.3 +link path=usr/lib/$(MACH64)/libgio-2.0.so.0 target=libgio-2.0.so.0.5400.3 +file path=usr/lib/$(MACH64)/libgio-2.0.so.0.5400.3 +link path=usr/lib/$(MACH64)/libglib-2.0.so target=libglib-2.0.so.0.5400.3 +link path=usr/lib/$(MACH64)/libglib-2.0.so.0 target=libglib-2.0.so.0.5400.3 +file path=usr/lib/$(MACH64)/libglib-2.0.so.0.5400.3 +link path=usr/lib/$(MACH64)/libgmodule-2.0.so target=libgmodule-2.0.so.0.5400.3 link path=usr/lib/$(MACH64)/libgmodule-2.0.so.0 \ - target=libgmodule-2.0.so.0.4600.2 -file path=usr/lib/$(MACH64)/libgmodule-2.0.so.0.4600.2 -file path=usr/lib/$(MACH64)/libgobject-2.0.la -link path=usr/lib/$(MACH64)/libgobject-2.0.so target=libgobject-2.0.so.0.4600.2 + target=libgmodule-2.0.so.0.5400.3 +file path=usr/lib/$(MACH64)/libgmodule-2.0.so.0.5400.3 +link path=usr/lib/$(MACH64)/libgobject-2.0.so target=libgobject-2.0.so.0.5400.3 link path=usr/lib/$(MACH64)/libgobject-2.0.so.0 \ - target=libgobject-2.0.so.0.4600.2 -file path=usr/lib/$(MACH64)/libgobject-2.0.so.0.4600.2 -file path=usr/lib/$(MACH64)/libgthread-2.0.la -link path=usr/lib/$(MACH64)/libgthread-2.0.so target=libgthread-2.0.so.0.4600.2 + target=libgobject-2.0.so.0.5400.3 +file path=usr/lib/$(MACH64)/libgobject-2.0.so.0.5400.3 +link path=usr/lib/$(MACH64)/libgthread-2.0.so target=libgthread-2.0.so.0.5400.3 link path=usr/lib/$(MACH64)/libgthread-2.0.so.0 \ - target=libgthread-2.0.so.0.4600.2 -file path=usr/lib/$(MACH64)/libgthread-2.0.so.0.4600.2 + target=libgthread-2.0.so.0.5400.3 +file path=usr/lib/$(MACH64)/libgthread-2.0.so.0.5400.3 file path=usr/lib/$(MACH64)/pkgconfig/gio-2.0.pc file path=usr/lib/$(MACH64)/pkgconfig/gio-unix-2.0.pc file path=usr/lib/$(MACH64)/pkgconfig/glib-2.0.pc @@ -347,28 +350,24 @@ file path=usr/lib/$(MACH64)/pkgconfig/gmodule-export-2.0.pc file path=usr/lib/$(MACH64)/pkgconfig/gmodule-no-export-2.0.pc file path=usr/lib/$(MACH64)/pkgconfig/gobject-2.0.pc file path=usr/lib/$(MACH64)/pkgconfig/gthread-2.0.pc +#file path=usr/lib/charset.alias file path=usr/lib/gio/modules/libgiofam.so file path=usr/lib/glib-2.0/include/glibconfig.h -file path=usr/lib/libgio-2.0.la -link path=usr/lib/libgio-2.0.so target=libgio-2.0.so.0.4600.2 -link path=usr/lib/libgio-2.0.so.0 target=libgio-2.0.so.0.4600.2 -file path=usr/lib/libgio-2.0.so.0.4600.2 -file path=usr/lib/libglib-2.0.la -link path=usr/lib/libglib-2.0.so target=libglib-2.0.so.0.4600.2 -link path=usr/lib/libglib-2.0.so.0 target=libglib-2.0.so.0.4600.2 -file path=usr/lib/libglib-2.0.so.0.4600.2 -file path=usr/lib/libgmodule-2.0.la -link path=usr/lib/libgmodule-2.0.so target=libgmodule-2.0.so.0.4600.2 -link path=usr/lib/libgmodule-2.0.so.0 target=libgmodule-2.0.so.0.4600.2 -file path=usr/lib/libgmodule-2.0.so.0.4600.2 -file path=usr/lib/libgobject-2.0.la -link path=usr/lib/libgobject-2.0.so target=libgobject-2.0.so.0.4600.2 -link path=usr/lib/libgobject-2.0.so.0 target=libgobject-2.0.so.0.4600.2 -file path=usr/lib/libgobject-2.0.so.0.4600.2 -file path=usr/lib/libgthread-2.0.la -link path=usr/lib/libgthread-2.0.so target=libgthread-2.0.so.0.4600.2 -link path=usr/lib/libgthread-2.0.so.0 target=libgthread-2.0.so.0.4600.2 -file path=usr/lib/libgthread-2.0.so.0.4600.2 +link path=usr/lib/libgio-2.0.so target=libgio-2.0.so.0.5400.3 +link path=usr/lib/libgio-2.0.so.0 target=libgio-2.0.so.0.5400.3 +file path=usr/lib/libgio-2.0.so.0.5400.3 +link path=usr/lib/libglib-2.0.so target=libglib-2.0.so.0.5400.3 +link path=usr/lib/libglib-2.0.so.0 target=libglib-2.0.so.0.5400.3 +file path=usr/lib/libglib-2.0.so.0.5400.3 +link path=usr/lib/libgmodule-2.0.so target=libgmodule-2.0.so.0.5400.3 +link path=usr/lib/libgmodule-2.0.so.0 target=libgmodule-2.0.so.0.5400.3 +file path=usr/lib/libgmodule-2.0.so.0.5400.3 +link path=usr/lib/libgobject-2.0.so target=libgobject-2.0.so.0.5400.3 +link path=usr/lib/libgobject-2.0.so.0 target=libgobject-2.0.so.0.5400.3 +file path=usr/lib/libgobject-2.0.so.0.5400.3 +link path=usr/lib/libgthread-2.0.so target=libgthread-2.0.so.0.5400.3 +link path=usr/lib/libgthread-2.0.so.0 target=libgthread-2.0.so.0.5400.3 +file path=usr/lib/libgthread-2.0.so.0.5400.3 file path=usr/lib/pkgconfig/gio-2.0.pc file path=usr/lib/pkgconfig/gio-unix-2.0.pc file path=usr/lib/pkgconfig/glib-2.0.pc @@ -384,38 +383,33 @@ file path=usr/share/bash-completion/completions/gapplication file path=usr/share/bash-completion/completions/gdbus file path=usr/share/bash-completion/completions/gresource file path=usr/share/bash-completion/completions/gsettings -file path=usr/share/gdb/auto-load/usr/lib/$(MACH64)/libglib-2.0.so.0.4600.2-gdb.py -file path=usr/share/gdb/auto-load/usr/lib/$(MACH64)/libgobject-2.0.so.0.4600.2-gdb.py -file path=usr/share/gdb/auto-load/usr/lib/libglib-2.0.so.0.4600.2-gdb.py -file path=usr/share/gdb/auto-load/usr/lib/libgobject-2.0.so.0.4600.2-gdb.py +file path=usr/share/gdb/auto-load/usr/lib/$(MACH64)/libglib-2.0.so.0.5400.3-gdb.py +file path=usr/share/gdb/auto-load/usr/lib/$(MACH64)/libgobject-2.0.so.0.5400.3-gdb.py +file path=usr/share/gdb/auto-load/usr/lib/libglib-2.0.so.0.5400.3-gdb.py +file path=usr/share/gdb/auto-load/usr/lib/libgobject-2.0.so.0.5400.3-gdb.py +file path=usr/share/gettext/its/gschema.its +file path=usr/share/gettext/its/gschema.loc file path=usr/share/glib-2.0/codegen/__init__.py file path=usr/share/glib-2.0/codegen/__init__.pyc -file path=usr/share/glib-2.0/codegen/__init__.pyo file path=usr/share/glib-2.0/codegen/codegen.py file path=usr/share/glib-2.0/codegen/codegen.pyc -file path=usr/share/glib-2.0/codegen/codegen.pyo file path=usr/share/glib-2.0/codegen/codegen_docbook.py file path=usr/share/glib-2.0/codegen/codegen_docbook.pyc -file path=usr/share/glib-2.0/codegen/codegen_docbook.pyo file path=usr/share/glib-2.0/codegen/codegen_main.py file path=usr/share/glib-2.0/codegen/codegen_main.pyc -file path=usr/share/glib-2.0/codegen/codegen_main.pyo file path=usr/share/glib-2.0/codegen/config.py file path=usr/share/glib-2.0/codegen/config.pyc -file path=usr/share/glib-2.0/codegen/config.pyo file path=usr/share/glib-2.0/codegen/dbustypes.py file path=usr/share/glib-2.0/codegen/dbustypes.pyc -file path=usr/share/glib-2.0/codegen/dbustypes.pyo file path=usr/share/glib-2.0/codegen/parser.py file path=usr/share/glib-2.0/codegen/parser.pyc -file path=usr/share/glib-2.0/codegen/parser.pyo file path=usr/share/glib-2.0/codegen/utils.py file path=usr/share/glib-2.0/codegen/utils.pyc -file path=usr/share/glib-2.0/codegen/utils.pyo -file path=usr/share/glib-2.0/gdb/glib.py -file path=usr/share/glib-2.0/gdb/gobject.py +file path=usr/share/glib-2.0/gdb/glib_gdb.py +file path=usr/share/glib-2.0/gdb/gobject_gdb.py file path=usr/share/glib-2.0/gettext/po/Makefile.in.in file path=usr/share/glib-2.0/schemas/gschema.dtd +file path=usr/share/glib-2.0/valgrind/glib.supp file path=usr/share/gtk-doc/html/gio/GAction.html file path=usr/share/gtk-doc/html/gio/GActionGroup.html file path=usr/share/gtk-doc/html/gio/GActionMap.html @@ -450,7 +444,11 @@ file path=usr/share/gtk-doc/html/gio/GDBusProxy.html file path=usr/share/gtk-doc/html/gio/GDBusServer.html file path=usr/share/gtk-doc/html/gio/GDataInputStream.html file path=usr/share/gtk-doc/html/gio/GDataOutputStream.html +file path=usr/share/gtk-doc/html/gio/GDatagramBased.html file path=usr/share/gtk-doc/html/gio/GDrive.html +file path=usr/share/gtk-doc/html/gio/GDtlsClientConnection.html +file path=usr/share/gtk-doc/html/gio/GDtlsConnection.html +file path=usr/share/gtk-doc/html/gio/GDtlsServerConnection.html file path=usr/share/gtk-doc/html/gio/GEmblem.html file path=usr/share/gtk-doc/html/gio/GEmblemedIcon.html file path=usr/share/gtk-doc/html/gio/GFile.html @@ -493,6 +491,7 @@ file path=usr/share/gtk-doc/html/gio/GPollableOutputStream.html file path=usr/share/gtk-doc/html/gio/GPropertyAction.html file path=usr/share/gtk-doc/html/gio/GProxy.html file path=usr/share/gtk-doc/html/gio/GProxyAddress.html +file path=usr/share/gtk-doc/html/gio/GProxyAddressEnumerator.html file path=usr/share/gtk-doc/html/gio/GProxyResolver.html file path=usr/share/gtk-doc/html/gio/GRemoteActionGroup.html file path=usr/share/gtk-doc/html/gio/GResolver.html @@ -508,6 +507,7 @@ file path=usr/share/gtk-doc/html/gio/GSimplePermission.html file path=usr/share/gtk-doc/html/gio/GSimpleProxyResolver.html file path=usr/share/gtk-doc/html/gio/GSocket.html file path=usr/share/gtk-doc/html/gio/GSocketAddress.html +file path=usr/share/gtk-doc/html/gio/GSocketAddressEnumerator.html file path=usr/share/gtk-doc/html/gio/GSocketClient.html file path=usr/share/gtk-doc/html/gio/GSocketConnectable.html file path=usr/share/gtk-doc/html/gio/GSocketConnection.html @@ -545,22 +545,6 @@ file path=usr/share/gtk-doc/html/gio/GVolumeMonitor.html file path=usr/share/gtk-doc/html/gio/GZlibCompressor.html file path=usr/share/gtk-doc/html/gio/GZlibDecompressor.html file path=usr/share/gtk-doc/html/gio/annotation-glossary.html -file path=usr/share/gtk-doc/html/gio/api-index-2-18.html -file path=usr/share/gtk-doc/html/gio/api-index-2-20.html -file path=usr/share/gtk-doc/html/gio/api-index-2-22.html -file path=usr/share/gtk-doc/html/gio/api-index-2-24.html -file path=usr/share/gtk-doc/html/gio/api-index-2-26.html -file path=usr/share/gtk-doc/html/gio/api-index-2-28.html -file path=usr/share/gtk-doc/html/gio/api-index-2-30.html -file path=usr/share/gtk-doc/html/gio/api-index-2-32.html -file path=usr/share/gtk-doc/html/gio/api-index-2-34.html -file path=usr/share/gtk-doc/html/gio/api-index-2-36.html -file path=usr/share/gtk-doc/html/gio/api-index-2-38.html -file path=usr/share/gtk-doc/html/gio/api-index-2-40.html -file path=usr/share/gtk-doc/html/gio/api-index-2-42.html -file path=usr/share/gtk-doc/html/gio/api-index-2-44.html -file path=usr/share/gtk-doc/html/gio/api-index-2-46.html -file path=usr/share/gtk-doc/html/gio/api-index-deprecated.html file path=usr/share/gtk-doc/html/gio/api-index-full.html file path=usr/share/gtk-doc/html/gio/application.html file path=usr/share/gtk-doc/html/gio/async.html @@ -622,6 +606,7 @@ file path=usr/share/gtk-doc/html/gio/gio-gpollableutils.html file path=usr/share/gtk-doc/html/gio/gio-hierarchy.html file path=usr/share/gtk-doc/html/gio/gio-querymodules.html file path=usr/share/gtk-doc/html/gio/gio.devhelp2 +file path=usr/share/gtk-doc/html/gio/gio.html file path=usr/share/gtk-doc/html/gio/glib-compile-resources.html file path=usr/share/gtk-doc/html/gio/glib-compile-schemas.html file path=usr/share/gtk-doc/html/gio/gresource-tool.html @@ -631,7 +616,6 @@ file path=usr/share/gtk-doc/html/gio/highlevel-socket.html file path=usr/share/gtk-doc/html/gio/home.png file path=usr/share/gtk-doc/html/gio/icons.html file path=usr/share/gtk-doc/html/gio/index.html -file path=usr/share/gtk-doc/html/gio/index.sgml file path=usr/share/gtk-doc/html/gio/left-insensitive.png file path=usr/share/gtk-doc/html/gio/left.png file path=usr/share/gtk-doc/html/gio/menu-example.png @@ -664,30 +648,6 @@ file path=usr/share/gtk-doc/html/glib/Sorted_binary_tree_inorder.svg file path=usr/share/gtk-doc/html/glib/Sorted_binary_tree_postorder.svg file path=usr/share/gtk-doc/html/glib/Sorted_binary_tree_preorder.svg file path=usr/share/gtk-doc/html/glib/annotation-glossary.html -file path=usr/share/gtk-doc/html/glib/api-index-2-10.html -file path=usr/share/gtk-doc/html/glib/api-index-2-12.html -file path=usr/share/gtk-doc/html/glib/api-index-2-14.html -file path=usr/share/gtk-doc/html/glib/api-index-2-16.html -file path=usr/share/gtk-doc/html/glib/api-index-2-18.html -file path=usr/share/gtk-doc/html/glib/api-index-2-2.html -file path=usr/share/gtk-doc/html/glib/api-index-2-20.html -file path=usr/share/gtk-doc/html/glib/api-index-2-22.html -file path=usr/share/gtk-doc/html/glib/api-index-2-24.html -file path=usr/share/gtk-doc/html/glib/api-index-2-26.html -file path=usr/share/gtk-doc/html/glib/api-index-2-28.html -file path=usr/share/gtk-doc/html/glib/api-index-2-30.html -file path=usr/share/gtk-doc/html/glib/api-index-2-32.html -file path=usr/share/gtk-doc/html/glib/api-index-2-34.html -file path=usr/share/gtk-doc/html/glib/api-index-2-36.html -file path=usr/share/gtk-doc/html/glib/api-index-2-38.html -file path=usr/share/gtk-doc/html/glib/api-index-2-4.html -file path=usr/share/gtk-doc/html/glib/api-index-2-40.html -file path=usr/share/gtk-doc/html/glib/api-index-2-42.html -file path=usr/share/gtk-doc/html/glib/api-index-2-44.html -file path=usr/share/gtk-doc/html/glib/api-index-2-46.html -file path=usr/share/gtk-doc/html/glib/api-index-2-6.html -file path=usr/share/gtk-doc/html/glib/api-index-2-8.html -file path=usr/share/gtk-doc/html/glib/api-index-deprecated.html file path=usr/share/gtk-doc/html/glib/api-index-full.html file path=usr/share/gtk-doc/html/glib/deprecated.html file path=usr/share/gtk-doc/html/glib/file-name-encodings.png @@ -699,6 +659,7 @@ file path=usr/share/gtk-doc/html/glib/glib-Balanced-Binary-Trees.html file path=usr/share/gtk-doc/html/glib/glib-Base64-Encoding.html file path=usr/share/gtk-doc/html/glib/glib-Basic-Types.html file path=usr/share/gtk-doc/html/glib/glib-Bookmark-file-parser.html +file path=usr/share/gtk-doc/html/glib/glib-Bounds-checked-integer-arithmetic.html file path=usr/share/gtk-doc/html/glib/glib-Byte-Arrays.html file path=usr/share/gtk-doc/html/glib/glib-Byte-Order-Macros.html file path=usr/share/gtk-doc/html/glib/glib-Caches.html @@ -716,6 +677,7 @@ file path=usr/share/gtk-doc/html/glib/glib-Error-Reporting.html file path=usr/share/gtk-doc/html/glib/glib-File-Utilities.html file path=usr/share/gtk-doc/html/glib/glib-GDateTime.html file path=usr/share/gtk-doc/html/glib/glib-GTimeZone.html +file path=usr/share/gtk-doc/html/glib/glib-GUuid.html file path=usr/share/gtk-doc/html/glib/glib-GVariant.html file path=usr/share/gtk-doc/html/glib/glib-GVariantType.html file path=usr/share/gtk-doc/html/glib/glib-Glob-style-pattern-matching.html @@ -782,7 +744,6 @@ file path=usr/share/gtk-doc/html/glib/gvariant-format-strings.html file path=usr/share/gtk-doc/html/glib/gvariant-text.html file path=usr/share/gtk-doc/html/glib/home.png file path=usr/share/gtk-doc/html/glib/index.html -file path=usr/share/gtk-doc/html/glib/index.sgml file path=usr/share/gtk-doc/html/glib/left-insensitive.png file path=usr/share/gtk-doc/html/glib/left.png file path=usr/share/gtk-doc/html/glib/mainloop-states.gif @@ -796,28 +757,6 @@ file path=usr/share/gtk-doc/html/gobject/GBinding.html file path=usr/share/gtk-doc/html/gobject/GTypeModule.html file path=usr/share/gtk-doc/html/gobject/GTypePlugin.html file path=usr/share/gtk-doc/html/gobject/annotation-glossary.html -file path=usr/share/gtk-doc/html/gobject/api-index-2-10.html -file path=usr/share/gtk-doc/html/gobject/api-index-2-12.html -file path=usr/share/gtk-doc/html/gobject/api-index-2-14.html -file path=usr/share/gtk-doc/html/gobject/api-index-2-18.html -file path=usr/share/gtk-doc/html/gobject/api-index-2-2.html -file path=usr/share/gtk-doc/html/gobject/api-index-2-22.html -file path=usr/share/gtk-doc/html/gobject/api-index-2-24.html -file path=usr/share/gtk-doc/html/gobject/api-index-2-26.html -file path=usr/share/gtk-doc/html/gobject/api-index-2-28.html -file path=usr/share/gtk-doc/html/gobject/api-index-2-30.html -file path=usr/share/gtk-doc/html/gobject/api-index-2-32.html -file path=usr/share/gtk-doc/html/gobject/api-index-2-34.html -file path=usr/share/gtk-doc/html/gobject/api-index-2-36.html -file path=usr/share/gtk-doc/html/gobject/api-index-2-38.html -file path=usr/share/gtk-doc/html/gobject/api-index-2-4.html -file path=usr/share/gtk-doc/html/gobject/api-index-2-40.html -file path=usr/share/gtk-doc/html/gobject/api-index-2-42.html -file path=usr/share/gtk-doc/html/gobject/api-index-2-44.html -file path=usr/share/gtk-doc/html/gobject/api-index-2-46.html -file path=usr/share/gtk-doc/html/gobject/api-index-2-6.html -file path=usr/share/gtk-doc/html/gobject/api-index-2-8.html -file path=usr/share/gtk-doc/html/gobject/api-index-deprecated.html file path=usr/share/gtk-doc/html/gobject/api-index-full.html file path=usr/share/gtk-doc/html/gobject/ch01s02.html file path=usr/share/gtk-doc/html/gobject/chapter-gobject.html @@ -860,7 +799,6 @@ file path=usr/share/gtk-doc/html/gobject/howto-interface-properties.html file path=usr/share/gtk-doc/html/gobject/howto-interface.html file path=usr/share/gtk-doc/html/gobject/howto-signals.html file path=usr/share/gtk-doc/html/gobject/index.html -file path=usr/share/gtk-doc/html/gobject/index.sgml file path=usr/share/gtk-doc/html/gobject/left-insensitive.png file path=usr/share/gtk-doc/html/gobject/left.png file path=usr/share/gtk-doc/html/gobject/pr01.html @@ -911,7 +849,9 @@ file path=usr/share/locale/eu/LC_MESSAGES/glib20.mo file path=usr/share/locale/fa/LC_MESSAGES/glib20.mo file path=usr/share/locale/fi/LC_MESSAGES/glib20.mo file path=usr/share/locale/fr/LC_MESSAGES/glib20.mo +file path=usr/share/locale/fur/LC_MESSAGES/glib20.mo file path=usr/share/locale/ga/LC_MESSAGES/glib20.mo +file path=usr/share/locale/gd/LC_MESSAGES/glib20.mo file path=usr/share/locale/gl/LC_MESSAGES/glib20.mo file path=usr/share/locale/gu/LC_MESSAGES/glib20.mo file path=usr/share/locale/he/LC_MESSAGES/glib20.mo @@ -980,6 +920,7 @@ file path=usr/share/man/man1/gapplication.1 file path=usr/share/man/man1/gdbus-codegen.1 file path=usr/share/man/man1/gdbus.1 file path=usr/share/man/man1/gio-querymodules.1 +file path=usr/share/man/man1/gio.1 file path=usr/share/man/man1/glib-compile-resources.1 file path=usr/share/man/man1/glib-compile-schemas.1 file path=usr/share/man/man1/glib-genmarshal.1 diff --git a/components/library/glib/manifests/sample-manifest.p5m b/components/library/glib/manifests/sample-manifest.p5m index a16359d1bdd..ad6ea9e1358 100644 --- a/components/library/glib/manifests/sample-manifest.p5m +++ b/components/library/glib/manifests/sample-manifest.p5m @@ -10,7 +10,7 @@ # # -# Copyright 2016 +# Copyright 2017 # set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) @@ -25,6 +25,7 @@ license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)' file path=usr/bin/$(MACH64)/gapplication file path=usr/bin/$(MACH64)/gdbus file path=usr/bin/$(MACH64)/gdbus-codegen +file path=usr/bin/$(MACH64)/gio file path=usr/bin/$(MACH64)/gio-querymodules file path=usr/bin/$(MACH64)/glib-compile-resources file path=usr/bin/$(MACH64)/glib-compile-schemas @@ -39,6 +40,7 @@ file path=usr/bin/$(MACH64)/gtester-report file path=usr/bin/gapplication file path=usr/bin/gdbus file path=usr/bin/gdbus-codegen +file path=usr/bin/gio file path=usr/bin/gio-querymodules file path=usr/bin/glib-compile-resources file path=usr/bin/glib-compile-schemas @@ -79,6 +81,7 @@ file path=usr/include/glib-2.0/gio/gconverter.h file path=usr/include/glib-2.0/gio/gconverterinputstream.h file path=usr/include/glib-2.0/gio/gconverteroutputstream.h file path=usr/include/glib-2.0/gio/gcredentials.h +file path=usr/include/glib-2.0/gio/gdatagrambased.h file path=usr/include/glib-2.0/gio/gdatainputstream.h file path=usr/include/glib-2.0/gio/gdataoutputstream.h file path=usr/include/glib-2.0/gio/gdbusactiongroup.h @@ -104,6 +107,9 @@ file path=usr/include/glib-2.0/gio/gdbusproxy.h file path=usr/include/glib-2.0/gio/gdbusserver.h file path=usr/include/glib-2.0/gio/gdbusutils.h file path=usr/include/glib-2.0/gio/gdrive.h +file path=usr/include/glib-2.0/gio/gdtlsclientconnection.h +file path=usr/include/glib-2.0/gio/gdtlsconnection.h +file path=usr/include/glib-2.0/gio/gdtlsserverconnection.h file path=usr/include/glib-2.0/gio/gemblem.h file path=usr/include/glib-2.0/gio/gemblemedicon.h file path=usr/include/glib-2.0/gio/gfile.h @@ -281,6 +287,7 @@ file path=usr/include/glib-2.0/glib/gtypes.h file path=usr/include/glib-2.0/glib/gunicode.h file path=usr/include/glib-2.0/glib/gurifuncs.h file path=usr/include/glib-2.0/glib/gutils.h +file path=usr/include/glib-2.0/glib/guuid.h file path=usr/include/glib-2.0/glib/gvariant.h file path=usr/include/glib-2.0/glib/gvarianttype.h file path=usr/include/glib-2.0/glib/gversion.h @@ -310,24 +317,24 @@ file path=usr/include/glib-2.0/gobject/gvaluetypes.h file path=usr/lib/$(MACH64)/charset.alias file path=usr/lib/$(MACH64)/gio/modules/libgiofam.so file path=usr/lib/$(MACH64)/glib-2.0/include/glibconfig.h -link path=usr/lib/$(MACH64)/libgio-2.0.so target=libgio-2.0.so.0.4600.2 -link path=usr/lib/$(MACH64)/libgio-2.0.so.0 target=libgio-2.0.so.0.4600.2 -file path=usr/lib/$(MACH64)/libgio-2.0.so.0.4600.2 -link path=usr/lib/$(MACH64)/libglib-2.0.so target=libglib-2.0.so.0.4600.2 -link path=usr/lib/$(MACH64)/libglib-2.0.so.0 target=libglib-2.0.so.0.4600.2 -file path=usr/lib/$(MACH64)/libglib-2.0.so.0.4600.2 -link path=usr/lib/$(MACH64)/libgmodule-2.0.so target=libgmodule-2.0.so.0.4600.2 +link path=usr/lib/$(MACH64)/libgio-2.0.so target=libgio-2.0.so.0.5400.3 +link path=usr/lib/$(MACH64)/libgio-2.0.so.0 target=libgio-2.0.so.0.5400.3 +file path=usr/lib/$(MACH64)/libgio-2.0.so.0.5400.3 +link path=usr/lib/$(MACH64)/libglib-2.0.so target=libglib-2.0.so.0.5400.3 +link path=usr/lib/$(MACH64)/libglib-2.0.so.0 target=libglib-2.0.so.0.5400.3 +file path=usr/lib/$(MACH64)/libglib-2.0.so.0.5400.3 +link path=usr/lib/$(MACH64)/libgmodule-2.0.so target=libgmodule-2.0.so.0.5400.3 link path=usr/lib/$(MACH64)/libgmodule-2.0.so.0 \ - target=libgmodule-2.0.so.0.4600.2 -file path=usr/lib/$(MACH64)/libgmodule-2.0.so.0.4600.2 -link path=usr/lib/$(MACH64)/libgobject-2.0.so target=libgobject-2.0.so.0.4600.2 + target=libgmodule-2.0.so.0.5400.3 +file path=usr/lib/$(MACH64)/libgmodule-2.0.so.0.5400.3 +link path=usr/lib/$(MACH64)/libgobject-2.0.so target=libgobject-2.0.so.0.5400.3 link path=usr/lib/$(MACH64)/libgobject-2.0.so.0 \ - target=libgobject-2.0.so.0.4600.2 -file path=usr/lib/$(MACH64)/libgobject-2.0.so.0.4600.2 -link path=usr/lib/$(MACH64)/libgthread-2.0.so target=libgthread-2.0.so.0.4600.2 + target=libgobject-2.0.so.0.5400.3 +file path=usr/lib/$(MACH64)/libgobject-2.0.so.0.5400.3 +link path=usr/lib/$(MACH64)/libgthread-2.0.so target=libgthread-2.0.so.0.5400.3 link path=usr/lib/$(MACH64)/libgthread-2.0.so.0 \ - target=libgthread-2.0.so.0.4600.2 -file path=usr/lib/$(MACH64)/libgthread-2.0.so.0.4600.2 + target=libgthread-2.0.so.0.5400.3 +file path=usr/lib/$(MACH64)/libgthread-2.0.so.0.5400.3 file path=usr/lib/$(MACH64)/pkgconfig/gio-2.0.pc file path=usr/lib/$(MACH64)/pkgconfig/gio-unix-2.0.pc file path=usr/lib/$(MACH64)/pkgconfig/glib-2.0.pc @@ -339,21 +346,21 @@ file path=usr/lib/$(MACH64)/pkgconfig/gthread-2.0.pc file path=usr/lib/charset.alias file path=usr/lib/gio/modules/libgiofam.so file path=usr/lib/glib-2.0/include/glibconfig.h -link path=usr/lib/libgio-2.0.so target=libgio-2.0.so.0.4600.2 -link path=usr/lib/libgio-2.0.so.0 target=libgio-2.0.so.0.4600.2 -file path=usr/lib/libgio-2.0.so.0.4600.2 -link path=usr/lib/libglib-2.0.so target=libglib-2.0.so.0.4600.2 -link path=usr/lib/libglib-2.0.so.0 target=libglib-2.0.so.0.4600.2 -file path=usr/lib/libglib-2.0.so.0.4600.2 -link path=usr/lib/libgmodule-2.0.so target=libgmodule-2.0.so.0.4600.2 -link path=usr/lib/libgmodule-2.0.so.0 target=libgmodule-2.0.so.0.4600.2 -file path=usr/lib/libgmodule-2.0.so.0.4600.2 -link path=usr/lib/libgobject-2.0.so target=libgobject-2.0.so.0.4600.2 -link path=usr/lib/libgobject-2.0.so.0 target=libgobject-2.0.so.0.4600.2 -file path=usr/lib/libgobject-2.0.so.0.4600.2 -link path=usr/lib/libgthread-2.0.so target=libgthread-2.0.so.0.4600.2 -link path=usr/lib/libgthread-2.0.so.0 target=libgthread-2.0.so.0.4600.2 -file path=usr/lib/libgthread-2.0.so.0.4600.2 +link path=usr/lib/libgio-2.0.so target=libgio-2.0.so.0.5400.3 +link path=usr/lib/libgio-2.0.so.0 target=libgio-2.0.so.0.5400.3 +file path=usr/lib/libgio-2.0.so.0.5400.3 +link path=usr/lib/libglib-2.0.so target=libglib-2.0.so.0.5400.3 +link path=usr/lib/libglib-2.0.so.0 target=libglib-2.0.so.0.5400.3 +file path=usr/lib/libglib-2.0.so.0.5400.3 +link path=usr/lib/libgmodule-2.0.so target=libgmodule-2.0.so.0.5400.3 +link path=usr/lib/libgmodule-2.0.so.0 target=libgmodule-2.0.so.0.5400.3 +file path=usr/lib/libgmodule-2.0.so.0.5400.3 +link path=usr/lib/libgobject-2.0.so target=libgobject-2.0.so.0.5400.3 +link path=usr/lib/libgobject-2.0.so.0 target=libgobject-2.0.so.0.5400.3 +file path=usr/lib/libgobject-2.0.so.0.5400.3 +link path=usr/lib/libgthread-2.0.so target=libgthread-2.0.so.0.5400.3 +link path=usr/lib/libgthread-2.0.so.0 target=libgthread-2.0.so.0.5400.3 +file path=usr/lib/libgthread-2.0.so.0.5400.3 file path=usr/lib/pkgconfig/gio-2.0.pc file path=usr/lib/pkgconfig/gio-unix-2.0.pc file path=usr/lib/pkgconfig/glib-2.0.pc @@ -369,10 +376,12 @@ file path=usr/share/bash-completion/completions/gapplication file path=usr/share/bash-completion/completions/gdbus file path=usr/share/bash-completion/completions/gresource file path=usr/share/bash-completion/completions/gsettings -file path=usr/share/gdb/auto-load/usr/lib/$(MACH64)/libglib-2.0.so.0.4600.2-gdb.py -file path=usr/share/gdb/auto-load/usr/lib/$(MACH64)/libgobject-2.0.so.0.4600.2-gdb.py -file path=usr/share/gdb/auto-load/usr/lib/libglib-2.0.so.0.4600.2-gdb.py -file path=usr/share/gdb/auto-load/usr/lib/libgobject-2.0.so.0.4600.2-gdb.py +file path=usr/share/gdb/auto-load/usr/lib/$(MACH64)/libglib-2.0.so.0.5400.3-gdb.py +file path=usr/share/gdb/auto-load/usr/lib/$(MACH64)/libgobject-2.0.so.0.5400.3-gdb.py +file path=usr/share/gdb/auto-load/usr/lib/libglib-2.0.so.0.5400.3-gdb.py +file path=usr/share/gdb/auto-load/usr/lib/libgobject-2.0.so.0.5400.3-gdb.py +file path=usr/share/gettext/its/gschema.its +file path=usr/share/gettext/its/gschema.loc file path=usr/share/glib-2.0/codegen/__init__.py file path=usr/share/glib-2.0/codegen/__init__.pyc file path=usr/share/glib-2.0/codegen/codegen.py @@ -389,10 +398,11 @@ file path=usr/share/glib-2.0/codegen/parser.py file path=usr/share/glib-2.0/codegen/parser.pyc file path=usr/share/glib-2.0/codegen/utils.py file path=usr/share/glib-2.0/codegen/utils.pyc -file path=usr/share/glib-2.0/gdb/glib.py -file path=usr/share/glib-2.0/gdb/gobject.py +file path=usr/share/glib-2.0/gdb/glib_gdb.py +file path=usr/share/glib-2.0/gdb/gobject_gdb.py file path=usr/share/glib-2.0/gettext/po/Makefile.in.in file path=usr/share/glib-2.0/schemas/gschema.dtd +file path=usr/share/glib-2.0/valgrind/glib.supp file path=usr/share/gtk-doc/html/gio/GAction.html file path=usr/share/gtk-doc/html/gio/GActionGroup.html file path=usr/share/gtk-doc/html/gio/GActionMap.html @@ -427,7 +437,11 @@ file path=usr/share/gtk-doc/html/gio/GDBusProxy.html file path=usr/share/gtk-doc/html/gio/GDBusServer.html file path=usr/share/gtk-doc/html/gio/GDataInputStream.html file path=usr/share/gtk-doc/html/gio/GDataOutputStream.html +file path=usr/share/gtk-doc/html/gio/GDatagramBased.html file path=usr/share/gtk-doc/html/gio/GDrive.html +file path=usr/share/gtk-doc/html/gio/GDtlsClientConnection.html +file path=usr/share/gtk-doc/html/gio/GDtlsConnection.html +file path=usr/share/gtk-doc/html/gio/GDtlsServerConnection.html file path=usr/share/gtk-doc/html/gio/GEmblem.html file path=usr/share/gtk-doc/html/gio/GEmblemedIcon.html file path=usr/share/gtk-doc/html/gio/GFile.html @@ -470,6 +484,7 @@ file path=usr/share/gtk-doc/html/gio/GPollableOutputStream.html file path=usr/share/gtk-doc/html/gio/GPropertyAction.html file path=usr/share/gtk-doc/html/gio/GProxy.html file path=usr/share/gtk-doc/html/gio/GProxyAddress.html +file path=usr/share/gtk-doc/html/gio/GProxyAddressEnumerator.html file path=usr/share/gtk-doc/html/gio/GProxyResolver.html file path=usr/share/gtk-doc/html/gio/GRemoteActionGroup.html file path=usr/share/gtk-doc/html/gio/GResolver.html @@ -485,6 +500,7 @@ file path=usr/share/gtk-doc/html/gio/GSimplePermission.html file path=usr/share/gtk-doc/html/gio/GSimpleProxyResolver.html file path=usr/share/gtk-doc/html/gio/GSocket.html file path=usr/share/gtk-doc/html/gio/GSocketAddress.html +file path=usr/share/gtk-doc/html/gio/GSocketAddressEnumerator.html file path=usr/share/gtk-doc/html/gio/GSocketClient.html file path=usr/share/gtk-doc/html/gio/GSocketConnectable.html file path=usr/share/gtk-doc/html/gio/GSocketConnection.html @@ -522,22 +538,6 @@ file path=usr/share/gtk-doc/html/gio/GVolumeMonitor.html file path=usr/share/gtk-doc/html/gio/GZlibCompressor.html file path=usr/share/gtk-doc/html/gio/GZlibDecompressor.html file path=usr/share/gtk-doc/html/gio/annotation-glossary.html -file path=usr/share/gtk-doc/html/gio/api-index-2-18.html -file path=usr/share/gtk-doc/html/gio/api-index-2-20.html -file path=usr/share/gtk-doc/html/gio/api-index-2-22.html -file path=usr/share/gtk-doc/html/gio/api-index-2-24.html -file path=usr/share/gtk-doc/html/gio/api-index-2-26.html -file path=usr/share/gtk-doc/html/gio/api-index-2-28.html -file path=usr/share/gtk-doc/html/gio/api-index-2-30.html -file path=usr/share/gtk-doc/html/gio/api-index-2-32.html -file path=usr/share/gtk-doc/html/gio/api-index-2-34.html -file path=usr/share/gtk-doc/html/gio/api-index-2-36.html -file path=usr/share/gtk-doc/html/gio/api-index-2-38.html -file path=usr/share/gtk-doc/html/gio/api-index-2-40.html -file path=usr/share/gtk-doc/html/gio/api-index-2-42.html -file path=usr/share/gtk-doc/html/gio/api-index-2-44.html -file path=usr/share/gtk-doc/html/gio/api-index-2-46.html -file path=usr/share/gtk-doc/html/gio/api-index-deprecated.html file path=usr/share/gtk-doc/html/gio/api-index-full.html file path=usr/share/gtk-doc/html/gio/application.html file path=usr/share/gtk-doc/html/gio/async.html @@ -599,6 +599,7 @@ file path=usr/share/gtk-doc/html/gio/gio-gpollableutils.html file path=usr/share/gtk-doc/html/gio/gio-hierarchy.html file path=usr/share/gtk-doc/html/gio/gio-querymodules.html file path=usr/share/gtk-doc/html/gio/gio.devhelp2 +file path=usr/share/gtk-doc/html/gio/gio.html file path=usr/share/gtk-doc/html/gio/glib-compile-resources.html file path=usr/share/gtk-doc/html/gio/glib-compile-schemas.html file path=usr/share/gtk-doc/html/gio/gresource-tool.html @@ -608,7 +609,6 @@ file path=usr/share/gtk-doc/html/gio/highlevel-socket.html file path=usr/share/gtk-doc/html/gio/home.png file path=usr/share/gtk-doc/html/gio/icons.html file path=usr/share/gtk-doc/html/gio/index.html -file path=usr/share/gtk-doc/html/gio/index.sgml file path=usr/share/gtk-doc/html/gio/left-insensitive.png file path=usr/share/gtk-doc/html/gio/left.png file path=usr/share/gtk-doc/html/gio/menu-example.png @@ -641,30 +641,6 @@ file path=usr/share/gtk-doc/html/glib/Sorted_binary_tree_inorder.svg file path=usr/share/gtk-doc/html/glib/Sorted_binary_tree_postorder.svg file path=usr/share/gtk-doc/html/glib/Sorted_binary_tree_preorder.svg file path=usr/share/gtk-doc/html/glib/annotation-glossary.html -file path=usr/share/gtk-doc/html/glib/api-index-2-10.html -file path=usr/share/gtk-doc/html/glib/api-index-2-12.html -file path=usr/share/gtk-doc/html/glib/api-index-2-14.html -file path=usr/share/gtk-doc/html/glib/api-index-2-16.html -file path=usr/share/gtk-doc/html/glib/api-index-2-18.html -file path=usr/share/gtk-doc/html/glib/api-index-2-2.html -file path=usr/share/gtk-doc/html/glib/api-index-2-20.html -file path=usr/share/gtk-doc/html/glib/api-index-2-22.html -file path=usr/share/gtk-doc/html/glib/api-index-2-24.html -file path=usr/share/gtk-doc/html/glib/api-index-2-26.html -file path=usr/share/gtk-doc/html/glib/api-index-2-28.html -file path=usr/share/gtk-doc/html/glib/api-index-2-30.html -file path=usr/share/gtk-doc/html/glib/api-index-2-32.html -file path=usr/share/gtk-doc/html/glib/api-index-2-34.html -file path=usr/share/gtk-doc/html/glib/api-index-2-36.html -file path=usr/share/gtk-doc/html/glib/api-index-2-38.html -file path=usr/share/gtk-doc/html/glib/api-index-2-4.html -file path=usr/share/gtk-doc/html/glib/api-index-2-40.html -file path=usr/share/gtk-doc/html/glib/api-index-2-42.html -file path=usr/share/gtk-doc/html/glib/api-index-2-44.html -file path=usr/share/gtk-doc/html/glib/api-index-2-46.html -file path=usr/share/gtk-doc/html/glib/api-index-2-6.html -file path=usr/share/gtk-doc/html/glib/api-index-2-8.html -file path=usr/share/gtk-doc/html/glib/api-index-deprecated.html file path=usr/share/gtk-doc/html/glib/api-index-full.html file path=usr/share/gtk-doc/html/glib/deprecated.html file path=usr/share/gtk-doc/html/glib/file-name-encodings.png @@ -676,6 +652,7 @@ file path=usr/share/gtk-doc/html/glib/glib-Balanced-Binary-Trees.html file path=usr/share/gtk-doc/html/glib/glib-Base64-Encoding.html file path=usr/share/gtk-doc/html/glib/glib-Basic-Types.html file path=usr/share/gtk-doc/html/glib/glib-Bookmark-file-parser.html +file path=usr/share/gtk-doc/html/glib/glib-Bounds-checked-integer-arithmetic.html file path=usr/share/gtk-doc/html/glib/glib-Byte-Arrays.html file path=usr/share/gtk-doc/html/glib/glib-Byte-Order-Macros.html file path=usr/share/gtk-doc/html/glib/glib-Caches.html @@ -693,6 +670,7 @@ file path=usr/share/gtk-doc/html/glib/glib-Error-Reporting.html file path=usr/share/gtk-doc/html/glib/glib-File-Utilities.html file path=usr/share/gtk-doc/html/glib/glib-GDateTime.html file path=usr/share/gtk-doc/html/glib/glib-GTimeZone.html +file path=usr/share/gtk-doc/html/glib/glib-GUuid.html file path=usr/share/gtk-doc/html/glib/glib-GVariant.html file path=usr/share/gtk-doc/html/glib/glib-GVariantType.html file path=usr/share/gtk-doc/html/glib/glib-Glob-style-pattern-matching.html @@ -759,7 +737,6 @@ file path=usr/share/gtk-doc/html/glib/gvariant-format-strings.html file path=usr/share/gtk-doc/html/glib/gvariant-text.html file path=usr/share/gtk-doc/html/glib/home.png file path=usr/share/gtk-doc/html/glib/index.html -file path=usr/share/gtk-doc/html/glib/index.sgml file path=usr/share/gtk-doc/html/glib/left-insensitive.png file path=usr/share/gtk-doc/html/glib/left.png file path=usr/share/gtk-doc/html/glib/mainloop-states.gif @@ -773,28 +750,6 @@ file path=usr/share/gtk-doc/html/gobject/GBinding.html file path=usr/share/gtk-doc/html/gobject/GTypeModule.html file path=usr/share/gtk-doc/html/gobject/GTypePlugin.html file path=usr/share/gtk-doc/html/gobject/annotation-glossary.html -file path=usr/share/gtk-doc/html/gobject/api-index-2-10.html -file path=usr/share/gtk-doc/html/gobject/api-index-2-12.html -file path=usr/share/gtk-doc/html/gobject/api-index-2-14.html -file path=usr/share/gtk-doc/html/gobject/api-index-2-18.html -file path=usr/share/gtk-doc/html/gobject/api-index-2-2.html -file path=usr/share/gtk-doc/html/gobject/api-index-2-22.html -file path=usr/share/gtk-doc/html/gobject/api-index-2-24.html -file path=usr/share/gtk-doc/html/gobject/api-index-2-26.html -file path=usr/share/gtk-doc/html/gobject/api-index-2-28.html -file path=usr/share/gtk-doc/html/gobject/api-index-2-30.html -file path=usr/share/gtk-doc/html/gobject/api-index-2-32.html -file path=usr/share/gtk-doc/html/gobject/api-index-2-34.html -file path=usr/share/gtk-doc/html/gobject/api-index-2-36.html -file path=usr/share/gtk-doc/html/gobject/api-index-2-38.html -file path=usr/share/gtk-doc/html/gobject/api-index-2-4.html -file path=usr/share/gtk-doc/html/gobject/api-index-2-40.html -file path=usr/share/gtk-doc/html/gobject/api-index-2-42.html -file path=usr/share/gtk-doc/html/gobject/api-index-2-44.html -file path=usr/share/gtk-doc/html/gobject/api-index-2-46.html -file path=usr/share/gtk-doc/html/gobject/api-index-2-6.html -file path=usr/share/gtk-doc/html/gobject/api-index-2-8.html -file path=usr/share/gtk-doc/html/gobject/api-index-deprecated.html file path=usr/share/gtk-doc/html/gobject/api-index-full.html file path=usr/share/gtk-doc/html/gobject/ch01s02.html file path=usr/share/gtk-doc/html/gobject/chapter-gobject.html @@ -837,7 +792,6 @@ file path=usr/share/gtk-doc/html/gobject/howto-interface-properties.html file path=usr/share/gtk-doc/html/gobject/howto-interface.html file path=usr/share/gtk-doc/html/gobject/howto-signals.html file path=usr/share/gtk-doc/html/gobject/index.html -file path=usr/share/gtk-doc/html/gobject/index.sgml file path=usr/share/gtk-doc/html/gobject/left-insensitive.png file path=usr/share/gtk-doc/html/gobject/left.png file path=usr/share/gtk-doc/html/gobject/pr01.html @@ -888,7 +842,9 @@ file path=usr/share/locale/eu/LC_MESSAGES/glib20.mo file path=usr/share/locale/fa/LC_MESSAGES/glib20.mo file path=usr/share/locale/fi/LC_MESSAGES/glib20.mo file path=usr/share/locale/fr/LC_MESSAGES/glib20.mo +file path=usr/share/locale/fur/LC_MESSAGES/glib20.mo file path=usr/share/locale/ga/LC_MESSAGES/glib20.mo +file path=usr/share/locale/gd/LC_MESSAGES/glib20.mo file path=usr/share/locale/gl/LC_MESSAGES/glib20.mo file path=usr/share/locale/gu/LC_MESSAGES/glib20.mo file path=usr/share/locale/he/LC_MESSAGES/glib20.mo @@ -957,6 +913,7 @@ file path=usr/share/man/man1/gapplication.1 file path=usr/share/man/man1/gdbus-codegen.1 file path=usr/share/man/man1/gdbus.1 file path=usr/share/man/man1/gio-querymodules.1 +file path=usr/share/man/man1/gio.1 file path=usr/share/man/man1/glib-compile-resources.1 file path=usr/share/man/man1/glib-compile-schemas.1 file path=usr/share/man/man1/glib-genmarshal.1 diff --git a/components/library/glib/patches/01-fix-default-path.patch b/components/library/glib/patches/01-fix-default-path.patch index a50f475e402..5f0ff3f1b5d 100644 --- a/components/library/glib/patches/01-fix-default-path.patch +++ b/components/library/glib/patches/01-fix-default-path.patch @@ -8,13 +8,13 @@ this behavior (bugzilla bug 317945), but this change is safe. This code only gets executed when the user's PATH is unset, which should be never. Safer to avoid adding "." to PATH. ---- glib-2.44.0/glib/gspawn.c Sat Feb 7 07:32:45 2015 -+++ glib-2.44.0/glib/gspawn.c Sun Apr 19 12:24:39 2015 -@@ -1708,7 +1708,12 @@ +--- glib-2.55.2/glib/gspawn.c.~1~ 2018-01-09 00:34:19.000000000 +0000 ++++ glib-2.55.2/glib/gspawn.c 2018-02-16 11:31:49.253694209 +0000 +@@ -1761,7 +1761,12 @@ * what to search if PATH is unset. POSIX may, dunno. */ -+#ifdef sun ++#ifdef __sun + /* bin is a symlink to usr/bin on Solaris */ + path = "/usr/bin"; +#else @@ -23,14 +23,13 @@ be never. Safer to avoid adding "." to PATH. } len = strlen (file) + 1; - --- glib-2.44.0/glib/gutils.c Sat Feb 28 17:50:08 2015 +++ glib-2.44.0/glib/gutils.c Sun Apr 19 12:26:11 2015 @@ -379,7 +379,12 @@ * what to search if PATH is unset. POSIX may, dunno. */ -+#ifdef sun ++#ifdef __sun + /* bin is a symlink to usr/bin on Solaris */ + path = "/usr/bin"; +#else diff --git a/components/library/glib/patches/02-gmodule-always-lazy.patch b/components/library/glib/patches/02-gmodule-always-lazy.patch index d5a3fae4926..e4362852f41 100644 --- a/components/library/glib/patches/02-gmodule-always-lazy.patch +++ b/components/library/glib/patches/02-gmodule-always-lazy.patch @@ -12,7 +12,7 @@ penalty at startup. Need to file upstream bug for that. { gpointer handle; + -+ #if defined(sun) && defined(__SVR4) ++ #if defined(__sun) && defined(__SVR4) + /* + * Always use RTLD_LAZY on Solaris; otherwise all relocations are performed + * immediately in all dynamic dependencies. diff --git a/components/library/glib/patches/03-dtrace-flags.patch b/components/library/glib/patches/03-dtrace-flags.patch index d82a9942aad..ed2ba268d50 100644 --- a/components/library/glib/patches/03-dtrace-flags.patch +++ b/components/library/glib/patches/03-dtrace-flags.patch @@ -3,20 +3,23 @@ should force -32 or -64 depending on build. Not appropriate for upstream. ---- glib-2.46.0/glib/Makefile.am 2015-09-07 12:27:03.000000000 -0700 -+++ glib-2.46.0/glib/Makefile.am 2015-09-24 22:24:14.141690708 -0700 -@@ -366,15 +366,15 @@ - DTCFLAGS = $(patsubst -W%,,$(CFLAGS)) +--- glib-2.52.0/glib/Makefile.am 2017-03-23 07:22:53.641866845 -0700 ++++ glib-2.52.0/glib/Makefile.am 2017-03-23 07:24:05.626741905 -0700 +@@ -365,18 +365,18 @@ + if ENABLE_DTRACE glib_probes.h: glib_probes.d - $(AM_V_GEN) $(DTRACE) -C -h -s $< -o $@.tmp + $(AM_V_GEN) $(DTRACE) $(DFLAGS) -C -h -s $< -o $@.tmp - @$(SED) -e "s,define STAP_HAS_SEMAPHORES 1,undef STAP_HAS_SEMAPHORES," < $@.tmp > $@ && rm -f $@.tmp + @$(SED) \ + -e "s,define STAP_HAS_SEMAPHORES 1,undef STAP_HAS_SEMAPHORES," \ + -e "s,define _SDT_HAS_SEMAPHORES 1,undef _SDT_HAS_SEMAPHORES," \ + < $@.tmp > $@ && rm -f $@.tmp -glib_probes.lo: glib_probes.d -- $(AM_V_GEN) env CC="$(DTCOMPILE)" CFLAGS="$(DTCFLAGS)" $(DTRACE) -G -s $< -o $@ +- $(AM_V_GEN) $(LIBTOOL) --mode=compile $(AM_V_lt) --tag=CC $(DTRACE) -G -s $< -o $@ +glib_probes.o: glib_probes.d -+ $(AM_V_GEN) env CC="$(DTCOMPILE)" CFLAGS="$(DTCFLAGS)" $(DTRACE) $(DFLAGS) -G -s $< -o $@ ++ $(AM_V_GEN) $(LIBTOOL) --mode=compile $(AM_V_lt) --tag=CC $(DTRACE) $(DFLAGS) -G -s $< -o $@ -BUILT_SOURCES += glib_probes.h glib_probes.lo +BUILT_SOURCES += glib_probes.h glib_probes.o @@ -25,4 +28,4 @@ Not appropriate for upstream. +libglib_2_0_la_LIBADD += glib_probes.o endif - if ENABLE_SYSTEMTAP + tapsetdir = @ABS_TAPSET_DIR@ diff --git a/components/library/glib/patches/04-ld-nodelete.patch b/components/library/glib/patches/04-ld-nodelete.patch deleted file mode 100644 index 1fcd095a857..00000000000 --- a/components/library/glib/patches/04-ld-nodelete.patch +++ /dev/null @@ -1,27 +0,0 @@ -This fixes configure tests that mistakenly omit the -shared flag when -testing whether -znodelete can be used. - -Need to file upstream bug - ---- glib-2.44.0/configure.ac 2015-04-19 19:15:34.588825144 -0700 -+++ glib-2.44.0/configure.ac 2015-04-19 19:18:29.068222772 -0700 -@@ -3467,8 +3467,9 @@ - AC_ARG_ENABLE([znodelete], - [AS_HELP_STRING([--disable-znodelete], - [avoid linking with -z,nodelete])],, -- [SAVED_LDFLAGS="${LDFLAGS}" SAVED_LIBS="${LIBS}" -+ [SAVED_CFLAGS="${CFLAGS}" SAVED_LDFLAGS="${LDFLAGS}" SAVED_LIBS="${LIBS}" - AC_MSG_CHECKING([for --fatal-warnings linker flag]) -+ CFLAGS="${SAVED_CFLAGS} -shared" - LDFLAGS=-Wl,--fatal-warnings - LIBS= - AC_TRY_LINK([], [return 0], -@@ -3483,7 +3484,7 @@ - enable_znodelete=yes, - AC_MSG_RESULT(no) - enable_znodelete=no) -- LDFLAGS="${SAVED_LDFLAGS}" LIBS="${SAVED_LIBS}"]) -+ CFLAGS="${SAVED_CFLAGS}" LDFLAGS="${SAVED_LDFLAGS}" LIBS="${SAVED_LIBS}"]) - - if test "x${enable_znodelete}" = "xyes"; then - GOBJECT_LINK_FLAGS=-Wl,-z,nodelete diff --git a/components/library/glib/patches/04-xopen-version.patch b/components/library/glib/patches/04-xopen-version.patch new file mode 100644 index 00000000000..32308e8540a --- /dev/null +++ b/components/library/glib/patches/04-xopen-version.patch @@ -0,0 +1,15 @@ +Remove Unix standard settings for Solaris 11.4, so we don't exclude all +features added between XPG2 & XPG7, now that these are exposed by default. + +To send upstream, need to adjust to right version for each OS level + +--- glib-2.46.0/configure.ac 2015-09-24 23:04:41.862038047 -0700 ++++ glib-2.46.0/configure.ac 2015-09-24 23:15:21.170129554 -0700 +@@ -1112,7 +1112,5 @@ + case $host in + *-*-solaris* ) +- AC_DEFINE(_XOPEN_SOURCE_EXTENDED, 1, Needed to get declarations for msg_control and msg_controllen on Solaris) +- AC_DEFINE(_XOPEN_SOURCE, 2, Needed to get declarations for msg_control and msg_controllen on Solaris) + AC_DEFINE(__EXTENSIONS__, 1, Needed to get declarations for msg_control and msg_controllen on Solaris) + ;; + esac diff --git a/components/library/glib/patches/05-gvariant-syntax.patch b/components/library/glib/patches/05-gvariant-syntax.patch deleted file mode 100644 index b3300a4e4df..00000000000 --- a/components/library/glib/patches/05-gvariant-syntax.patch +++ /dev/null @@ -1,15 +0,0 @@ -Stray semicolon. - -Need to file upstream bug - ---- glib-2.44.0/glib/gvariant.c 2015-04-19 18:47:21.907638721 -0700 -+++ glib-2.44.0/glib/gvariant.c 2015-04-19 18:47:36.209115010 -0700 -@@ -2584,7 +2584,7 @@ - { - return g_string_free (g_variant_print_string (value, NULL, type_annotate), - FALSE); --}; -+} - - /* Hash, Equal, Compare {{{1 */ - /** diff --git a/components/library/glib/patches/06-python34.patch b/components/library/glib/patches/06-python34.patch deleted file mode 100644 index b3ecab018b9..00000000000 --- a/components/library/glib/patches/06-python34.patch +++ /dev/null @@ -1,49 +0,0 @@ -Python 3.x compatibility patch. - -Need to determine if we should file an upstream bug. - ---- glib-2.44.0/glib/gtester-report 2015-04-19 20:30:04.062159597 -0700 -+++ glib-2.44.0/glib/gtester-report 2015-04-19 20:29:10.670933155 -0700 -@@ -306,20 +306,20 @@ - if binary.success_cases: - oklink = 'href="javascript:toggle_display (\'ResultTable\', \'tr\', \'b%u_\', \'success\')"' % self.bcounter - if real_cases != 0: -- self.oprint ('ER\n' % erlink) -- self.oprint ('OK\n' % oklink) -- self.oprint ('\n') -- perc = binary.success_cases * 100.0 / real_cases -- pcolor = { -- 100 : 'bgcolor="lightgreen"', -- 0 : 'bgcolor="red"', -- }.get (int (perc), 'bgcolor="yellow"') -- self.oprint ('%.2f%%\n' % (pcolor, perc)) -- self.oprint ('\n') -+ self.oprint ('ER\n' % erlink) -+ self.oprint ('OK\n' % oklink) -+ self.oprint ('\n') -+ perc = binary.success_cases * 100.0 / real_cases -+ pcolor = { -+ 100 : 'bgcolor="lightgreen"', -+ 0 : 'bgcolor="red"', -+ }.get (int (perc), 'bgcolor="yellow"') -+ self.oprint ('%.2f%%\n' % (pcolor, perc)) -+ self.oprint ('\n') - else: -- self.oprint ('Empty\n') -- self.oprint ('\n') -- self.oprint ('\n') -+ self.oprint ('Empty\n') -+ self.oprint ('\n') -+ self.oprint ('\n') - for tc in binary.testcases: - self.handle_testcase (tc, binary) - def handle_totals (self): -@@ -464,7 +464,7 @@ - " Needs python-subunit]") - options, files = parser.parse_args() - if options.version: -- print parser.epilog -+ print(parser.epilog) - return None, None - if len(files) != 1: - parser.error("Must supply a log file to parse.") diff --git a/components/library/glib/patches/08-gio-trash-only-home.patch b/components/library/glib/patches/08-gio-trash-only-home.patch index b5b1be6a412..64a72cc5325 100644 --- a/components/library/glib/patches/08-gio-trash-only-home.patch +++ b/components/library/glib/patches/08-gio-trash-only-home.patch @@ -1,24 +1,26 @@ ---- glib-2.20.1/gio/glocalfile.c.ori 2009-04-15 03:46:56.161574399 +0100 -+++ glib-2.20.1/gio/glocalfile.c 2009-04-15 03:48:57.698109713 +0100 -@@ -1732,123 +1733,26 @@ +--- glib-2.55.2/gio/glocalfile.c.~1~ 2018-01-09 00:34:19.000000000 +0000 ++++ glib-2.55.2/gio/glocalfile.c 2018-02-16 12:20:09.786992190 +0000 +@@ -1987,6 +1987,7 @@ + char *dirname, *globaldir; + GVfsClass *class; + GVfs *vfs; ++ GFile *trash; + int errsv; + + if (g_lstat (local->filename, &file_stat) != 0) +@@ -2004,123 +2005,26 @@ is_homedir_trash = FALSE; trashdir = NULL; - if (file_stat.st_dev == home_stat.st_dev) -+ /* Always move to .Trash in the user's home directory -+ */ -+ is_homedir_trash = TRUE; -+ errno = 0; -+ trashdir = g_build_filename (g_get_user_data_dir (), "Trash", NULL); -+ if (g_mkdir_with_parents (trashdir, 0700) < 0) - { +- { - is_homedir_trash = TRUE; - errno = 0; - trashdir = g_build_filename (g_get_user_data_dir (), "Trash", NULL); - if (g_mkdir_with_parents (trashdir, 0700) < 0) - { - char *display_name; -- int errsv = errno; +- errsv = errno; - - display_name = g_filename_display_name (trashdir); - g_set_error (error, G_IO_ERROR, @@ -38,13 +40,13 @@ - - uid = geteuid (); - g_snprintf (uid_str, sizeof (uid_str), "%lu", (unsigned long)uid); -- -- topdir = find_topdir_for (local->filename); +- +- topdir = _g_local_file_find_topdir_for (local->filename); - if (topdir == NULL) - { -- g_set_error_literal (error, G_IO_ERROR, -- G_IO_ERROR_NOT_SUPPORTED, -- _("Unable to find toplevel directory for trash")); +- g_set_io_error (error, +- _("Unable to find toplevel directory to trash %s"), +- file, G_IO_ERROR_NOT_SUPPORTED); - return FALSE; - } - @@ -117,17 +119,25 @@ - } - } - } -+ char *display_name; -+ int errsv = errno; - +- - if (trashdir == NULL) - { - g_free (topdir); -- g_set_error_literal (error, G_IO_ERROR, -- G_IO_ERROR_NOT_SUPPORTED, -- _("Unable to find or create trash directory")); +- g_set_io_error (error, +- _("Unable to find or create trash directory for %s"), +- file, G_IO_ERROR_NOT_SUPPORTED); - return FALSE; - } ++ /* Always move to .Trash in the user's home directory ++ */ ++ is_homedir_trash = TRUE; ++ errno = 0; ++ trashdir = g_build_filename (g_get_user_data_dir (), "Trash", NULL); ++ if (g_mkdir_with_parents (trashdir, 0700) < 0) ++ { ++ char *display_name; ++ int errsv = errno; ++ + display_name = g_filename_display_name (trashdir); + g_set_error (error, G_IO_ERROR, + g_io_error_from_errno (errsv), @@ -141,7 +151,7 @@ /* Trashdir points to the trash dir with the "info" and "files" subdirectories */ -@@ -1912,8 +1816,8 @@ +@@ -2213,8 +2117,8 @@ trashfile = g_build_filename (filesdir, trashname, NULL); g_free (filesdir); @@ -150,9 +160,9 @@ + trash = g_file_new_for_path(trashfile); + if (!g_file_move (file, trash, 0, cancellable, NULL, NULL, NULL)) { - int errsv = errno; + errsv = errno; -@@ -1921,6 +1825,7 @@ +@@ -2223,6 +2127,7 @@ g_free (trashname); g_free (infofile); g_free (trashfile); @@ -160,18 +170,7 @@ if (errsv == EXDEV) /* The trash dir was actually on another fs anyway!? -diff -ruN glib-2.23.5.orig/gio/glocalfile.c glib-2.23.5/gio/glocalfile.c ---- glib-2.23.5.orig/gio/glocalfile.c 2010-03-12 01:24:16.709204235 +0000 -+++ glib-2.23.5/gio/glocalfile.c 2010-03-12 01:25:06.966511383 +0000 -@@ -1806,6 +1806,7 @@ - char *dirname, *globaldir; - GVfsClass *class; - GVfs *vfs; -+ GFile *trash; - - if (g_lstat (local->filename, &file_stat) != 0) - { -@@ -1939,6 +1940,7 @@ +@@ -2245,6 +2150,7 @@ class->local_file_moved (vfs, local->filename, trashfile); g_free (trashfile); diff --git a/components/library/glib/patches/10-gsize.patch b/components/library/glib/patches/10-gsize.patch index d874bb9f617..c0077e8d8d2 100644 --- a/components/library/glib/patches/10-gsize.patch +++ b/components/library/glib/patches/10-gsize.patch @@ -1,6 +1,6 @@ ---- glib-2.37.0/configure.ac.orig Fri May 3 14:52:05 2013 -+++ glib-2.37.0/configure.ac Fri May 3 14:55:44 2013 -@@ -3056,12 +3056,21 @@ +--- glib-2.55.2/configure.ac.~1~ 2018-02-06 23:10:12.000000000 +0000 ++++ glib-2.55.2/configure.ac 2018-02-16 12:02:21.124132506 +0000 +@@ -2814,12 +2814,21 @@ _______EOF cat >>$outfile <<_______EOF diff --git a/components/library/glib/patches/11-file-monitor-segfault.patch b/components/library/glib/patches/11-file-monitor-segfault.patch deleted file mode 100644 index 92ab0a81ce9..00000000000 --- a/components/library/glib/patches/11-file-monitor-segfault.patch +++ /dev/null @@ -1,42 +0,0 @@ -Patch from upstream to fix segfault introduced in 2.46.0 that -causes Nautilus to crash on startup in our GNOME 2.30 desktop. - -From 30359e740953b596d6c3d980dba36dd131681a1f Mon Sep 17 00:00:00 2001 -From: Allison Ryan Lortie -Date: Mon, 30 Nov 2015 10:13:46 -0500 -Subject: [PATCH] file monitors: reorder some code to avoid segfault - -We must initialise '->source' before we use fields inside of it. - -https://bugzilla.gnome.org/show_bug.cgi?id=758823 ---- - gio/glocalfilemonitor.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/gio/glocalfilemonitor.c b/gio/glocalfilemonitor.c -index dbd62ec..49a4dd2 100644 ---- a/gio/glocalfilemonitor.c -+++ b/gio/glocalfilemonitor.c -@@ -748,6 +748,9 @@ g_local_file_monitor_start (GLocalFileMonitor *local_monitor, - - g_assert (!local_monitor->source); - -+ source = g_file_monitor_source_new (local_monitor, filename, is_directory, flags); -+ local_monitor->source = source; /* owns the ref */ -+ - if (is_directory && !class->mount_notify && (flags & G_FILE_MONITOR_WATCH_MOUNTS)) - { - #ifdef G_OS_WIN32 -@@ -771,9 +774,6 @@ g_local_file_monitor_start (GLocalFileMonitor *local_monitor, - #endif - } - -- source = g_file_monitor_source_new (local_monitor, filename, is_directory, flags); -- local_monitor->source = source; /* owns the ref */ -- - G_LOCAL_FILE_MONITOR_GET_CLASS (local_monitor)->start (local_monitor, - source->dirname, source->basename, source->filename, - source); --- -2.7.4 - diff --git a/components/library/glib/patches/07-gcc.patch b/components/library/glib/patches/11-gcc.patch similarity index 57% rename from components/library/glib/patches/07-gcc.patch rename to components/library/glib/patches/11-gcc.patch index 521c275b124..2e91f7a0d30 100644 --- a/components/library/glib/patches/07-gcc.patch +++ b/components/library/glib/patches/11-gcc.patch @@ -2,37 +2,38 @@ gcc complaints about mismatched types for format specifiers. Need to determine if we should file an upstream bug. ---- glib-2.44.1/gio/gdbusauthmechanismsha1.c Fri Dec 19 13:49:48 2014 -+++ glib-2.44.1/gio/gdbusauthmechanismsha1.c Wed May 20 10:56:38 2015 -@@ -272,7 +272,7 @@ +--- glib-2.54.3/gio/gdbusauthmechanismsha1.c 2018-02-19 15:48:05.266240515 +0000 ++++ glib-2.54.3/gio/gdbusauthmechanismsha1.c 2018-01-09 00:34:19.000000000 +0000 +@@ -273,7 +273,7 @@ G_IO_ERROR_FAILED, - _("Permissions on directory '%s' are malformed. Expected mode 0700, got 0%o"), + _("Permissions on directory “%s” are malformed. Expected mode 0700, got 0%o"), path, - statbuf.st_mode & 0777); -+ (unsigned int) statbuf.st_mode & 0777); ++ (guint) (statbuf.st_mode & 0777)); g_free (path); path = NULL; goto out; ---- glib-2.44.1/gio/gdbusmessage.c Tue May 12 19:39:04 2015 -+++ glib-2.44.1/gio/gdbusmessage.c Wed May 20 10:56:38 2015 -@@ -3472,9 +3472,9 @@ - if (fstat (fds[n], &statbuf) == 0) +--- glib-2.54.3/gio/gdbusmessage.c.~1~ 2018-01-08 23:00:42.000000000 +0000 ++++ glib-2.54.3/gio/gdbusmessage.c 2018-02-19 15:57:23.277441619 +0000 +@@ -3479,10 +3479,10 @@ { + #ifndef MAJOR_MINOR_NOT_FOUND g_string_append_printf (fs, "%s" "dev=%d:%d", fs->len > 0 ? "," : "", - major (statbuf.st_dev), minor (statbuf.st_dev)); -+ (int) major (statbuf.st_dev), (int) minor (statbuf.st_dev)); ++ (gint) major (statbuf.st_dev), (gint) minor (statbuf.st_dev)); + #endif g_string_append_printf (fs, "%s" "mode=0%o", fs->len > 0 ? "," : "", - statbuf.st_mode); -+ (unsigned int) statbuf.st_mode); ++ (guint) statbuf.st_mode); g_string_append_printf (fs, "%s" "ino=%" G_GUINT64_FORMAT, fs->len > 0 ? "," : "", (guint64) statbuf.st_ino); g_string_append_printf (fs, "%s" "uid=%u", fs->len > 0 ? "," : "", -@@ -3482,7 +3482,7 @@ - g_string_append_printf (fs, "%s" "gid=%u", fs->len > 0 ? "," : "", +@@ -3491,7 +3491,7 @@ (guint) statbuf.st_gid); + #ifndef MAJOR_MINOR_NOT_FOUND g_string_append_printf (fs, "%s" "rdev=%d:%d", fs->len > 0 ? "," : "", - major (statbuf.st_rdev), minor (statbuf.st_rdev)); -+ (int) major (statbuf.st_rdev), (int) minor (statbuf.st_rdev)); ++ (gint) major (statbuf.st_rdev), (gint) minor (statbuf.st_rdev)); + #endif g_string_append_printf (fs, "%s" "size=%" G_GUINT64_FORMAT, fs->len > 0 ? "," : "", (guint64) statbuf.st_size); - g_string_append_printf (fs, "%s" "atime=%" G_GUINT64_FORMAT, fs->len > 0 ? "," : "", diff --git a/components/library/glib/patches/12-pfexec.patch b/components/library/glib/patches/12-pfexec.patch index cd9a1d9abc0..74d1c969821 100644 --- a/components/library/glib/patches/12-pfexec.patch +++ b/components/library/glib/patches/12-pfexec.patch @@ -13,7 +13,7 @@ here to allow applications using glib to work with dbus. return __libc_enable_secure; } -#elif defined(HAVE_ISSETUGID) && !defined(__BIONIC__) -+#elif defined(HAVE_ISSETUGID) && !defined(__BIONIC__) && !defined(sun) ++#elif defined(HAVE_ISSETUGID) && !defined(__BIONIC__) && !defined(__sun) /* BSD: http://www.freebsd.org/cgi/man.cgi?query=issetugid&sektion=2 */ /* Android had it in older versions but the new 64 bit ABI does not diff --git a/components/library/glib/patches/13-file-monitor-print.patch b/components/library/glib/patches/13-file-monitor-print.patch deleted file mode 100644 index 70b86f877f0..00000000000 --- a/components/library/glib/patches/13-file-monitor-print.patch +++ /dev/null @@ -1,20 +0,0 @@ -Patch from upstream bugzilla for -Bug 756879 - gio fam monitor: debug output can destroy functionality -https://bugzilla.gnome.org/show_bug.cgi?id=756879 - -aka Oracle bug 23501949: -gtk application with immodule connection dumps unnecessary strings 'II 1' - -diff --git a/gio/fam/gfamfilemonitor.c b/gio/fam/gfamfilemonitor.c -index 50474c8..551b3c2 100644 ---- a/gio/fam/gfamfilemonitor.c -+++ b/gio/fam/gfamfilemonitor.c -@@ -140,8 +140,6 @@ g_fam_file_monitor_is_supported (void) - - g_mutex_unlock (&fam_lock); - -- g_print ("II %d\n", fam_initialised); -- - return fam_initialised; - } - diff --git a/components/library/glib/patches/14-gstrerror.patch b/components/library/glib/patches/14-gstrerror.patch deleted file mode 100644 index 095bfeb8b63..00000000000 --- a/components/library/glib/patches/14-gstrerror.patch +++ /dev/null @@ -1,34 +0,0 @@ -Fix from upstream git for: -Bug 24458406 - g_strerror caches and tries to reuse a pointer to a stack buffer - -Included in later 2.48 release upstream. - -From f87e002313d566dcce71a9aba040d22ddb5c1e80 Mon Sep 17 00:00:00 2001 -From: Dan Winship -Date: Mon, 16 Nov 2015 16:57:38 -0500 -Subject: [PATCH] Fix g_strerror() on non-glibc - -When using one of the codepaths that copies the error string into buf, -make sure the string gets strdup() afterward. - -https://bugzilla.gnome.org/show_bug.cgi?id=758194 ---- - glib/gstrfuncs.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/glib/gstrfuncs.c b/glib/gstrfuncs.c -index b5a862b..975be0b 100644 ---- a/glib/gstrfuncs.c -+++ b/glib/gstrfuncs.c -@@ -1293,6 +1293,8 @@ g_strerror (gint errnum) - if (error) - g_print ("%s\n", error->message); - } -+ else if (msg == (const gchar *)buf) -+ msg = g_strdup (buf); - - g_hash_table_insert (errors, GINT_TO_POINTER (errnum), (char *) msg); - } --- -2.7.4 - diff --git a/components/library/glib/patches/15-x-terminal-emulator.patch b/components/library/glib/patches/15-x-terminal-emulator.patch index eabd8c6e10e..5f1799c9991 100644 --- a/components/library/glib/patches/15-x-terminal-emulator.patch +++ b/components/library/glib/patches/15-x-terminal-emulator.patch @@ -1,5 +1,5 @@ ---- glib-2.43.4/gio/gdesktopappinfo.c.~1~ 2015-02-07 13:35:55.000000000 +0300 -+++ glib-2.43.4/gio/gdesktopappinfo.c 2016-10-29 12:48:46.694082010 +0300 +--- glib-2.54.3/gio/gdesktopappinfo.c.~1~ 2018-01-08 23:00:49.000000000 +0000 ++++ glib-2.54.3/gio/gdesktopappinfo.c 2018-02-19 15:43:20.188865573 +0000 @@ -25,6 +25,7 @@ #include "config.h" @@ -8,7 +8,7 @@ #include #include -@@ -2449,6 +2450,7 @@ +@@ -2452,6 +2453,7 @@ int term_argc = 0; char *check; char **the_argv; @@ -16,14 +16,9 @@ g_return_val_if_fail (argc != NULL, FALSE); g_return_val_if_fail (argv != NULL, FALSE); -@@ -2470,35 +2472,58 @@ - term_argc = 2; - term_argv = g_new0 (char *, 3); - -- check = g_find_program_in_path ("gnome-terminal"); -- if (check != NULL) -+ check = g_find_program_in_path ("x-terminal-emulator"); -+ if (check != NULL) +@@ -2476,28 +2478,54 @@ + check = g_find_program_in_path ("gnome-terminal"); + if (check != NULL) { - term_argv[0] = check; - /* Note that gnome-terminal takes -x and @@ -39,8 +34,6 @@ - if (check == NULL) - check = g_find_program_in_path ("rxvt"); - if (check == NULL) -- check = g_find_program_in_path ("xterm"); -- if (check == NULL) - check = g_find_program_in_path ("dtterm"); - if (check == NULL) + memset(buf,0, SYMLINK_MAX+1); @@ -96,7 +89,5 @@ - term_argv[0] = check; - term_argv[1] = g_strdup ("-e"); } -- - real_argc = term_argc + *argc; - real_argv = g_new (char *, real_argc + 1); + real_argc = term_argc + *argc; diff --git a/components/library/glib/patches/17-python.patch b/components/library/glib/patches/17-python.patch new file mode 100644 index 00000000000..4d714dc9adb --- /dev/null +++ b/components/library/glib/patches/17-python.patch @@ -0,0 +1,27 @@ +diff -ur glib-2.55.2-orig/gio/gdbus-2.0/codegen/gdbus-codegen.in glib-2.55.2/gio/gdbus-2.0/codegen/gdbus-codegen.in +--- glib-2.55.2-orig/gio/gdbus-2.0/codegen/gdbus-codegen.in 2018-02-16 17:18:51.213354835 +0000 ++++ glib-2.55.2/gio/gdbus-2.0/codegen/gdbus-codegen.in 2018-02-16 17:19:19.687640248 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env @PYTHON@ ++#!@PYTHON@ + + # GDBus - GLib D-Bus Library + # +diff -ur glib-2.55.2-orig/gobject/glib-genmarshal.in glib-2.55.2/gobject/glib-genmarshal.in +--- glib-2.55.2-orig/gobject/glib-genmarshal.in 2018-02-16 17:18:51.225945754 +0000 ++++ glib-2.55.2/gobject/glib-genmarshal.in 2018-02-16 17:19:48.804553286 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env @PYTHON@ ++#!@PYTHON@ + + # pylint: disable=too-many-lines, missing-docstring, invalid-name + +diff -ur glib-2.55.2-orig/gobject/glib-mkenums.in glib-2.55.2/gobject/glib-mkenums.in +--- glib-2.55.2-orig/gobject/glib-mkenums.in 2018-02-16 17:18:51.226243036 +0000 ++++ glib-2.55.2/gobject/glib-mkenums.in 2018-02-16 17:20:01.125266201 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env @PYTHON@ ++#!@PYTHON@ + + # If the code below looks horrible and unpythonic, do not panic. + # diff --git a/components/library/glib/test/results-32.master b/components/library/glib/test/results-32.master new file mode 100644 index 00000000000..9b7c0818efa --- /dev/null +++ b/components/library/glib/test/results-32.master @@ -0,0 +1,54 @@ +# TOTAL: 0 +# PASS: 0 +# SKIP: 0 +# XFAIL: 0 +# FAIL: 0 +# XPASS: 0 +# ERROR: 0 +# TOTAL: 0 +# PASS: 0 +# SKIP: 0 +# XFAIL: 0 +# FAIL: 0 +# XPASS: 0 +# ERROR: 0 +# TOTAL: 0 +# PASS: 0 +# SKIP: 0 +# XFAIL: 0 +# FAIL: 0 +# XPASS: 0 +# ERROR: 0 +# TOTAL: 0 +# PASS: 0 +# SKIP: 0 +# XFAIL: 0 +# FAIL: 0 +# XPASS: 0 +# ERROR: 0 +# TOTAL: 0 +# PASS: 0 +# SKIP: 0 +# XFAIL: 0 +# FAIL: 0 +# XPASS: 0 +# ERROR: 0 +ERROR: convert - too few tests run (expected 7, got 2) +ERROR: convert - exited with status 134 (terminated by signal 6?) +ERROR: gdatetime - too few tests run (expected 47, got 11) +ERROR: gdatetime - exited with status 134 (terminated by signal 6?) +FAIL: logging 12 /structured-logging/roundtrip1 +ERROR: logging - exited with status 1 +ERROR: strfuncs - too few tests run (expected 32, got 25) +ERROR: strfuncs - exited with status 134 (terminated by signal 6?) +ERROR: string - too few tests run (expected 18, got 14) +ERROR: string - exited with status 134 (terminated by signal 6?) +ERROR: timer - too few tests run (expected 7, got 0) +ERROR: timer - exited with status 134 (terminated by signal 6?) +# TOTAL: 3778 +# PASS: 3753 +# SKIP: 13 +# XFAIL: 0 +# FAIL: 1 +# XPASS: 0 +# ERROR: 11 diff --git a/components/library/glib/test/results-64.master b/components/library/glib/test/results-64.master new file mode 100644 index 00000000000..ee6da1a0ae5 --- /dev/null +++ b/components/library/glib/test/results-64.master @@ -0,0 +1,52 @@ +# TOTAL: 0 +# PASS: 0 +# SKIP: 0 +# XFAIL: 0 +# FAIL: 0 +# XPASS: 0 +# ERROR: 0 +# TOTAL: 0 +# PASS: 0 +# SKIP: 0 +# XFAIL: 0 +# FAIL: 0 +# XPASS: 0 +# ERROR: 0 +# TOTAL: 0 +# PASS: 0 +# SKIP: 0 +# XFAIL: 0 +# FAIL: 0 +# XPASS: 0 +# ERROR: 0 +# TOTAL: 0 +# PASS: 0 +# SKIP: 0 +# XFAIL: 0 +# FAIL: 0 +# XPASS: 0 +# ERROR: 0 +# TOTAL: 0 +# PASS: 0 +# SKIP: 0 +# XFAIL: 0 +# FAIL: 0 +# XPASS: 0 +# ERROR: 0 +ERROR: convert - too few tests run (expected 7, got 2) +ERROR: convert - exited with status 134 (terminated by signal 6?) +ERROR: gdatetime - too few tests run (expected 47, got 11) +ERROR: gdatetime - exited with status 134 (terminated by signal 6?) +FAIL: logging 12 /structured-logging/roundtrip1 +ERROR: logging - exited with status 1 +ERROR: strfuncs - too few tests run (expected 32, got 25) +ERROR: strfuncs - exited with status 134 (terminated by signal 6?) +ERROR: string - too few tests run (expected 18, got 14) +ERROR: string - exited with status 134 (terminated by signal 6?) +# TOTAL: 3783 +# PASS: 3760 +# SKIP: 13 +# XFAIL: 0 +# FAIL: 1 +# XPASS: 0 +# ERROR: 9