devel/glib20: update to 2.80.0

Temporarily pass -Dintrospection=disabled to avoid dependency loop
with devel/gobject-introspection.

Changes:	https://gitlab.gnome.org/GNOME/glib/-/blob/2.80.0/NEWS
PR:		277581
Reported by:	GitLab (notify releases)
Exp-run by:	antoine
This commit is contained in:
Jan Beich 2024-03-07 22:35:05 +01:00
parent 377b3e130b
commit 47c17dccc9
5 changed files with 61 additions and 23 deletions

View File

@ -1,5 +1,5 @@
PORTNAME= glib
DISTVERSION= 2.78.4
DISTVERSION= 2.80.0
PORTEPOCH= 2
CATEGORIES= devel
MASTER_SITES= GNOME
@ -11,8 +11,10 @@ WWW= https://www.gtk.org/
LICENSE= LGPL20
BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR}
LIB_DEPENDS= libffi.so:devel/libffi \
libpcre2-8.so:devel/pcre2
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR}
# iconv:wchar_t - our iconv in base doesn't support utf-8 -> wchar_t (boooo)
# (wchar_t is used by glibmm, rawtherapee triggered this)
@ -25,6 +27,7 @@ USE_PYTHON= py3kplist
MESON_ARGS= -Db_lundef=false \
-Ddefault_library=both \
-Dinstalled_tests=false \
-Dintrospection=disabled \
-Dlibmount=disabled \
-Dlocalstatedir=/var \
-Druntime_dir=/var/run \
@ -36,7 +39,7 @@ CPE_VENDOR= gnome
CONFLICTS_INSTALL= p5-Giovanni
_LIBVERSION= 0.7800.4
_LIBVERSION= 0.8000.0
PLIST_SUB= LIBVERSION=${_LIBVERSION}
OPTIONS_DEFINE= DEBUG GTKDOC FAM_ALTBACKEND MANPAGES NLS TEST
@ -45,14 +48,12 @@ OPTIONS_SUB= yes
GTKDOC_BUILD_DEPENDS= gtk-doc>0:textproc/gtk-doc
GTKDOC_IMPLIES= TEST
GTKDOC_MESON_TRUE= gtk_doc
GTKDOC_MESON_TRUE= documentation
FAM_ALTBACKEND_DESC= Alternate file monitor backend
MANPAGES_BUILD_DEPENDS= docbook-xml>4.1.2:textproc/docbook-xml \
docbook-xsl>0:textproc/docbook-xsl
MANPAGES_USE= GNOME=libxslt:build
MANPAGES_MESON_TRUE= man
MANPAGES_BUILD_DEPENDS= rst2man:textproc/py-docutils
MANPAGES_MESON_ENABLED= man-pages
TEST_BUILD_DEPENDS= dbus-daemon:devel/dbus
TEST_MESON_TRUE= tests

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1705866500
SHA256 (gnome/glib-2.78.4.tar.xz) = 24b8e0672dca120cc32d394bccb85844e732e04fe75d18bb0573b2dbc7548f63
SIZE (gnome/glib-2.78.4.tar.xz) = 5331892
TIMESTAMP = 1709847305
SHA256 (gnome/glib-2.80.0.tar.xz) = 8228a92f92a412160b139ae68b6345bd28f24434a7b5af150ebe21ff587a561d
SIZE (gnome/glib-2.80.0.tar.xz) = 5510536

View File

@ -1,21 +1,20 @@
--- glib/gspawn.c.orig 2023-03-10 14:33:15 UTC
+++ glib/gspawn.c
@@ -54,6 +54,12 @@
--- glib/glib-unix.c.orig 2024-03-07 21:35:05 UTC
+++ glib/glib-unix.c
@@ -55,6 +55,11 @@
#include <sys/syscall.h> /* for syscall and SYS_getdents64 */
#endif
+#ifdef __FreeBSD__
+#include <sys/types.h>
+#include <sys/user.h>
+#include <libutil.h>
+#endif
+
#include "gspawn.h"
#include "gspawn-private.h"
#include "gthread.h"
@@ -1231,6 +1237,33 @@ g_spawn_check_exit_status (gint wait_status,
return g_spawn_check_wait_status (wait_status, error);
#ifdef HAVE_SYS_RESOURCE_H
#include <sys/resource.h>
#endif /* HAVE_SYS_RESOURCE_H */
@@ -620,6 +625,33 @@ filename_to_fd (const char *p)
}
#endif
+#ifdef __FreeBSD__
+static int
@ -44,10 +43,10 @@
+}
+#endif
+
static int safe_fdwalk_with_invalid_fds (int (*cb)(void *data, int fd), void *data);
/* This function is called between fork() and exec() and hence must be
* async-signal-safe (see signal-safety(7)). */
static gssize
@@ -1432,6 +1465,13 @@ safe_fdwalk (int (*cb)(void *data, int fd), void *data
@@ -640,6 +672,13 @@ safe_fdwalk (int (*cb)(void *data, int fd), void *data
* may fail on non-Linux operating systems. See safe_fdwalk_with_invalid_fds
* for a slower alternative.
*/

View File

@ -1,6 +1,9 @@
bin/gapplication
bin/gdbus
bin/gdbus-codegen
bin/gi-compile-repository
bin/gi-decompile-typelib
bin/gi-inspect-typelib
bin/gio
bin/gio-querymodules
bin/glib-compile-resources
@ -177,6 +180,32 @@ include/glib-2.0/gio/gvolume.h
include/glib-2.0/gio/gvolumemonitor.h
include/glib-2.0/gio/gzlibcompressor.h
include/glib-2.0/gio/gzlibdecompressor.h
include/glib-2.0/girepository/gi-visibility.h
include/glib-2.0/girepository/giarginfo.h
include/glib-2.0/girepository/gibaseinfo.h
include/glib-2.0/girepository/gicallableinfo.h
include/glib-2.0/girepository/gicallbackinfo.h
include/glib-2.0/girepository/giconstantinfo.h
include/glib-2.0/girepository/gienuminfo.h
include/glib-2.0/girepository/gifieldinfo.h
include/glib-2.0/girepository/giflagsinfo.h
include/glib-2.0/girepository/gifunctioninfo.h
include/glib-2.0/girepository/giinterfaceinfo.h
include/glib-2.0/girepository/giobjectinfo.h
include/glib-2.0/girepository/gipropertyinfo.h
include/glib-2.0/girepository/giregisteredtypeinfo.h
include/glib-2.0/girepository/girepository-autocleanups.h
include/glib-2.0/girepository/girepository.h
include/glib-2.0/girepository/girffi.h
include/glib-2.0/girepository/gisignalinfo.h
include/glib-2.0/girepository/gistructinfo.h
include/glib-2.0/girepository/gitypeinfo.h
include/glib-2.0/girepository/gitypelib.h
include/glib-2.0/girepository/gitypes.h
include/glib-2.0/girepository/giunioninfo.h
include/glib-2.0/girepository/giunresolvedinfo.h
include/glib-2.0/girepository/givalueinfo.h
include/glib-2.0/girepository/givfuncinfo.h
include/glib-2.0/glib-object.h
include/glib-2.0/glib-unix.h
include/glib-2.0/glib.h
@ -266,7 +295,6 @@ include/glib-2.0/glib/gvariant.h
include/glib-2.0/glib/gvarianttype.h
include/glib-2.0/glib/gversion.h
include/glib-2.0/glib/gversionmacros.h
include/glib-2.0/glib/gwin32.h
include/glib-2.0/gmodule.h
include/glib-2.0/gmodule/gmodule-visibility.h
include/glib-2.0/gobject/gbinding.h
@ -298,6 +326,10 @@ lib/libgio-2.0.a
lib/libgio-2.0.so
lib/libgio-2.0.so.0
lib/libgio-2.0.so.%%LIBVERSION%%
lib/libgirepository-2.0.a
lib/libgirepository-2.0.so
lib/libgirepository-2.0.so.0
lib/libgirepository-2.0.so.%%LIBVERSION%%
lib/libglib-2.0.a
lib/libglib-2.0.so
lib/libglib-2.0.so.0
@ -316,6 +348,7 @@ lib/libgthread-2.0.so.0
lib/libgthread-2.0.so.%%LIBVERSION%%
libdata/pkgconfig/gio-2.0.pc
libdata/pkgconfig/gio-unix-2.0.pc
libdata/pkgconfig/girepository-2.0.pc
libdata/pkgconfig/glib-2.0.pc
libdata/pkgconfig/gmodule-2.0.pc
libdata/pkgconfig/gmodule-export-2.0.pc
@ -326,6 +359,9 @@ libexec/gio-launch-desktop
%%MANPAGES%%share/man/man1/gapplication.1.gz
%%MANPAGES%%share/man/man1/gdbus-codegen.1.gz
%%MANPAGES%%share/man/man1/gdbus.1.gz
%%MANPAGES%%share/man/man1/gi-compile-repository.1.gz
%%MANPAGES%%share/man/man1/gi-decompile-typelib.1.gz
%%MANPAGES%%share/man/man1/gi-inspect-typelib.1.gz
%%MANPAGES%%share/man/man1/gio-querymodules.1.gz
%%MANPAGES%%share/man/man1/gio.1.gz
%%MANPAGES%%share/man/man1/glib-compile-resources.1.gz

View File

@ -10,6 +10,8 @@ WWW= https://github.com/gtkd-developers/GlibD
LICENSE= LGPL3
LICENSE_FILE= ${WRKSRC}/COPYING
BROKEN= https://github.com/gtkd-developers/GlibD/issues/20
BUILD_DEPENDS= girtod:lang/gir-to-d \
ldc2:lang/ldc
LIB_DEPENDS= libphobos2-ldc-shared.so:lang/ldc \