Skip to content

Commit b927f57

Browse files
saturnericsaturneric
authored
Merge pull request #212 from Anthony-Lloyd/main
fix for compiling and packaging for fedora42
2 parents 7e2083e + e57423f commit b927f57

6 files changed

Lines changed: 165 additions & 4 deletions

File tree

‎CMakeLists.txt‎

Lines changed: 113 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,14 @@ if(GPGFRONTEND_BUILD_TYPE_ONLY_APPLICATION)
163163
set(STABLE_BUILD_ONLY_APPLICATION 1)
164164
endif()
165165

166+
# Fallback for BUILD_APPLICATION if not set by any build type
167+
if(NOT DEFINED BUILD_APPLICATION)
168+
if(GPGFRONTEND_GENERATE_LINUX_INSTALL_SOFTWARE OR GPGFRONTEND_BUILD_TYPE_STABLE OR GPGFRONTEND_BUILD_TYPE_ONLY_APPLICATION)
169+
set(BUILD_APPLICATION 1)
170+
message(STATUS "Setting BUILD_APPLICATION=1 as fallback based on build configuration")
171+
endif()
172+
endif()
173+
166174
if(GPGFRONTEND_BUILD_APP_IMAGE)
167175
set(BUILD_APP_IMAGE 1)
168176
endif()
@@ -413,6 +421,18 @@ set(CMAKE_AUTOUIC ON)
413421
set(CMAKE_AUTORCC_OPTIONS "--compress;9")
414422
set(CMAKE_AUTOUIC_SEARCH_PATHS ${CMAKE_AUTOUIC_SEARCH_PATHS} ${CMAKE_SOURCE_DIR}/ui)
415423

424+
# Find and configure libassuan using pkg-config
425+
find_package(PkgConfig REQUIRED)
426+
pkg_check_modules(LIBASSUAN libassuan)
427+
428+
if(NOT LIBASSUAN_FOUND)
429+
message(FATAL_ERROR "libassuan not found. Please install libassuan-dev or libassuan-devel package for your system.")
430+
endif()
431+
432+
# Add libassuan include and library paths globally since it's a core dependency
433+
include_directories(${LIBASSUAN_INCLUDE_DIRS})
434+
link_directories(${LIBASSUAN_LIBRARY_DIRS})
435+
416436
if(STABLE_BUILD_APPLICATION)
417437
message("[*] Build Stable Application")
418438
set(BUILD_CORE 1)
@@ -456,6 +476,99 @@ message(STATUS "Build Type: ${CMAKE_BUILD_TYPE}")
456476
message(STATUS "Build C Flags: ${CMAKE_C_FLAGS}")
457477
message(STATUS "Build C++ Flags: ${CMAKE_CXX_FLAGS}")
458478

479+
# CPack configuration
480+
set(CPACK_GENERATOR "RPM")
481+
set(CPACK_PACKAGE_NAME "GpgFrontend")
482+
set(CPACK_PACKAGE_VERSION "${PROJECT_VERSION}")
483+
set(CPACK_PACKAGE_RELEASE "1")
484+
set(CPACK_PACKAGING_INSTALL_PREFIX "/usr")
485+
set(CPACK_PACKAGE_CONTACT "eric@bktus.com")
486+
set(CPACK_RPM_PACKAGE_LICENSE "GPLv3")
487+
set(CPACK_RPM_PACKAGE_GROUP "Applications/System")
488+
set(CPACK_RPM_PACKAGE_REQUIRES "libassuan >= 2.5.0, gpgme >= 1.12.0, qt6-qtbase >= 6.0.0, gtk-update-icon-cache")
489+
set(CPACK_RPM_PACKAGE_URL "https://gpgfrontend.bktus.com")
490+
set(CPACK_RPM_PACKAGE_DESCRIPTION "GpgFrontend is a free, open-source, robust yet user-friendly, compact and cross-platform tool for OpenPGP encryption.")
491+
492+
# Configure RPM scripts
493+
configure_file(
494+
"${CMAKE_SOURCE_DIR}/cmake/rpm/post-install.sh"
495+
"${CMAKE_BINARY_DIR}/rpm-post-install.sh"
496+
@ONLY
497+
)
498+
configure_file(
499+
"${CMAKE_SOURCE_DIR}/cmake/rpm/post-uninstall.sh"
500+
"${CMAKE_BINARY_DIR}/rpm-post-uninstall.sh"
501+
@ONLY
502+
)
503+
504+
# Set RPM scripts
505+
set(CPACK_RPM_POST_INSTALL_SCRIPT_FILE "${CMAKE_BINARY_DIR}/rpm-post-install.sh")
506+
set(CPACK_RPM_POST_UNINSTALL_SCRIPT_FILE "${CMAKE_BINARY_DIR}/rpm-post-uninstall.sh")
507+
508+
# Make the scripts executable
509+
file(CHMOD ${CMAKE_BINARY_DIR}/rpm-post-install.sh
510+
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
511+
file(CHMOD ${CMAKE_BINARY_DIR}/rpm-post-uninstall.sh
512+
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
513+
514+
# Documentation handling
515+
set(CPACK_RPM_PACKAGE_LICENSE_FILE "${CMAKE_SOURCE_DIR}/COPYING")
516+
set(CPACK_RPM_PACKAGE_DOCUMENTATION "${CMAKE_SOURCE_DIR}/README.md")
517+
518+
# Install license and documentation
519+
install(FILES "${CMAKE_SOURCE_DIR}/COPYING"
520+
DESTINATION "share/licenses/${CPACK_PACKAGE_NAME}"
521+
COMPONENT runtime)
522+
install(FILES "${CMAKE_SOURCE_DIR}/README.md"
523+
DESTINATION "share/doc/${CPACK_PACKAGE_NAME}"
524+
COMPONENT runtime)
525+
526+
# Install icons for all resolutions
527+
foreach(size IN ITEMS 32 48 64 128 256 512)
528+
install(FILES "${CMAKE_SOURCE_DIR}/resource/lfs/hicolor/${size}x${size}/apps/com.bktus.gpgfrontend.png"
529+
DESTINATION "share/icons/hicolor/${size}x${size}/apps"
530+
RENAME "gpgfrontend.png"
531+
COMPONENT runtime)
532+
# Also install with the full name for .desktop file compatibility
533+
install(FILES "${CMAKE_SOURCE_DIR}/resource/lfs/hicolor/${size}x${size}/apps/com.bktus.gpgfrontend.png"
534+
DESTINATION "share/icons/hicolor/${size}x${size}/apps"
535+
COMPONENT runtime)
536+
endforeach()
537+
538+
# Install desktop file
539+
install(FILES "${CMAKE_SOURCE_DIR}/resource/appstream/com.bktus.gpgfrontend.desktop"
540+
DESTINATION "share/applications"
541+
COMPONENT runtime)
542+
543+
# Install metainfo/appdata
544+
install(FILES "${CMAKE_SOURCE_DIR}/resource/appstream/com.bktus.gpgfrontend.metainfo.xml"
545+
DESTINATION "share/metainfo"
546+
COMPONENT runtime)
547+
548+
# Exclude files from auto-detection of dependencies
549+
set(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION
550+
"/usr/share/doc"
551+
"/usr/share/licenses"
552+
"/usr/share/applications"
553+
"/usr/share/metainfo"
554+
"/usr/share/icons"
555+
"/usr/share/icons/hicolor"
556+
"/usr/share/icons/hicolor/128x128"
557+
"/usr/share/icons/hicolor/256x256"
558+
"/usr/share/icons/hicolor/32x32"
559+
"/usr/share/icons/hicolor/48x48"
560+
"/usr/share/icons/hicolor/512x512"
561+
"/usr/share/icons/hicolor/64x64"
562+
"/usr/share/icons/hicolor/128x128/apps"
563+
"/usr/share/icons/hicolor/256x256/apps"
564+
"/usr/share/icons/hicolor/32x32/apps"
565+
"/usr/share/icons/hicolor/48x48/apps"
566+
"/usr/share/icons/hicolor/512x512/apps"
567+
"/usr/share/icons/hicolor/64x64/apps")
568+
569+
# Include CPack to enable packaging support
570+
include(CPack)
571+
459572
# third_party
460573
add_subdirectory(third_party) # source code
461574
add_subdirectory(src)

‎cmake/rpm/post-install.sh‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
#!/bin/sh
2+
3+
# Update icon cache
4+
if [ -x /usr/bin/gtk-update-icon-cache ]; then
5+
/usr/bin/gtk-update-icon-cache -f -t /usr/share/icons/hicolor || :
6+
fi
7+
8+
# Update desktop database
9+
if [ -x /usr/bin/update-desktop-database ]; then
10+
/usr/bin/update-desktop-database -q /usr/share/applications || :
11+
fi
12+
13+
# Update mime database
14+
if [ -x /usr/bin/update-mime-database ]; then
15+
/usr/bin/update-mime-database /usr/share/mime || :
16+
fi
17+
18+
# Try XDG icon cache update if available
19+
if [ -x /usr/bin/xdg-icon-resource ]; then
20+
/usr/bin/xdg-icon-resource forceupdate --theme hicolor || :
21+
fi
22+
23+
# Clear icon cache for current user if logged in
24+
if [ ! -z "$SUDO_USER" ]; then
25+
su "$SUDO_USER" -c 'gtk-update-icon-cache -f -t ~/.local/share/icons/hicolor 2>/dev/null || :'
26+
fi

‎cmake/rpm/post-uninstall.sh‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
#!/bin/sh
2+
3+
# Update icon cache after removal
4+
if [ -x /usr/bin/gtk-update-icon-cache ]; then
5+
/usr/bin/gtk-update-icon-cache -f -t /usr/share/icons/hicolor || :
6+
fi
7+
8+
# Update desktop database after removal
9+
if [ -x /usr/bin/update-desktop-database ]; then
10+
/usr/bin/update-desktop-database -q /usr/share/applications || :
11+
fi
12+
13+
# Update mime database after removal
14+
if [ -x /usr/bin/update-mime-database ]; then
15+
/usr/bin/update-mime-database /usr/share/mime || :
16+
fi
17+
18+
# Try XDG icon cache update if available
19+
if [ -x /usr/bin/xdg-icon-resource ]; then
20+
/usr/bin/xdg-icon-resource forceupdate --theme hicolor || :
21+
fi

‎src/core/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ target_sources(gpgfrontend_core PRIVATE
5555
${CMAKE_SOURCE_DIR}/third_party/qt-aes/qaesencryption.cpp)
5656

5757
# link gnupg libraries
58-
target_link_libraries(gpgfrontend_core PUBLIC gpgme assuan gpg-error)
58+
target_link_libraries(gpgfrontend_core PUBLIC gpgme ${LIBASSUAN_LIBRARIES} gpg-error)
5959

6060
# link openssl
6161
target_link_libraries(gpgfrontend_core PUBLIC OpenSSL::SSL OpenSSL::Crypto)

‎src/core/function/gpg/GpgSmartCardManager.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ auto PercentDataEscape(const QByteArray& data, bool plus_escape = false,
204204
} else if (plus_escape && ch == ' ') {
205205
result += '+';
206206
} else if (plus_escape && (ch < 0x20 || ch == '+')) {
207-
result += QString("%%%1").arg(ch, 2, 16, QLatin1Char('0')).toUpper();
207+
result += QString("%%%1").arg(static_cast<int>(static_cast<unsigned char>(ch)), 2, 16, QLatin1Char('0')).toUpper();
208208
} else {
209209
result += QLatin1Char(ch);
210210
}

‎src/ui/GpgFrontendApplication.cpp‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,9 @@ namespace GpgFrontend::UI {
3535
GpgFrontendApplication::GpgFrontendApplication(int &argc, char *argv[])
3636
: QApplication(argc, argv) {
3737
#if !(defined(__APPLE__) && defined(__MACH__))
38-
GpgFrontend::UI::GpgFrontendApplication::setWindowIcon(
39-
QIcon(":/icons/gpgfrontend.png"));
38+
// Try system theme icon first, fall back to resource
39+
QIcon appIcon = QIcon::fromTheme("gpgfrontend", QIcon(":/icons/gpgfrontend.png"));
40+
GpgFrontend::UI::GpgFrontendApplication::setWindowIcon(appIcon);
4041
#endif
4142

4243
QString application_display_name = GetProjectName();

0 commit comments

Comments
 (0)