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

Update to glib2-2.60.1.

Browse Source 
First step in updating GNOME to version 3.32 (which should happen during
g2k19).
This commit is contained in:
ajacoutot 2019-04-28 06:28:17 +00:00
parent 91914d24eb
commit 0a4d1614cc
7 changed files with 34 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
devel/glib2/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.299 2019/03/27 12:54:47 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.300 2019/04/28 06:28:17 ajacoutot Exp $
# Everything is a Freaking GLib/GTK+ problem
CFLAGS += -g
@ -7,9 +7,8 @@ INSTALL_STRIP= # empty
COMMENT= general-purpose utility library
GNOME_PROJECT= glib
GNOME_VERSION= 2.58.3
GNOME_VERSION= 2.60.1
PKGNAME= ${DISTNAME:S/glib/glib2/}
REVISION= 8
CATEGORIES= devel
@ -21,11 +20,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.1 # 0.5800.3
SHARED_LIBS += gmodule-2.0 4200.8 # 0.5800.3
SHARED_LIBS += gthread-2.0 4200.8 # 0.5800.3
SHARED_LIBS += gobject-2.0 4200.8 # 0.5800.3
SHARED_LIBS += gio-2.0 4200.8 # 0.5800.3
SHARED_LIBS += glib-2.0 4201.2 # 0.6000.1
SHARED_LIBS += gmodule-2.0 4200.9 # 0.6000.1
SHARED_LIBS += gthread-2.0 4200.9 # 0.6000.1
SHARED_LIBS += gobject-2.0 4200.9 # 0.6000.1
SHARED_LIBS += gio-2.0 4200.9 # 0.6000.1
# LGPLv2
PERMIT_PACKAGE_CDROM= Yes
@ -55,16 +54,11 @@ TEST_DEPENDS= devel/desktop-file-utils \
x11/dbus
CONFIGURE_ARGS= -Diconv=gnu \
-Dselinux=false \
-Dselinux=disabled \
-Dxattr=false \
-Dlibmount=false \
-Dman=true
.include <bsd.port.arch.mk>
.if ${PROPERTIES:Mgcc3}
PATCH_LIST= patch-* gcc3-*
.endif
pre-configure:
sed -i -e "s,/usr/local,${LOCALBASE},g;" \
-e "s,/etc/xdg,${SYSCONFDIR}/xdg,g" \

4
devel/glib2/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (glib-2.58.3.tar.xz) = j0PDF2foiiXacrUqQPMwH+/EmmZbVtwQ7nzJVly+dIE=
SIZE (glib-2.58.3.tar.xz) = 4863648
SHA256 (glib-2.60.1.tar.xz) = ifiE9dXGEmFA7IaM7xhMQs5ykCwTzQjzbmYDcXebVWA=
SIZE (glib-2.60.1.tar.xz) = 4586668

16
devel/glib2/patches/gcc3-patch-glib_tests_meson_build
View File

@ -1,16 +0,0 @@
$OpenBSD: gcc3-patch-glib_tests_meson_build,v 1.1 2019/01/01 11:32:15 ajacoutot Exp $
-Wstrict-aliasing is not supported by GCC3.
Index: glib/tests/meson.build
--- glib/tests/meson.build.orig
+++ glib/tests/meson.build
@@ -2,7 +2,7 @@ glib_tests = {
'array-test' : {},
'asyncqueue' : {},
'atomic' : {
- 'c_args' : cc.get_id() == 'gcc' ? ['-Wstrict-aliasing=2'] : [],
+ 'c_args' : [],
},
'autoptr' : {
'skip' : cc.get_id() == 'msvc',

16
devel/glib2/patches/patch-gio_tests_meson_build Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-gio_tests_meson_build,v 1.1 2019/04/28 06:28:17 ajacoutot Exp $
https://gitlab.gnome.org/GNOME/glib/merge_requests/802
Index: gio/tests/meson.build
--- gio/tests/meson.build.orig
+++ gio/tests/meson.build
@@ -139,7 +139,7 @@ if host_machine.system() != 'windows'
shared_library('slow-connect-preload',
'slow-connect-preload.c',
name_prefix : '',
- dependencies: cc.find_library('dl'),
+ dependencies: cc.find_library('dl', required: host_machine.system() != 'openbsd'),
install_dir : installed_tests_execdir,
install: installed_tests_enabled,
)

36
devel/glib2/patches/patch-glib_gutils_c
View File

@ -1,36 +0,0 @@
$OpenBSD: patch-glib_gutils_c,v 1.8 2019/03/27 12:54:47 ajacoutot Exp $
Check if the XDG directories actually exist before adding them to the list which
is specially important for programs using unveil(2).
Index: glib/gutils.c
--- glib/gutils.c.orig
+++ glib/gutils.c
@@ -1576,7 +1576,7 @@ load_user_special_dirs (void)
for (i = 0; i < n_lines; i++)
{
gchar *buffer = lines[i];
- gchar *d, *p;
+ gchar *d, *p, *td;
gint len;
gboolean is_relative = FALSE;
GUserDirectory directory;
@@ -1668,11 +1668,14 @@ load_user_special_dirs (void)
d[len - 1] = 0;
if (is_relative)
- {
- g_user_special_dirs[directory] = g_build_filename (g_get_home_dir (), d, NULL);
- }
+ td = g_build_filename (g_get_home_dir (), d, NULL);
else
- g_user_special_dirs[directory] = g_strdup (d);
+ td = g_strdup (d);
+
+ if (g_file_test (td, G_FILE_TEST_IS_DIR))
+ g_user_special_dirs[directory] = g_strdup (td);
+
+ g_free(td);
}
g_strfreev (lines);

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

@ -1,4 +1,4 @@
$OpenBSD: patch-meson_build,v 1.2 2019/01/10 13:36:26 jca Exp $
$OpenBSD: patch-meson_build,v 1.3 2019/04/28 06:28:17 ajacoutot Exp $
The old autoconf build has the following additional check after
determining a valid type for gsize:
@ -19,7 +19,7 @@ make the workaround more generic.
Index: meson.build
--- meson.build.orig
+++ meson.build
@@ -1267,13 +1267,6 @@ if sizet_size == short_size
@@ -1275,13 +1275,6 @@ if sizet_size == short_size
glibconfig_conf.set_quoted('gsize_format', 'hu')
glibconfig_conf.set_quoted('gssize_format', 'hi')
glibconfig_conf.set('glib_msize_type', 'SHRT')
@ -33,7 +33,7 @@ Index: meson.build
elif sizet_size == long_size
glibconfig_conf.set('glib_size_type_define', 'long')
glibconfig_conf.set_quoted('gsize_modifier', 'l')
@@ -1281,6 +1274,13 @@ elif sizet_size == long_size
@@ -1289,6 +1282,13 @@ elif sizet_size == long_size
glibconfig_conf.set_quoted('gsize_format', 'lu')
glibconfig_conf.set_quoted('gssize_format', 'li')
glibconfig_conf.set('glib_msize_type', 'LONG')
@ -47,7 +47,7 @@ Index: meson.build
elif sizet_size == long_long_size
glibconfig_conf.set('glib_size_type_define', 'long long')
glibconfig_conf.set_quoted('gsize_modifier', int64_m)
@@ -1571,9 +1571,8 @@ atomicdefine = '''
@@ -1579,9 +1579,8 @@ atomicdefine = '''
# We know that we can always use real ("lock free") atomic operations with MSVC
if cc.get_id() == 'msvc' or cc.links(atomictest, name : 'atomic ops')
have_atomic_lock_free = true

7
devel/glib2/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.71 2019/01/21 21:52:58 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.72 2019/04/28 06:28:17 ajacoutot Exp $
@conflict glib2-docs-*
@conflict glib2-fam-*
@pkgpath devel/glib2,-docs
@ -282,6 +282,7 @@ include/glib-2.0/gobject/gbinding.h
include/glib-2.0/gobject/gboxed.h
include/glib-2.0/gobject/gclosure.h
include/glib-2.0/gobject/genums.h
include/glib-2.0/gobject/glib-enumtypes.h
include/glib-2.0/gobject/glib-types.h
include/glib-2.0/gobject/gmarshal.h
include/glib-2.0/gobject/gobject-autocleanups.h
@ -349,8 +350,8 @@ share/gdb/auto-load/
share/gdb/auto-load/usr/
share/gdb/auto-load/${PREFIX}/
share/gdb/auto-load/${PREFIX}/lib/
share/gdb/auto-load/${PREFIX}/lib/libglib-2.0.so.0.5800.3-gdb.py
share/gdb/auto-load/${PREFIX}/lib/libgobject-2.0.so.0.5800.3-gdb.py
share/gdb/auto-load/${PREFIX}/lib/libglib-2.0.so.0.6000.1-gdb.py
share/gdb/auto-load/${PREFIX}/lib/libgobject-2.0.so.0.6000.1-gdb.py
share/gettext/its/
share/gettext/its/gschema.its
share/gettext/its/gschema.loc