Index: head/devel/glib20/Makefile =================================================================== --- head/devel/glib20/Makefile (revision 552775) +++ head/devel/glib20/Makefile (revision 552776) @@ -1,105 +1,106 @@ # Created by: Vanilla I. Shu # $FreeBSD$ PORTNAME= glib PORTVERSION= 2.66.1 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= devel MASTER_SITES= GNOME DIST_SUBDIR= gnome MAINTAINER= desktop@FreeBSD.org COMMENT= Some useful routines of C programming (current stable version) LICENSE= LGPL20 USES= tar:xz PORTSCOUT= limitw:1,even LIB_DEPENDS+= libpcre.so:devel/pcre \ libffi.so:devel/libffi # 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 gettext gnome iconv:wchar_t \ localbase:ldflags meson perl5 pkgconfig python:3.5+ USE_PYTHON= py3kplist USE_PERL5= build USE_LDCONFIG= yes MESON_ARGS= -Db_lundef=false \ -Dlibmount=disabled \ -Dselinux=disabled \ -Dinstalled_tests=false \ -Ddefault_library=both \ -Dxattr=false BINARY_ALIAS= python3=${PYTHON_CMD} LIBVERSION= 0.6600.1 PLIST_SUB+= LIBVERSION=${LIBVERSION} glib_MAN= gtester.1 gtester-report.1 glib-gettextize.1 gio_MAN= gdbus.1 gsettings.1 gio-querymodules.1 gio.1 \ glib-compile-schemas.1 gapplication.1 \ glib-compile-resources.1 gresource.1 gdbus-codegen.1 gobject_MAN= glib-genmarshal.1 glib-mkenums.1 gobject-query.1 OPTIONS_DEFINE= DEBUG MANPAGES NLS OPTIONS_DEFAULT= MANPAGES OPTIONS_SUB= yes 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 .include # doesn't build yet MESON_ARGS+= -Ddtrace=false .if empty(ICONV_LIB) MESON_ARGS+= -Diconv=libc # native? .else MESON_ARGS+= -Diconv=external .endif .if ${ARCH} == powerpc64 EXTRA_PATCHES+= ${FILESDIR}/extra-arch-powerpc64 .endif 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 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 Index: head/devel/glib20/files/patch-gio_gunixmounts.c =================================================================== --- head/devel/glib20/files/patch-gio_gunixmounts.c (nonexistent) +++ head/devel/glib20/files/patch-gio_gunixmounts.c (revision 552776) @@ -0,0 +1,41 @@ +--- gio/gunixmounts.c.orig 2020-10-01 09:17:53.138733000 -0400 ++++ gio/gunixmounts.c 2020-10-15 13:05:40.628175000 -0400 +@@ -1389,6 +1389,8 @@ + + #elif (defined(HAVE_GETVFSSTAT) || defined(HAVE_GETFSSTAT)) && defined(HAVE_FSTAB_H) && defined(HAVE_SYS_MOUNT_H) + ++G_LOCK_DEFINE_STATIC(getfsent); ++ + static GList * + _g_get_unix_mount_points (void) + { +@@ -1400,9 +1402,6 @@ + struct stat sb; + #endif + +- if (!setfsent ()) +- return NULL; +- + return_list = NULL; + + #ifdef HAVE_SYS_SYSCTL_H +@@ -1433,6 +1432,11 @@ + #endif + #endif + ++ G_LOCK (getfsent); ++ if (!setfsent ()) { ++ G_UNLOCK (getfsent); ++ return NULL; ++ } + while ((fstab = getfsent ()) != NULL) + { + gboolean is_read_only = FALSE; +@@ -1468,6 +1472,7 @@ + } + + endfsent (); ++ G_UNLOCK (getfsent); + + return g_list_reverse (return_list); + } Property changes on: head/devel/glib20/files/patch-gio_gunixmounts.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property