diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile index 62d08626ae72..6b6c5fd91646 100644 --- a/devel/glib20/Makefile +++ b/devel/glib20/Makefile @@ -1,110 +1,114 @@ # Created by: Vanilla I. Shu PORTNAME= glib DISTVERSION= 2.70.0 +PORTREVISION= 1 PORTEPOCH= 2 CATEGORIES= devel MASTER_SITES= GNOME DIST_SUBDIR= gnome MAINTAINER= desktop@FreeBSD.org COMMENT= Some useful routines of C programming (current stable version) LICENSE= LGPL20 LIB_DEPENDS= libffi.so:devel/libffi \ libpcre.so:devel/pcre # 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 \ meson perl5 pkgconfig python:3.6+ tar:xz USE_LDCONFIG= yes USE_PERL5= build USE_PYTHON= py3kplist MESON_ARGS= -Db_lundef=false \ -Ddefault_library=both \ -Dinstalled_tests=false \ -Dlibmount=disabled \ -Dlocalstatedir=/var \ -Dselinux=disabled \ -Dxattr=false BINARY_ALIAS= python3=${PYTHON_CMD} PORTSCOUT= limitw:1,even CPE_VENDOR= gnome _LIBVERSION= 0.7000.0 PLIST_SUB= LIBVERSION=${_LIBVERSION} -OPTIONS_DEFINE= DEBUG FAM_ALTBACKEND MANPAGES NLS +OPTIONS_DEFINE= DEBUG FAM_ALTBACKEND MANPAGES NLS TEST OPTIONS_DEFAULT= MANPAGES OPTIONS_SUB= yes 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 +TEST_DEPENDS= dbus-daemon:devel/dbus +TEST_MESON_TRUE= tests + .include # doesn't build yet MESON_ARGS+= -Ddtrace=false .if empty(ICONV_LIB) # native? MESON_ARGS+= -Diconv=libc .else MESON_ARGS+= -Diconv=external .endif pre-configure-FAM_ALTBACKEND-on: @${REINPLACE_CMD} -e 's|kqueue-helper.c|kqueue_fnm.c|g ; \ s|.*kqueue-missing.c.*||g ; \ s|.*dep-list.c.*||g' \ ${WRKSRC}/gio/kqueue/meson.build @${CP} -f ${FILESDIR}/gkqueuefilemonitor.c ${WRKSRC}/gio/kqueue/gkqueuefilemonitor.c @${CP} ${FILESDIR}/kqueue_fnm.c ${WRKSRC}/gio/kqueue/kqueue_fnm.c @${CP} ${FILESDIR}/kqueue_fnm.h ${WRKSRC}/gio/kqueue/kqueue_fnm.h post-patch: ${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g ; \ s|/usr/share/locale/locale|${LOCALBASE}/share/locale/locale|g' \ ${WRKSRC}/glib/gutils.c ${REINPLACE_CMD} -e 's|@PYTHON@|${PYTHON_CMD}|g' \ ${WRKSRC}/gio/gdbus-2.0/codegen/gdbus-codegen.in \ ${WRKSRC}/glib/gtester-report.in \ ${WRKSRC}/gobject/glib-genmarshal.in \ ${WRKSRC}/gobject/glib-mkenums.in ${REINPLACE_CMD} -e '/inotify_init1/d' \ -e '/inotify.h/d' \ ${WRKSRC}/meson.build ${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ ${WRKSRC}/gio/xdgmime/xdgmime.c \ ${WRKSRC}/glib/gutils.c \ ${WRKSRC}/glib/tests/utils.c CODEGENDIR= ${PREFIX}/share/glib-2.0/codegen post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/share/GConf/gsettings ${MKDIR} ${STAGEDIR}${PREFIX}/lib/gio/modules # generates .py[co] files for installed modules # if that's not done, ${PYTHON_SITELIBDIR}/gps will be polluted # with these files when module is imported from root user ${FIND} ${STAGEDIR}${PREFIX} -name \*.pyc -delete (cd ${STAGEDIR}${PREFIX} && \ ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \ -d ${CODEGENDIR} -f ${CODEGENDIR:S;${PREFIX}/;;} && \ ${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \ -d ${CODEGENDIR} -f ${CODEGENDIR:S;${PREFIX}/;;}) # install bash completion regardless if bash is present ${MKDIR} ${STAGEDIR}${PREFIX}/share/bash-completion/completions .for file in gapplication gdbus gio gresource gsettings ${INSTALL_DATA} ${WRKSRC}/gio/completion/${file} \ ${STAGEDIR}${PREFIX}/share/bash-completion/completions/ .endfor ${RM} -r ${STAGEDIR}${PREFIX}/libexec/installed-tests .include diff --git a/devel/glib20/files/patch-gio_tests_meson.build b/devel/glib20/files/patch-gio_tests_meson.build new file mode 100644 index 000000000000..435c5afe7f2d --- /dev/null +++ b/devel/glib20/files/patch-gio_tests_meson.build @@ -0,0 +1,61 @@ +--- gio/tests/meson.build.orig 2021-06-10 18:57:57 UTC ++++ gio/tests/meson.build +@@ -49,7 +49,6 @@ gio_tests = { + 'buffered-output-stream' : {}, + 'cancellable' : {}, + 'contexts' : {}, +- 'contenttype' : {}, + 'converter-stream' : {}, + 'credentials' : {}, + 'data-input-stream' : {}, +@@ -94,7 +93,6 @@ gio_tests = { + 'tls-interaction' : {'extra_sources' : ['gtesttlsbackend.c']}, + 'tls-database' : {'extra_sources' : ['gtesttlsbackend.c']}, + 'tls-bindings' : {'extra_sources' : ['gtesttlsbackend.c']}, +- 'gdbus-address-get-session' : {}, + 'win32-appinfo' : {}, + } + +@@ -151,10 +149,6 @@ endif + if host_machine.system() != 'windows' + gio_tests += { + 'file' : {}, +- 'gdbus-peer' : { +- 'dependencies' : [libgdbus_example_objectmanager_dep], +- 'install_rpath' : installed_tests_execdir +- }, + 'gdbus-peer-object-manager' : {}, + 'live-g-file' : {}, + 'socket-address' : {}, +@@ -190,31 +184,14 @@ if host_machine.system() != 'windows' + } + endif + +- # Uninstalled because of the check-for-executable logic in DesktopAppInfo +- # unable to find the installed executable +- if not glib_have_cocoa +- gio_tests += { +- 'appinfo' : { +- 'install' : false, +- }, +- 'desktop-app-info' : { +- 'install' : false, +- }, +- } +- endif +- + test_extra_programs += { + 'basic-application' : {}, + 'dbus-launch' : {}, +- 'appinfo-test' : {}, + } + + if not glib_have_cocoa + test_extra_programs += { + 'apps' : {}, +- } +- gio_tests += { +- 'mimeapps' : {}, + } + endif + diff --git a/devel/glib20/files/patch-glib_glib-unix.c b/devel/glib20/files/patch-glib_glib-unix.c new file mode 100644 index 000000000000..1160e0cf537f --- /dev/null +++ b/devel/glib20/files/patch-glib_glib-unix.c @@ -0,0 +1,63 @@ +--- glib/glib-unix.c.orig 2021-09-17 10:17:56 UTC ++++ glib/glib-unix.c +@@ -463,7 +463,6 @@ g_unix_get_passwd_entry (const gchar *user_name, + } *buffer = NULL; + gsize string_buffer_size = 0; + GError *local_error = NULL; +- int errsv = 0; + + g_return_val_if_fail (user_name != NULL, NULL); + g_return_val_if_fail (error == NULL || *error == NULL, NULL); +@@ -493,10 +492,8 @@ g_unix_get_passwd_entry (const gchar *user_name, + */ + buffer = g_malloc0 (sizeof (*buffer) + string_buffer_size + 6); + +- errno = 0; + retval = getpwnam_r (user_name, &buffer->pwd, buffer->string_buffer, + string_buffer_size, &passwd_file_entry); +- errsv = errno; + + /* Bail out if: the lookup was successful, or if the user id can't be + * found (should be pretty rare case actually), or if the buffer should be +@@ -508,19 +505,19 @@ g_unix_get_passwd_entry (const gchar *user_name, + break; + } + else if (retval == 0 || +- errsv == ENOENT || errsv == ESRCH || +- errsv == EBADF || errsv == EPERM) ++ retval == ENOENT || retval == ESRCH || ++ retval == EBADF || retval == EPERM) + { + /* Username not found. */ +- g_unix_set_error_from_errno (&local_error, errsv); ++ g_unix_set_error_from_errno (&local_error, retval); + break; + } +- else if (errsv == ERANGE) ++ else if (retval == ERANGE) + { + /* Can’t allocate enough string buffer space. */ + if (string_buffer_size > 32 * 1024) + { +- g_unix_set_error_from_errno (&local_error, errsv); ++ g_unix_set_error_from_errno (&local_error, retval); + break; + } + +@@ -529,7 +526,7 @@ g_unix_get_passwd_entry (const gchar *user_name, + } + else + { +- g_unix_set_error_from_errno (&local_error, errsv); ++ g_unix_set_error_from_errno (&local_error, retval); + break; + } + } +@@ -543,7 +540,6 @@ g_unix_get_passwd_entry (const gchar *user_name, + { + g_clear_pointer (&buffer, g_free); + g_propagate_error (error, g_steal_pointer (&local_error)); +- errno = errsv; + } + + return (struct passwd *) g_steal_pointer (&buffer);