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

Update to glib2-2.74.1. 

I decided to start the h2k22 hackathon by breaking things :-)
There will be mostly mechanical diff over ~340 ports after this commit to
fix WANTLIB after GLib moved from pcre to pcre2.
This survived a bulk but there might be some misses.

First step to upgrade GNOME to 43.
This commit is contained in:
ajacoutot 2022-11-05 17:04:18 +00:00
parent 827050064a
commit 8faa3c9b42
7 changed files with 26 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
devel/glib2/Makefile
View File

@ -1,7 +1,7 @@
COMMENT= general-purpose utility library
GNOME_PROJECT= glib
GNOME_VERSION= 2.72.4
GNOME_VERSION= 2.74.1
PKGNAME= ${DISTNAME:S/glib/glib2/}
CATEGORIES= devel
@ -14,17 +14,17 @@ 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.8 # 0.7200.4
SHARED_LIBS += gobject-2.0 4200.15 # 0.7200.4
SHARED_LIBS += gthread-2.0 4200.15 # 0.7200.4
SHARED_LIBS += gmodule-2.0 4200.15 # 0.7200.4
SHARED_LIBS += gio-2.0 4200.15 # 0.7200.4
SHARED_LIBS += glib-2.0 4201.9 # 0.7400.1
SHARED_LIBS += gobject-2.0 4200.16 # 0.7400.1
SHARED_LIBS += gthread-2.0 4200.16 # 0.7400.1
SHARED_LIBS += gmodule-2.0 4200.16 # 0.7400.1
SHARED_LIBS += gio-2.0 4200.16 # 0.7400.1
# LGPLv2
PERMIT_PACKAGE= Yes
# uses pledge()
WANTLIB += c elf>=2 ffi iconv intl pcre pthread z
WANTLIB += c elf>=2 ffi iconv intl pcre2-8 pthread z
MODULES= devel/meson \
lang/python \
@ -38,7 +38,7 @@ DEBUG_PACKAGES= ${BUILD_PACKAGES}
BUILD_DEPENDS += shells/bash
LIB_DEPENDS= devel/gettext,-runtime \
devel/pcre \
devel/pcre2 \
devel/libffi
# need X11 because DBus is used in the GDBus test cases;

4
devel/glib2/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (glib-2.72.4.tar.xz) = iEirpRi6L0IX0UQweh1sua/MkrVOXBOsH4xNRgjpbw4=
SIZE (glib-2.72.4.tar.xz) = 4884256
SHA256 (glib-2.74.1.tar.xz) = CrmBYY0dtHhF5WQXsNfBI/gaNCeyuck/Wkb/W7uWSWQ=
SIZE (glib-2.74.1.tar.xz) = 5189452

6
devel/glib2/patches/patch-gio_glib-compile-schemas_c
View File

@ -3,7 +3,7 @@ XXX do not warn about bad dconf paths
Index: gio/glib-compile-schemas.c
--- gio/glib-compile-schemas.c.orig
+++ gio/glib-compile-schemas.c
@@ -1232,6 +1232,7 @@ parse_state_start_schema (ParseState *state,
@@ -1234,6 +1234,7 @@ parse_state_start_schema (ParseState *state,
return;
}
@ -11,7 +11,7 @@ Index: gio/glib-compile-schemas.c
if (path && (g_str_has_prefix (path, "/apps/") ||
g_str_has_prefix (path, "/desktop/") ||
g_str_has_prefix (path, "/system/")))
@@ -1244,6 +1245,7 @@ parse_state_start_schema (ParseState *state,
@@ -1246,6 +1247,7 @@ parse_state_start_schema (ParseState *state,
g_printerr ("%s\n", message);
g_free (message);
}
@ -19,7 +19,7 @@ Index: gio/glib-compile-schemas.c
state->schema_state = schema_state_new (path, gettext_domain,
extends, extends_name, list_of);
@@ -2198,6 +2200,11 @@ main (int argc, char **argv)
@@ -2200,6 +2202,11 @@ main (int argc, char **argv)
#ifdef HAVE_BIND_TEXTDOMAIN_CODESET
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
#endif

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

@ -3,7 +3,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=653555
Index: gio/gunixmount.c
--- gio/gunixmount.c.orig
+++ gio/gunixmount.c
@@ -27,6 +27,10 @@
@@ -29,6 +29,10 @@
#include <sys/wait.h>
#include <unistd.h>
@ -14,7 +14,7 @@ Index: gio/gunixmount.c
#include <glib.h>
#include "gsubprocess.h"
#include "gioenums.h"
@@ -332,12 +336,35 @@ g_unix_mount_unmount (GMount *mount,
@@ -334,12 +338,35 @@ g_unix_mount_unmount (GMount *mount,
gpointer user_data)
{
GUnixMount *unix_mount = G_UNIX_MOUNT (mount);
@ -50,7 +50,7 @@ Index: gio/gunixmount.c
eject_unmount_do (mount, cancellable, callback, user_data, argv, "[gio] unmount mount");
}
@@ -358,12 +385,29 @@ g_unix_mount_eject (GMount *mount,
@@ -360,12 +387,29 @@ g_unix_mount_eject (GMount *mount,
gpointer user_data)
{
GUnixMount *unix_mount = G_UNIX_MOUNT (mount);

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

@ -3,7 +3,7 @@ https://gitlab.gnome.org/GNOME/glib/merge_requests/832
Index: glib/gfileutils.c
--- glib/gfileutils.c.orig
+++ glib/gfileutils.c
@@ -258,7 +258,7 @@ g_mkdir_with_parents (const gchar *pathname,
@@ -260,7 +260,7 @@ g_mkdir_with_parents (const gchar *pathname,
if (!g_file_test (fn, G_FILE_TEST_EXISTS))
{

4
devel/glib2/patches/patch-meson_build
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
@@ -1364,18 +1364,6 @@ endif
@@ -1422,18 +1422,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"
@@ -1387,6 +1375,18 @@ if long_long_size == long_size
@@ -1445,6 +1433,18 @@ if long_long_size == long_size
return 1;
}''', name : 'int64_t is long long')
int64_t_typedef = 'long long'

10
devel/glib2/pkg/PLIST
View File

@ -28,7 +28,6 @@ include/gio-unix-2.0/
include/gio-unix-2.0/gio/
include/gio-unix-2.0/gio/gdesktopappinfo.h
include/gio-unix-2.0/gio/gfiledescriptorbased.h
include/gio-unix-2.0/gio/gunixfdlist.h
include/gio-unix-2.0/gio/gunixfdmessage.h
include/gio-unix-2.0/gio/gunixinputstream.h
include/gio-unix-2.0/gio/gunixmounts.h
@ -185,6 +184,7 @@ include/glib-2.0/gio/gtlspassword.h
include/glib-2.0/gio/gtlsserverconnection.h
include/glib-2.0/gio/gunixconnection.h
include/glib-2.0/gio/gunixcredentialsmessage.h
include/glib-2.0/gio/gunixfdlist.h
include/glib-2.0/gio/gunixsocketaddress.h
include/glib-2.0/gio/gvfs.h
include/glib-2.0/gio/gvolume.h
@ -325,6 +325,7 @@ lib/pkgconfig/gmodule-export-2.0.pc
lib/pkgconfig/gmodule-no-export-2.0.pc
lib/pkgconfig/gobject-2.0.pc
lib/pkgconfig/gthread-2.0.pc
@bin libexec/gio-launch-desktop
@man man/man1/gapplication.1
@man man/man1/gdbus-codegen.1
@man man/man1/gdbus.1
@ -353,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.7200.4-gdb.py
share/gdb/auto-load/usr/local/lib/libgobject-2.0.so.0.7200.4-gdb.py
share/gdb/auto-load/usr/local/lib/libglib-2.0.so.0.7400.1-gdb.py
share/gdb/auto-load/usr/local/lib/libgobject-2.0.so.0.7400.1-gdb.py
share/gettext/its/
share/gettext/its/gschema.its
share/gettext/its/gschema.loc
@ -379,6 +380,9 @@ share/glib-2.0/schemas/
share/glib-2.0/schemas/gschema.dtd
share/glib-2.0/valgrind/
share/glib-2.0/valgrind/glib.supp
share/locale/ab/
share/locale/ab/LC_MESSAGES/
share/locale/ab/LC_MESSAGES/glib20.mo
share/locale/af/
share/locale/af/LC_MESSAGES/
share/locale/af/LC_MESSAGES/glib20.mo