From nobody Fri Mar 18 10:01:39 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id BA1B81A1EE07; Fri, 18 Mar 2022 10:01:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KKfg74cdxz3mYX; Fri, 18 Mar 2022 10:01:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647597699; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jJoAK3UbpQcFqsgLzdk2PQYZiwhJORQ+DfA6Ogztu+E=; b=eKxnPCLLnQswkW+XH9BJtmV+vHosNMJ6ZzJIcGS4djf/0I2YcVkicS7/Lg56HXPYSYKnle HRirhX54CCcqhdB/KeUNucYKyr3HBIeyhHWuo3aTSHf6a/3CMYsmyy35JAdlj5ej42d4sX 4sGa7tpTqKK6HuK7CDnbH+rKpILOaFqDHzdnfaV7cvgaar5pk/1xq+ni+p2T8eK2LahHms yO8ckwEO7wNmKaRe2s4JirurOC9eRJIQbYDLBIvXj1ulFaFhH/PAqH5V4AT/Cdz8btcsoN MYlpav+lK8hmGk1MRMVAVe8RNq0xwYf0iMvGSA526uphv4PKoioY6CXlSwfvjA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7E44F1C4F4; Fri, 18 Mar 2022 10:01:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 22IA1dEI030092; Fri, 18 Mar 2022 10:01:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22IA1d8a030091; Fri, 18 Mar 2022 10:01:39 GMT (envelope-from git) Date: Fri, 18 Mar 2022 10:01:39 GMT Message-Id: <202203181001.22IA1d8a030091@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 522332dbc718 - main - devel/glib: convert gio modules and glib schemas to triggers List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 522332dbc7186af743b36a5ed6bf8911f7975463 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647597699; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jJoAK3UbpQcFqsgLzdk2PQYZiwhJORQ+DfA6Ogztu+E=; b=naLk7qeBGI/gL9JSOBD8j++EhaWrOF9Egv4sjfOSBIkRUUMLXiIsHkyC0cVG0ZAnu9Io+L fImNrIJ0P736WgB5XAdhtZTGrqSPMWKAVb1230CwT55/Tr9WhHsnLttnNMZGo5BVh3P3ky C2ZjGWocm7TcxRbba1MGBTQpRt1gda81KpU1aqr3tfotNcEXlvEMFdAen7cliculYtTVE8 bejgKdNGikK+m7Y1nyHL8IE3To/+e6G+6lfmI7OqrjvIcXtKQ0UorUIo+pXPJRgEu14+aq HSlkO4bYcZrIUNpzy7EkBdiC17NyRDDL6ZHb+RaKLVLLROEfA1Y5dQIXIF4HgA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1647597699; a=rsa-sha256; cv=none; b=xGSHxtWdEPyCC/7wuvZXfuJLYX1nZiI4SI3Hpwil7IuRDVfTWEjtWWzQEYpkWPsdmd1a6s UYOsb7tJqEAbHX+poM6y+SXvE3nOyD0BKrpHF4G2OQC+LYlcA8CNQUiBBu0SaJqf1moGHm /vLekHsFkIhoAv+PCXO8mE5nd+5S49fiEZlb49M0eHdnUWzSS7K2FkcqYYQH5cyVfKjDVU Q4E1V/0oDSBFWjQbVSiHy8bKzo//0cHIL8xC6MOwZ0myygpmsD5JNywrUyqcaTzN05Z5Rv J+mLZMYvNeWWaQ1/fTIum9pCGnbKK3GIPi1UJAPtuxmbHZoWyi2q/UWhn/UdNA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/ports/commit/?id=522332dbc7186af743b36a5ed6bf8911f7975463 commit 522332dbc7186af743b36a5ed6bf8911f7975463 Author: Baptiste Daroussin AuthorDate: 2022-03-15 09:43:12 +0000 Commit: Baptiste Daroussin CommitDate: 2022-03-18 10:00:23 +0000 devel/glib: convert gio modules and glib schemas to triggers Use trigger to compile glib schemas, and generate gio modules cache PR: 262567 Reviewed by: tcberner Exp-run by: antoine Differential Revision: https://reviews.freebsd.org/D34564 --- Keywords/glib-schemas.ucl | 14 -------------- Mk/Scripts/check_leftovers.sh | 3 --- Mk/Uses/gnome.mk | 3 --- Mk/bsd.port.mk | 2 -- devel/dconf/Makefile | 1 + devel/dconf/pkg-plist | 2 -- devel/gconf2/Makefile | 2 +- devel/gconf2/pkg-plist | 2 -- devel/glib20/Makefile | 4 +++- devel/glib20/files/gio-modules.ucl.in | 16 ++++++++++++++++ devel/glib20/files/glib-schemas.ucl.in | 16 ++++++++++++++++ devel/glib20/pkg-plist | 3 --- 12 files changed, 37 insertions(+), 31 deletions(-) diff --git a/Keywords/glib-schemas.ucl b/Keywords/glib-schemas.ucl deleted file mode 100644 index 192c8ed99efb..000000000000 --- a/Keywords/glib-schemas.ucl +++ /dev/null @@ -1,14 +0,0 @@ -# MAINTAINER: gnome@FreeBSD.org -# -# Rebuild the glib schema cache. -# -# Ports installing glib schemas should use the GLIB_SCHEMAS macro -# from USE_GNOME instead of calling this keyword directly. - -actions: [] -post-install: < /dev/null || true -EOD -post-deinstall: < /dev/null || true -EOD diff --git a/Mk/Scripts/check_leftovers.sh b/Mk/Scripts/check_leftovers.sh index 65c2d143396c..00e8ad4a45dc 100644 --- a/Mk/Scripts/check_leftovers.sh +++ b/Mk/Scripts/check_leftovers.sh @@ -140,9 +140,6 @@ while read -r modtype path extra; do case "${sub_path}" in # gconftool-2 --makefile-uninstall-rule is unpredictable etc/gconf/gconf.xml.defaults/%gconf-tree*.xml) ;; - # This is a cache file for gio modules could be modified - # for any gio modules - lib/gio/modules/giomodule.cache) ;; # removal of info files leaves entry uneasy to cleanup # in info/dir info/dir) ;; diff --git a/Mk/Uses/gnome.mk b/Mk/Uses/gnome.mk index 89f45350ad13..5bde97919ffa 100644 --- a/Mk/Uses/gnome.mk +++ b/Mk/Uses/gnome.mk @@ -411,15 +411,12 @@ gnome-post-gconf-schemas: done .endif -# we put the @glib-schemas behind the plist schema entry, because it compiles files -# in the directory. So we should remove the port file first before recompiling. .if defined(GLIB_SCHEMAS) _USES_install+= 690:gnome-post-glib-schemas gnome-post-glib-schemas: @for i in ${GLIB_SCHEMAS}; do \ ${ECHO_CMD} "share/glib-2.0/schemas/$${i}" >> ${TMPPLIST}; \ done - @${ECHO_CMD} "@glib-schemas" >> ${TMPPLIST}; .endif .endif diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 78961a9b6c31..7419f99e4a45 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -1923,14 +1923,12 @@ PKGPOSTDEINSTALL?= ${PKGDIR}/pkg-post-deinstall _FORCE_POST_PATTERNS= rmdir kldxref mkfontscale mkfontdir fc-cache \ fonts.dir fonts.scale gtk-update-icon-cache \ - gio-querymodules \ gtk-query-immodules \ ldconfig \ load-octave-pkg \ ocamlfind \ update-desktop-database update-mime-database \ gdk-pixbuf-query-loaders catalog.ports \ - glib-compile-schemas \ ccache-update-links .if defined(USE_LOCAL_MK) diff --git a/devel/dconf/Makefile b/devel/dconf/Makefile index 41ff9e480666..997171695011 100644 --- a/devel/dconf/Makefile +++ b/devel/dconf/Makefile @@ -2,6 +2,7 @@ PORTNAME= dconf PORTVERSION= 0.40.0 +PORTREVISION= 1 CATEGORIES= devel gnome MASTER_SITES= GNOME DISTNAME= dconf-${PORTVERSION} diff --git a/devel/dconf/pkg-plist b/devel/dconf/pkg-plist index ba0d6417d18b..40a45bda58e4 100644 --- a/devel/dconf/pkg-plist +++ b/devel/dconf/pkg-plist @@ -20,5 +20,3 @@ share/vala/vapi/dconf.deps share/vala/vapi/dconf.vapi @dir %%ETCDIR%%/db @dir %%ETCDIR%%/profile -@postexec %D/bin/gio-querymodules %D/lib/gio/modules 2>/dev/null || /usr/bin/true -@postunexec %D/bin/gio-querymodules %D/lib/gio/modules 2>/dev/null || /usr/bin/true diff --git a/devel/gconf2/Makefile b/devel/gconf2/Makefile index 992e08073ad7..9e535cc824ad 100644 --- a/devel/gconf2/Makefile +++ b/devel/gconf2/Makefile @@ -3,7 +3,7 @@ PORTNAME= gconf2 PORTVERSION= 3.2.6 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= devel gnome MASTER_SITES= GNOME/sources/GConf/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} DISTNAME= GConf-${PORTVERSION} diff --git a/devel/gconf2/pkg-plist b/devel/gconf2/pkg-plist index 50f6d2dc2b61..f9834ffaf121 100644 --- a/devel/gconf2/pkg-plist +++ b/devel/gconf2/pkg-plist @@ -122,5 +122,3 @@ share/sgml/gconf/gconf-1.0.dtd @dir etc/gconf/gconf.xml.defaults @dir etc/gconf/gconf.xml.mandatory @dir etc/gconf/gconf.xml.system -@postexec %D/bin/gio-querymodules %D/lib/gio/modules 2>/dev/null || /usr/bin/true -@postunexec %D/bin/gio-querymodules %D/lib/gio/modules 2>/dev/null || /usr/bin/true diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile index f4df13465bf6..0ff7ed6e50bb 100644 --- a/devel/glib20/Makefile +++ b/devel/glib20/Makefile @@ -2,6 +2,7 @@ PORTNAME= glib DISTVERSION= 2.70.4 +PORTREVISION= 1 PORTEPOCH= 2 CATEGORIES= devel MASTER_SITES= GNOME @@ -18,7 +19,8 @@ LIB_DEPENDS= 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 cpe gettext gnome iconv:wchar_t localbase:ldflags \ - meson perl5 pkgconfig python:3.6+ tar:xz + meson perl5 pkgconfig python:3.6+ tar:xz trigger +TRIGGERS= gio-modules glib-schemas USE_LDCONFIG= yes USE_PERL5= build USE_PYTHON= py3kplist diff --git a/devel/glib20/files/gio-modules.ucl.in b/devel/glib20/files/gio-modules.ucl.in new file mode 100644 index 000000000000..dafa3a160553 --- /dev/null +++ b/devel/glib20/files/gio-modules.ucl.in @@ -0,0 +1,16 @@ +path: "%%PREFIX%%/lib/gio/modules" +cleanup: { + type: lua + sandbox: false + script: </dev/null || /usr/bin/true -@postunexec /bin/rm -f %D/share/glib-2.0/schemas/gschemas.compiled || /usr/bin/true -@postexec %D/bin/gio-querymodules %D/lib/gio/modules 2>/dev/null || /usr/bin/true