diff options
author | V3n3RiX <venerix@koprulu.sector> | 2023-08-22 21:47:11 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2023-08-22 21:47:11 +0100 |
commit | 9368ace94caa5cdda868a0dbb7c75a3fc7a2b911 (patch) | |
tree | a9a5e87e053b6853c703732ad8050bd895efc1ea /mail-mta/proton-mail-bridge | |
parent | c1d361b300cff921a04bd9ae2f800bf8914559eb (diff) |
gentoo auto-resync : 22:08:2023 - 21:47:11
Diffstat (limited to 'mail-mta/proton-mail-bridge')
4 files changed, 121 insertions, 31 deletions
diff --git a/mail-mta/proton-mail-bridge/Manifest b/mail-mta/proton-mail-bridge/Manifest index e9079925b3c2..35a279caf02a 100644 --- a/mail-mta/proton-mail-bridge/Manifest +++ b/mail-mta/proton-mail-bridge/Manifest @@ -1,9 +1,9 @@ -AUX proton-mail-bridge-3.3.2-telemetry_default.patch 408 BLAKE2B 545e1b849e7a6cd6db0075993e57b77eb1090e3aee8d3c14fb0c0ca22960eaff415b676ee3b3d00b058dcd48f6978a33764bcc1b6ac148126c2bcd2526793ea3 SHA512 b366f69c582af26a3ff93d436bbd9f6759cd6767b95f923a0d124266172d6d480a35424587cf0e41d25823943becd6d986218756adc0a62153c1c02f5da51465 +AUX proton-mail-bridge-3.3.2-gui_gentoo.patch 2760 BLAKE2B fc31a27afd24f8f02f0e1864cbc0b863a480dc94991c30e6498dbfb7ab06243dff14f45db31ff665851feccf523310d0b396f3c8ea46e8416b34330f9080b3cc SHA512 d1955987ea62c4148792372cb34f84e828a9b56c29ae04480b66de1f97435ed54d6bc038ca4bb89b0683fbc0d3befd8f4b1355512805e3bbde635f1a3e3ec3f4 AUX proton-mail-bridge.service-r1 341 BLAKE2B 056e68d9d2f009b60708c5bea58e851b3955e3292e44af114976815f597ca813917b2b74082fae5d0146288aefa9a38993d791272073b23bcff51cbed4f4bbdf SHA512 bafea6004077cb2b5d77ebb9fd48ca925be20987b1a1698b68c9853e9c1d95ac2d0d8d77f78fb2b3e7c1e56d4ea4e7d2dcfeef857df189f1ae51a57ce5d0ac93 DIST proton-mail-bridge-3.1.3-deps.tar.xz 206716212 BLAKE2B 4f79e4428ef37452d0abd288e074ecdce8886393582352117b6df5275e1b2f0f8018145c20b8fa889f6473899fd0fde6b621e52cf2faaa218fdac8238134a19b SHA512 fd948e39afaab15d7318c8b46cffd97823857cd8e1c5ba2b2ed3673fcbf186627b190bd876973fbb71854355f4dfba62663e902651716301685dca5f14f26e81 DIST proton-mail-bridge-3.1.3.tar.gz 4443963 BLAKE2B 2c8fc571612c11c0e281e8f268774e886ba3742b696bdd1180d7cf45525d21d9c062cd3d33acb57a6ceed8dad6b864490c89c090ebfd4bceb4e8c41b19015ae8 SHA512 4f4ca3a2b95c7eed34a13d7f8f296d95717b9c1f95bd157e08c3f21cc752ea3dac5eaefac27662f57f875d9690a5d77a9e15f71406280dcaad6f9054b2ef54b9 DIST proton-mail-bridge-3.3.2-deps.tar.xz 252980292 BLAKE2B 2d7c8961c1ed8a6fb15a26f6b3ee650932b89626c0eea1d3acaf24b5ef6b44a90cb021a051a5f018cf94db5ccb029c4b79390275bca9a39ceeb6b5ef62aa1386 SHA512 52ff54e80635e795462e0bdbd5e02b831478a49225d296ec46ef5591cef173c49bcf63d925d503537d57ccaf65a09424f82d1c8ad8e906d822306ca22bba1121 DIST proton-mail-bridge-3.3.2.tar.gz 4481491 BLAKE2B e00cf4268dcebc7f4eeab5a0738c04e1a809a5633b4d97637ea74aa4ac3eb68dd343b45fef5fca602c4c89faa2d1e05f1c605d9b56ee83d669b07b815f8ae92b SHA512 1b49355f8e816b6a00bf7fad91d0f696efb5ee1f5ea311fd4b92549f715185ea280ac874a759be5d3f8c7ff2309b8f0c3bb37c8502963059b26f4630bc9339f0 EBUILD proton-mail-bridge-3.1.3.ebuild 1304 BLAKE2B d84f2164bf3ccf91321f9041c331cf4a2eaeee3e54197f013f0014363a1dea0020febf047641f54bd8db0da7ac7cd0f849b0012764d0a1269e5e7c40f2875833 SHA512 e5c315f34abd46ecdb477fb35eda3f57b4bc31a49efba49adc3327318172c80a89de5605fea51c284ed5bca2b2e2218d1d165487f59447af5d4392dc53190676 -EBUILD proton-mail-bridge-3.3.2.ebuild 1862 BLAKE2B 1d1d3736541ddcc665e052137e0bb1213a1d7f8c495a45dace38ac1cb4687f9d78b78a1d0da04498964fa515f0ab7cb5e862c266c653b875360ce8f20cff59d1 SHA512 24f7655c104f9f508469568ceca7044c833bafd3853f0d472f11e917800c86973601b3f758edaf7e0cf63b707b24b97d9640075c5ac8bf72e2e7e49a3e0da91f +EBUILD proton-mail-bridge-3.3.2.ebuild 2837 BLAKE2B 0e7bfc382172dcc6d8bbd3015b80a8921c3a5eff64a94e66ee1654aa24acc4506bce648b63d7098d4973ec99f58aae5bab6a2c3b876bc1af3720fac3a7e14cfc SHA512 602d809f1b75f34257b380898efa4f6045233cc380812e25aea2f1dbd68ba7a5ed2a9d32bd80c7f8467c2c36abd0b5a2a163cc0a501bd1d26b18af563f98a8ee MISC metadata.xml 594 BLAKE2B 4a52e340f984c6a6b3175e06221d277e59b1bfa0929ac019ca56d1b0eaf8801122a3ebd596784494c85a9fa78ce99f880288785a9a0465bb6b2b44397ab5a43a SHA512 b8627546fa733b97d5aa78ed51feaafb3623b770b2e434704055c0e5e23731c18adf3a9a25c73dd77d916060d8f112959772bf4102ccda78e2188e91b9e03348 diff --git a/mail-mta/proton-mail-bridge/files/proton-mail-bridge-3.3.2-gui_gentoo.patch b/mail-mta/proton-mail-bridge/files/proton-mail-bridge-3.3.2-gui_gentoo.patch new file mode 100644 index 000000000000..6bf34627039f --- /dev/null +++ b/mail-mta/proton-mail-bridge/files/proton-mail-bridge-3.3.2-gui_gentoo.patch @@ -0,0 +1,68 @@ +--- a/internal/frontend/bridge-gui/bridge-gui/CMakeLists.txt ++++ b/internal/frontend/bridge-gui/bridge-gui/CMakeLists.txt +@@ -165,12 +165,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 +@@ -185,3 +182,4 @@ + endif() + + include(Deploy${DEPLOY_OS}.cmake) ++endif() +--- a/internal/frontend/bridge-gui/bridge-gui/main.cpp ++++ b/internal/frontend/bridge-gui/bridge-gui/main.cpp +@@ -53,7 +53,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 const grpcServiceConfigWaitDelayMs = 180000; ///< The wait delay for the gRPC config file in milliseconds. + QString const waitFlag = "--wait"; ///< The wait command-line flag. + +--- a/internal/frontend/bridge-gui/bridgepp/CMakeLists.txt ++++ b/internal/frontend/bridge-gui/bridgepp/CMakeLists.txt +@@ -161,6 +161,9 @@ + + target_precompile_headers(bridgepp PRIVATE Pch.h) + ++install(TARGETS bridgepp) ++ ++if(0) + #***************************************************************************************************************************************************** + # GoogleTest + #***************************************************************************************************************************************************** +@@ -198,3 +201,4 @@ + + include(GoogleTest) + gtest_discover_tests(bridgepp-test) ++endif() +--- a/internal/frontend/bridge-gui/BridgeSetup.cmake ++++ b/internal/frontend/bridge-gui/BridgeSetup.cmake +@@ -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() diff --git a/mail-mta/proton-mail-bridge/files/proton-mail-bridge-3.3.2-telemetry_default.patch b/mail-mta/proton-mail-bridge/files/proton-mail-bridge-3.3.2-telemetry_default.patch deleted file mode 100644 index 3c8df6c2ef9d..000000000000 --- a/mail-mta/proton-mail-bridge/files/proton-mail-bridge-3.3.2-telemetry_default.patch +++ /dev/null @@ -1,14 +0,0 @@ -Such things really should be opt-in rather than opt-out, and doubly so given -Gentoo does not package the bridge GUI yet. - ---- a/internal/vault/types_settings.go -+++ b/internal/vault/types_settings.go -@@ -96,7 +96,7 @@ - ShowAllMail: true, - Autostart: true, - AutoUpdate: true, -- TelemetryDisabled: false, -+ TelemetryDisabled: true, - - LastVersion: "0.0.0", - FirstStart: true, diff --git a/mail-mta/proton-mail-bridge/proton-mail-bridge-3.3.2.ebuild b/mail-mta/proton-mail-bridge/proton-mail-bridge-3.3.2.ebuild index 7d85059d6295..013049b4d5c9 100644 --- a/mail-mta/proton-mail-bridge/proton-mail-bridge-3.3.2.ebuild +++ b/mail-mta/proton-mail-bridge/proton-mail-bridge-3.3.2.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit go-module systemd xdg-utils +inherit cmake go-module systemd xdg-utils MY_PN="${PN/-mail/}" MY_P="${MY_PN}-${PV}" @@ -22,11 +22,21 @@ IUSE="gui" PROPERTIES="test_network" RESTRICT="test" -RDEPEND="app-crypt/libsecret" +RDEPEND="app-crypt/libsecret + gui? ( + >=dev-libs/protobuf-21.12:= + dev-libs/sentry-native + dev-qt/qtbase:6=[gui,icu,widgets] + dev-qt/qtdeclarative:6=[widgets] + dev-qt/qtsvg:6= + media-libs/mesa + net-libs/grpc:= + ) +" DEPEND="${RDEPEND}" PATCHES=( - "${FILESDIR}"/${PN}-3.3.2-telemetry_default.patch + "${FILESDIR}"/${PN}-3.3.2-gui_gentoo.patch ) S="${WORKDIR}"/${MY_P} @@ -34,14 +44,39 @@ S="${WORKDIR}"/${MY_P} src_prepare() { xdg_environment_reset default + if use gui; then + local PATCHES=() + BUILD_DIR="${WORKDIR}"/gui_build \ + CMAKE_USE_DIR="${S}"/internal/frontend/bridge-gui/bridge-gui \ + cmake_src_prepare + fi +} + +src_configure() { + if use gui; then + # TODO: + # - auto-sync version number between the two executables + # - can we leave BRIDGE_TAG unset? Seems it gets displayed in some info box + local mycmakeargs=( + -DBRIDGE_APP_FULL_NAME="Proton Mail Bridge" + -DBRIDGE_APP_VERSION="${PV}+git" + -DBRIDGE_REPO_ROOT="${S}" + -DBRIDGE_TAG="NOTAG" + -DBRIDGE_VENDOR="Gentoo Linux" + ) + BUILD_DIR="${WORKDIR}"/gui_build \ + CMAKE_USE_DIR="${S}"/internal/frontend/bridge-gui/bridge-gui \ + cmake_src_configure + fi } src_compile() { + emake build-nogui + if use gui; then - eerror "Since version 3.0.0, GUI support in ${PN} requires Qt6 and is therefore currently not available" - die "USE=gui requires Qt6" - else - emake build-nogui + BUILD_DIR="${WORKDIR}"/gui_build \ + CMAKE_USE_DIR="${S}"/internal/frontend/bridge-gui/bridge-gui \ + cmake_src_compile fi } @@ -53,31 +88,32 @@ src_install() { exeinto /usr/bin newexe bridge ${PN} + if use gui; then + BUILD_DIR="${WORKDIR}"/gui_build \ + CMAKE_USE_DIR="${S}"/internal/frontend/bridge-gui/bridge-gui \ + cmake_src_install + mv "${ED}"/usr/bin/bridge-gui "${ED}"/usr/bin/${PN}-gui || die + fi + systemd_newuserunit "${FILESDIR}"/${PN}.service-r1 ${PN}.service einstalldocs } pkg_postinst() { - use gui && xdg_icon_cache_update - if [[ -n "${REPLACING_VERSIONS}" ]]; then local oldver for oldver in ${REPLACING_VERSIONS}; do if ver_test "${oldver}" -lt 3.2.0; then - ewarn "Please note that since version 3.2.0, ${PN} can share usage statistics with upstream." + ewarn "Please note that since version 3.2.0, ${PN} by default shares usage statistics with upstream." ewarn "For details, please see" ewarn ewarn " https://proton.me/support/share-usage-statistics" ewarn - ewarn "Gentoo ebuilds change the default value of the 'send telemetry' setting to disabled." + ewarn "This behaviour can be disabled through ${PN}-gui, under Advanced Settings." ewarn break fi done fi } - -pkg_postrm() { - use gui && xdg_icon_cache_update -} |