summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilip Withnall <pwithnall@endlessos.org>2021-04-08 14:50:44 +0100
committerPhilip Withnall <pwithnall@endlessos.org>2021-04-08 14:50:44 +0100
commitc2954ecb04986852a8440b0db17292fe5af42f9b (patch)
treea3838cca4ac4fe7e1512a1a811dcc5d543392742
parentffc9ac559996a165231221571b61fff3b8af556e (diff)
2.68.12.68.1
Signed-off-by: Philip Withnall <pwithnall@endlessos.org>
-rw-r--r--NEWS21
-rw-r--r--meson.build2
2 files changed, 22 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index e23634ffe..0f0a50775 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,24 @@
+Overview of changes in GLib 2.68.1
+==================================
+
+* Fix a crash in `GKeyFile` when parsing a file which contains translations
+ using a `GKeyFile` instance which has loaded another file previously (#2361)
+
+* Pin GIO DLL in memory on Windows (!2016)
+
+* Bugs fixed:
+ - #2361 g_key_file_load_from_file segfaults on "Key[*]="like lines
+ - !1997 Backport !1996 “Include glibconfig.h to get the G_OS_UNIX token” to glib-2-68
+ - !2016 GIO W32: Pin gio DLL
+ - !2021 Backport MR !2016 (GIO W32: Pin gio DLL) into glib-2-68
+ - !2022 Few fixes and notes for building on Visual Studio 2012 and earlier
+ - !2034 Backport MR !2032 (gkeyfile: Drop a redundant check) into glib-2-68
+ - !2035 Backport !2026 “Split g_test_log() messages that contain multiple lines” to glib-2-68
+
+* Translation updates:
+ - English (United Kingdom)
+
+
Overview of changes in GLib 2.68.0
==================================
diff --git a/meson.build b/meson.build
index 7bde033b5..657c478e6 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
project('glib', 'c', 'cpp',
- version : '2.68.0',
+ version : '2.68.1',
# NOTE: We keep this pinned at 0.49 because that's what Debian 10 ships
meson_version : '>= 0.49.2',
default_options : [