diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile --- a/devel/glib20/Makefile +++ b/devel/glib20/Makefile @@ -1,11 +1,13 @@ PORTNAME= glib -DISTVERSION= 2.80.5 -PORTREVISION= 1 +DISTVERSION= 2.82.4 PORTEPOCH= 2 CATEGORIES= devel MASTER_SITES= GNOME DIST_SUBDIR= gnome +PATCH_SITES= https://gitlab.gnome.org/GNOME/${PORTNAME}/-/commit/ +PATCHFILES= 3dcf1ea13d9b2a3371fa35b79e640063de33dc20.patch:-p1 + MAINTAINER= desktop@FreeBSD.org COMMENT= Some useful routines of C programming (current stable version) WWW= https://www.gtk.org/ @@ -20,6 +22,15 @@ update-desktop-database:devel/desktop-file-utils \ update-mime-database:misc/shared-mime-info +FLAVORS= default bootstrap +FLAVORS_SUB= yes + +default_CONFLICTS_INSTALL= glib-bootstrap +default_BUILD_DEPENDS= g-ir-scanner:devel/gobject-introspection@bootstrap + +bootstrap_PKGNAMESUFFIX= -bootstrap +bootstrap_CONFLICTS_INSTALL= glib + # iconv:wchar_t - our iconv in base doesn't support utf-8 -> wchar_t (boooo) # (wchar_t is used by glibmm, rawtherapee triggered this) USES= compiler:c11 cpe gettext gnome iconv:wchar_t localbase:ldflags \ @@ -31,10 +42,11 @@ MESON_ARGS= -Db_lundef=false \ -Ddefault_library=both \ -Dinstalled_tests=false \ - -Dintrospection=disabled \ -Dlibmount=disabled \ -Druntime_dir=/var/run \ -Dselinux=disabled \ + -Dsysprof=disabled \ + -Dsystemtap=disabled \ -Dxattr=false BINARY_ALIAS= python3=${PYTHON_CMD} PORTSCOUT= limitw:1,even @@ -42,7 +54,7 @@ CONFLICTS_INSTALL= p5-Giovanni -_LIBVERSION= 0.8000.5 +_LIBVERSION= 0.${DISTVERSION:R:E}00.${DISTVERSION:E} PLIST_SUB= LIBVERSION=${_LIBVERSION} OPTIONS_DEFINE= DOCS FAM_ALTBACKEND MANPAGES NLS TEST @@ -63,7 +75,13 @@ .include # doesn't build yet -MESON_ARGS+= -Ddtrace=false +MESON_ARGS+= -Ddtrace=disabled + +.if ${FLAVOR:U} == bootstrap +MESON_ARGS+= -Dintrospection=disabled +.else +MESON_ARGS+= -Dintrospection=enabled +.endif pre-configure-FAM_ALTBACKEND-on: @${REINPLACE_CMD} -e 's|kqueue-helper.c|kqueue_fnm.c|g ; \ diff --git a/devel/glib20/distinfo b/devel/glib20/distinfo --- a/devel/glib20/distinfo +++ b/devel/glib20/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1724667709 -SHA256 (gnome/glib-2.80.5.tar.xz) = 9f23a9de803c695bbfde7e37d6626b18b9a83869689dd79019bf3ae66c3e6771 -SIZE (gnome/glib-2.80.5.tar.xz) = 5538308 +TIMESTAMP = 1733991305 +SHA256 (gnome/glib-2.82.4.tar.xz) = 37dd0877fe964cd15e9a2710b044a1830fb1bd93652a6d0cb6b8b2dff187c709 +SIZE (gnome/glib-2.82.4.tar.xz) = 5556896 +SHA256 (gnome/3dcf1ea13d9b2a3371fa35b79e640063de33dc20.patch) = 31f731207b6f4a2760e048138c5363fe42c05e3624cbe5ee9612f3d047cb176c +SIZE (gnome/3dcf1ea13d9b2a3371fa35b79e640063de33dc20.patch) = 2083 diff --git a/devel/glib20/files/patch-networkmonitor-netlink b/devel/glib20/files/patch-networkmonitor-netlink deleted file mode 100644 --- a/devel/glib20/files/patch-networkmonitor-netlink +++ /dev/null @@ -1,76 +0,0 @@ -From 02172bda73663f63b603956a180c6c6fc6a3d187 Mon Sep 17 00:00:00 2001 -From: Gleb Popov <6yearold@gmail.com> -Date: Tue, 29 Oct 2024 21:18:36 +0300 -Subject: [PATCH] Enable GNetworkMonitorNetlink on FreeBSD - -https://gitlab.gnome.org/GNOME/glib/-/merge_requests/4376 - ---- - gio/gnetworkmonitornetlink.c | 8 ++++++++ - meson.build | 4 +++- - 2 files changed, 11 insertions(+), 1 deletion(-) - -diff --git a/gio/gnetworkmonitornetlink.c b/gio/gnetworkmonitornetlink.c -index bf51d31f99..adaa77d38b 100644 ---- a/gio/gnetworkmonitornetlink.c -+++ ./gio/gnetworkmonitornetlink.c -@@ -38,8 +38,14 @@ - - /* must come at the end to pick system includes from - * gnetworkingprivate.h */ -+#ifdef HAVE_LINUX_NETLINK_H - #include - #include -+#endif -+#ifdef HAVE_NETLINK_NETLINK_H -+#include -+#include -+#endif - - static GInitableIface *initable_parent_iface; - static void g_network_monitor_netlink_iface_init (GNetworkMonitorInterface *iface); -@@ -124,6 +130,7 @@ g_network_monitor_netlink_initable_init (GInitable *initable, - return FALSE; - } - -+#ifdef SO_PASSCRED - if (!g_socket_set_option (nl->priv->sock, SOL_SOCKET, SO_PASSCRED, - TRUE, NULL)) - { -@@ -133,6 +140,7 @@ g_network_monitor_netlink_initable_init (GInitable *initable, - g_strerror (errsv)); - return FALSE; - } -+#endif - - /* Request the current state */ - if (!request_dump (nl, error)) -diff --git a/meson.build b/meson.build -index 69e4b036ea..7da293881e 100644 ---- a/meson.build -+++ ./meson.build -@@ -400,10 +400,12 @@ headers = [ - 'inttypes.h', - 'libproc.h', - 'limits.h', -+ 'linux/netlink.h', - 'locale.h', - 'mach/mach_time.h', - 'memory.h', - 'mntent.h', -+ 'netlink/netlink.h', - 'poll.h', - 'pwd.h', - 'sched.h', -@@ -461,7 +463,7 @@ if cc.check_header('malloc.h') - glib_conf_prefix = glib_conf_prefix + '#define HAVE_MALLOC_H 1\n' - endif - --if cc.check_header('linux/netlink.h') -+if glib_conf.has('HAVE_LINUX_NETLINK_H') or glib_conf.has('HAVE_NETLINK_NETLINK_H') - glib_conf.set('HAVE_NETLINK', 1) - endif - --- -GitLab - diff --git a/devel/glib20/pkg-plist b/devel/glib20/pkg-plist --- a/devel/glib20/pkg-plist +++ b/devel/glib20/pkg-plist @@ -326,6 +326,13 @@ lib/libgio-2.0.so lib/libgio-2.0.so.0 lib/libgio-2.0.so.%%LIBVERSION%% +%%DEFAULT%%lib/girepository-1.0/GIRepository-3.0.typelib +%%DEFAULT%%lib/girepository-1.0/GLib-2.0.typelib +%%DEFAULT%%lib/girepository-1.0/GLibUnix-2.0.typelib +%%DEFAULT%%lib/girepository-1.0/GModule-2.0.typelib +%%DEFAULT%%lib/girepository-1.0/GObject-2.0.typelib +%%DEFAULT%%lib/girepository-1.0/Gio-2.0.typelib +%%DEFAULT%%lib/girepository-1.0/GioUnix-2.0.typelib lib/libgirepository-2.0.a lib/libgirepository-2.0.so lib/libgirepository-2.0.so.0 @@ -382,15 +389,37 @@ share/bash-completion/completions/gio share/bash-completion/completions/gresource share/bash-completion/completions/gsettings +%%DOCS%%share/doc/gio-2.0/gapplication.html +%%DOCS%%share/doc/gio-2.0/gdbus-codegen.html +%%DOCS%%share/doc/gio-2.0/gdbus.html +%%DOCS%%share/doc/gio-2.0/gio-querymodules.html +%%DOCS%%share/doc/gio-2.0/gio.html +%%DOCS%%share/doc/gio-2.0/glib-compile-resources.html +%%DOCS%%share/doc/gio-2.0/glib-compile-schemas.html +%%DOCS%%share/doc/gio-2.0/gresource.html +%%DOCS%%share/doc/gio-2.0/gsettings.html +%%DOCS%%%%DOCSDIR%%-2.0/glib-gettextize.html +%%DOCS%%%%DOCSDIR%%-2.0/gtester-report.html +%%DOCS%%%%DOCSDIR%%-2.0/gtester.html %%DOCS%%%%DOCSDIR%%-2.0/gvariant-byte-boundaries.svg %%DOCS%%%%DOCSDIR%%-2.0/gvariant-integer-and-string-structure.svg %%DOCS%%%%DOCSDIR%%-2.0/gvariant-integer-array.svg %%DOCS%%%%DOCSDIR%%-2.0/gvariant-specification-1.0.html %%DOCS%%%%DOCSDIR%%-2.0/gvariant-string-array.svg +%%DOCS%%share/doc/gobject-2.0/glib-genmarshal.html +%%DOCS%%share/doc/gobject-2.0/glib-mkenums.html +%%DOCS%%share/doc/gobject-2.0/gobject-query.html share/gdb/auto-load%%RESETPREFIX%%/lib/libglib-2.0.so.%%LIBVERSION%%-gdb.py share/gdb/auto-load%%RESETPREFIX%%/lib/libgobject-2.0.so.%%LIBVERSION%%-gdb.py share/gettext/its/gschema.its share/gettext/its/gschema.loc +%%DEFAULT%%share/gir-1.0/GIRepository-3.0.gir +%%DEFAULT%%share/gir-1.0/GLib-2.0.gir +%%DEFAULT%%share/gir-1.0/GLibUnix-2.0.gir +%%DEFAULT%%share/gir-1.0/GModule-2.0.gir +%%DEFAULT%%share/gir-1.0/GObject-2.0.gir +%%DEFAULT%%share/gir-1.0/Gio-2.0.gir +%%DEFAULT%%share/gir-1.0/GioUnix-2.0.gir %%DATADIR%%-2.0/codegen/__init__.py %%DATADIR%%-2.0/codegen/__init__.pyc %%DATADIR%%-2.0/codegen/__init__.pyo diff --git a/devel/gobject-introspection/Makefile b/devel/gobject-introspection/Makefile --- a/devel/gobject-introspection/Makefile +++ b/devel/gobject-introspection/Makefile @@ -1,6 +1,5 @@ PORTNAME= gobject-introspection -DISTVERSION= 1.78.1 -PORTREVISION= 2 +DISTVERSION= 1.82.0 PORTEPOCH= 1 CATEGORIES= devel MASTER_SITES= GNOME @@ -17,19 +16,33 @@ LIB_DEPENDS= libffi.so:devel/libffi -PORTSCOUT= limitw:1,even +FLAVORS= default bootstrap + +default_LIB_DEPENDS= libglib-2.0.so:devel/glib20 +default_CONFLICTS_INSTALL= gobject-introspection-bootstrap + +bootstrap_PKGNAMESUFFIX= -bootstrap +bootstrap_LIB_DEPENDS= libglib-2.0.so:devel/glib20@bootstrap +bootstrap_CONFLICTS_INSTALL= gobject-introspection USES= bison gettext gnome localbase meson pkgconfig python tar:xz -USE_GNOME= glib20 USE_LDCONFIG= yes MESON_ARGS= -Ddoctool=disabled \ -Dpython=${PYTHON_CMD} +PORTSCOUT= limitw:1,even OPTIONS_DEFINE= TEST TEST_MESON_ENABLED= cairo TEST_LIB_DEPENDS= libcairo.so:graphics/cairo +.include + +.if ${PYTHON_REL} >= 31200 +BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR} +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR} +.endif + post-patch: @${REINPLACE_CMD} -e 's|%%PYTHON_CMD%%|${PYTHON_CMD}|' ${WRKSRC}/tools/meson.build @@ -42,4 +55,4 @@ post-install: @${RM} ${STAGEDIR}${PREFIX}/lib/gobject-introspection/giscanner/doctemplates/*/meson.build* -.include +.include diff --git a/devel/gobject-introspection/distinfo b/devel/gobject-introspection/distinfo --- a/devel/gobject-introspection/distinfo +++ b/devel/gobject-introspection/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1694863927 -SHA256 (gnome/gobject-introspection-1.78.1.tar.xz) = bd7babd99af7258e76819e45ba4a6bc399608fe762d83fde3cac033c50841bb4 -SIZE (gnome/gobject-introspection-1.78.1.tar.xz) = 1060296 +TIMESTAMP = 1728051662 +SHA256 (gnome/gobject-introspection-1.82.0.tar.xz) = 0f5a4c1908424bf26bc41e9361168c363685080fbdb87a196c891c8401ca2f09 +SIZE (gnome/gobject-introspection-1.82.0.tar.xz) = 1052872 diff --git a/devel/gobject-introspection/pkg-plist b/devel/gobject-introspection/pkg-plist --- a/devel/gobject-introspection/pkg-plist +++ b/devel/gobject-introspection/pkg-plist @@ -29,10 +29,6 @@ lib/girepository-1.0/DBusGLib-1.0.typelib lib/girepository-1.0/GIRepository-2.0.typelib lib/girepository-1.0/GL-1.0.typelib -lib/girepository-1.0/GLib-2.0.typelib -lib/girepository-1.0/GModule-2.0.typelib -lib/girepository-1.0/GObject-2.0.typelib -lib/girepository-1.0/Gio-2.0.typelib lib/girepository-1.0/Vulkan-1.0.typelib lib/girepository-1.0/cairo-1.0.typelib lib/girepository-1.0/fontconfig-2.0.typelib @@ -204,10 +200,6 @@ share/gir-1.0/DBusGLib-1.0.gir share/gir-1.0/GIRepository-2.0.gir share/gir-1.0/GL-1.0.gir -share/gir-1.0/GLib-2.0.gir -share/gir-1.0/GModule-2.0.gir -share/gir-1.0/GObject-2.0.gir -share/gir-1.0/Gio-2.0.gir share/gir-1.0/Vulkan-1.0.gir share/gir-1.0/cairo-1.0.gir share/gir-1.0/fontconfig-2.0.gir @@ -232,6 +224,8 @@ %%DATADIR%%-1.0/tests/gimarshallingtests.c %%DATADIR%%-1.0/tests/gimarshallingtests.h %%DATADIR%%-1.0/tests/gitestmacros.h +%%DATADIR%%-1.0/tests/regress-unix.c +%%DATADIR%%-1.0/tests/regress-unix.h %%DATADIR%%-1.0/tests/regress.c %%DATADIR%%-1.0/tests/regress.h %%DATADIR%%-1.0/tests/utility.c