cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to glib2-2.70.3.

Browse Source
This commit is contained in:
ajacoutot 2022-01-27 07:36:46 +00:00
parent d2f9dbd9c6
commit 6bd6358333
5 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
devel/glib2/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.354 2021/12/03 10:40:34 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.355 2022/01/27 07:36:46 ajacoutot Exp $
COMMENT= general-purpose utility library
GNOME_PROJECT= glib
GNOME_VERSION= 2.70.2
GNOME_VERSION= 2.70.3
PKGNAME= ${DISTNAME:S/glib/glib2/}
CATEGORIES= devel
@ -16,11 +16,11 @@ MAINTAINER= Antoine Jacoutot <ajacoutot@openbsd.org>
# 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.7 # 0.7000.2
SHARED_LIBS += gobject-2.0 4200.14 # 0.7000.2
SHARED_LIBS += gthread-2.0 4200.14 # 0.7000.2
SHARED_LIBS += gmodule-2.0 4200.14 # 0.7000.2
SHARED_LIBS += gio-2.0 4200.14 # 0.7000.2
SHARED_LIBS += glib-2.0 4201.7 # 0.7000.3
SHARED_LIBS += gobject-2.0 4200.14 # 0.7000.3
SHARED_LIBS += gthread-2.0 4200.14 # 0.7000.3
SHARED_LIBS += gmodule-2.0 4200.14 # 0.7000.3
SHARED_LIBS += gio-2.0 4200.14 # 0.7000.3
# LGPLv2
PERMIT_PACKAGE= Yes

4
devel/glib2/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (glib-2.70.2.tar.xz) = BVFFnIXNPaPVjdyQFv0ovlr1A/XhYVpxultRKslFgG8=
SIZE (glib-2.70.2.tar.xz) = 4822356
SHA256 (glib-2.70.3.tar.xz) = Iz+khBweGeOW23YH1Y9rdbozE8UL8Pzgey41MtXrfUY=
SIZE (glib-2.70.3.tar.xz) = 4824700

4
devel/glib2/patches/patch-glib_gfileutils_c
View File

@ -1,11 +1,11 @@
$OpenBSD: patch-glib_gfileutils_c,v 1.7 2020/11/01 08:21:04 ajacoutot Exp $
$OpenBSD: patch-glib_gfileutils_c,v 1.8 2022/01/27 07:36:46 ajacoutot Exp $
https://gitlab.gnome.org/GNOME/glib/merge_requests/832
Index: glib/gfileutils.c
--- glib/gfileutils.c.orig
+++ glib/gfileutils.c
@@ -263,7 +263,7 @@ g_mkdir_with_parents (const gchar *pathname,
@@ -258,7 +258,7 @@ g_mkdir_with_parents (const gchar *pathname,
if (!g_file_test (fn, G_FILE_TEST_EXISTS))
{

6
devel/glib2/patches/patch-meson_build
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-meson_build,v 1.19 2021/10/25 07:21:27 ajacoutot Exp $
$OpenBSD: patch-meson_build,v 1.20 2022/01/27 07:36:46 ajacoutot Exp $
XXX base gcc
Reordering needed to prefer long long because base-gcc doesn't recognize
@ -8,7 +8,7 @@ and doesn't fail to compile the test case (gint64 should be long long).
Index: meson.build
--- meson.build.orig
+++ meson.build
@@ -1318,18 +1318,6 @@ endif
@@ -1317,18 +1317,6 @@ endif
# works.
if long_long_size == long_size
if cc.compiles('''#if defined(_AIX) && !defined(__GNUC__)
@ -27,7 +27,7 @@ Index: meson.build
#pragma options langlvl=stdc99
#endif
#pragma GCC diagnostic error "-Wincompatible-pointer-types"
@@ -1341,6 +1329,18 @@ if long_long_size == long_size
@@ -1340,6 +1328,18 @@ if long_long_size == long_size
return 1;
}''', name : 'int64_t is long long')
int64_t_typedef = 'long long'

6
devel/glib2/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.102 2021/12/03 10:40:34 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.103 2022/01/27 07:36:46 ajacoutot Exp $
@conflict glib2-docs-*
@conflict glib2-fam-*
@pkgpath devel/glib2,-docs
@ -350,8 +350,8 @@ share/bash-completion/completions/gresource
share/bash-completion/completions/gsettings
share/doc/pkg-readmes/${PKGSTEM}
share/gdb/auto-load/${PREFIX}/lib/
share/gdb/auto-load/${PREFIX}/lib/libglib-2.0.so.0.7000.2-gdb.py
share/gdb/auto-load/${PREFIX}/lib/libgobject-2.0.so.0.7000.2-gdb.py
share/gdb/auto-load/${PREFIX}/lib/libglib-2.0.so.0.7000.3-gdb.py
share/gdb/auto-load/${PREFIX}/lib/libgobject-2.0.so.0.7000.3-gdb.py
share/gettext/its/
share/gettext/its/gschema.its
share/gettext/its/gschema.loc