components/library/glib/Makefile
@@ -19,31 +19,24 @@ include ../../../make-rules/shared-macros.mk COMPONENT_NAME= glib COMPONENT_MJR_VERSION= 2.62 COMPONENT_MNR_VERSION= 6 COMPONENT_REVISION= 3 # Note: When updating this component make sure that it still works with our HAL. # Version 2.66.x is known for its problems eg. when plugging/unplugging USB devices under X11. # 2.62.6 is the last known working version (2.63.x, 2.64.x untested). COMPONENT_VERSION= $(COMPONENT_MJR_VERSION).$(COMPONENT_MNR_VERSION) # We need to have a fake version because we had delivered non-working versions before: IPS_COMPONENT_VERSION= 2.70.0 COMPONENT_SUMMARY= GNOME core libraries COMPONENT_CLASSIFICATION=Desktop (GNOME)/Libraries COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION) COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.xz COMPONENT_ARCHIVE_HASH= sha256:104fa26fbefae8024ff898330c671ec23ad075c1c0bce45c325c6d5657d58b9c COMPONENT_ARCHIVE_URL= https://download.gnome.org/sources/$(COMPONENT_NAME)/$(COMPONENT_MJR_VERSION)/$(COMPONENT_ARCHIVE) COMPONENT_PROJECT_URL= https://www.gtk.org/ COMPONENT_FMRI= library/glib2 COMPONENT_NAME= glib COMPONENT_MJR_VERSION= 2.73 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:df1a2b841667d6b48b2ef6969ebda4328243829f6e45866726f806f90f64eead COMPONENT_ARCHIVE_URL= https://download.gnome.org/sources/$(COMPONENT_NAME)/$(COMPONENT_MJR_VERSION)/$(COMPONENT_ARCHIVE) COMPONENT_PROJECT_URL= https://wiki.gnome.org/Projects/GLib/ COMPONENT_FMRI= library/glib2 COMPONENT_CLASSIFICATION= Desktop (GNOME)/Libraries COMPONENT_LICENSE= GPLv2 COMPONENT_LICENSE_FILE= COPYING include $(WS_MAKE_RULES)/common.mk PYTHON_VERSION = 3.5 # dbus-daemon is in /usr/lib PATH = $(PATH.gnu):/usr/lib PATH = $(PATH.gnu) # socketpair(3socket) requires -lsocket -lnsl LDFLAGS += -lsocket -lnsl @@ -62,7 +55,6 @@ # We do not have getxattr() so disable xattr CONFIGURE_OPTIONS += -Dxattr=false CONFIGURE_OPTIONS += -Dfam=true CONFIGURE_OPTIONS += -Dman=true COMPONENT_POST_CONFIGURE_ACTION= \ @@ -70,6 +62,25 @@ # We need to install libraries and set correct LD_LIBRARY_PATH before test $(TEST_TARGET): $(INSTALL_TARGET) # Dtrace flags DFLAGS.64 = -64 COMPONENT_BUILD_ENV += DFLAGS=$(DFLAGS.$(BITS)) COMPONENT_POST_CONFIGURE_ACTION= \ ( cd $(@D); $(GSED) -i "s/_FILE_OFFSET_BITS=64/_FILE_OFFSET_BITS=$(BITS)/g" ./build.ninja ) # Otherwise tests fail unexport SHELLOPTS # We need to install libraries and set correct LD_LIBRARY_PATH before test $(TEST_TARGET): $(INSTALL_TARGET) # dbus-daemon is in /usr/lib COMPONENT_TEST_ENV.32 = LD_LIBRARY_PATH=$(PROTO_DIR)/usr/lib PATH=$(PATH):/usr/lib COMPONENT_TEST_ENV.64 = LD_LIBRARY_PATH=$(PROTO_DIR)/usr/lib/$(MACH64) PATH=$(PATH):/usr/lib/$(MACH64) COMPONENT_TEST_ENV = $(COMPONENT_TEST_ENV.$(BITS)) COMPONENT_TEST_ENV += LC_ALL=C.UTF-8 COMPONENT_TEST_TRANSFORMER = $(NAWK) COMPONENT_TEST_TRANSFORMS = "'/^(Fail|Ok|Expected Fail|Unexpected Pass|Skipped|Timeout)/'" @@ -81,10 +92,9 @@ REQUIRED_PACKAGES += library/desktop/desktop-file-utils # Auto-generated dependencies REQUIRED_PACKAGES += library/file-monitor/gamin PYTHON_REQUIRED_PACKAGES += runtime/python REQUIRED_PACKAGES += library/libffi REQUIRED_PACKAGES += library/pcre REQUIRED_PACKAGES += library/pcre2 REQUIRED_PACKAGES += library/zlib REQUIRED_PACKAGES += runtime/python-35 REQUIRED_PACKAGES += shell/ksh93 REQUIRED_PACKAGES += system/library components/library/glib/glib2.p5m
@@ -23,7 +23,7 @@ set name=info.source-url value=$(COMPONENT_ARCHIVE_URL) set name=org.opensolaris.consolidation value=$(CONSOLIDATION) license COPYING license='LGPLv2' license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)' <transform file path=usr/share/locale/([^/]+)(\..+){0,1}(/.+){0,1} -> default facet.locale.%<\1> true> @@ -33,7 +33,6 @@ 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-launch-desktop file path=usr/bin/$(MACH64)/gio-querymodules file path=usr/bin/$(MACH64)/glib-compile-resources file path=usr/bin/$(MACH64)/glib-compile-schemas @@ -49,7 +48,6 @@ 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-launch-desktop file path=usr/bin/gio-querymodules file path=usr/bin/glib-compile-resources file path=usr/bin/glib-compile-schemas @@ -63,14 +61,10 @@ file path=usr/bin/gtester-report pkg.depend.bypass-generate=.*(content|subunit|testtools).* file path=usr/include/gio-unix-2.0/gio/gdesktopappinfo.h file path=usr/include/gio-unix-2.0/gio/gfiledescriptorbased.h file path=usr/include/gio-unix-2.0/gio/gunixconnection.h file path=usr/include/gio-unix-2.0/gio/gunixcredentialsmessage.h file path=usr/include/gio-unix-2.0/gio/gunixfdlist.h file path=usr/include/gio-unix-2.0/gio/gunixfdmessage.h file path=usr/include/gio-unix-2.0/gio/gunixinputstream.h file path=usr/include/gio-unix-2.0/gio/gunixmounts.h file path=usr/include/gio-unix-2.0/gio/gunixoutputstream.h file path=usr/include/gio-unix-2.0/gio/gunixsocketaddress.h file path=usr/include/glib-2.0/gio/gaction.h file path=usr/include/glib-2.0/gio/gactiongroup.h file path=usr/include/glib-2.0/gio/gactiongroupexporter.h @@ -115,6 +109,8 @@ 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/gdebugcontroller.h file path=usr/include/glib-2.0/gio/gdebugcontrollerdbus.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 @@ -152,6 +148,7 @@ file path=usr/include/glib-2.0/gio/gliststore.h file path=usr/include/glib-2.0/gio/gloadableicon.h file path=usr/include/glib-2.0/gio/gmemoryinputstream.h file path=usr/include/glib-2.0/gio/gmemorymonitor.h file path=usr/include/glib-2.0/gio/gmemoryoutputstream.h file path=usr/include/glib-2.0/gio/gmenu.h file path=usr/include/glib-2.0/gio/gmenuexporter.h @@ -170,6 +167,7 @@ file path=usr/include/glib-2.0/gio/gpollableinputstream.h file path=usr/include/glib-2.0/gio/gpollableoutputstream.h file path=usr/include/glib-2.0/gio/gpollableutils.h file path=usr/include/glib-2.0/gio/gpowerprofilemonitor.h file path=usr/include/glib-2.0/gio/gpropertyaction.h file path=usr/include/glib-2.0/gio/gproxy.h file path=usr/include/glib-2.0/gio/gproxyaddress.h @@ -215,6 +213,10 @@ file path=usr/include/glib-2.0/gio/gtlsinteraction.h file path=usr/include/glib-2.0/gio/gtlspassword.h file path=usr/include/glib-2.0/gio/gtlsserverconnection.h file path=usr/include/glib-2.0/gio/gunixconnection.h file path=usr/include/glib-2.0/gio/gunixcredentialsmessage.h file path=usr/include/glib-2.0/gio/gunixfdlist.h file path=usr/include/glib-2.0/gio/gunixsocketaddress.h file path=usr/include/glib-2.0/gio/gvfs.h file path=usr/include/glib-2.0/gio/gvolume.h file path=usr/include/glib-2.0/gio/gvolumemonitor.h @@ -258,6 +260,7 @@ file path=usr/include/glib-2.0/glib/giochannel.h file path=usr/include/glib-2.0/glib/gkeyfile.h file path=usr/include/glib-2.0/glib/glib-autocleanups.h file path=usr/include/glib-2.0/glib/glib-typeof.h file path=usr/include/glib-2.0/glib/glist.h file path=usr/include/glib-2.0/glib/gmacros.h file path=usr/include/glib-2.0/glib/gmain.h @@ -289,6 +292,7 @@ file path=usr/include/glib-2.0/glib/gstrfuncs.h file path=usr/include/glib-2.0/glib/gstring.h file path=usr/include/glib-2.0/glib/gstringchunk.h file path=usr/include/glib-2.0/glib/gstrvbuilder.h file path=usr/include/glib-2.0/glib/gtestutils.h file path=usr/include/glib-2.0/glib/gthread.h file path=usr/include/glib-2.0/glib/gthreadpool.h @@ -298,7 +302,7 @@ file path=usr/include/glib-2.0/glib/gtree.h 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/guri.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 @@ -308,6 +312,7 @@ file path=usr/include/glib-2.0/glib/gwin32.h file path=usr/include/glib-2.0/gmodule.h file path=usr/include/glib-2.0/gobject/gbinding.h file path=usr/include/glib-2.0/gobject/gbindinggroup.h file path=usr/include/glib-2.0/gobject/gboxed.h file path=usr/include/glib-2.0/gobject/gclosure.h file path=usr/include/glib-2.0/gobject/genums.h @@ -320,6 +325,7 @@ file path=usr/include/glib-2.0/gobject/gparam.h file path=usr/include/glib-2.0/gobject/gparamspecs.h file path=usr/include/glib-2.0/gobject/gsignal.h file path=usr/include/glib-2.0/gobject/gsignalgroup.h file path=usr/include/glib-2.0/gobject/gsourceclosure.h file path=usr/include/glib-2.0/gobject/gtype.h file path=usr/include/glib-2.0/gobject/gtypemodule.h @@ -328,26 +334,25 @@ 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)/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 link path=usr/lib/$(MACH64)/libgio-2.0.so.0 target=libgio-2.0.so.0.6200.6 file path=usr/lib/$(MACH64)/libgio-2.0.so.0.6200.6 link path=usr/lib/$(MACH64)/libgio-2.0.so.0 target=libgio-2.0.so.0.7303.0 file path=usr/lib/$(MACH64)/libgio-2.0.so.0.7303.0 link path=usr/lib/$(MACH64)/libglib-2.0.so target=libglib-2.0.so.0 link path=usr/lib/$(MACH64)/libglib-2.0.so.0 target=libglib-2.0.so.0.6200.6 file path=usr/lib/$(MACH64)/libglib-2.0.so.0.6200.6 link path=usr/lib/$(MACH64)/libglib-2.0.so.0 target=libglib-2.0.so.0.7303.0 file path=usr/lib/$(MACH64)/libglib-2.0.so.0.7303.0 link path=usr/lib/$(MACH64)/libgmodule-2.0.so target=libgmodule-2.0.so.0 link path=usr/lib/$(MACH64)/libgmodule-2.0.so.0 \ target=libgmodule-2.0.so.0.6200.6 file path=usr/lib/$(MACH64)/libgmodule-2.0.so.0.6200.6 target=libgmodule-2.0.so.0.7303.0 file path=usr/lib/$(MACH64)/libgmodule-2.0.so.0.7303.0 link path=usr/lib/$(MACH64)/libgobject-2.0.so target=libgobject-2.0.so.0 link path=usr/lib/$(MACH64)/libgobject-2.0.so.0 \ target=libgobject-2.0.so.0.6200.6 file path=usr/lib/$(MACH64)/libgobject-2.0.so.0.6200.6 target=libgobject-2.0.so.0.7303.0 file path=usr/lib/$(MACH64)/libgobject-2.0.so.0.7303.0 link path=usr/lib/$(MACH64)/libgthread-2.0.so target=libgthread-2.0.so.0 link path=usr/lib/$(MACH64)/libgthread-2.0.so.0 \ target=libgthread-2.0.so.0.6200.6 file path=usr/lib/$(MACH64)/libgthread-2.0.so.0.6200.6 target=libgthread-2.0.so.0.7303.0 file path=usr/lib/$(MACH64)/libgthread-2.0.so.0.7303.0 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 @@ -356,23 +361,23 @@ 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/gio/modules/libgiofam.so file usr/lib/gio-launch-desktop path=usr/bin/gio-launch-desktop mode=0555 file path=usr/lib/glib-2.0/include/glibconfig.h link path=usr/lib/libgio-2.0.so target=libgio-2.0.so.0 link path=usr/lib/libgio-2.0.so.0 target=libgio-2.0.so.0.6200.6 file path=usr/lib/libgio-2.0.so.0.6200.6 link path=usr/lib/libgio-2.0.so.0 target=libgio-2.0.so.0.7303.0 file path=usr/lib/libgio-2.0.so.0.7303.0 link path=usr/lib/libglib-2.0.so target=libglib-2.0.so.0 link path=usr/lib/libglib-2.0.so.0 target=libglib-2.0.so.0.6200.6 file path=usr/lib/libglib-2.0.so.0.6200.6 link path=usr/lib/libglib-2.0.so.0 target=libglib-2.0.so.0.7303.0 file path=usr/lib/libglib-2.0.so.0.7303.0 link path=usr/lib/libgmodule-2.0.so target=libgmodule-2.0.so.0 link path=usr/lib/libgmodule-2.0.so.0 target=libgmodule-2.0.so.0.6200.6 file path=usr/lib/libgmodule-2.0.so.0.6200.6 link path=usr/lib/libgmodule-2.0.so.0 target=libgmodule-2.0.so.0.7303.0 file path=usr/lib/libgmodule-2.0.so.0.7303.0 link path=usr/lib/libgobject-2.0.so target=libgobject-2.0.so.0 link path=usr/lib/libgobject-2.0.so.0 target=libgobject-2.0.so.0.6200.6 file path=usr/lib/libgobject-2.0.so.0.6200.6 link path=usr/lib/libgobject-2.0.so.0 target=libgobject-2.0.so.0.7303.0 file path=usr/lib/libgobject-2.0.so.0.7303.0 link path=usr/lib/libgthread-2.0.so target=libgthread-2.0.so.0 link path=usr/lib/libgthread-2.0.so.0 target=libgthread-2.0.so.0.6200.6 file path=usr/lib/libgthread-2.0.so.0.6200.6 link path=usr/lib/libgthread-2.0.so.0 target=libgthread-2.0.so.0.7303.0 file path=usr/lib/libgthread-2.0.so.0.7303.0 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 @@ -389,16 +394,17 @@ file path=usr/share/bash-completion/completions/gio 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.6200.6-gdb.py file path=usr/share/gdb/auto-load/usr/lib/$(MACH64)/libgobject-2.0.so.0.6200.6-gdb.py file path=usr/share/gdb/auto-load/usr/lib/libglib-2.0.so.0.6200.6-gdb.py file path=usr/share/gdb/auto-load/usr/lib/libgobject-2.0.so.0.6200.6-gdb.py file path=usr/share/gdb/auto-load/usr/lib/$(MACH64)/libglib-2.0.so.0.7303.0-gdb.py file path=usr/share/gdb/auto-load/usr/lib/$(MACH64)/libgobject-2.0.so.0.7303.0-gdb.py file path=usr/share/gdb/auto-load/usr/lib/libglib-2.0.so.0.7303.0-gdb.py file path=usr/share/gdb/auto-load/usr/lib/libgobject-2.0.so.0.7303.0-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/codegen.py file path=usr/share/glib-2.0/codegen/codegen_docbook.py file path=usr/share/glib-2.0/codegen/codegen_main.py file path=usr/share/glib-2.0/codegen/codegen_rst.py file path=usr/share/glib-2.0/codegen/config.py file path=usr/share/glib-2.0/codegen/dbustypes.py file path=usr/share/glib-2.0/codegen/parser.py @@ -408,6 +414,7 @@ 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/locale/ab/LC_MESSAGES/glib20.mo file path=usr/share/locale/af/LC_MESSAGES/glib20.mo file path=usr/share/locale/am/LC_MESSAGES/glib20.mo file path=usr/share/locale/an/LC_MESSAGES/glib20.mo components/library/glib/manifests/sample-manifest.p5m
@@ -27,7 +27,6 @@ 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-launch-desktop file path=usr/bin/$(MACH64)/gio-querymodules file path=usr/bin/$(MACH64)/glib-compile-resources file path=usr/bin/$(MACH64)/glib-compile-schemas @@ -43,7 +42,6 @@ file path=usr/bin/gdbus file path=usr/bin/gdbus-codegen file path=usr/bin/gio file path=usr/bin/gio-launch-desktop file path=usr/bin/gio-querymodules file path=usr/bin/glib-compile-resources file path=usr/bin/glib-compile-schemas @@ -57,14 +55,10 @@ file path=usr/bin/gtester-report file path=usr/include/gio-unix-2.0/gio/gdesktopappinfo.h file path=usr/include/gio-unix-2.0/gio/gfiledescriptorbased.h file path=usr/include/gio-unix-2.0/gio/gunixconnection.h file path=usr/include/gio-unix-2.0/gio/gunixcredentialsmessage.h file path=usr/include/gio-unix-2.0/gio/gunixfdlist.h file path=usr/include/gio-unix-2.0/gio/gunixfdmessage.h file path=usr/include/gio-unix-2.0/gio/gunixinputstream.h file path=usr/include/gio-unix-2.0/gio/gunixmounts.h file path=usr/include/gio-unix-2.0/gio/gunixoutputstream.h file path=usr/include/gio-unix-2.0/gio/gunixsocketaddress.h file path=usr/include/glib-2.0/gio/gaction.h file path=usr/include/glib-2.0/gio/gactiongroup.h file path=usr/include/glib-2.0/gio/gactiongroupexporter.h @@ -109,6 +103,8 @@ 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/gdebugcontroller.h file path=usr/include/glib-2.0/gio/gdebugcontrollerdbus.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 @@ -146,6 +142,7 @@ file path=usr/include/glib-2.0/gio/gliststore.h file path=usr/include/glib-2.0/gio/gloadableicon.h file path=usr/include/glib-2.0/gio/gmemoryinputstream.h file path=usr/include/glib-2.0/gio/gmemorymonitor.h file path=usr/include/glib-2.0/gio/gmemoryoutputstream.h file path=usr/include/glib-2.0/gio/gmenu.h file path=usr/include/glib-2.0/gio/gmenuexporter.h @@ -164,6 +161,7 @@ file path=usr/include/glib-2.0/gio/gpollableinputstream.h file path=usr/include/glib-2.0/gio/gpollableoutputstream.h file path=usr/include/glib-2.0/gio/gpollableutils.h file path=usr/include/glib-2.0/gio/gpowerprofilemonitor.h file path=usr/include/glib-2.0/gio/gpropertyaction.h file path=usr/include/glib-2.0/gio/gproxy.h file path=usr/include/glib-2.0/gio/gproxyaddress.h @@ -209,6 +207,10 @@ file path=usr/include/glib-2.0/gio/gtlsinteraction.h file path=usr/include/glib-2.0/gio/gtlspassword.h file path=usr/include/glib-2.0/gio/gtlsserverconnection.h file path=usr/include/glib-2.0/gio/gunixconnection.h file path=usr/include/glib-2.0/gio/gunixcredentialsmessage.h file path=usr/include/glib-2.0/gio/gunixfdlist.h file path=usr/include/glib-2.0/gio/gunixsocketaddress.h file path=usr/include/glib-2.0/gio/gvfs.h file path=usr/include/glib-2.0/gio/gvolume.h file path=usr/include/glib-2.0/gio/gvolumemonitor.h @@ -252,6 +254,7 @@ file path=usr/include/glib-2.0/glib/giochannel.h file path=usr/include/glib-2.0/glib/gkeyfile.h file path=usr/include/glib-2.0/glib/glib-autocleanups.h file path=usr/include/glib-2.0/glib/glib-typeof.h file path=usr/include/glib-2.0/glib/glist.h file path=usr/include/glib-2.0/glib/gmacros.h file path=usr/include/glib-2.0/glib/gmain.h @@ -283,6 +286,7 @@ file path=usr/include/glib-2.0/glib/gstrfuncs.h file path=usr/include/glib-2.0/glib/gstring.h file path=usr/include/glib-2.0/glib/gstringchunk.h file path=usr/include/glib-2.0/glib/gstrvbuilder.h file path=usr/include/glib-2.0/glib/gtestutils.h file path=usr/include/glib-2.0/glib/gthread.h file path=usr/include/glib-2.0/glib/gthreadpool.h @@ -292,7 +296,7 @@ file path=usr/include/glib-2.0/glib/gtree.h 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/guri.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 @@ -302,6 +306,7 @@ file path=usr/include/glib-2.0/glib/gwin32.h file path=usr/include/glib-2.0/gmodule.h file path=usr/include/glib-2.0/gobject/gbinding.h file path=usr/include/glib-2.0/gobject/gbindinggroup.h file path=usr/include/glib-2.0/gobject/gboxed.h file path=usr/include/glib-2.0/gobject/gclosure.h file path=usr/include/glib-2.0/gobject/genums.h @@ -314,6 +319,7 @@ file path=usr/include/glib-2.0/gobject/gparam.h file path=usr/include/glib-2.0/gobject/gparamspecs.h file path=usr/include/glib-2.0/gobject/gsignal.h file path=usr/include/glib-2.0/gobject/gsignalgroup.h file path=usr/include/glib-2.0/gobject/gsourceclosure.h file path=usr/include/glib-2.0/gobject/gtype.h file path=usr/include/glib-2.0/gobject/gtypemodule.h @@ -322,26 +328,25 @@ 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)/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 link path=usr/lib/$(MACH64)/libgio-2.0.so.0 target=libgio-2.0.so.0.6200.6 file path=usr/lib/$(MACH64)/libgio-2.0.so.0.6200.6 link path=usr/lib/$(MACH64)/libgio-2.0.so.0 target=libgio-2.0.so.0.7303.0 file path=usr/lib/$(MACH64)/libgio-2.0.so.0.7303.0 link path=usr/lib/$(MACH64)/libglib-2.0.so target=libglib-2.0.so.0 link path=usr/lib/$(MACH64)/libglib-2.0.so.0 target=libglib-2.0.so.0.6200.6 file path=usr/lib/$(MACH64)/libglib-2.0.so.0.6200.6 link path=usr/lib/$(MACH64)/libglib-2.0.so.0 target=libglib-2.0.so.0.7303.0 file path=usr/lib/$(MACH64)/libglib-2.0.so.0.7303.0 link path=usr/lib/$(MACH64)/libgmodule-2.0.so target=libgmodule-2.0.so.0 link path=usr/lib/$(MACH64)/libgmodule-2.0.so.0 \ target=libgmodule-2.0.so.0.6200.6 file path=usr/lib/$(MACH64)/libgmodule-2.0.so.0.6200.6 target=libgmodule-2.0.so.0.7303.0 file path=usr/lib/$(MACH64)/libgmodule-2.0.so.0.7303.0 link path=usr/lib/$(MACH64)/libgobject-2.0.so target=libgobject-2.0.so.0 link path=usr/lib/$(MACH64)/libgobject-2.0.so.0 \ target=libgobject-2.0.so.0.6200.6 file path=usr/lib/$(MACH64)/libgobject-2.0.so.0.6200.6 target=libgobject-2.0.so.0.7303.0 file path=usr/lib/$(MACH64)/libgobject-2.0.so.0.7303.0 link path=usr/lib/$(MACH64)/libgthread-2.0.so target=libgthread-2.0.so.0 link path=usr/lib/$(MACH64)/libgthread-2.0.so.0 \ target=libgthread-2.0.so.0.6200.6 file path=usr/lib/$(MACH64)/libgthread-2.0.so.0.6200.6 target=libgthread-2.0.so.0.7303.0 file path=usr/lib/$(MACH64)/libgthread-2.0.so.0.7303.0 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 @@ -350,23 +355,23 @@ 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/gio/modules/libgiofam.so file path=usr/lib/gio-launch-desktop file path=usr/lib/glib-2.0/include/glibconfig.h link path=usr/lib/libgio-2.0.so target=libgio-2.0.so.0 link path=usr/lib/libgio-2.0.so.0 target=libgio-2.0.so.0.6200.6 file path=usr/lib/libgio-2.0.so.0.6200.6 link path=usr/lib/libgio-2.0.so.0 target=libgio-2.0.so.0.7303.0 file path=usr/lib/libgio-2.0.so.0.7303.0 link path=usr/lib/libglib-2.0.so target=libglib-2.0.so.0 link path=usr/lib/libglib-2.0.so.0 target=libglib-2.0.so.0.6200.6 file path=usr/lib/libglib-2.0.so.0.6200.6 link path=usr/lib/libglib-2.0.so.0 target=libglib-2.0.so.0.7303.0 file path=usr/lib/libglib-2.0.so.0.7303.0 link path=usr/lib/libgmodule-2.0.so target=libgmodule-2.0.so.0 link path=usr/lib/libgmodule-2.0.so.0 target=libgmodule-2.0.so.0.6200.6 file path=usr/lib/libgmodule-2.0.so.0.6200.6 link path=usr/lib/libgmodule-2.0.so.0 target=libgmodule-2.0.so.0.7303.0 file path=usr/lib/libgmodule-2.0.so.0.7303.0 link path=usr/lib/libgobject-2.0.so target=libgobject-2.0.so.0 link path=usr/lib/libgobject-2.0.so.0 target=libgobject-2.0.so.0.6200.6 file path=usr/lib/libgobject-2.0.so.0.6200.6 link path=usr/lib/libgobject-2.0.so.0 target=libgobject-2.0.so.0.7303.0 file path=usr/lib/libgobject-2.0.so.0.7303.0 link path=usr/lib/libgthread-2.0.so target=libgthread-2.0.so.0 link path=usr/lib/libgthread-2.0.so.0 target=libgthread-2.0.so.0.6200.6 file path=usr/lib/libgthread-2.0.so.0.6200.6 link path=usr/lib/libgthread-2.0.so.0 target=libgthread-2.0.so.0.7303.0 file path=usr/lib/libgthread-2.0.so.0.7303.0 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 @@ -383,16 +388,17 @@ file path=usr/share/bash-completion/completions/gio 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.6200.6-gdb.py file path=usr/share/gdb/auto-load/usr/lib/$(MACH64)/libgobject-2.0.so.0.6200.6-gdb.py file path=usr/share/gdb/auto-load/usr/lib/libglib-2.0.so.0.6200.6-gdb.py file path=usr/share/gdb/auto-load/usr/lib/libgobject-2.0.so.0.6200.6-gdb.py file path=usr/share/gdb/auto-load/usr/lib/$(MACH64)/libglib-2.0.so.0.7303.0-gdb.py file path=usr/share/gdb/auto-load/usr/lib/$(MACH64)/libgobject-2.0.so.0.7303.0-gdb.py file path=usr/share/gdb/auto-load/usr/lib/libglib-2.0.so.0.7303.0-gdb.py file path=usr/share/gdb/auto-load/usr/lib/libgobject-2.0.so.0.7303.0-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/codegen.py file path=usr/share/glib-2.0/codegen/codegen_docbook.py file path=usr/share/glib-2.0/codegen/codegen_main.py file path=usr/share/glib-2.0/codegen/codegen_rst.py file path=usr/share/glib-2.0/codegen/config.py file path=usr/share/glib-2.0/codegen/dbustypes.py file path=usr/share/glib-2.0/codegen/parser.py @@ -402,6 +408,7 @@ 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/locale/ab/LC_MESSAGES/glib20.mo file path=usr/share/locale/af/LC_MESSAGES/glib20.mo file path=usr/share/locale/am/LC_MESSAGES/glib20.mo file path=usr/share/locale/an/LC_MESSAGES/glib20.mo components/library/glib/patches/01-fix-default-path.patch
File was deleted components/library/glib/patches/02-gmodule-always-lazy.patch
@@ -5,24 +5,27 @@ not just Solaris, otherwise there could be a significant performance penalty at startup. Need to file upstream bug for that. --- glib-2.44.0/gmodule/gmodule-dl.c 2014-10-04 17:08:22.000000000 -0700 +++ glib-2.44.0/gmodule/gmodule-dl.c 2015-04-19 12:35:57.727036805 -0700 @@ -93,9 +93,17 @@ gboolean bind_local) diff --git a/gmodule/gmodule-dl.c b/gmodule/gmodule-dl.c index c1c2fce..d71595e 100644 --- a/gmodule/gmodule-dl.c +++ b/gmodule/gmodule-dl.c @@ -133,10 +133,18 @@ _g_module_open (const gchar *file_name, GError **error) { 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. + */ + bind_lazy = 1; + #endif +#endif lock_dlerror (); handle = dlopen (file_name, - (bind_local ? 0 : RTLD_GLOBAL) | (bind_lazy ? RTLD_LAZY : RTLD_NOW)); + (bind_local ? 0 : RTLD_GLOBAL) | (bind_lazy ? RTLD_LAZY | RTLD_FIRST : RTLD_NOW)); if (!handle) g_module_set_error (fetch_dlerror (TRUE)); { const gchar *message = fetch_dlerror (TRUE); components/library/glib/patches/04-xopen-version.patch
@@ -1,6 +1,11 @@ --- glib-2.62.3/meson.build.1 2019-12-18 21:58:02.109823287 +0000 +++ glib-2.62.3/meson.build 2019-12-18 21:59:14.389494095 +0000 @@ -2011,8 +2011,6 @@ 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 --- a/meson.build 2019-09-25 15:21:05.190853342 -0700 +++ b/meson.build 2019-09-25 15:21:13.619238512 -0700 @@ -1905,8 +1905,6 @@ # FIXME: How to detect Solaris? https://github.com/mesonbuild/meson/issues/1578 if host_system == 'sunos' components/library/glib/patches/08-gio-trash-only-home.patch
@@ -1,20 +1,21 @@ --- 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 @@ --- glib-2.66.4/gio/glocalfile.c.orig 2020-12-17 12:47:11.417608000 +0000 +++ glib-2.66.4/gio/glocalfile.c 2020-12-20 11:49:17.686916141 +0000 @@ -1956,6 +1956,7 @@ char *dirname, *globaldir; GVfsClass *class; GVfs *vfs; + GFile *trash; int errsv; if (g_lstat (local->filename, &file_stat) != 0) @@ -1984,138 +1984,26 @@ g_local_file_trash (GFile *file, if (glib_should_use_portal ()) --- a/gio/glocalfile.c +++ b/gio/glocalfile.c @@ -2039,146 +2039,25 @@ g_local_file_trash (GFile *file, g_free (path); } - if (file_stat.st_dev == home_stat.st_dev) + /* Always move to .Trash in the user's home directory + */ + /* 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); @@ -27,13 +28,11 @@ - { - char *display_name; - errsv = errno; + 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), - _("Unable to create trash dir %s: %s"), - _("Unable to create trash directory %s: %s"), - display_name, g_strerror (errsv)); - g_free (display_name); - g_free (trashdir); @@ -45,7 +44,7 @@ - { - uid_t uid; - char uid_str[32]; - GUnixMountEntry *mount; - gboolean success = FALSE; - - uid = geteuid (); - g_snprintf (uid_str, sizeof (uid_str), "%lu", (unsigned long)uid); @@ -59,19 +58,14 @@ - return FALSE; - } - - mount = g_unix_mount_at (topdir, NULL); - if (mount == NULL || g_unix_mount_is_system_internal (mount)) - if (ignore_trash_path (topdir)) - { - g_set_error (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED, - _("Trashing on system internal mounts is not supported")); - - g_clear_pointer (&mount, g_unix_mount_free); - g_free (topdir); - - return FALSE; - } - - g_clear_pointer (&mount, g_unix_mount_free); - - /* Try looking for global trash dir $topdir/.Trash/$uid */ - globaldir = g_build_filename (topdir, ".Trash", NULL); @@ -80,6 +74,7 @@ - (global_stat.st_mode & S_ISVTX) != 0) - { - trashdir = g_build_filename (globaldir, uid_str, NULL); - success = TRUE; - - if (g_lstat (trashdir, &trash_stat) == 0) - { @@ -89,12 +84,14 @@ - /* Not a directory or not owned by user, ignore */ - g_free (trashdir); - trashdir = NULL; - success = FALSE; - } - } - else if (g_mkdir (trashdir, 0700) == -1) - { - g_free (trashdir); - trashdir = NULL; - success = FALSE; - } - } - g_free (globaldir); @@ -106,6 +103,7 @@ - /* No global trash dir, or it failed the tests, fall back to $topdir/.Trash-$uid */ - dirname = g_strdup_printf (".Trash-%s", uid_str); - trashdir = g_build_filename (topdir, dirname, NULL); - success = TRUE; - g_free (dirname); - - tried_create = FALSE; @@ -121,8 +119,7 @@ - g_remove (trashdir); - - /* Not a directory or not owned by user, ignore */ - g_free (trashdir); - trashdir = NULL; - success = FALSE; - } - } - else @@ -137,25 +134,37 @@ - } - else - { - g_free (trashdir); - trashdir = NULL; - success = FALSE; - } - } - } - - if (trashdir == NULL) - if (!success) - { - g_free (topdir); - g_set_io_error (error, - _("Unable to find or create trash directory for %s"), - file, G_IO_ERROR_NOT_SUPPORTED); - gchar *trashdir_display_name = NULL, *file_display_name = NULL; - - trashdir_display_name = g_filename_display_name (trashdir); - file_display_name = g_filename_display_name (local->filename); - g_set_error (error, G_IO_ERROR, - G_IO_ERROR_NOT_SUPPORTED, - _("Unable to find or create trash directory %s to trash %s"), - trashdir_display_name, file_display_name); - - g_free (trashdir_display_name); - g_free (file_display_name); - - g_free (topdir); - g_free (trashdir); + char *display_name; + errsv = errno; - return FALSE; - } + display_name = g_filename_display_name (trashdir); + g_set_error (error, G_IO_ERROR, + g_io_error_from_errno (errsv), + _("Unable to create trash dir %s: %s"), + display_name, g_strerror (errsv)); + g_io_error_from_errno (errsv), + _("Unable to create trash directory %s: %s"), + display_name, g_strerror (errsv)); + g_free (display_name); + g_free (trashdir); + return FALSE; components/library/glib/patches/17-python.patch
@@ -1,3 +1,5 @@ 3 tests more fail, if only 'find_installation('python3') is used --- glib-2.62.3/meson.build.~2~ 2019-12-19 12:55:14.141812814 +0000 +++ glib-2.62.3/meson.build 2019-12-19 12:57:07.818095148 +0000 @@ -1992,9 +1992,8 @@ @@ -7,8 +9,8 @@ -python = import('python').find_installation('python3') -# used for '#!/usr/bin/env <name>' -python_name = 'python3' +python = import('python').find_installation('python3.5') +python_name = '/usr/bin/python3.5' +python = import('python').find_installation('python3.9') +python_name = '/usr/bin/python3.9' python_version = python.language_version() python_version_req = '>=3.4' components/library/glib/patches/18-pid-format.patch
@@ -1,11 +1,13 @@ --- glib-2.62.3/tests/mapping-test.c.1 2019-12-19 00:36:15.376515079 +0000 +++ glib-2.62.3/tests/mapping-test.c 2019-12-19 00:42:04.596913255 +0000 @@ -208,7 +208,7 @@ diff --git a/glib/tests/mapping.c b/glib/tests/mapping.c index ea3495c..996e4da 100644 --- a/glib/tests/mapping.c +++ b/glib/tests/mapping.c @@ -225,7 +225,7 @@ test_child_private (void) signal (SIGUSR1, handle_usr1); #endif - g_snprintf (pid, sizeof(pid), "%d", getpid ()); + g_snprintf (pid, sizeof(pid), "%ld", (long) getpid ()); child_argv[0] = argv0; child_argv[0] = local_argv[0]; child_argv[1] = "mapchild"; child_argv[2] = pid; components/library/glib/patches/19-static-assert-c++17.patch
File was deleted components/library/glib/patches/21-test-one-half-convert.patch
File was deleted components/library/glib/patches/22-zoneinfo.patch
File was deleted components/library/glib/patches/23-vasprintf.patch
File was deleted components/library/glib/patches/24-timer-test-double.patch
@@ -11,14 +11,6 @@ static void test_timer_basic (void) @@ -38,6 +39,7 @@ elapsed = g_timer_elapsed (timer, µs); g_assert_cmpfloat (elapsed, <, 1.0); + printf("elapsed * 1e6: %f\n", elapsed * 1e6); g_assert_cmpuint (micros, ==, ((guint64)(elapsed * 1e6)) % 1000000); g_timer_destroy (timer); @@ -57,6 +59,8 @@ g_usleep (100); elapsed2 = g_timer_elapsed (timer, NULL); components/library/glib/patches/26-iconv-U+FFFF.patch
@@ -1,8 +1,10 @@ See https://www.illumos.org/issues/14934 --- glib-2.62.6/tests/utf8.txt.orig +++ glib-2.62.6/tests/utf8.txt @@ -61,10 +61,6 @@ diff --git a/glib/tests/utf8.txt b/glib/tests/utf8.txt index 194d1b5..de9c016 100644 --- a/glib/tests/utf8.txt +++ b/glib/tests/utf8.txt @@ -61,10 +61,6 @@ VALID VALID 000007ff @@ -13,7 +15,7 @@ ÷¿¿¿ NOTUNICODE 001fffff @@ -95,10 +91,6 @@ @@ -95,10 +91,6 @@ fffd VALID 0010fffd
@@ -1,6 +1,8 @@ --- glib-2.62.6/tests/mapping-test.c.orig +++ glib-2.62.6/tests/mapping-test.c @@ -40,6 +40,10 @@ diff --git a/glib/tests/mapping.c b/glib/tests/mapping.c index 96544b1..b97fbab 100644 --- a/glib/tests/mapping.c +++ b/glib/tests/mapping.c @@ -38,6 +38,10 @@ static char **local_argv; static void handle_usr1 (int signum) { components/library/glib/patches/32-umask-test.patch
New file @@ -0,0 +1,16 @@ umask returns mode_t which is unsigned int this maks confusion in 32bit and 64bit build, so we extend to long for both diff --git a/gio/tests/file.c b/gio/tests/file.c index 9a15f97..888da69 100644 --- a/gio/tests/file.c +++ b/gio/tests/file.c @@ -2373,7 +2373,7 @@ test_copy_preserve_mode (void) /* Reset the umask after querying it above. There’s no way to query it without * changing it. */ umask (current_umask); - g_test_message ("Current umask: %u", current_umask); + g_test_message ("Current umask: %lu", (long) current_umask); for (i = 0; i < G_N_ELEMENTS (vectors); i++) { components/library/glib/pkg5
@@ -4,11 +4,10 @@ "developer/build/meson", "developer/build/ninja", "library/desktop/desktop-file-utils", "library/file-monitor/gamin", "library/libffi", "library/pcre", "library/pcre2", "library/zlib", "runtime/python-35", "runtime/python-39", "shell/ksh93", "system/library", "system/library/dbus" components/library/glib/test/results-all.master
@@ -1,6 +1,6 @@ Ok: 257 Ok: 266 Expected Fail: 0 Fail: 5 Fail: 10 Unexpected Pass: 0 Skipped: 0 Timeout: 0
