From nobody Mon Oct 11 07:17:51 2021 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 CA95117E2EB0; Mon, 11 Oct 2021 07:17:52 +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 4HSVW36qNnz4snc; Mon, 11 Oct 2021 07:17:51 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 A66261CD2F; Mon, 11 Oct 2021 07:17:51 +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 19B7HpoL050336; Mon, 11 Oct 2021 07:17:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19B7HpxQ050335; Mon, 11 Oct 2021 07:17:51 GMT (envelope-from git) Date: Mon, 11 Oct 2021 07:17:51 GMT Message-Id: <202110110717.19B7HpxQ050335@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: 40f1c0d283d4 - main - editors/libreoffice: drop handling of icon cache 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: 40f1c0d283d42c1c89222da3e84428db730c31cf Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/ports/commit/?id=40f1c0d283d42c1c89222da3e84428db730c31cf commit 40f1c0d283d42c1c89222da3e84428db730c31cf Author: Baptiste Daroussin AuthorDate: 2021-10-11 07:16:55 +0000 Commit: Baptiste Daroussin CommitDate: 2021-10-11 07:16:55 +0000 editors/libreoffice: drop handling of icon cache Let the icon cache be handle by the trigger brought in by the toolkits on the system. --- editors/libreoffice/Makefile | 13 ++----------- editors/libreoffice6/Makefile | 10 +--------- 2 files changed, 3 insertions(+), 20 deletions(-) diff --git a/editors/libreoffice/Makefile b/editors/libreoffice/Makefile index 1749975bc153..4d95da5e1a91 100644 --- a/editors/libreoffice/Makefile +++ b/editors/libreoffice/Makefile @@ -149,12 +149,10 @@ GNOME_LIB_DEPENDS= libdbus-1.so:devel/dbus \ GNOME_USE= GNOME=dconf GTK3_CONFIGURE_ENABLE= gtk3 -GTK3_USE= GNOME=gtk30,gtk-update-icon-cache -GTK3_VARS= POST_PLIST=add-plist-gnome +GTK3_USE= GNOME=gtk30 GTK4_CONFIGURE_ENABLE= gtk4 -GTK4_USE= GNOME=gtk40,gtk-update-icon-cache -GTK4_VARS= POST_PLIST=add-plist-gnome +GTK4_USE= GNOME=gtk40 JAVA_BUILD_DEPENDS= ant:devel/apache-ant \ ${JAVAJARDIR}/commons-codec.jar:java/apache-commons-codec \ @@ -346,11 +344,4 @@ post-install-SDK-on: ${FIND} -s ${subdir}/libreoffice -not -type d >> ${TMPPLIST} .endfor -add-plist-gnome: -.for subdir in gnome hicolor locolor - @${ECHO_CMD} "@rmtry share/icons/${subdir}/icon-theme.cache" >> ${TMPPLIST} - @${ECHO_CMD} "@postexec ${LOCALBASE}/bin/gtk-update-icon-cache -q -f %D/share/icons/${subdir} 2>/dev/null || ${TRUE}" >> ${TMPPLIST} - @${ECHO_CMD} "@postunexec ${LOCALBASE}/bin/gtk-update-icon-cache -q -f %D/share/icons/${subdir} 2>/dev/null || ${TRUE}" >> ${TMPPLIST} -.endfor - .include diff --git a/editors/libreoffice6/Makefile b/editors/libreoffice6/Makefile index dfa18147dd27..ceb69f8fd542 100644 --- a/editors/libreoffice6/Makefile +++ b/editors/libreoffice6/Makefile @@ -146,8 +146,7 @@ GNOME_LIB_DEPENDS= libdbus-1.so:devel/dbus \ GNOME_USE= GNOME=dconf GTK3_CONFIGURE_ENABLE= gtk3 -GTK3_USE= GNOME=gtk30,gtk-update-icon-cache -GTK3_VARS= POST_PLIST=add-plist-gnome +GTK3_USE= GNOME=gtk30 I18N_CONFIGURE_WITH= lang=ALL I18N_DISTFILES= ${PORTNAME}-dictionaries-${LOVERSION}${EXTRACT_SUFX} \ @@ -322,11 +321,4 @@ post-install-SDK-on: ${FIND} -s ${subdir}/libreoffice -not -type d >> ${TMPPLIST} .endfor -add-plist-gnome: -.for subdir in gnome hicolor locolor - @${ECHO_CMD} "@rmtry share/icons/${subdir}/icon-theme.cache" >> ${TMPPLIST} - @${ECHO_CMD} "@postexec ${LOCALBASE}/bin/gtk-update-icon-cache -q -f %D/share/icons/${subdir} 2>/dev/null || ${TRUE}" >> ${TMPPLIST} - @${ECHO_CMD} "@postunexec ${LOCALBASE}/bin/gtk-update-icon-cache -q -f %D/share/icons/${subdir} 2>/dev/null || ${TRUE}" >> ${TMPPLIST} -.endfor - .include