SECURITY update to glib2-2.74.4.

This commit is contained in:
ajacoutot 2022-12-22 08:58:33 +00:00
parent 066badee03
commit cf5bc56aa6
4 changed files with 15 additions and 23 deletions

View File

@ -1,9 +1,8 @@
COMMENT= general-purpose utility library
GNOME_PROJECT= glib
GNOME_VERSION= 2.74.3
GNOME_VERSION= 2.74.4
PKGNAME= ${DISTNAME:S/glib/glib2/}
REVISION= 1
CATEGORIES= devel
@ -11,21 +10,15 @@ HOMEPAGE= http://www.gtk.org/
MAINTAINER= Antoine Jacoutot <ajacoutot@openbsd.org>
# https://gitlab.gnome.org/GNOME/glib/-/merge_requests/3125
MASTER_SITES0= https://gitlab.gnome.org/GNOME/glib/-/commit/
PATCH_DIST_STRIP= -p1
PATCHFILES= e16fb83755e08a4c2da2b0a8ea0fc2e27b1154bf.patch:0 \
31ec4dd01ada306ef1419badb5f701832ad5ad8e.patch:0
# according to upstream, there should never be a need to bump major; doing so
# would trigger an abort():
# GLib-GObject:ERROR:gvaluetypes.c:457:_g_value_types_init:
# assertion failed: (type == G_TYPE_CHAR)
SHARED_LIBS += glib-2.0 4201.9 # 0.7400.3
SHARED_LIBS += gobject-2.0 4200.16 # 0.7400.3
SHARED_LIBS += gthread-2.0 4200.16 # 0.7400.3
SHARED_LIBS += gmodule-2.0 4200.16 # 0.7400.3
SHARED_LIBS += gio-2.0 4200.16 # 0.7400.3
SHARED_LIBS += glib-2.0 4201.9 # 0.7400.4
SHARED_LIBS += gobject-2.0 4200.16 # 0.7400.4
SHARED_LIBS += gthread-2.0 4200.16 # 0.7400.4
SHARED_LIBS += gmodule-2.0 4200.16 # 0.7400.4
SHARED_LIBS += gio-2.0 4200.16 # 0.7400.4
# LGPLv2
PERMIT_PACKAGE= Yes

View File

@ -1,6 +1,2 @@
SHA256 (31ec4dd01ada306ef1419badb5f701832ad5ad8e.patch) = MV3JThkID+uj4wTchWH6ht3ZWY/8ahFh2TLZgGBVizg=
SHA256 (e16fb83755e08a4c2da2b0a8ea0fc2e27b1154bf.patch) = /3eKhjo4g3dbpO9pZrAEF5yZIkcD2u4bzYtka4SRChk=
SHA256 (glib-2.74.3.tar.xz) = 6bxB7NlpDZvGqXDMc4ARm4KOW2pLFsOTxjiz3CuHy8s=
SIZE (31ec4dd01ada306ef1419badb5f701832ad5ad8e.patch) = 11278
SIZE (e16fb83755e08a4c2da2b0a8ea0fc2e27b1154bf.patch) = 112509
SIZE (glib-2.74.3.tar.xz) = 5181732
SHA256 (glib-2.74.4.tar.xz) = DoLaXqEptERCJ8fkqeWY9yiNGZS/Y/EpxEuQz9JDIXI=
SIZE (glib-2.74.4.tar.xz) = 5208484

View File

@ -6,7 +6,7 @@ and doesn't fail to compile the test case (gint64 should be long long).
Index: meson.build
--- meson.build.orig
+++ meson.build
@@ -1422,18 +1422,6 @@ endif
@@ -1431,18 +1431,6 @@ endif
# works.
if long_long_size == long_size
if cc.compiles('''#if defined(_AIX) && !defined(__GNUC__)
@ -25,7 +25,7 @@ Index: meson.build
#pragma options langlvl=stdc99
#endif
#pragma GCC diagnostic error "-Wincompatible-pointer-types"
@@ -1445,6 +1433,18 @@ if long_long_size == long_size
@@ -1454,6 +1442,18 @@ if long_long_size == long_size
return 1;
}''', name : 'int64_t is long long')
int64_t_typedef = 'long long'

View File

@ -354,8 +354,8 @@ share/bash-completion/completions/gresource
share/bash-completion/completions/gsettings
share/doc/pkg-readmes/${PKGSTEM}
share/gdb/auto-load/usr/local/lib/
share/gdb/auto-load/usr/local/lib/libglib-2.0.so.0.7400.3-gdb.py
share/gdb/auto-load/usr/local/lib/libgobject-2.0.so.0.7400.3-gdb.py
share/gdb/auto-load/usr/local/lib/libglib-2.0.so.0.7400.4-gdb.py
share/gdb/auto-load/usr/local/lib/libgobject-2.0.so.0.7400.4-gdb.py
share/gettext/its/
share/gettext/its/gschema.its
share/gettext/its/gschema.loc
@ -469,6 +469,9 @@ share/locale/hy/
share/locale/hy/LC_MESSAGES/
share/locale/hy/LC_MESSAGES/glib20.mo
share/locale/id/LC_MESSAGES/glib20.mo
share/locale/ie/
share/locale/ie/LC_MESSAGES/
share/locale/ie/LC_MESSAGES/glib20.mo
share/locale/is/
share/locale/is/LC_MESSAGES/
share/locale/is/LC_MESSAGES/glib20.mo