MFH: r565169

devel/glib20: Update to 2.66.7

- Update to 2.66.7
- Depend on supported Python versions
- Clean up Makefile

Reviewed by:	tcberner
Approved by:	tcberner
Differential Revision:	https://reviews.freebsd.org/D28646
This commit is contained in:
Juraj Lutter 2021-02-13 18:51:01 +00:00
parent f515353b36
commit 91898d7b26
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/branches/2021Q1/; revision=565171
2 changed files with 32 additions and 40 deletions

View File

@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= glib
PORTVERSION= 2.66.4
PORTREVISION= 1
DISTVERSION= 2.66.7
PORTEPOCH= 1
CATEGORIES= devel
MASTER_SITES= GNOME
@ -14,43 +13,35 @@ 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
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 gettext gnome iconv:wchar_t \
localbase:ldflags meson perl5 pkgconfig python:3.5+
USE_PYTHON= py3kplist
USE_PERL5= build
USES= compiler:c11 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 \
-Dselinux=disabled \
-Dinstalled_tests=false \
-Ddefault_library=both \
-Dxattr=false
BINARY_ALIAS= python3=${PYTHON_CMD}
PORTSCOUT= limitw:1,even
LIBVERSION= 0.6600.4
PLIST_SUB+= LIBVERSION=${LIBVERSION}
_LIBVERSION= 0.6600.7
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_DEFINE= DEBUG MANPAGES NLS
OPTIONS_DEFAULT= MANPAGES
OPTIONS_SUB= yes
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_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 <bsd.port.pre.mk>
@ -59,48 +50,49 @@ MANPAGES_MESON_TRUE= man
MESON_ARGS+= -Ddtrace=false
.if empty(ICONV_LIB)
MESON_ARGS+= -Diconv=libc # native?
# native?
MESON_ARGS+= -Diconv=libc
.else
MESON_ARGS+= -Diconv=external
.endif
.if ${ARCH} == powerpc64
EXTRA_PATCHES+= ${FILESDIR}/extra-arch-powerpc64
EXTRA_PATCHES= ${FILESDIR}/extra-arch-powerpc64
.endif
post-patch:
@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g ; \
${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' \
${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' \
${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
${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
${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
# 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
${RM} -r ${STAGEDIR}${PREFIX}/libexec/installed-tests
.include <bsd.port.post.mk>

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1608351562
SHA256 (gnome/glib-2.66.4.tar.xz) = 97df8670e32f9fd4f7392b0980e661dd625012015d58350da1e58e343f4af984
SIZE (gnome/glib-2.66.4.tar.xz) = 4838124
TIMESTAMP = 1613215761
SHA256 (gnome/glib-2.66.7.tar.xz) = 09f158769f6f26b31074e15b1ac80ec39b13b53102dfae66cfe826fb2cc65502
SIZE (gnome/glib-2.66.7.tar.xz) = 4844892