From 672783030e9a82c9d965e59bc6af1310ed2c8bde Mon Sep 17 00:00:00 2001
From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Fri, 23 Jul 2021 13:47:07 +0200
Subject: [PATCH] glib: update to 2.69.0

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
---
 config/rootfiles/common/glib | 15 ++++++++-------
 lfs/glib                     |  6 +++---
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/config/rootfiles/common/glib b/config/rootfiles/common/glib
index d3973a99d9..93ea84a26a 100644
--- a/config/rootfiles/common/glib
+++ b/config/rootfiles/common/glib
@@ -217,6 +217,7 @@
 #usr/include/glib-2.0/glib/giochannel.h
 #usr/include/glib-2.0/glib/gkeyfile.h
 #usr/include/glib-2.0/glib/glib-autocleanups.h
+#usr/include/glib-2.0/glib/glib-typeof.h
 #usr/include/glib-2.0/glib/glist.h
 #usr/include/glib-2.0/glib/gmacros.h
 #usr/include/glib-2.0/glib/gmain.h
@@ -294,19 +295,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.6800.3
+usr/lib/libgio-2.0.so.0.6900.0
 #usr/lib/libglib-2.0.so
 usr/lib/libglib-2.0.so.0
-usr/lib/libglib-2.0.so.0.6800.3
+usr/lib/libglib-2.0.so.0.6900.0
 #usr/lib/libgmodule-2.0.so
 usr/lib/libgmodule-2.0.so.0
-usr/lib/libgmodule-2.0.so.0.6800.3
+usr/lib/libgmodule-2.0.so.0.6900.0
 #usr/lib/libgobject-2.0.so
 usr/lib/libgobject-2.0.so.0
-usr/lib/libgobject-2.0.so.0.6800.3
+usr/lib/libgobject-2.0.so.0.6900.0
 #usr/lib/libgthread-2.0.so
 usr/lib/libgthread-2.0.so.0
-usr/lib/libgthread-2.0.so.0.6800.3
+usr/lib/libgthread-2.0.so.0.6900.0
 #usr/lib/pkgconfig/gio-2.0.pc
 #usr/lib/pkgconfig/gio-unix-2.0.pc
 #usr/lib/pkgconfig/glib-2.0.pc
@@ -326,8 +327,8 @@ usr/lib/libgthread-2.0.so.0.6800.3
 #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.6800.3-gdb.py
-#usr/share/gdb/auto-load/usr/lib/libgobject-2.0.so.0.6800.3-gdb.py
+#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/gettext/its
 #usr/share/gettext/its/gschema.its
 #usr/share/gettext/its/gschema.loc
diff --git a/lfs/glib b/lfs/glib
index 522c542581..cbf666f703 100644
--- a/lfs/glib
+++ b/lfs/glib
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2021  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # 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.68.3
+VER        = 2.69.0
 
 THISAPP    = glib-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = a3968c7510447f055fd2204ba947f80f
+$(DL_FILE)_MD5 = 1235b943e4f9c36e2f046ffe43dcad03
 
 install : $(TARGET)
 
-- 
2.39.2