diff options
author | V3n3RiX <venerix@koprulu.sector> | 2024-12-05 01:18:11 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2024-12-05 01:19:22 +0000 |
commit | 5324d006175d7a42c71018423d2ba965ef8caea0 (patch) | |
tree | b4a439a477f34995066ef8e0135ac99d465fa3b2 /mail-mta/proton-mail-bridge/files/proton-mail-bridge-3.14.0-gui.patch | |
parent | ebbf4222e4acdec2257ec391af513cd36eb1192c (diff) |
mail-mta/proton-mail-bridge :
* import from Gentoo && version bump
* fix GUI start-up failure with qt6.8
* https://github.com/ProtonMail/proton-bridge/issues/500
* https://github.com/ProtonMail/proton-bridge/pull/502
Diffstat (limited to 'mail-mta/proton-mail-bridge/files/proton-mail-bridge-3.14.0-gui.patch')
-rw-r--r-- | mail-mta/proton-mail-bridge/files/proton-mail-bridge-3.14.0-gui.patch | 73 |
1 files changed, 73 insertions, 0 deletions
diff --git a/mail-mta/proton-mail-bridge/files/proton-mail-bridge-3.14.0-gui.patch b/mail-mta/proton-mail-bridge/files/proton-mail-bridge-3.14.0-gui.patch new file mode 100644 index 00000000..2e131a3e --- /dev/null +++ b/mail-mta/proton-mail-bridge/files/proton-mail-bridge-3.14.0-gui.patch @@ -0,0 +1,73 @@ +diff '--color=auto' -Nur a/internal/frontend/bridge-gui/bridge-gui/CMakeLists.txt b/internal/frontend/bridge-gui/bridge-gui/CMakeLists.txt +--- a/internal/frontend/bridge-gui/bridge-gui/CMakeLists.txt 2024-09-25 09:47:40.000000000 +0100 ++++ b/internal/frontend/bridge-gui/bridge-gui/CMakeLists.txt 2024-12-05 00:59:21.824976820 +0000 +@@ -167,12 +167,9 @@ + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE) + +-install(TARGETS bridge-gui +- RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}" +- BUNDLE DESTINATION "${CMAKE_INSTALL_PREFIX}" +- LIBRARY DESTINATION "${CMAKE_INSTALL_PREFIX}" +- ) ++install(TARGETS bridge-gui) + ++if(0) + qt_generate_deploy_app_script( + TARGET bridge-gui + FILENAME_VARIABLE deploy_script +@@ -187,3 +184,4 @@ + endif() + + include(Deploy${DEPLOY_OS}.cmake) ++endif() +diff '--color=auto' -Nur a/internal/frontend/bridge-gui/bridge-gui/main.cpp b/internal/frontend/bridge-gui/bridge-gui/main.cpp +--- a/internal/frontend/bridge-gui/bridge-gui/main.cpp 2024-09-25 09:47:40.000000000 +0100 ++++ b/internal/frontend/bridge-gui/bridge-gui/main.cpp 2024-12-05 01:00:05.767976494 +0000 +@@ -51,7 +51,7 @@ + + QString const bridgeLock = "bridge-v3.lock"; ///< The file name used for the bridge-gui lock file. + QString const bridgeGUILock = "bridge-v3-gui.lock"; ///< The file name used for the bridge-gui lock file. +-QString const exeName = "bridge" + exeSuffix; ///< The bridge executable file name.* ++QString const exeName = "proton-mail-bridge" + exeSuffix; ///< The bridge executable file name.* + qint64 constexpr grpcServiceConfigWaitDelayMs = 180000; ///< The wait delay for the gRPC config file in milliseconds. + QString const waitFlag = "--wait"; ///< The wait command-line flag. + QString const orphanInstanceException = "An orphan instance of bridge is already running. Please terminate it and relaunch the application."; +diff '--color=auto' -Nur a/internal/frontend/bridge-gui/bridgepp/CMakeLists.txt b/internal/frontend/bridge-gui/bridgepp/CMakeLists.txt +--- a/internal/frontend/bridge-gui/bridgepp/CMakeLists.txt 2024-09-25 09:47:40.000000000 +0100 ++++ b/internal/frontend/bridge-gui/bridgepp/CMakeLists.txt 2024-12-05 01:01:46.241975749 +0000 +@@ -164,6 +164,10 @@ + + target_precompile_headers(bridgepp PRIVATE Pch.h) + ++install(TARGETS bridgepp) ++ ++if(0) ++ + #***************************************************************************************************************************************************** + # GoogleTest + #***************************************************************************************************************************************************** +@@ -205,3 +209,4 @@ + + include(GoogleTest) + gtest_discover_tests(bridgepp-test) ++endif() +diff '--color=auto' -Nur a/internal/frontend/bridge-gui/BridgeSetup.cmake b/internal/frontend/bridge-gui/BridgeSetup.cmake +--- a/internal/frontend/bridge-gui/BridgeSetup.cmake 2024-09-25 09:47:40.000000000 +0100 ++++ b/internal/frontend/bridge-gui/BridgeSetup.cmake 2024-12-05 01:03:38.578974915 +0000 +@@ -45,6 +45,7 @@ + endif() + + ++if(0) + #**************************************************************************************************************************************************** + # vcpkg, toolchain, and architecture + #**************************************************************************************************************************************************** +@@ -87,4 +88,5 @@ + set(VCPKG_TARGET_TRIPLET x64-windows) + endif() + +-set(CMAKE_TOOLCHAIN_FILE "${VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake" CACHE STRING "toolchain") +\ No newline at end of file ++set(CMAKE_TOOLCHAIN_FILE "${VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake" CACHE STRING "toolchain") ++endif() |