aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--CMakeLists.txt88
-rw-r--r--cmake/rpm/post-install.sh26
-rw-r--r--cmake/rpm/post-uninstall.sh21
-rw-r--r--src/core/function/gpg/GpgSmartCardManager.cpp2
-rw-r--r--src/ui/GpgFrontendApplication.cpp5
5 files changed, 138 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index dab01f18..65212fe3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -163,6 +163,14 @@ if(GPGFRONTEND_BUILD_TYPE_ONLY_APPLICATION)
set(STABLE_BUILD_ONLY_APPLICATION 1)
endif()
+# Fallback for BUILD_APPLICATION if not set by any build type
+if(NOT DEFINED BUILD_APPLICATION)
+ if(GPGFRONTEND_GENERATE_LINUX_INSTALL_SOFTWARE OR GPGFRONTEND_BUILD_TYPE_STABLE OR GPGFRONTEND_BUILD_TYPE_ONLY_APPLICATION)
+ set(BUILD_APPLICATION 1)
+ message(STATUS "Setting BUILD_APPLICATION=1 as fallback based on build configuration")
+ endif()
+endif()
+
if(GPGFRONTEND_BUILD_APP_IMAGE)
set(BUILD_APP_IMAGE 1)
endif()
@@ -474,12 +482,90 @@ set(CPACK_PACKAGE_NAME "GpgFrontend")
set(CPACK_PACKAGE_VERSION "${PROJECT_VERSION}")
set(CPACK_PACKAGE_RELEASE "1")
set(CPACK_PACKAGING_INSTALL_PREFIX "/usr")
+set(CPACK_PACKAGE_CONTACT "[email protected]")
set(CPACK_RPM_PACKAGE_LICENSE "GPLv3")
set(CPACK_RPM_PACKAGE_GROUP "Applications/System")
-set(CPACK_RPM_PACKAGE_REQUIRES "libassuan >= 2.5.0, gpgme >= 1.12.0, qt6-qtbase >= 6.0.0")
+set(CPACK_RPM_PACKAGE_REQUIRES "libassuan >= 2.5.0, gpgme >= 1.12.0, qt6-qtbase >= 6.0.0, gtk-update-icon-cache")
set(CPACK_RPM_PACKAGE_URL "https://gpgfrontend.bktus.com")
set(CPACK_RPM_PACKAGE_DESCRIPTION "GpgFrontend is a free, open-source, robust yet user-friendly, compact and cross-platform tool for OpenPGP encryption.")
+# Configure RPM scripts
+configure_file(
+ "${CMAKE_SOURCE_DIR}/cmake/rpm/post-install.sh"
+ "${CMAKE_BINARY_DIR}/rpm-post-install.sh"
+ @ONLY
+)
+configure_file(
+ "${CMAKE_SOURCE_DIR}/cmake/rpm/post-uninstall.sh"
+ "${CMAKE_BINARY_DIR}/rpm-post-uninstall.sh"
+ @ONLY
+)
+
+# Set RPM scripts
+set(CPACK_RPM_POST_INSTALL_SCRIPT_FILE "${CMAKE_BINARY_DIR}/rpm-post-install.sh")
+set(CPACK_RPM_POST_UNINSTALL_SCRIPT_FILE "${CMAKE_BINARY_DIR}/rpm-post-uninstall.sh")
+
+# Make the scripts executable
+file(CHMOD ${CMAKE_BINARY_DIR}/rpm-post-install.sh
+ PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+file(CHMOD ${CMAKE_BINARY_DIR}/rpm-post-uninstall.sh
+ PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+
+# Documentation handling
+set(CPACK_RPM_PACKAGE_LICENSE_FILE "${CMAKE_SOURCE_DIR}/COPYING")
+set(CPACK_RPM_PACKAGE_DOCUMENTATION "${CMAKE_SOURCE_DIR}/README.md")
+
+# Install license and documentation
+install(FILES "${CMAKE_SOURCE_DIR}/COPYING"
+ DESTINATION "share/licenses/${CPACK_PACKAGE_NAME}"
+ COMPONENT runtime)
+install(FILES "${CMAKE_SOURCE_DIR}/README.md"
+ DESTINATION "share/doc/${CPACK_PACKAGE_NAME}"
+ COMPONENT runtime)
+
+# Install icons for all resolutions
+foreach(size IN ITEMS 32 48 64 128 256 512)
+ install(FILES "${CMAKE_SOURCE_DIR}/resource/lfs/hicolor/${size}x${size}/apps/com.bktus.gpgfrontend.png"
+ DESTINATION "share/icons/hicolor/${size}x${size}/apps"
+ RENAME "gpgfrontend.png"
+ COMPONENT runtime)
+ # Also install with the full name for .desktop file compatibility
+ install(FILES "${CMAKE_SOURCE_DIR}/resource/lfs/hicolor/${size}x${size}/apps/com.bktus.gpgfrontend.png"
+ DESTINATION "share/icons/hicolor/${size}x${size}/apps"
+ COMPONENT runtime)
+endforeach()
+
+# Install desktop file
+install(FILES "${CMAKE_SOURCE_DIR}/resource/appstream/com.bktus.gpgfrontend.desktop"
+ DESTINATION "share/applications"
+ COMPONENT runtime)
+
+# Install metainfo/appdata
+install(FILES "${CMAKE_SOURCE_DIR}/resource/appstream/com.bktus.gpgfrontend.metainfo.xml"
+ DESTINATION "share/metainfo"
+ COMPONENT runtime)
+
+# Exclude files from auto-detection of dependencies
+set(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION
+ "/usr/share/doc"
+ "/usr/share/licenses"
+ "/usr/share/applications"
+ "/usr/share/metainfo"
+ "/usr/share/icons"
+ "/usr/share/icons/hicolor"
+ "/usr/share/icons/hicolor/128x128"
+ "/usr/share/icons/hicolor/256x256"
+ "/usr/share/icons/hicolor/32x32"
+ "/usr/share/icons/hicolor/48x48"
+ "/usr/share/icons/hicolor/512x512"
+ "/usr/share/icons/hicolor/64x64"
+ "/usr/share/icons/hicolor/128x128/apps"
+ "/usr/share/icons/hicolor/256x256/apps"
+ "/usr/share/icons/hicolor/32x32/apps"
+ "/usr/share/icons/hicolor/48x48/apps"
+ "/usr/share/icons/hicolor/512x512/apps"
+ "/usr/share/icons/hicolor/64x64/apps")
+
# Include CPack to enable packaging support
include(CPack)
diff --git a/cmake/rpm/post-install.sh b/cmake/rpm/post-install.sh
new file mode 100644
index 00000000..7e532d2b
--- /dev/null
+++ b/cmake/rpm/post-install.sh
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+# Update icon cache
+if [ -x /usr/bin/gtk-update-icon-cache ]; then
+ /usr/bin/gtk-update-icon-cache -f -t /usr/share/icons/hicolor || :
+fi
+
+# Update desktop database
+if [ -x /usr/bin/update-desktop-database ]; then
+ /usr/bin/update-desktop-database -q /usr/share/applications || :
+fi
+
+# Update mime database
+if [ -x /usr/bin/update-mime-database ]; then
+ /usr/bin/update-mime-database /usr/share/mime || :
+fi
+
+# Try XDG icon cache update if available
+if [ -x /usr/bin/xdg-icon-resource ]; then
+ /usr/bin/xdg-icon-resource forceupdate --theme hicolor || :
+fi
+
+# Clear icon cache for current user if logged in
+if [ ! -z "$SUDO_USER" ]; then
+ su "$SUDO_USER" -c 'gtk-update-icon-cache -f -t ~/.local/share/icons/hicolor 2>/dev/null || :'
+fi \ No newline at end of file
diff --git a/cmake/rpm/post-uninstall.sh b/cmake/rpm/post-uninstall.sh
new file mode 100644
index 00000000..87da628d
--- /dev/null
+++ b/cmake/rpm/post-uninstall.sh
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+# Update icon cache after removal
+if [ -x /usr/bin/gtk-update-icon-cache ]; then
+ /usr/bin/gtk-update-icon-cache -f -t /usr/share/icons/hicolor || :
+fi
+
+# Update desktop database after removal
+if [ -x /usr/bin/update-desktop-database ]; then
+ /usr/bin/update-desktop-database -q /usr/share/applications || :
+fi
+
+# Update mime database after removal
+if [ -x /usr/bin/update-mime-database ]; then
+ /usr/bin/update-mime-database /usr/share/mime || :
+fi
+
+# Try XDG icon cache update if available
+if [ -x /usr/bin/xdg-icon-resource ]; then
+ /usr/bin/xdg-icon-resource forceupdate --theme hicolor || :
+fi \ No newline at end of file
diff --git a/src/core/function/gpg/GpgSmartCardManager.cpp b/src/core/function/gpg/GpgSmartCardManager.cpp
index 203c36ec..e0608dd3 100644
--- a/src/core/function/gpg/GpgSmartCardManager.cpp
+++ b/src/core/function/gpg/GpgSmartCardManager.cpp
@@ -204,7 +204,7 @@ auto PercentDataEscape(const QByteArray& data, bool plus_escape = false,
} else if (plus_escape && ch == ' ') {
result += '+';
} else if (plus_escape && (ch < 0x20 || ch == '+')) {
- result += QString("%%%1").arg(ch, 2, 16, QLatin1Char('0')).toUpper();
+ result += QString("%%%1").arg(static_cast<int>(static_cast<unsigned char>(ch)), 2, 16, QLatin1Char('0')).toUpper();
} else {
result += QLatin1Char(ch);
}
diff --git a/src/ui/GpgFrontendApplication.cpp b/src/ui/GpgFrontendApplication.cpp
index 271c8e57..961d1194 100644
--- a/src/ui/GpgFrontendApplication.cpp
+++ b/src/ui/GpgFrontendApplication.cpp
@@ -35,8 +35,9 @@ namespace GpgFrontend::UI {
GpgFrontendApplication::GpgFrontendApplication(int &argc, char *argv[])
: QApplication(argc, argv) {
#if !(defined(__APPLE__) && defined(__MACH__))
- GpgFrontend::UI::GpgFrontendApplication::setWindowIcon(
- QIcon(":/icons/gpgfrontend.png"));
+ // Try system theme icon first, fall back to resource
+ QIcon appIcon = QIcon::fromTheme("gpgfrontend", QIcon(":/icons/gpgfrontend.png"));
+ GpgFrontend::UI::GpgFrontendApplication::setWindowIcon(appIcon);
#endif
QString application_display_name = GetProjectName();
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-09 02:32:21 +0000