Public/VeraCrypt
1
0
Fork 0
mirror of https://github.com/veracrypt/VeraCrypt.git synced 2026-08-23 20:39:32 -05:00
Code Activity

Linux/FreeBSD: stop installing symbolic app icon

Browse Source 
Do not package veracrypt-symbolic.svg under hicolor symbolic icons, as KDE may prefer it for AppIndicator tray items and render a black monochrome icon.

Remove the obsolete symbolic icon during generic installer upgrades and refresh the hicolor icon cache after install or uninstall cleanup.
This commit is contained in:
Mounir IDRASSI
2026-06-20 14:45:46 +09:00
parent 3650fdfca4
commit ee0d67ad16
10 changed files with 68 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Build/CMakeLists.txt
+5
View File
@@ -322,8 +322,10 @@ if ( ( PLATFORM STREQUAL "Debian" ) OR ( PLATFORM STREQUAL "Ubuntu" ) )
file( MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Packaging/debian-control)
configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/Packaging/debian-control/postinst ${CMAKE_CURRENT_BINARY_DIR}/Packaging/debian-control/postinst)
configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/Packaging/debian-control/prerm ${CMAKE_CURRENT_BINARY_DIR}/Packaging/debian-control/prerm)
configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/Packaging/debian-control/postrm ${CMAKE_CURRENT_BINARY_DIR}/Packaging/debian-control/postrm)
set( DEBIAN_POSTINST ${CMAKE_CURRENT_BINARY_DIR}/Packaging/debian-control/postinst)
set( DEBIAN_PRERM ${CMAKE_CURRENT_BINARY_DIR}/Packaging/debian-control/prerm)
set( DEBIAN_POSTRM ${CMAKE_CURRENT_BINARY_DIR}/Packaging/debian-control/postrm)
set( CPACK_GENERATOR "DEB" ) # mandatory
@@ -420,8 +422,10 @@ elseif ( ( PLATFORM STREQUAL "CentOS" ) OR ( PLATFORM STREQUAL "openSUSE" ) OR (
file( MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Packaging/rpm-control)
configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/Packaging/rpm-control/postinstall.sh ${CMAKE_CURRENT_BINARY_DIR}/Packaging/rpm-control/postinstall.sh)
configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/Packaging/rpm-control/prerm.sh ${CMAKE_CURRENT_BINARY_DIR}/Packaging/rpm-control/prerm.sh)
configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/Packaging/rpm-control/postuninstall.sh ${CMAKE_CURRENT_BINARY_DIR}/Packaging/rpm-control/postuninstall.sh)
set( RPM_POSTINSTALL ${CMAKE_CURRENT_BINARY_DIR}/Packaging/rpm-control/postinstall.sh)
set( RPM_PRERM ${CMAKE_CURRENT_BINARY_DIR}/Packaging/rpm-control/prerm.sh)
set( RPM_POSTUNINSTALL ${CMAKE_CURRENT_BINARY_DIR}/Packaging/rpm-control/postuninstall.sh)
set( CPACK_GENERATOR "RPM" ) # mandatory
# Reproducible RPM: CPackRPM does not consume SOURCE_DATE_EPOCH on its own.
@@ -481,6 +485,7 @@ elseif ( ( PLATFORM STREQUAL "CentOS" ) OR ( PLATFORM STREQUAL "openSUSE" ) OR (
set( CPACK_RPM_PRE_UNINSTALL_SCRIPT_FILE ${RPM_PRERM}) # optional
set( CPACK_RPM_POST_INSTALL_SCRIPT_FILE ${RPM_POSTINSTALL}) # optional
set( CPACK_RPM_POST_UNINSTALL_SCRIPT_FILE ${RPM_POSTUNINSTALL}) # optional
# Prevents CPack from generating file conflicts
# This is to avoid having %dir of these directories in the .spec file
src/Build/Packaging/debian-control/postinst
+6 -1
View File
@@ -6,6 +6,11 @@ rm -f \
/usr/share/doc/veracrypt/HTML/ru/Donation_Bank.html \
/usr/share/doc/veracrypt/HTML/ru/bank_30x30.png \
/usr/share/doc/veracrypt/HTML/zh-cn/Donation_Bank.html \
/usr/share/doc/veracrypt/HTML/zh-cn/bank_30x30.png || true
/usr/share/doc/veracrypt/HTML/zh-cn/bank_30x30.png \
/usr/share/icons/hicolor/symbolic/apps/veracrypt-symbolic.svg || true
if command -v gtk-update-icon-cache >/dev/null 2>&1; then
gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor >/dev/null 2>&1 || true
fi
exit 0
src/Build/Packaging/debian-control/postrm
Executable
+7
View File
@@ -0,0 +1,7 @@
#!/bin/sh
if command -v gtk-update-icon-cache >/dev/null 2>&1; then
gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor >/dev/null 2>&1 || true
fi
exit 0
src/Build/Packaging/rpm-control/postinstall.sh
+6 -1
View File
@@ -6,6 +6,11 @@ rm -f \
/usr/share/doc/veracrypt/HTML/ru/Donation_Bank.html \
/usr/share/doc/veracrypt/HTML/ru/bank_30x30.png \
/usr/share/doc/veracrypt/HTML/zh-cn/Donation_Bank.html \
/usr/share/doc/veracrypt/HTML/zh-cn/bank_30x30.png || true
/usr/share/doc/veracrypt/HTML/zh-cn/bank_30x30.png \
/usr/share/icons/hicolor/symbolic/apps/veracrypt-symbolic.svg || true
if command -v gtk-update-icon-cache >/dev/null 2>&1; then
gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor >/dev/null 2>&1 || true
fi
exit 0
src/Build/Packaging/rpm-control/postuninstall.sh
Executable
+7
View File
@@ -0,0 +1,7 @@
#!/bin/sh
if command -v gtk-update-icon-cache >/dev/null 2>&1; then
gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor >/dev/null 2>&1 || true
fi
exit 0