diff options
Diffstat (limited to 'devel/glib20/Makefile')
| -rw-r--r-- | devel/glib20/Makefile | 32 |
1 files changed, 9 insertions, 23 deletions
diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile index 400741e226c2..b3eb8d31d60c 100644 --- a/devel/glib20/Makefile +++ b/devel/glib20/Makefile @@ -1,6 +1,5 @@ PORTNAME= glib -DISTVERSION= 2.84.1 -PORTREVISION= 3 +DISTVERSION= 2.84.4 PORTEPOCH= 2 CATEGORIES= devel MASTER_SITES= GNOME @@ -14,7 +13,6 @@ LICENSE= LGPL20 BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR} LIB_DEPENDS= libffi.so:devel/libffi \ - libinotify.so:devel/libinotify \ libpcre2-8.so:devel/pcre2 RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR} TEST_DEPENDS= dbus-uuidgen:devel/dbus \ @@ -32,7 +30,7 @@ bootstrap_PKGNAMESUFFIX= -bootstrap # 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 \ +USES= compiler:c11 cpe gettext-runtime gnome iconv:wchar_t localbase:ldflags \ meson perl5 pkgconfig python tar:xz ${${FLAVOR}_USES} USE_LDCONFIG= yes USE_PERL5= build @@ -56,7 +54,7 @@ CONFLICTS_INSTALL= p5-Giovanni _LIBVERSION= 0.${DISTVERSION:R:E}00.${DISTVERSION:E} PLIST_SUB= LIBVERSION=${_LIBVERSION} -OPTIONS_DEFINE= DOCS FAM_ALTBACKEND MANPAGES NLS TEST +OPTIONS_DEFINE= DOCS MANPAGES NLS TEST OPTIONS_DEFAULT= MANPAGES OPTIONS_SUB= yes @@ -64,21 +62,22 @@ DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gi-docgen>0:textproc/py-gi-docgen@${P DOCS_IMPLIES= MANPAGES TEST DOCS_MESON_TRUE= documentation -FAM_ALTBACKEND_DESC= Alternate file monitor backend - MANPAGES_BUILD_DEPENDS= rst2man:textproc/py-docutils MANPAGES_MESON_ENABLED= man-pages +NLS_USES= gettext-tools +NLS_MESON_ENABLED= nls + TEST_MESON_TRUE= tests # doesn't build yet MESON_ARGS+= -Ddtrace=disabled .if ${FLAVOR:U} == bootstrap -MESON_ARGS+= -Dintrospection=disabled -Ddocumentation=false -Dman-pages=disabled +MESON_ARGS+= -Dintrospection=disabled -Ddocumentation=false -Dman-pages=disabled -Dnls=disabled OPTIONS_DEFINE= PREFIX= ${LOCALBASE}/glib-bootstrap -PLIST_SUB+= PORTDOCS='@comment ' NLS='@comment ' MANPAGES='@comment ' +PLIST_SUB+= DOCS='@comment ' NLS='@comment ' MANPAGES='@comment ' .else BINARY_ALIAS+= g-ir-scanner=${LOCALBASE}/gobject-introspection-bootstrap/bin/g-ir-scanner MESON_ARGS+= -Dintrospection=enabled @@ -87,6 +86,7 @@ MESON_ARGS+= -Dintrospection=enabled .if exists(/usr/include/sys/inotify.h) MESON_ARGS+= -Dfile_monitor_backend='inotify' .else +LIB_DEPENDS+= libinotify.so:devel/libinotify MESON_ARGS+= -Dfile_monitor_backend='libinotify-kqueue' .endif @@ -96,15 +96,6 @@ post-extract: ${CP} ${LOCALBASE}/glib-bootstrap/libdata/pkgconfig/* ${PKGCONFIG_LINKDIR} .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|@PYTHON@|${PYTHON_CMD}|g' \ ${WRKSRC}/gio/gdbus-2.0/codegen/gdbus-codegen.in \ @@ -121,11 +112,6 @@ post-patch: CODEGENDIR= ${PREFIX}/share/glib-2.0/codegen -post-install-DOCS-on: -# this doc file gets created conditionally, so instead of adding another -# PLIST_SUB item just create an empty file if it is missing - ${TOUCH} ${STAGEDIR}${DOCSDIR}-2.0/const.VA_COPY_AS_ARRAY.html - post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/share/GConf/gsettings ${MKDIR} ${STAGEDIR}${PREFIX}/lib/gio/modules |