diff --git a/config/rootfiles/common/glib b/config/rootfiles/common/glib index 4481c2c7e..02f0ba74c 100644 --- a/config/rootfiles/common/glib +++ b/config/rootfiles/common/glib @@ -181,6 +181,33 @@ usr/include/glib-2.0/gio/gdebugcontroller.h #usr/include/glib-2.0/gio/gvolumemonitor.h #usr/include/glib-2.0/gio/gzlibcompressor.h #usr/include/glib-2.0/gio/gzlibdecompressor.h +#usr/include/glib-2.0/girepository +#usr/include/glib-2.0/girepository/gi-visibility.h +#usr/include/glib-2.0/girepository/giarginfo.h +#usr/include/glib-2.0/girepository/gibaseinfo.h +#usr/include/glib-2.0/girepository/giboxedinfo.h +#usr/include/glib-2.0/girepository/gicallableinfo.h +#usr/include/glib-2.0/girepository/gicallbackinfo.h +#usr/include/glib-2.0/girepository/giconstantinfo.h +#usr/include/glib-2.0/girepository/gienuminfo.h +#usr/include/glib-2.0/girepository/gifieldinfo.h +#usr/include/glib-2.0/girepository/giflagsinfo.h +#usr/include/glib-2.0/girepository/gifunctioninfo.h +#usr/include/glib-2.0/girepository/giinterfaceinfo.h +#usr/include/glib-2.0/girepository/giobjectinfo.h +#usr/include/glib-2.0/girepository/gipropertyinfo.h +#usr/include/glib-2.0/girepository/giregisteredtypeinfo.h +#usr/include/glib-2.0/girepository/girepository.h +#usr/include/glib-2.0/girepository/girffi.h +#usr/include/glib-2.0/girepository/gisignalinfo.h +#usr/include/glib-2.0/girepository/gistructinfo.h +#usr/include/glib-2.0/girepository/gitypeinfo.h +#usr/include/glib-2.0/girepository/gitypelib.h +#usr/include/glib-2.0/girepository/gitypes.h +#usr/include/glib-2.0/girepository/giunioninfo.h +#usr/include/glib-2.0/girepository/giunresolvedinfo.h +#usr/include/glib-2.0/girepository/givalueinfo.h +#usr/include/glib-2.0/girepository/givfuncinfo.h #usr/include/glib-2.0/glib #usr/include/glib-2.0/glib-object.h #usr/include/glib-2.0/glib-unix.h @@ -308,21 +335,25 @@ usr/include/glib-2.0/gio/gdebugcontroller.h #usr/lib/glib-2.0/include/glibconfig.h #usr/lib/libgio-2.0.so usr/lib/libgio-2.0.so.0 -usr/lib/libgio-2.0.so.0.7700.0 +usr/lib/libgio-2.0.so.0.7901.0 +#usr/lib/libgirepository-2.0.so +usr/lib/libgirepository-2.0.so.0 +usr/lib/libgirepository-2.0.so.0.7901.0 #usr/lib/libglib-2.0.so usr/lib/libglib-2.0.so.0 -usr/lib/libglib-2.0.so.0.7700.0 +usr/lib/libglib-2.0.so.0.7901.0 #usr/lib/libgmodule-2.0.so usr/lib/libgmodule-2.0.so.0 -usr/lib/libgmodule-2.0.so.0.7700.0 +usr/lib/libgmodule-2.0.so.0.7901.0 #usr/lib/libgobject-2.0.so usr/lib/libgobject-2.0.so.0 -usr/lib/libgobject-2.0.so.0.7700.0 +usr/lib/libgobject-2.0.so.0.7901.0 #usr/lib/libgthread-2.0.so usr/lib/libgthread-2.0.so.0 -usr/lib/libgthread-2.0.so.0.7700.0 +usr/lib/libgthread-2.0.so.0.7901.0 #usr/lib/pkgconfig/gio-2.0.pc #usr/lib/pkgconfig/gio-unix-2.0.pc +#usr/lib/pkgconfig/girepository-2.0.pc #usr/lib/pkgconfig/glib-2.0.pc #usr/lib/pkgconfig/gmodule-2.0.pc #usr/lib/pkgconfig/gmodule-export-2.0.pc @@ -342,8 +373,8 @@ usr/lib/libgthread-2.0.so.0.7700.0 #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.7700.0-gdb.py -#usr/share/gdb/auto-load/usr/lib/libgobject-2.0.so.0.7700.0-gdb.py +#usr/share/gdb/auto-load/usr/lib/libglib-2.0.so.0.7901.0-gdb.py +#usr/share/gdb/auto-load/usr/lib/libgobject-2.0.so.0.7901.0-gdb.py #usr/share/gettext/its #usr/share/gettext/its/gschema.its #usr/share/gettext/its/gschema.loc @@ -359,6 +390,8 @@ usr/lib/libgthread-2.0.so.0.7700.0 #usr/share/glib-2.0/codegen/dbustypes.py #usr/share/glib-2.0/codegen/parser.py #usr/share/glib-2.0/codegen/utils.py +#usr/share/glib-2.0/dtds +#usr/share/glib-2.0/dtds/gresource.dtd #usr/share/glib-2.0/gdb #usr/share/glib-2.0/gdb/glib_gdb.py #usr/share/glib-2.0/gdb/gobject_gdb.py @@ -571,4 +604,3 @@ usr/lib/libgthread-2.0.so.0.7700.0 #usr/share/locale/zh_HK/LC_MESSAGES #usr/share/locale/zh_HK/LC_MESSAGES/glib20.mo #usr/share/locale/zh_TW/LC_MESSAGES/glib20.mo - diff --git a/lfs/glib b/lfs/glib index 20e95b4ab..a7b30443a 100644 --- a/lfs/glib +++ b/lfs/glib @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2023 IPFire Team # +# Copyright (C) 2007-2024 IPFire Team # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@ include Config -VER = 2.77.0 +VER = 2.79.1 THISAPP = glib-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = da610dfd6a9a95de0bcd92a939dc7ae27a2f2cfcd9c6df803948e43de90473b17d84b1463c5173b0b87ddef132d8784de5ad2df2482cd4a97625324d5adf65b7 +$(DL_FILE)_BLAKE2 = 04398f3bb816b174ca86d9329aab9e477977a9f84c8ee77917179f00527d11b060af8467c7748bdbd5a8a25ec8d8fbc5866d912a8cc1a020118e57789d55a9e6 install : $(TARGET) @@ -72,8 +72,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) $(UPDATE_AUTOMAKE) cd $(DIR_APP) && meson --prefix=/usr \ - --sysconfdir=/etc \ - builddir/ + --sysconfdir=/etc \ + builddir/ cd $(DIR_APP) && ninja -C builddir/ $(MAKETUNING) cd $(DIR_APP) && ninja -C builddir/ install @rm -rf $(DIR_APP) diff --git a/make.sh b/make.sh index 546cdc0af..40627f163 100755 --- a/make.sh +++ b/make.sh @@ -1150,6 +1150,9 @@ buildipfire() { lfsmake2 dracut lfsmake2 lvm2 lfsmake2 multipath-tools + lfsmake2 python3-toml + lfsmake2 python3-pyproject2setuppy + lfsmake2 python3-packaging lfsmake2 glib lfsmake2 libgudev lfsmake2 libgpg-error @@ -1487,8 +1490,6 @@ buildipfire() { lfsmake2 elinks lfsmake2 igmpproxy lfsmake2 opus - lfsmake2 python3-toml - lfsmake2 python3-pyproject2setuppy lfsmake2 python3-pyparsing lfsmake2 spice-protocol lfsmake2 spice @@ -1572,7 +1573,6 @@ buildipfire() { lfsmake2 python3-install lfsmake2 python3-urllib3 lfsmake2 python3-flit - lfsmake2 python3-packaging lfsmake2 python3-typing-extensions lfsmake2 python3-semantic-version lfsmake2 python3-setuptools-scm @@ -1656,6 +1656,9 @@ buildipfire() { lfsmake2 dnsdist lfsmake2 bird lfsmake2 libyang + lfsmake2 abseil-cpp + lfsmake2 protobuf + lfsmake2 protobuf-c lfsmake2 frr lfsmake2 dmidecode lfsmake2 mcelog