Index: head/devel/glib20/Makefile =================================================================== --- head/devel/glib20/Makefile (revision 565055) +++ head/devel/glib20/Makefile (revision 565056) @@ -1,106 +1,110 @@ # Created by: Vanilla I. Shu # $FreeBSD$ PORTNAME= glib PORTVERSION= 2.66.4 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.4 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 + ${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 Index: head/devel/glib20/files/patch-gio_xdgmime_xdgmime.c =================================================================== --- head/devel/glib20/files/patch-gio_xdgmime_xdgmime.c (revision 565055) +++ head/devel/glib20/files/patch-gio_xdgmime_xdgmime.c (revision 565056) @@ -1,11 +1,11 @@ ---- gio/xdgmime/xdgmime.c.orig Mon Nov 8 22:25:27 2004 -+++ gio/xdgmime/xdgmime.c Sat Nov 13 10:27:22 2004 -@@ -204,7 +204,7 @@ - +--- gio/xdgmime/xdgmime.c.orig 2020-12-17 11:47:11 UTC ++++ gio/xdgmime/xdgmime.c +@@ -235,7 +235,7 @@ xdg_init_dirs (void) xdg_data_dirs = getenv ("XDG_DATA_DIRS"); + if (xdg_data_dirs == NULL) - xdg_data_dirs = "/usr/local/share/:/usr/share/"; -+ xdg_data_dirs = "/usr/local/share/"; ++ xdg_data_dirs = "%%LOCALBASE%%/share/"; - ptr = xdg_data_dirs; - + /* Work out how many dirs we’re dealing with. */ + if (xdg_data_home != NULL || home != NULL) Index: head/devel/glib20/files/patch-glib_gutils.c =================================================================== --- head/devel/glib20/files/patch-glib_gutils.c (revision 565055) +++ head/devel/glib20/files/patch-glib_gutils.c (revision 565056) @@ -1,11 +1,20 @@ ---- glib/gutils.c.orig 2018-12-23 14:10:41.000000000 +0100 -+++ glib/gutils.c 2018-12-27 00:18:23.471950000 +0100 -@@ -2219,7 +2219,7 @@ +--- glib/gutils.c.orig 2020-12-17 11:47:11 UTC ++++ glib/gutils.c +@@ -2500,7 +2500,7 @@ g_build_system_data_dirs (void) + */ + #ifndef G_OS_WIN32 + if (!data_dirs || !data_dirs[0]) +- data_dirs = "/usr/local/share/:/usr/share/"; ++ data_dirs = "%%LOCALBASE%%/share/:/usr/share/"; + + data_dir_vector = g_strsplit (data_dirs, G_SEARCHPATH_SEPARATOR_S, 0); + #else +@@ -2594,7 +2594,7 @@ g_build_system_config_dirs (void) } #else if (!conf_dirs || !conf_dirs[0]) - conf_dirs = "/etc/xdg"; -+ conf_dirs = "/usr/local/etc/xdg:/etc/xdg"; ++ conf_dirs = "%%LOCALBASE%%/etc/xdg:/etc/xdg"; conf_dir_vector = g_strsplit (conf_dirs, G_SEARCHPATH_SEPARATOR_S, 0); #endif Index: head/devel/glib20/files/patch-glib_tests_utils.c =================================================================== --- head/devel/glib20/files/patch-glib_tests_utils.c (revision 565055) +++ head/devel/glib20/files/patch-glib_tests_utils.c (revision 565056) @@ -1,11 +1,11 @@ ---- glib/tests/utils.c.orig 2012-09-24 02:19:54.000000000 +0000 -+++ glib/tests/utils.c 2012-09-24 02:20:48.000000000 +0000 -@@ -416,7 +416,7 @@ +--- glib/tests/utils.c.orig 2020-12-17 11:47:11 UTC ++++ glib/tests/utils.c +@@ -485,7 +485,7 @@ test_xdg_dirs (void) xdg = (gchar *)g_getenv ("XDG_CONFIG_DIRS"); if (!xdg) - xdg = "/etc/xdg"; -+ xdg = "/usr/local/etc/xdg:/etc/xdg"; ++ xdg = "%%LOCALBASE%%/etc/xdg:/etc/xdg"; dirs = g_get_system_config_dirs ();