From 9211d19aab7f33d7fff393be4c4e9e1286cb3550 Mon Sep 17 00:00:00 2001 From: Esteve Varela Colominas Date: Sat, 12 Jun 2021 18:45:32 +0200 Subject: net-im/telegram-desktop: Require USE=gtk for USE=webkit No sense in leaving out the "gtk" in "webkit-gtk", even though the current build error can be patched around. Also synced the patch with the pull request, which is a simple rename, no revbump necessary. Signed-off-by: Esteve Varela Colominas Signed-off-by: Georgy Yakovlev --- .../tdesktop-2.7.3-disable-webkit-separately.patch | 72 ---------------------- .../tdesktop-2.7.4-disable-webkit-separately.patch | 72 ++++++++++++++++++++++ .../telegram-desktop-2.7.4-r1.ebuild | 5 +- 3 files changed, 75 insertions(+), 74 deletions(-) delete mode 100644 net-im/telegram-desktop/files/tdesktop-2.7.3-disable-webkit-separately.patch create mode 100644 net-im/telegram-desktop/files/tdesktop-2.7.4-disable-webkit-separately.patch (limited to 'net-im/telegram-desktop') diff --git a/net-im/telegram-desktop/files/tdesktop-2.7.3-disable-webkit-separately.patch b/net-im/telegram-desktop/files/tdesktop-2.7.3-disable-webkit-separately.patch deleted file mode 100644 index 8e56d10f0deb..000000000000 --- a/net-im/telegram-desktop/files/tdesktop-2.7.3-disable-webkit-separately.patch +++ /dev/null @@ -1,72 +0,0 @@ ---- tdesktop-2.7.3-full.orig/Telegram/lib_webview/CMakeLists.txt -+++ tdesktop-2.7.3-full/Telegram/lib_webview/CMakeLists.txt -@@ -116,7 +116,7 @@ if (WIN32) - desktop-app::lib_webview_winrt - ) - elseif (LINUX) -- if (NOT DESKTOP_APP_DISABLE_GTK_INTEGRATION) -+ if (NOT DESKTOP_APP_DISABLE_WEBKIT_INTEGRATION) - find_package(PkgConfig REQUIRED) - - if (DESKTOP_APP_USE_PACKAGED AND NOT DESKTOP_APP_USE_PACKAGED_LAZY) ---- tdesktop-2.7.3-full.orig/Telegram/lib_webview/webview/platform/linux/webview_linux.cpp -+++ tdesktop-2.7.3-full/Telegram/lib_webview/webview/platform/linux/webview_linux.cpp -@@ -11,14 +11,14 @@ - namespace Webview { - - Available Availability() { --#ifndef DESKTOP_APP_DISABLE_GTK_INTEGRATION -+#ifndef DESKTOP_APP_DISABLE_WEBKIT_INTEGRATION - return WebKit2Gtk::Availability(); --#else // !DESKTOP_APP_DISABLE_GTK_INTEGRATION -+#else // !DESKTOP_APP_DISABLE_WEBKIT_INTEGRATION - return Available{ - .error = Available::Error::NoGtkOrWebkit2Gtk, - .details = "This feature was disabled at build time.", - }; --#endif // DESKTOP_APP_DISABLE_GTK_INTEGRATION -+#endif // DESKTOP_APP_DISABLE_WEBKIT_INTEGRATION - } - - bool SupportsEmbedAfterCreate() { -@@ -26,11 +26,11 @@ bool SupportsEmbedAfterCreate() { - } - - std::unique_ptr CreateInstance(Config config) { --#ifndef DESKTOP_APP_DISABLE_GTK_INTEGRATION -+#ifndef DESKTOP_APP_DISABLE_WEBKIT_INTEGRATION - return WebKit2Gtk::CreateInstance(std::move(config)); --#else // !DESKTOP_APP_DISABLE_GTK_INTEGRATION -+#else // !DESKTOP_APP_DISABLE_WEBKIT_INTEGRATION - return nullptr; --#endif // DESKTOP_APP_DISABLE_GTK_INTEGRATION -+#endif // DESKTOP_APP_DISABLE_WEBKIT_INTEGRATION - } - - } // namespace Webview ---- tdesktop-2.7.3-full.orig/cmake/options.cmake -+++ tdesktop-2.7.3-full/cmake/options.cmake -@@ -49,6 +49,13 @@ if (DESKTOP_APP_DISABLE_GTK_INTEGRATION) - ) - endif() - -+if (DESKTOP_APP_DISABLE_WEBKIT_INTEGRATION) -+ target_compile_definitions(common_options -+ INTERFACE -+ DESKTOP_APP_DISABLE_WEBKIT_INTEGRATION -+ ) -+endif() -+ - if (DESKTOP_APP_USE_PACKAGED) - target_compile_definitions(common_options - INTERFACE ---- tdesktop-2.7.3-full.orig/cmake/variables.cmake -+++ tdesktop-2.7.3-full/cmake/variables.cmake -@@ -32,6 +32,7 @@ option(DESKTOP_APP_DISABLE_DBUS_INTEGRAT - option(DESKTOP_APP_DISABLE_X11_INTEGRATION "Disable all code for X11 integration (Linux only)." OFF) - option(DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION "Disable all code for Wayland integration (Linux only)." OFF) - option(DESKTOP_APP_DISABLE_GTK_INTEGRATION "Disable all code for GTK integration (Linux only)." OFF) -+option(DESKTOP_APP_DISABLE_WEBKIT_INTEGRATION "Disable all code for WebkitGTK integration (Linux only)." OFF) - option(DESKTOP_APP_USE_GLIBC_WRAPS "Use wraps for new GLIBC features." OFF) - option(DESKTOP_APP_USE_PACKAGED "Find libraries using CMake instead of exact paths." ${no_special_target}) - option(DESKTOP_APP_USE_PACKAGED_LAZY "Bundle recommended Qt plugins for self-contained packages. (Linux only)" OFF) diff --git a/net-im/telegram-desktop/files/tdesktop-2.7.4-disable-webkit-separately.patch b/net-im/telegram-desktop/files/tdesktop-2.7.4-disable-webkit-separately.patch new file mode 100644 index 000000000000..e54aca2ffa05 --- /dev/null +++ b/net-im/telegram-desktop/files/tdesktop-2.7.4-disable-webkit-separately.patch @@ -0,0 +1,72 @@ +--- tdesktop-2.7.4-full.orig/Telegram/lib_webview/CMakeLists.txt ++++ tdesktop-2.7.4-full/Telegram/lib_webview/CMakeLists.txt +@@ -116,7 +116,7 @@ + desktop-app::lib_webview_winrt + ) + elseif (LINUX) +- if (NOT DESKTOP_APP_DISABLE_GTK_INTEGRATION) ++ if (NOT DESKTOP_APP_DISABLE_WEBKIT) + find_package(PkgConfig REQUIRED) + + if (DESKTOP_APP_USE_PACKAGED AND NOT DESKTOP_APP_USE_PACKAGED_LAZY) +--- tdesktop-2.7.4-full.orig/Telegram/lib_webview/webview/platform/linux/webview_linux.cpp ++++ tdesktop-2.7.4-full/Telegram/lib_webview/webview/platform/linux/webview_linux.cpp +@@ -11,14 +11,14 @@ + namespace Webview { + + Available Availability() { +-#ifndef DESKTOP_APP_DISABLE_GTK_INTEGRATION ++#ifndef DESKTOP_APP_DISABLE_WEBKIT + return WebKit2Gtk::Availability(); +-#else // !DESKTOP_APP_DISABLE_GTK_INTEGRATION ++#else // !DESKTOP_APP_DISABLE_WEBKIT + return Available{ + .error = Available::Error::NoGtkOrWebkit2Gtk, + .details = "This feature was disabled at build time.", + }; +-#endif // DESKTOP_APP_DISABLE_GTK_INTEGRATION ++#endif // DESKTOP_APP_DISABLE_WEBKIT + } + + bool SupportsEmbedAfterCreate() { +@@ -26,11 +26,11 @@ + } + + std::unique_ptr CreateInstance(Config config) { +-#ifndef DESKTOP_APP_DISABLE_GTK_INTEGRATION ++#ifndef DESKTOP_APP_DISABLE_WEBKIT + return WebKit2Gtk::CreateInstance(std::move(config)); +-#else // !DESKTOP_APP_DISABLE_GTK_INTEGRATION ++#else // !DESKTOP_APP_DISABLE_WEBKIT + return nullptr; +-#endif // DESKTOP_APP_DISABLE_GTK_INTEGRATION ++#endif // DESKTOP_APP_DISABLE_WEBKIT + } + + } // namespace Webview +--- tdesktop-2.7.4-full.orig/cmake/options.cmake ++++ tdesktop-2.7.4-full/cmake/options.cmake +@@ -49,6 +49,13 @@ + ) + endif() + ++if (DESKTOP_APP_DISABLE_WEBKIT) ++ target_compile_definitions(common_options ++ INTERFACE ++ DESKTOP_APP_DISABLE_WEBKIT ++ ) ++endif() ++ + if (DESKTOP_APP_USE_PACKAGED) + target_compile_definitions(common_options + INTERFACE +--- tdesktop-2.7.4-full.orig/cmake/variables.cmake ++++ tdesktop-2.7.4-full/cmake/variables.cmake +@@ -38,6 +38,7 @@ + option(DESKTOP_APP_USE_PACKAGED_LAZY_PLATFORMTHEMES "Bundle recommended Qt platform themes for self-contained packages. (Linux only)" ${DESKTOP_APP_USE_PACKAGED_LAZY}) + option(DESKTOP_APP_USE_PACKAGED_FFMPEG_STATIC "Link ffmpeg statically in packaged mode." OFF) + option(DESKTOP_APP_DISABLE_SPELLCHECK "Disable spellcheck library." ${osx_special_target}) ++option(DESKTOP_APP_DISABLE_WEBKIT "Disable WebkitGTK library (Linux only)." OFF) + option(DESKTOP_APP_DISABLE_CRASH_REPORTS "Disable crash report generation." ${no_special_target}) + option(DESKTOP_APP_DISABLE_AUTOUPDATE "Disable autoupdate." ${disable_autoupdate}) + option(DESKTOP_APP_USE_HUNSPELL_ONLY "Disable system spellchecker and use bundled Hunspell only. (For debugging purposes)" OFF) diff --git a/net-im/telegram-desktop/telegram-desktop-2.7.4-r1.ebuild b/net-im/telegram-desktop/telegram-desktop-2.7.4-r1.ebuild index ba8f38360067..1f51780319cc 100644 --- a/net-im/telegram-desktop/telegram-desktop-2.7.4-r1.ebuild +++ b/net-im/telegram-desktop/telegram-desktop-2.7.4-r1.ebuild @@ -61,6 +61,7 @@ REQUIRED_USE=" spell? ( ^^ ( enchant hunspell ) ) + webkit? ( gtk ) " S="${WORKDIR}/${MY_P}" @@ -68,7 +69,7 @@ S="${WORKDIR}/${MY_P}" PATCHES=( # https://github.com/desktop-app/cmake_helpers/pull/91 # https://github.com/desktop-app/lib_webview/pull/2 - "${FILESDIR}/tdesktop-2.7.3-disable-webkit-separately.patch" + "${FILESDIR}/tdesktop-2.7.4-disable-webkit-separately.patch" # https://github.com/desktop-app/lib_webview/commit/0b4100d7cecc4e748c51f3f51ebfd1392ec3978a "${FILESDIR}/tdesktop-2.7.3-webview-include-gdkx.patch" # https://github.com/desktop-app/lib_webview/pull/3 @@ -108,7 +109,7 @@ src_configure() { -DDESKTOP_APP_DISABLE_WAYLAND_INTEGRATION=$(usex wayland OFF ON) -DDESKTOP_APP_DISABLE_DBUS_INTEGRATION=$(usex dbus OFF ON) -DDESKTOP_APP_DISABLE_GTK_INTEGRATION=$(usex gtk OFF ON) - -DDESKTOP_APP_DISABLE_WEBKIT_INTEGRATION=$(usex webkit OFF ON) + -DDESKTOP_APP_DISABLE_WEBKIT=$(usex webkit OFF ON) -DDESKTOP_APP_DISABLE_SPELLCHECK=$(usex spell OFF ON) # enables hunspell (recommended) -DDESKTOP_APP_USE_ENCHANT=$(usex enchant ON OFF) # enables enchant and disables hunspell ) -- cgit v1.2.3-65-gdbad