- Update from 2.54.3 to 2.68.1
- Update rootfile
- glib-2.54.3-compile-fixes-1.patch not required, all changes now
incorporated in the source tarball
- meson/ninja have replaced autotools
- As so's updated ran find-dependencies
No additional programs flagged up
- Changelog is too large to include here
Full details can be viewed in the NEWS file in the source tarball
Large number of bugs fixed
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
---
config/rootfiles/common/glib | 461 +-----------------
lfs/glib | 15 +-
src/patches/glib-2.54.3-compile-fixes-1.patch | 71 ---
3 files changed, 24 insertions(+), 523 deletions(-)
delete mode 100644 src/patches/glib-2.54.3-compile-fixes-1.patch
diff --git a/config/rootfiles/common/glib b/config/rootfiles/common/glib
index 0ecb3417f..a72b6fee8 100644
--- a/config/rootfiles/common/glib
+++ b/config/rootfiles/common/glib
@@ -108,12 +108,14 @@
#usr/include/glib-2.0/gio/gliststore.h
#usr/include/glib-2.0/gio/gloadableicon.h
#usr/include/glib-2.0/gio/gmemoryinputstream.h
+#usr/include/glib-2.0/gio/gmemorymonitor.h
#usr/include/glib-2.0/gio/gmemoryoutputstream.h
#usr/include/glib-2.0/gio/gmenu.h
#usr/include/glib-2.0/gio/gmenuexporter.h
#usr/include/glib-2.0/gio/gmenumodel.h
#usr/include/glib-2.0/gio/gmount.h
#usr/include/glib-2.0/gio/gmountoperation.h
+#usr/include/glib-2.0/gio/gnativesocketaddress.h
#usr/include/glib-2.0/gio/gnativevolumemonitor.h
#usr/include/glib-2.0/gio/gnetworkaddress.h
#usr/include/glib-2.0/gio/gnetworking.h
@@ -232,6 +234,9 @@
#usr/include/glib-2.0/glib/gquark.h
#usr/include/glib-2.0/glib/gqueue.h
#usr/include/glib-2.0/glib/grand.h
+#usr/include/glib-2.0/glib/grcbox.h
+#usr/include/glib-2.0/glib/grefcount.h
+#usr/include/glib-2.0/glib/grefstring.h
#usr/include/glib-2.0/glib/gregex.h
#usr/include/glib-2.0/glib/gscanner.h
#usr/include/glib-2.0/glib/gsequence.h
@@ -243,6 +248,7 @@
#usr/include/glib-2.0/glib/gstrfuncs.h
#usr/include/glib-2.0/glib/gstring.h
#usr/include/glib-2.0/glib/gstringchunk.h
+#usr/include/glib-2.0/glib/gstrvbuilder.h
#usr/include/glib-2.0/glib/gtestutils.h
#usr/include/glib-2.0/glib/gthread.h
#usr/include/glib-2.0/glib/gthreadpool.h
@@ -252,7 +258,7 @@
#usr/include/glib-2.0/glib/gtree.h
#usr/include/glib-2.0/glib/gtypes.h
#usr/include/glib-2.0/glib/gunicode.h
-#usr/include/glib-2.0/glib/gurifuncs.h
+#usr/include/glib-2.0/glib/guri.h
#usr/include/glib-2.0/glib/gutils.h
#usr/include/glib-2.0/glib/guuid.h
#usr/include/glib-2.0/glib/gvariant.h
@@ -266,6 +272,7 @@
#usr/include/glib-2.0/gobject/gboxed.h
#usr/include/glib-2.0/gobject/gclosure.h
#usr/include/glib-2.0/gobject/genums.h
+#usr/include/glib-2.0/gobject/glib-enumtypes.h
#usr/include/glib-2.0/gobject/glib-types.h
#usr/include/glib-2.0/gobject/gmarshal.h
#usr/include/glib-2.0/gobject/gobject-autocleanups.h
@@ -282,31 +289,24 @@
#usr/include/glib-2.0/gobject/gvaluearray.h
#usr/include/glib-2.0/gobject/gvaluecollector.h
#usr/include/glib-2.0/gobject/gvaluetypes.h
-#usr/lib/gio
-#usr/lib/gio/modules
#usr/lib/glib-2.0
#usr/lib/glib-2.0/include
#usr/lib/glib-2.0/include/glibconfig.h
-#usr/lib/libgio-2.0.la
#usr/lib/libgio-2.0.so
usr/lib/libgio-2.0.so.0
-usr/lib/libgio-2.0.so.0.5400.3
-#usr/lib/libglib-2.0.la
+usr/lib/libgio-2.0.so.0.6800.1
#usr/lib/libglib-2.0.so
usr/lib/libglib-2.0.so.0
-usr/lib/libglib-2.0.so.0.5400.3
-#usr/lib/libgmodule-2.0.la
+usr/lib/libglib-2.0.so.0.6800.1
#usr/lib/libgmodule-2.0.so
usr/lib/libgmodule-2.0.so.0
-usr/lib/libgmodule-2.0.so.0.5400.3
-#usr/lib/libgobject-2.0.la
+usr/lib/libgmodule-2.0.so.0.6800.1
#usr/lib/libgobject-2.0.so
usr/lib/libgobject-2.0.so.0
-usr/lib/libgobject-2.0.so.0.5400.3
-#usr/lib/libgthread-2.0.la
+usr/lib/libgobject-2.0.so.0.6800.1
#usr/lib/libgthread-2.0.so
usr/lib/libgthread-2.0.so.0
-usr/lib/libgthread-2.0.so.0.5400.3
+usr/lib/libgthread-2.0.so.0.6800.1
#usr/lib/pkgconfig/gio-2.0.pc
#usr/lib/pkgconfig/gio-unix-2.0.pc
#usr/lib/pkgconfig/glib-2.0.pc
@@ -320,43 +320,27 @@ usr/lib/libgthread-2.0.so.0.5400.3
#usr/share/aclocal/gsettings.m4
#usr/share/bash-completion/completions/gapplication
#usr/share/bash-completion/completions/gdbus
+#usr/share/bash-completion/completions/gio
#usr/share/bash-completion/completions/gresource
#usr/share/bash-completion/completions/gsettings
-#usr/share/gdb
#usr/share/gdb/auto-load
#usr/share/gdb/auto-load/usr
#usr/share/gdb/auto-load/usr/lib
-#usr/share/gdb/auto-load/usr/lib/libglib-2.0.so.0.5400.3-gdb.py
-#usr/share/gdb/auto-load/usr/lib/libgobject-2.0.so.0.5400.3-gdb.py
+#usr/share/gdb/auto-load/usr/lib/libglib-2.0.so.0.6800.1-gdb.py
+#usr/share/gdb/auto-load/usr/lib/libgobject-2.0.so.0.6800.1-gdb.py
#usr/share/gettext/its
#usr/share/gettext/its/gschema.its
#usr/share/gettext/its/gschema.loc
#usr/share/glib-2.0
#usr/share/glib-2.0/codegen
#usr/share/glib-2.0/codegen/__init__.py
-#usr/share/glib-2.0/codegen/__init__.pyc
-#usr/share/glib-2.0/codegen/__init__.pyo
#usr/share/glib-2.0/codegen/codegen.py
-#usr/share/glib-2.0/codegen/codegen.pyc
-#usr/share/glib-2.0/codegen/codegen.pyo
#usr/share/glib-2.0/codegen/codegen_docbook.py
-#usr/share/glib-2.0/codegen/codegen_docbook.pyc
-#usr/share/glib-2.0/codegen/codegen_docbook.pyo
#usr/share/glib-2.0/codegen/codegen_main.py
-#usr/share/glib-2.0/codegen/codegen_main.pyc
-#usr/share/glib-2.0/codegen/codegen_main.pyo
#usr/share/glib-2.0/codegen/config.py
-#usr/share/glib-2.0/codegen/config.pyc
-#usr/share/glib-2.0/codegen/config.pyo
#usr/share/glib-2.0/codegen/dbustypes.py
-#usr/share/glib-2.0/codegen/dbustypes.pyc
-#usr/share/glib-2.0/codegen/dbustypes.pyo
#usr/share/glib-2.0/codegen/parser.py
-#usr/share/glib-2.0/codegen/parser.pyc
-#usr/share/glib-2.0/codegen/parser.pyo
#usr/share/glib-2.0/codegen/utils.py
-#usr/share/glib-2.0/codegen/utils.pyc
-#usr/share/glib-2.0/codegen/utils.pyo
#usr/share/glib-2.0/gdb
#usr/share/glib-2.0/gdb/glib_gdb.py
#usr/share/glib-2.0/gdb/gobject_gdb.py
@@ -367,417 +351,6 @@ usr/lib/libgthread-2.0.so.0.5400.3
#usr/share/glib-2.0/schemas/gschema.dtd
#usr/share/glib-2.0/valgrind
#usr/share/glib-2.0/valgrind/glib.supp
-#usr/share/gtk-doc/html/gio
-#usr/share/gtk-doc/html/gio/GAction.html
-#usr/share/gtk-doc/html/gio/GActionGroup.html
-#usr/share/gtk-doc/html/gio/GActionMap.html
-#usr/share/gtk-doc/html/gio/GAppInfo.html
-#usr/share/gtk-doc/html/gio/GAppInfoMonitor.html
-#usr/share/gtk-doc/html/gio/GApplication.html
-#usr/share/gtk-doc/html/gio/GApplicationCommandLine.html
-#usr/share/gtk-doc/html/gio/GAsyncInitable.html
-#usr/share/gtk-doc/html/gio/GAsyncResult.html
-#usr/share/gtk-doc/html/gio/GBufferedInputStream.html
-#usr/share/gtk-doc/html/gio/GBufferedOutputStream.html
-#usr/share/gtk-doc/html/gio/GBytesIcon.html
-#usr/share/gtk-doc/html/gio/GCancellable.html
-#usr/share/gtk-doc/html/gio/GCharsetConverter.html
-#usr/share/gtk-doc/html/gio/GConverter.html
-#usr/share/gtk-doc/html/gio/GCredentials.html
-#usr/share/gtk-doc/html/gio/GDBusActionGroup.html
-#usr/share/gtk-doc/html/gio/GDBusAuthObserver.html
-#usr/share/gtk-doc/html/gio/GDBusConnection.html
-#usr/share/gtk-doc/html/gio/GDBusInterface.html
-#usr/share/gtk-doc/html/gio/GDBusInterfaceSkeleton.html
-#usr/share/gtk-doc/html/gio/GDBusMenuModel.html
-#usr/share/gtk-doc/html/gio/GDBusMessage.html
-#usr/share/gtk-doc/html/gio/GDBusMethodInvocation.html
-#usr/share/gtk-doc/html/gio/GDBusObject.html
-#usr/share/gtk-doc/html/gio/GDBusObjectManager.html
-#usr/share/gtk-doc/html/gio/GDBusObjectManagerClient.html
-#usr/share/gtk-doc/html/gio/GDBusObjectManagerServer.html
-#usr/share/gtk-doc/html/gio/GDBusObjectProxy.html
-#usr/share/gtk-doc/html/gio/GDBusObjectSkeleton.html
-#usr/share/gtk-doc/html/gio/GDBusProxy.html
-#usr/share/gtk-doc/html/gio/GDBusServer.html
-#usr/share/gtk-doc/html/gio/GDataInputStream.html
-#usr/share/gtk-doc/html/gio/GDataOutputStream.html
-#usr/share/gtk-doc/html/gio/GDatagramBased.html
-#usr/share/gtk-doc/html/gio/GDrive.html
-#usr/share/gtk-doc/html/gio/GDtlsClientConnection.html
-#usr/share/gtk-doc/html/gio/GDtlsConnection.html
-#usr/share/gtk-doc/html/gio/GDtlsServerConnection.html
-#usr/share/gtk-doc/html/gio/GEmblem.html
-#usr/share/gtk-doc/html/gio/GEmblemedIcon.html
-#usr/share/gtk-doc/html/gio/GFile.html
-#usr/share/gtk-doc/html/gio/GFileDescriptorBased.html
-#usr/share/gtk-doc/html/gio/GFileEnumerator.html
-#usr/share/gtk-doc/html/gio/GFileIOStream.html
-#usr/share/gtk-doc/html/gio/GFileIcon.html
-#usr/share/gtk-doc/html/gio/GFileInfo.html
-#usr/share/gtk-doc/html/gio/GFileInputStream.html
-#usr/share/gtk-doc/html/gio/GFileMonitor.html
-#usr/share/gtk-doc/html/gio/GFileOutputStream.html
-#usr/share/gtk-doc/html/gio/GFilenameCompleter.html
-#usr/share/gtk-doc/html/gio/GFilterInputStream.html
-#usr/share/gtk-doc/html/gio/GFilterOutputStream.html
-#usr/share/gtk-doc/html/gio/GIOModule.html
-#usr/share/gtk-doc/html/gio/GIOStream.html
-#usr/share/gtk-doc/html/gio/GIcon.html
-#usr/share/gtk-doc/html/gio/GInetAddress.html
-#usr/share/gtk-doc/html/gio/GInetAddressMask.html
-#usr/share/gtk-doc/html/gio/GInetSocketAddress.html
-#usr/share/gtk-doc/html/gio/GInitable.html
-#usr/share/gtk-doc/html/gio/GInputStream.html
-#usr/share/gtk-doc/html/gio/GListModel.html
-#usr/share/gtk-doc/html/gio/GListStore.html
-#usr/share/gtk-doc/html/gio/GLoadableIcon.html
-#usr/share/gtk-doc/html/gio/GMemoryInputStream.html
-#usr/share/gtk-doc/html/gio/GMemoryOutputStream.html
-#usr/share/gtk-doc/html/gio/GMenu.html
-#usr/share/gtk-doc/html/gio/GMenuModel.html
-#usr/share/gtk-doc/html/gio/GMount.html
-#usr/share/gtk-doc/html/gio/GMountOperation.html
-#usr/share/gtk-doc/html/gio/GNetworkAddress.html
-#usr/share/gtk-doc/html/gio/GNetworkMonitor.html
-#usr/share/gtk-doc/html/gio/GNetworkService.html
-#usr/share/gtk-doc/html/gio/GNotification.html
-#usr/share/gtk-doc/html/gio/GOutputStream.html
-#usr/share/gtk-doc/html/gio/GPermission.html
-#usr/share/gtk-doc/html/gio/GPollableInputStream.html
-#usr/share/gtk-doc/html/gio/GPollableOutputStream.html
-#usr/share/gtk-doc/html/gio/GPropertyAction.html
-#usr/share/gtk-doc/html/gio/GProxy.html
-#usr/share/gtk-doc/html/gio/GProxyAddress.html
-#usr/share/gtk-doc/html/gio/GProxyAddressEnumerator.html
-#usr/share/gtk-doc/html/gio/GProxyResolver.html
-#usr/share/gtk-doc/html/gio/GRemoteActionGroup.html
-#usr/share/gtk-doc/html/gio/GResolver.html
-#usr/share/gtk-doc/html/gio/GResource.html
-#usr/share/gtk-doc/html/gio/GSeekable.html
-#usr/share/gtk-doc/html/gio/GSettings.html
-#usr/share/gtk-doc/html/gio/GSettingsBackend.html
-#usr/share/gtk-doc/html/gio/GSimpleAction.html
-#usr/share/gtk-doc/html/gio/GSimpleActionGroup.html
-#usr/share/gtk-doc/html/gio/GSimpleAsyncResult.html
-#usr/share/gtk-doc/html/gio/GSimpleIOStream.html
-#usr/share/gtk-doc/html/gio/GSimplePermission.html
-#usr/share/gtk-doc/html/gio/GSimpleProxyResolver.html
-#usr/share/gtk-doc/html/gio/GSocket.html
-#usr/share/gtk-doc/html/gio/GSocketAddress.html
-#usr/share/gtk-doc/html/gio/GSocketAddressEnumerator.html
-#usr/share/gtk-doc/html/gio/GSocketClient.html
-#usr/share/gtk-doc/html/gio/GSocketConnectable.html
-#usr/share/gtk-doc/html/gio/GSocketConnection.html
-#usr/share/gtk-doc/html/gio/GSocketControlMessage.html
-#usr/share/gtk-doc/html/gio/GSocketListener.html
-#usr/share/gtk-doc/html/gio/GSocketService.html
-#usr/share/gtk-doc/html/gio/GSrvTarget.html
-#usr/share/gtk-doc/html/gio/GSubprocess.html
-#usr/share/gtk-doc/html/gio/GSubprocessLauncher.html
-#usr/share/gtk-doc/html/gio/GTask.html
-#usr/share/gtk-doc/html/gio/GTcpConnection.html
-#usr/share/gtk-doc/html/gio/GTcpWrapperConnection.html
-#usr/share/gtk-doc/html/gio/GTestDBus.html
-#usr/share/gtk-doc/html/gio/GThemedIcon.html
-#usr/share/gtk-doc/html/gio/GThreadedSocketService.html
-#usr/share/gtk-doc/html/gio/GTlsBackend.html
-#usr/share/gtk-doc/html/gio/GTlsCertificate.html
-#usr/share/gtk-doc/html/gio/GTlsClientConnection.html
-#usr/share/gtk-doc/html/gio/GTlsConnection.html
-#usr/share/gtk-doc/html/gio/GTlsDatabase.html
-#usr/share/gtk-doc/html/gio/GTlsFileDatabase.html
-#usr/share/gtk-doc/html/gio/GTlsInteraction.html
-#usr/share/gtk-doc/html/gio/GTlsPassword.html
-#usr/share/gtk-doc/html/gio/GTlsServerConnection.html
-#usr/share/gtk-doc/html/gio/GUnixConnection.html
-#usr/share/gtk-doc/html/gio/GUnixCredentialsMessage.html
-#usr/share/gtk-doc/html/gio/GUnixFDList.html
-#usr/share/gtk-doc/html/gio/GUnixFDMessage.html
-#usr/share/gtk-doc/html/gio/GUnixInputStream.html
-#usr/share/gtk-doc/html/gio/GUnixOutputStream.html
-#usr/share/gtk-doc/html/gio/GUnixSocketAddress.html
-#usr/share/gtk-doc/html/gio/GVfs.html
-#usr/share/gtk-doc/html/gio/GVolume.html
-#usr/share/gtk-doc/html/gio/GVolumeMonitor.html
-#usr/share/gtk-doc/html/gio/GZlibCompressor.html
-#usr/share/gtk-doc/html/gio/GZlibDecompressor.html
-#usr/share/gtk-doc/html/gio/annotation-glossary.html
-#usr/share/gtk-doc/html/gio/api-index-full.html
-#usr/share/gtk-doc/html/gio/application.html
-#usr/share/gtk-doc/html/gio/async.html
-#usr/share/gtk-doc/html/gio/ch01.html
-#usr/share/gtk-doc/html/gio/ch02.html
-#usr/share/gtk-doc/html/gio/ch03.html
-#usr/share/gtk-doc/html/gio/ch32.html
-#usr/share/gtk-doc/html/gio/ch33.html
-#usr/share/gtk-doc/html/gio/ch33s02.html
-#usr/share/gtk-doc/html/gio/ch33s03.html
-#usr/share/gtk-doc/html/gio/ch34.html
-#usr/share/gtk-doc/html/gio/ch34s02.html
-#usr/share/gtk-doc/html/gio/ch34s03.html
-#usr/share/gtk-doc/html/gio/ch34s04.html
-#usr/share/gtk-doc/html/gio/ch34s05.html
-#usr/share/gtk-doc/html/gio/ch34s06.html
-#usr/share/gtk-doc/html/gio/ch34s07.html
-#usr/share/gtk-doc/html/gio/ch35.html
-#usr/share/gtk-doc/html/gio/ch35s02.html
-#usr/share/gtk-doc/html/gio/ch35s03.html
-#usr/share/gtk-doc/html/gio/ch35s04.html
-#usr/share/gtk-doc/html/gio/conversion.html
-#usr/share/gtk-doc/html/gio/data-models.html
-#usr/share/gtk-doc/html/gio/extending-gio.html
-#usr/share/gtk-doc/html/gio/extending.html
-#usr/share/gtk-doc/html/gio/failable_initialization.html
-#usr/share/gtk-doc/html/gio/file_mon.html
-#usr/share/gtk-doc/html/gio/file_ops.html
-#usr/share/gtk-doc/html/gio/gapplication-tool.html
-#usr/share/gtk-doc/html/gio/gdbus-codegen.html
-#usr/share/gtk-doc/html/gio/gdbus-convenience.html
-#usr/share/gtk-doc/html/gio/gdbus-example-gdbus-codegen.html
-#usr/share/gtk-doc/html/gio/gdbus-lowlevel.html
-#usr/share/gtk-doc/html/gio/gdbus.html
-#usr/share/gtk-doc/html/gio/gio-D-Bus-Addresses.html
-#usr/share/gtk-doc/html/gio/gio-D-Bus-Introspection-Data.html
-#usr/share/gtk-doc/html/gio/gio-D-Bus-Utilities.html
-#usr/share/gtk-doc/html/gio/gio-Desktop-file-based-GAppInfo.html
-#usr/share/gtk-doc/html/gio/gio-Extension-Points.html
-#usr/share/gtk-doc/html/gio/gio-GActionGroup-exporter.html
-#usr/share/gtk-doc/html/gio/gio-GContentType.html
-#usr/share/gtk-doc/html/gio/gio-GConverterInputstream.html
-#usr/share/gtk-doc/html/gio/gio-GConverterOutputstream.html
-#usr/share/gtk-doc/html/gio/gio-GDBusError.html
-#usr/share/gtk-doc/html/gio/gio-GFileAttribute.html
-#usr/share/gtk-doc/html/gio/gio-GIOError.html
-#usr/share/gtk-doc/html/gio/gio-GIOScheduler.html
-#usr/share/gtk-doc/html/gio/gio-GMenuModel-exporter.html
-#usr/share/gtk-doc/html/gio/gio-GSettingsSchema-GSettingsSchemaSource.html
-#usr/share/gtk-doc/html/gio/gio-GWin32InputStream.html
-#usr/share/gtk-doc/html/gio/gio-GWin32OutputStream.html
-#usr/share/gtk-doc/html/gio/gio-GWin32RegistryKey.html
-#usr/share/gtk-doc/html/gio/gio-Owning-Bus-Names.html
-#usr/share/gtk-doc/html/gio/gio-TLS-Overview.html
-#usr/share/gtk-doc/html/gio/gio-Unix-Mounts.html
-#usr/share/gtk-doc/html/gio/gio-Watching-Bus-Names.html
-#usr/share/gtk-doc/html/gio/gio-gnetworking.h.html
-#usr/share/gtk-doc/html/gio/gio-gpollableutils.html
-#usr/share/gtk-doc/html/gio/gio-hierarchy.html
-#usr/share/gtk-doc/html/gio/gio-querymodules.html
-#usr/share/gtk-doc/html/gio/gio.devhelp2
-#usr/share/gtk-doc/html/gio/gio.html
-#usr/share/gtk-doc/html/gio/glib-compile-resources.html
-#usr/share/gtk-doc/html/gio/glib-compile-schemas.html
-#usr/share/gtk-doc/html/gio/gresource-tool.html
-#usr/share/gtk-doc/html/gio/gsettings-tool.html
-#usr/share/gtk-doc/html/gio/gvfs-overview.png
-#usr/share/gtk-doc/html/gio/highlevel-socket.html
-#usr/share/gtk-doc/html/gio/home.png
-#usr/share/gtk-doc/html/gio/icons.html
-#usr/share/gtk-doc/html/gio/index.html
-#usr/share/gtk-doc/html/gio/left-insensitive.png
-#usr/share/gtk-doc/html/gio/left.png
-#usr/share/gtk-doc/html/gio/menu-example.png
-#usr/share/gtk-doc/html/gio/menu-model.png
-#usr/share/gtk-doc/html/gio/migrating.html
-#usr/share/gtk-doc/html/gio/networking.html
-#usr/share/gtk-doc/html/gio/permissions.html
-#usr/share/gtk-doc/html/gio/pt01.html
-#usr/share/gtk-doc/html/gio/pt02.html
-#usr/share/gtk-doc/html/gio/registry.html
-#usr/share/gtk-doc/html/gio/resolver.html
-#usr/share/gtk-doc/html/gio/resources.html
-#usr/share/gtk-doc/html/gio/right-insensitive.png
-#usr/share/gtk-doc/html/gio/right.png
-#usr/share/gtk-doc/html/gio/running-gio-apps.html
-#usr/share/gtk-doc/html/gio/settings.html
-#usr/share/gtk-doc/html/gio/streaming.html
-#usr/share/gtk-doc/html/gio/style.css
-#usr/share/gtk-doc/html/gio/subprocesses.html
-#usr/share/gtk-doc/html/gio/testing.html
-#usr/share/gtk-doc/html/gio/tls.html
-#usr/share/gtk-doc/html/gio/tools.html
-#usr/share/gtk-doc/html/gio/types.html
-#usr/share/gtk-doc/html/gio/up-insensitive.png
-#usr/share/gtk-doc/html/gio/up.png
-#usr/share/gtk-doc/html/gio/utils.html
-#usr/share/gtk-doc/html/gio/volume_mon.html
-#usr/share/gtk-doc/html/glib
-#usr/share/gtk-doc/html/glib/Sorted_binary_tree_breadth-first_traversal.svg
-#usr/share/gtk-doc/html/glib/Sorted_binary_tree_inorder.svg
-#usr/share/gtk-doc/html/glib/Sorted_binary_tree_postorder.svg
-#usr/share/gtk-doc/html/glib/Sorted_binary_tree_preorder.svg
-#usr/share/gtk-doc/html/glib/annotation-glossary.html
-#usr/share/gtk-doc/html/glib/api-index-full.html
-#usr/share/gtk-doc/html/glib/deprecated.html
-#usr/share/gtk-doc/html/glib/file-name-encodings.png
-#usr/share/gtk-doc/html/glib/glib-Arrays.html
-#usr/share/gtk-doc/html/glib/glib-Asynchronous-Queues.html
-#usr/share/gtk-doc/html/glib/glib-Atomic-Operations.html
-#usr/share/gtk-doc/html/glib/glib-Automatic-String-Completion.html
-#usr/share/gtk-doc/html/glib/glib-Balanced-Binary-Trees.html
-#usr/share/gtk-doc/html/glib/glib-Base64-Encoding.html
-#usr/share/gtk-doc/html/glib/glib-Basic-Types.html
-#usr/share/gtk-doc/html/glib/glib-Bookmark-file-parser.html
-#usr/share/gtk-doc/html/glib/glib-Bounds-checked-integer-arithmetic.html
-#usr/share/gtk-doc/html/glib/glib-Byte-Arrays.html
-#usr/share/gtk-doc/html/glib/glib-Byte-Order-Macros.html
-#usr/share/gtk-doc/html/glib/glib-Caches.html
-#usr/share/gtk-doc/html/glib/glib-Character-Set-Conversion.html
-#usr/share/gtk-doc/html/glib/glib-Commandline-option-parser.html
-#usr/share/gtk-doc/html/glib/glib-Data-Checksums.html
-#usr/share/gtk-doc/html/glib/glib-Data-HMACs.html
-#usr/share/gtk-doc/html/glib/glib-Datasets.html
-#usr/share/gtk-doc/html/glib/glib-Date-and-Time-Functions.html
-#usr/share/gtk-doc/html/glib/glib-Deprecated-Thread-APIs.html
-#usr/share/gtk-doc/html/glib/glib-Double-ended-Queues.html
-#usr/share/gtk-doc/html/glib/glib-Doubly-Linked-Lists.html
-#usr/share/gtk-doc/html/glib/glib-Dynamic-Loading-of-Modules.html
-#usr/share/gtk-doc/html/glib/glib-Error-Reporting.html
-#usr/share/gtk-doc/html/glib/glib-File-Utilities.html
-#usr/share/gtk-doc/html/glib/glib-GDateTime.html
-#usr/share/gtk-doc/html/glib/glib-GTimeZone.html
-#usr/share/gtk-doc/html/glib/glib-GUuid.html
-#usr/share/gtk-doc/html/glib/glib-GVariant.html
-#usr/share/gtk-doc/html/glib/glib-GVariantType.html
-#usr/share/gtk-doc/html/glib/glib-Glob-style-pattern-matching.html
-#usr/share/gtk-doc/html/glib/glib-Hash-Tables.html
-#usr/share/gtk-doc/html/glib/glib-Hook-Functions.html
-#usr/share/gtk-doc/html/glib/glib-Hostname-Utilities.html
-#usr/share/gtk-doc/html/glib/glib-I18N.html
-#usr/share/gtk-doc/html/glib/glib-IO-Channels.html
-#usr/share/gtk-doc/html/glib/glib-Key-value-file-parser.html
-#usr/share/gtk-doc/html/glib/glib-Keyed-Data-Lists.html
-#usr/share/gtk-doc/html/glib/glib-Lexical-Scanner.html
-#usr/share/gtk-doc/html/glib/glib-Memory-Allocation.html
-#usr/share/gtk-doc/html/glib/glib-Memory-Slices.html
-#usr/share/gtk-doc/html/glib/glib-Message-Logging.html
-#usr/share/gtk-doc/html/glib/glib-Miscellaneous-Macros.html
-#usr/share/gtk-doc/html/glib/glib-Miscellaneous-Utility-Functions.html
-#usr/share/gtk-doc/html/glib/glib-N-ary-Trees.html
-#usr/share/gtk-doc/html/glib/glib-Numerical-Definitions.html
-#usr/share/gtk-doc/html/glib/glib-Perl-compatible-regular-expressions.html
-#usr/share/gtk-doc/html/glib/glib-Pointer-Arrays.html
-#usr/share/gtk-doc/html/glib/glib-Quarks.html
-#usr/share/gtk-doc/html/glib/glib-Random-Numbers.html
-#usr/share/gtk-doc/html/glib/glib-Relations-and-Tuples.html
-#usr/share/gtk-doc/html/glib/glib-Sequences.html
-#usr/share/gtk-doc/html/glib/glib-Shell-related-Utilities.html
-#usr/share/gtk-doc/html/glib/glib-Simple-XML-Subset-Parser.html
-#usr/share/gtk-doc/html/glib/glib-Singly-Linked-Lists.html
-#usr/share/gtk-doc/html/glib/glib-Spawning-Processes.html
-#usr/share/gtk-doc/html/glib/glib-Standard-Macros.html
-#usr/share/gtk-doc/html/glib/glib-String-Chunks.html
-#usr/share/gtk-doc/html/glib/glib-String-Utility-Functions.html
-#usr/share/gtk-doc/html/glib/glib-Strings.html
-#usr/share/gtk-doc/html/glib/glib-Testing.html
-#usr/share/gtk-doc/html/glib/glib-The-Main-Event-Loop.html
-#usr/share/gtk-doc/html/glib/glib-Thread-Pools.html
-#usr/share/gtk-doc/html/glib/glib-Threads.html
-#usr/share/gtk-doc/html/glib/glib-Timers.html
-#usr/share/gtk-doc/html/glib/glib-Trash-Stacks.html
-#usr/share/gtk-doc/html/glib/glib-Type-Conversion-Macros.html
-#usr/share/gtk-doc/html/glib/glib-UNIX-specific-utilities-and-integration.html
-#usr/share/gtk-doc/html/glib/glib-URI-Functions.html
-#usr/share/gtk-doc/html/glib/glib-Unicode-Manipulation.html
-#usr/share/gtk-doc/html/glib/glib-Version-Information.html
-#usr/share/gtk-doc/html/glib/glib-Warnings-and-Assertions.html
-#usr/share/gtk-doc/html/glib/glib-Windows-Compatibility-Functions.html
-#usr/share/gtk-doc/html/glib/glib-building.html
-#usr/share/gtk-doc/html/glib/glib-changes.html
-#usr/share/gtk-doc/html/glib/glib-compiling.html
-#usr/share/gtk-doc/html/glib/glib-core.html
-#usr/share/gtk-doc/html/glib/glib-cross-compiling.html
-#usr/share/gtk-doc/html/glib/glib-data-types.html
-#usr/share/gtk-doc/html/glib/glib-fundamentals.html
-#usr/share/gtk-doc/html/glib/glib-gettextize.html
-#usr/share/gtk-doc/html/glib/glib-programming.html
-#usr/share/gtk-doc/html/glib/glib-regex-syntax.html
-#usr/share/gtk-doc/html/glib/glib-resources.html
-#usr/share/gtk-doc/html/glib/glib-running.html
-#usr/share/gtk-doc/html/glib/glib-utilities.html
-#usr/share/gtk-doc/html/glib/glib.devhelp2
-#usr/share/gtk-doc/html/glib/glib.html
-#usr/share/gtk-doc/html/glib/gtester-report.html
-#usr/share/gtk-doc/html/glib/gtester.html
-#usr/share/gtk-doc/html/glib/gvariant-format-strings.html
-#usr/share/gtk-doc/html/glib/gvariant-text.html
-#usr/share/gtk-doc/html/glib/home.png
-#usr/share/gtk-doc/html/glib/index.html
-#usr/share/gtk-doc/html/glib/left-insensitive.png
-#usr/share/gtk-doc/html/glib/left.png
-#usr/share/gtk-doc/html/glib/mainloop-states.gif
-#usr/share/gtk-doc/html/glib/right-insensitive.png
-#usr/share/gtk-doc/html/glib/right.png
-#usr/share/gtk-doc/html/glib/style.css
-#usr/share/gtk-doc/html/glib/tools.html
-#usr/share/gtk-doc/html/glib/up-insensitive.png
-#usr/share/gtk-doc/html/glib/up.png
-#usr/share/gtk-doc/html/gobject
-#usr/share/gtk-doc/html/gobject/GBinding.html
-#usr/share/gtk-doc/html/gobject/GTypeModule.html
-#usr/share/gtk-doc/html/gobject/GTypePlugin.html
-#usr/share/gtk-doc/html/gobject/annotation-glossary.html
-#usr/share/gtk-doc/html/gobject/api-index-full.html
-#usr/share/gtk-doc/html/gobject/ch01s02.html
-#usr/share/gtk-doc/html/gobject/chapter-gobject.html
-#usr/share/gtk-doc/html/gobject/chapter-gtype.html
-#usr/share/gtk-doc/html/gobject/chapter-intro.html
-#usr/share/gtk-doc/html/gobject/chapter-signal.html
-#usr/share/gtk-doc/html/gobject/glib-genmarshal.html
-#usr/share/gtk-doc/html/gobject/glib-mkenums.html
-#usr/share/gtk-doc/html/gobject/glue.png
-#usr/share/gtk-doc/html/gobject/gobject-Boxed-Types.html
-#usr/share/gtk-doc/html/gobject/gobject-Closures.html
-#usr/share/gtk-doc/html/gobject/gobject-Enumeration-and-Flag-Types.html
-#usr/share/gtk-doc/html/gobject/gobject-GParamSpec.html
-#usr/share/gtk-doc/html/gobject/gobject-Generic-values.html
-#usr/share/gtk-doc/html/gobject/gobject-Signals.html
-#usr/share/gtk-doc/html/gobject/gobject-Standard-Parameter-and-Value-Types.html
-#usr/share/gtk-doc/html/gobject/gobject-The-Base-Object-Type.html
-#usr/share/gtk-doc/html/gobject/gobject-Type-Information.html
-#usr/share/gtk-doc/html/gobject/gobject-Value-arrays.html
-#usr/share/gtk-doc/html/gobject/gobject-Varargs-Value-Collection.html
-#usr/share/gtk-doc/html/gobject/gobject-memory.html
-#usr/share/gtk-doc/html/gobject/gobject-properties.html
-#usr/share/gtk-doc/html/gobject/gobject-query.html
-#usr/share/gtk-doc/html/gobject/gobject.devhelp2
-#usr/share/gtk-doc/html/gobject/gtype-conventions.html
-#usr/share/gtk-doc/html/gobject/gtype-instantiable-classed.html
-#usr/share/gtk-doc/html/gobject/gtype-non-instantiable-classed.html
-#usr/share/gtk-doc/html/gobject/gtype-non-instantiable.html
-#usr/share/gtk-doc/html/gobject/home.png
-#usr/share/gtk-doc/html/gobject/howto-gobject-chainup.html
-#usr/share/gtk-doc/html/gobject/howto-gobject-code.html
-#usr/share/gtk-doc/html/gobject/howto-gobject-construction.html
-#usr/share/gtk-doc/html/gobject/howto-gobject-destruction.html
-#usr/share/gtk-doc/html/gobject/howto-gobject-methods.html
-#usr/share/gtk-doc/html/gobject/howto-gobject.html
-#usr/share/gtk-doc/html/gobject/howto-interface-implement.html
-#usr/share/gtk-doc/html/gobject/howto-interface-override.html
-#usr/share/gtk-doc/html/gobject/howto-interface-prerequisite.html
-#usr/share/gtk-doc/html/gobject/howto-interface-properties.html
-#usr/share/gtk-doc/html/gobject/howto-interface.html
-#usr/share/gtk-doc/html/gobject/howto-signals.html
-#usr/share/gtk-doc/html/gobject/index.html
-#usr/share/gtk-doc/html/gobject/left-insensitive.png
-#usr/share/gtk-doc/html/gobject/left.png
-#usr/share/gtk-doc/html/gobject/pr01.html
-#usr/share/gtk-doc/html/gobject/pt01.html
-#usr/share/gtk-doc/html/gobject/pt02.html
-#usr/share/gtk-doc/html/gobject/pt03.html
-#usr/share/gtk-doc/html/gobject/right-insensitive.png
-#usr/share/gtk-doc/html/gobject/right.png
-#usr/share/gtk-doc/html/gobject/rn01.html
-#usr/share/gtk-doc/html/gobject/rn02.html
-#usr/share/gtk-doc/html/gobject/signal.html
-#usr/share/gtk-doc/html/gobject/style.css
-#usr/share/gtk-doc/html/gobject/tools-ginspector.html
-#usr/share/gtk-doc/html/gobject/tools-gob.html
-#usr/share/gtk-doc/html/gobject/tools-gtkdoc.html
-#usr/share/gtk-doc/html/gobject/tools-refdb.html
-#usr/share/gtk-doc/html/gobject/tools-vala.html
-#usr/share/gtk-doc/html/gobject/up-insensitive.png
-#usr/share/gtk-doc/html/gobject/up.png
#usr/share/locale/af/LC_MESSAGES/glib20.mo
#usr/share/locale/am
#usr/share/locale/am/LC_MESSAGES
@@ -843,8 +416,6 @@ usr/lib/libgthread-2.0.so.0.5400.3
#usr/share/locale/is/LC_MESSAGES/glib20.mo
#usr/share/locale/it/LC_MESSAGES/glib20.mo
#usr/share/locale/ja/LC_MESSAGES/glib20.mo
-#usr/share/locale/ka
-#usr/share/locale/ka/LC_MESSAGES
#usr/share/locale/ka/LC_MESSAGES/glib20.mo
#usr/share/locale/kk/LC_MESSAGES/glib20.mo
#usr/share/locale/kn/LC_MESSAGES/glib20.mo
diff --git a/lfs/glib b/lfs/glib
index 662caab90..66d5ffc8b 100644
--- a/lfs/glib
+++ b/lfs/glib
@@ -24,7 +24,7 @@
include Config
-VER = 2.54.3
+VER = 2.68.1
THISAPP = glib-$(VER)
DL_FILE = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 16e886ad677bf07b7d48eb8188bcf759
+$(DL_FILE)_MD5 = bc9f2250be1f773bb17747d3b2e6a3ae
install : $(TARGET)
@@ -71,10 +71,11 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
$(UPDATE_AUTOMAKE)
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glib-2.54.3-compile-fixes-1.patch
- cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc \
- --with-pcre=system
- cd $(DIR_APP) && make $(MAKETUNING)
- cd $(DIR_APP) && make install
+ cd $(DIR_APP) && meson --prefix=/usr \
+ --sysconfdir=/etc \
+ -D internal_pcre=false \
+ builddir/
+ cd $(DIR_APP) && ninja -C builddir/
+ cd $(DIR_APP) && ninja -C builddir/ install
@rm -rf $(DIR_APP)
@$(POSTBUILD)
diff --git a/src/patches/glib-2.54.3-compile-fixes-1.patch b/src/patches/glib-2.54.3-compile-fixes-1.patch
deleted file mode 100644
index ecf30ded5..000000000
--- a/src/patches/glib-2.54.3-compile-fixes-1.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From 566e1d61a500267c7849ad0b2552feec9c9a29a6 Mon Sep 17 00:00:00 2001
-From: Ernestas Kulik <ekulik(a)redhat.com>
-Date: Tue, 29 Jan 2019 09:50:46 +0100
-Subject: [PATCH] gdbus: Avoid printing null strings
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This mostly affects the 2.56 branch, but, given that GCC 9 is being
-stricter about passing null string pointers to printf-like functions, it
-might make sense to proactively fix such calls.
-
-gdbusauth.c: In function '_g_dbus_auth_run_server':
-gdbusauth.c:1302:11: error: '%s' directive argument is null
-[-Werror=format-overflow=]
- 1302 | debug_print ("SERVER: WaitingForBegin, read '%s'",
- line);
- |
-
-gdbusmessage.c: In function ‘g_dbus_message_to_blob’:
-gdbusmessage.c:2730:30: error: ‘%s’ directive argument is null [-Werror=format-overflow=]
- 2730 | tupled_signature_str = g_strdup_printf ("(%s)", signature_str);
- |
----
- gio/gdbusauth.c | 2 +-
- gio/gdbusmessage.c | 5 ++---
- 2 files changed, 3 insertions(+), 4 deletions(-)
-
-diff --git a/gio/gdbusauth.c b/gio/gdbusauth.c
-index 1f8ea8057..752ec23fc 100644
---- a/gio/gdbusauth.c
-+++ b/gio/gdbusauth.c
-@@ -1272,9 +1272,9 @@ _g_dbus_auth_run_server (GDBusAuth *auth,
- &line_length,
- cancellable,
- error);
-- debug_print ("SERVER: WaitingForBegin, read '%s'", line);
- if (line == NULL)
- goto out;
-+ debug_print ("SERVER: WaitingForBegin, read '%s'", line);
- if (g_strcmp0 (line, "BEGIN") == 0)
- {
- /* YAY, done! */
-diff --git a/gio/gdbusmessage.c b/gio/gdbusmessage.c
-index 3221b925d..3a1a1f9e9 100644
---- a/gio/gdbusmessage.c
-+++ b/gio/gdbusmessage.c
-@@ -2731,7 +2731,6 @@ g_dbus_message_to_blob (GDBusMessage *message,
- if (message->body != NULL)
- {
- gchar *tupled_signature_str;
-- tupled_signature_str = g_strdup_printf ("(%s)", signature_str);
- if (signature == NULL)
- {
- g_set_error (error,
-@@ -2739,10 +2738,10 @@ g_dbus_message_to_blob (GDBusMessage *message,
- G_IO_ERROR_INVALID_ARGUMENT,
- _("Message body has signature “%s” but there is no signature header"),
- signature_str);
-- g_free (tupled_signature_str);
- goto out;
- }
-- else if (g_strcmp0 (tupled_signature_str, g_variant_get_type_string (message->body)) != 0)
-+ tupled_signature_str = g_strdup_printf ("(%s)", signature_str);
-+ if (g_strcmp0 (tupled_signature_str, g_variant_get_type_string (message->body)) != 0)
- {
- g_set_error (error,
- G_IO_ERROR,
---
-2.22.0
-
--
2.31.1