From nobody Sun Mar 27 13:24:44 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 A4A5A1A34257; Sun, 27 Mar 2022 13:24:44 +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 4KRGlJ4C4Rz4YqN; Sun, 27 Mar 2022 13:24:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648387484; 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=Kwn0eMlfHgdSgPvYvd+bg3pLMkThXgXaV+A7nGyi4QM=; b=njhl1P5pVvSofPFgC8WEYPsS3I9Lu3Avju8221pUP3f2o6dB9GPAS753ddSOxYsvDmIOBi dDksJQJ2fu+2RqDvURp205NGOQEbYiRHJEegTGQs1jdL2E71tYEopsLN9axmtOribvyfOz 5Nx8yMluI7pWn10qUNBwq+zL6ltgFitRrlwURZmxWw8S1O8ed/s0WpIbfRTmBiOO0xuGTu LZI7xZ2BBeriv5stJNl861J7/32Rv4TbnMwZGT03oaWM/6BwaTU9pchT/CR+teujM4iJew OshB3jnT4hIlBxnuO0FFs2hp3QYIQ4ANzuFheEy2oxE342lrhjOH3IGfMQ27tQ== 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 7060E1630E; Sun, 27 Mar 2022 13:24:44 +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 22RDOi62083571; Sun, 27 Mar 2022 13:24:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22RDOiQT083569; Sun, 27 Mar 2022 13:24:44 GMT (envelope-from git) Date: Sun, 27 Mar 2022 13:24:44 GMT Message-Id: <202203271324.22RDOiQT083569@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Tobias C. Berner" Subject: git: bd08b1edde61 - main - graphics/gdk-pixbuf2: add trigger to run gdk-pixbuf-query-loaders 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: tcberner X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bd08b1edde618be0d9644299561b696a507a446f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648387484; 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=Kwn0eMlfHgdSgPvYvd+bg3pLMkThXgXaV+A7nGyi4QM=; b=kNvZJbctCjlqPgEYNqCt1Y5fZHMTJsMnNofoXcopHJ0ZUFutL7JC9UGy1hJ75qLZDbejdE EPT3/DxeSCDKFqrSlFbSM1MR1h36Rq6n4NoIw0lqp3q0ThPf9xJsdsCsBzuSHd1igWBE5J iM0w7gUbaHXRwm55Rj9SXbq4nw2f2kCeEhumgVvqAg4i4mLvCBWH9YEzelOT70sS8Cz2FL 3aE4HRN75Hr6czJG2Y304entYYctoJj6rRe2Sf4cceXuWc+uf69R80EDpPkZYJygvhg2oi qpvHp9VgdtMTpA9AaxmkJuDvkFd2PRCmr0whNHfrEGGjG6CJdGldyzAPHy155g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648387484; a=rsa-sha256; cv=none; b=JkwlwidLlAGf8RIcKBYGarlmNFlSl+/Tu/aob5fOVPCFlRADUY86VvXz7I8NGztPklho4y WRZfqTTaDgrrmePiseZ2ULUnq7QmVg8sf0m5AFbNFVz7aIj4BUpbiSvGyGgq54lRMZIs4v lM3x2MA23UpHey1RqaUbV2UN6YFzV+up7IGvCqxYZlADg9kxG1+NMGWi12XNXKELKR5biI dq0LLcKjvN2oxYifgTPZ3SRbzAma4dE+KpMNTg0xXuOV4LuqmfuPI6Jc5To3sfKZyFo94S 06B31zpbnp4KxCLctdYDKmdjV7h6C2hpw/hb0HZ2p3vXAg+z2xZDjl92AR5YMQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by tcberner: URL: https://cgit.FreeBSD.org/ports/commit/?id=bd08b1edde618be0d9644299561b696a507a446f commit bd08b1edde618be0d9644299561b696a507a446f Author: Tobias C. Berner AuthorDate: 2022-03-26 07:05:20 +0000 Commit: Tobias C. Berner CommitDate: 2022-03-27 13:21:30 +0000 graphics/gdk-pixbuf2: add trigger to run gdk-pixbuf-query-loaders gdk-pixbuf2 uses a cache of its loadable modules, which is updated by ${RREFIX}/bin/gdk-pixbuf-query-loaders and stored in ${PREFIX}/lib/gdk-pixbuf-2.0/${GTK2_VERSION}/loaders. Remove the pre-existing @exec and @postexec commands in the ports providing such modules, and add a trigger in graphics/gdk-pixbuf2 to do this automatically. Reviewed by: bapt Differential Revision: https://reviews.freebsd.org/D34679 --- Mk/bsd.port.mk | 2 +- graphics/gdk-pixbuf2/Makefile | 4 +++- .../gdk-pixbuf2/files/gdk-pixbuf-query-loaders.ucl.in | 17 +++++++++++++++++ graphics/gdk-pixbuf2/pkg-plist | 2 -- graphics/libavif/pkg-plist | 2 -- graphics/libjxl/pkg-plist | 2 -- graphics/librsvg2-rust/pkg-plist | 2 -- graphics/librsvg2/pkg-plist | 2 -- graphics/webp-pixbuf-loader/pkg-plist | 2 -- 9 files changed, 21 insertions(+), 14 deletions(-) diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 58a03b2fb643..6710a7cee2df 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -1927,7 +1927,7 @@ _FORCE_POST_PATTERNS= rmdir kldxref mkfontscale mkfontdir fc-cache \ load-octave-pkg \ ocamlfind \ update-desktop-database update-mime-database \ - gdk-pixbuf-query-loaders catalog.ports \ + catalog.ports \ ccache-update-links .if defined(USE_LOCAL_MK) diff --git a/graphics/gdk-pixbuf2/Makefile b/graphics/gdk-pixbuf2/Makefile index 3804cb947246..17c1e597d833 100644 --- a/graphics/gdk-pixbuf2/Makefile +++ b/graphics/gdk-pixbuf2/Makefile @@ -17,11 +17,13 @@ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= docbook-xsl>0:textproc/docbook-xsl USES= cpe gettext gnome localbase:ldflags meson pkgconfig \ - python:3.4+,build shared-mime-info tar:xz + python:3.4+,build shared-mime-info tar:xz trigger CPE_VENDOR= gnome USE_GNOME= glib20 introspection:build libxslt:build USE_LDCONFIG= yes MESON_ARGS= -Dman=true +TRIGGERS= gdk-pixbuf-query-loaders +SUB_LIST= GTK2_VERSION=${GTK2_VERSION} BINARY_ALIAS= python3=${PYTHON_VERSION} diff --git a/graphics/gdk-pixbuf2/files/gdk-pixbuf-query-loaders.ucl.in b/graphics/gdk-pixbuf2/files/gdk-pixbuf-query-loaders.ucl.in new file mode 100644 index 000000000000..814bf2d40b72 --- /dev/null +++ b/graphics/gdk-pixbuf2/files/gdk-pixbuf-query-loaders.ucl.in @@ -0,0 +1,17 @@ +path: "%%PREFIX%%/lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders" +cleanup: { + type: lua + sandbox: false + script: < /dev/null 2>&1 && %D/bin/gdk-pixbuf-query-loaders > %D/lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders.cache 2>/dev/null || /usr/bin/true -@postunexec rm %D/lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders.cache 2>&1 >/dev/null || true diff --git a/graphics/libavif/pkg-plist b/graphics/libavif/pkg-plist index 23c018ec1137..08f46c72a996 100644 --- a/graphics/libavif/pkg-plist +++ b/graphics/libavif/pkg-plist @@ -9,5 +9,3 @@ lib/libavif.so lib/libavif.so.13 lib/libavif.so.13.0.0 libdata/pkgconfig/libavif.pc -%%PIXBUF%%@postexec %D/bin/gdk-pixbuf-query-loaders > /dev/null 2>&1 && %D/bin/gdk-pixbuf-query-loaders > %D/lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders.cache 2>/dev/null || /usr/bin/true -%%PIXBUF%%@postunexec %D/bin/gdk-pixbuf-query-loaders > /dev/null 2>&1 && %D/bin/gdk-pixbuf-query-loaders > %D/lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders.cache 2>/dev/null || /usr/bin/true diff --git a/graphics/libjxl/pkg-plist b/graphics/libjxl/pkg-plist index 77bfe896e4c8..91051800f600 100644 --- a/graphics/libjxl/pkg-plist +++ b/graphics/libjxl/pkg-plist @@ -33,5 +33,3 @@ libdata/pkgconfig/libjxl_threads.pc %%MANPAGES%%share/man/man1/djxl.1.gz share/mime/packages/image-jxl.xml %%PIXBUF%%share/thumbnailers/jxl.thumbnailer -%%PIXBUF%%@postexec %D/bin/gdk-pixbuf-query-loaders > /dev/null 2>&1 && %D/bin/gdk-pixbuf-query-loaders > %D/lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders.cache 2>/dev/null || /usr/bin/true -%%PIXBUF%%@postunexec %D/bin/gdk-pixbuf-query-loaders > /dev/null 2>&1 && %D/bin/gdk-pixbuf-query-loaders > %D/lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders.cache 2>/dev/null || /usr/bin/true diff --git a/graphics/librsvg2-rust/pkg-plist b/graphics/librsvg2-rust/pkg-plist index eac007058524..e44127c344eb 100644 --- a/graphics/librsvg2-rust/pkg-plist +++ b/graphics/librsvg2-rust/pkg-plist @@ -131,5 +131,3 @@ man/man1/rsvg-convert.1.gz share/gir-1.0/Rsvg-2.0.gir share/thumbnailers/librsvg.thumbnailer share/vala/vapi/librsvg-2.0.vapi -@postexec %D/bin/gdk-pixbuf-query-loaders > /dev/null 2>&1 && %D/bin/gdk-pixbuf-query-loaders > %D/lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders.cache 2>/dev/null || /usr/bin/true -@postunexec %D/bin/gdk-pixbuf-query-loaders > /dev/null 2>&1 && %D/bin/gdk-pixbuf-query-loaders > %D/lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders.cache 2>/dev/null || /usr/bin/true diff --git a/graphics/librsvg2/pkg-plist b/graphics/librsvg2/pkg-plist index 07d52269c0e0..d5d4006c0c14 100644 --- a/graphics/librsvg2/pkg-plist +++ b/graphics/librsvg2/pkg-plist @@ -35,5 +35,3 @@ man/man1/rsvg-convert.1.gz share/gir-1.0/Rsvg-2.0.gir share/thumbnailers/librsvg.thumbnailer %%VAPI%%share/vala/vapi/librsvg-2.0.vapi -@postexec %D/bin/gdk-pixbuf-query-loaders > /dev/null 2>&1 && %D/bin/gdk-pixbuf-query-loaders > %D/lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders.cache 2>/dev/null || /usr/bin/true -@postunexec %D/bin/gdk-pixbuf-query-loaders > /dev/null 2>&1 && %D/bin/gdk-pixbuf-query-loaders > %D/lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders.cache 2>/dev/null || /usr/bin/true diff --git a/graphics/webp-pixbuf-loader/pkg-plist b/graphics/webp-pixbuf-loader/pkg-plist index 42b7ba98ad0b..8f9f1875cd6a 100644 --- a/graphics/webp-pixbuf-loader/pkg-plist +++ b/graphics/webp-pixbuf-loader/pkg-plist @@ -1,4 +1,2 @@ lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-webp.so share/thumbnailers/webp-pixbuf.thumbnailer -@postexec %D/bin/gdk-pixbuf-query-loaders > /dev/null 2>&1 && %D/bin/gdk-pixbuf-query-loaders > %D/lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders.cache 2>/dev/null || /usr/bin/true -@postunexec %D/bin/gdk-pixbuf-query-loaders > /dev/null 2>&1 && %D/bin/gdk-pixbuf-query-loaders > %D/lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders.cache 2>/dev/null || /usr/bin/true