kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

editors/libreoffice: drop handling of icon cache

Browse source 
Let the icon cache be handle by the trigger brought in by the toolkits
on the system.
This commit is contained in:
Baptiste Daroussin 2021-10-11 09:16:55 +02:00
parent ac9de29196
commit 40f1c0d283
2 changed files with 3 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
editors/libreoffice/Makefile
View file

@ -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 <bsd.port.post.mk>

10
editors/libreoffice6/Makefile
View file

@ -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 <bsd.port.post.mk>