diff --git a/config/rootfiles/common/glib b/config/rootfiles/common/glib index 93ea84a26..7eab31554 100644 --- a/config/rootfiles/common/glib +++ b/config/rootfiles/common/glib @@ -127,6 +127,7 @@ #usr/include/glib-2.0/gio/gpollableinputstream.h #usr/include/glib-2.0/gio/gpollableoutputstream.h #usr/include/glib-2.0/gio/gpollableutils.h +#usr/include/glib-2.0/gio/gpowerprofilemonitor.h #usr/include/glib-2.0/gio/gpropertyaction.h #usr/include/glib-2.0/gio/gproxy.h #usr/include/glib-2.0/gio/gproxyaddress.h @@ -295,19 +296,19 @@ #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.6900.0 +usr/lib/libgio-2.0.so.0.7000.1 #usr/lib/libglib-2.0.so usr/lib/libglib-2.0.so.0 -usr/lib/libglib-2.0.so.0.6900.0 +usr/lib/libglib-2.0.so.0.7000.1 #usr/lib/libgmodule-2.0.so usr/lib/libgmodule-2.0.so.0 -usr/lib/libgmodule-2.0.so.0.6900.0 +usr/lib/libgmodule-2.0.so.0.7000.1 #usr/lib/libgobject-2.0.so usr/lib/libgobject-2.0.so.0 -usr/lib/libgobject-2.0.so.0.6900.0 +usr/lib/libgobject-2.0.so.0.7000.1 #usr/lib/libgthread-2.0.so usr/lib/libgthread-2.0.so.0 -usr/lib/libgthread-2.0.so.0.6900.0 +usr/lib/libgthread-2.0.so.0.7000.1 #usr/lib/pkgconfig/gio-2.0.pc #usr/lib/pkgconfig/gio-unix-2.0.pc #usr/lib/pkgconfig/glib-2.0.pc @@ -327,8 +328,8 @@ usr/lib/libgthread-2.0.so.0.6900.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.6900.0-gdb.py -#usr/share/gdb/auto-load/usr/lib/libgobject-2.0.so.0.6900.0-gdb.py +#usr/share/gdb/auto-load/usr/lib/libglib-2.0.so.0.7000.1-gdb.py +#usr/share/gdb/auto-load/usr/lib/libgobject-2.0.so.0.7000.1-gdb.py #usr/share/gettext/its #usr/share/gettext/its/gschema.its #usr/share/gettext/its/gschema.loc diff --git a/lfs/glib b/lfs/glib index 58c45415a..228a69b9f 100644 --- a/lfs/glib +++ b/lfs/glib @@ -24,7 +24,7 @@ include Config -VER = 2.69.0 +VER = 2.70.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 = 1235b943e4f9c36e2f046ffe43dcad03 +$(DL_FILE)_MD5 = fb613d21fabce3d3d8520f37d12bd473 install : $(TARGET) @@ -73,7 +73,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) $(UPDATE_AUTOMAKE) cd $(DIR_APP) && meson --prefix=/usr \ --sysconfdir=/etc \ - -D internal_pcre=false \ builddir/ cd $(DIR_APP) && ninja -C builddir/ $(MAKETUNING) cd $(DIR_APP) && ninja -C builddir/ install