From owner-dev-commits-ports-all@freebsd.org Fri May 14 03:05:26 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 0CA5C636DEB; Fri, 14 May 2021 03:05:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FhD116y93z4dnh; Fri, 14 May 2021 03:05:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DE37B256E; Fri, 14 May 2021 03:05:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 14E35Prp054059; Fri, 14 May 2021 03:05:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14E35Pgt054058; Fri, 14 May 2021 03:05:25 GMT (envelope-from git) Date: Fri, 14 May 2021 03:05:25 GMT Message-Id: <202105140305.14E35Pgt054058@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Charlie Li Subject: git: 80762637bb7d - main - net-im/telegram-desktop: fix build with GTK option MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vishwin X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 80762637bb7d34dcc3e8049b869db0908f404b2c Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 May 2021 03:05:26 -0000 The branch main has been updated by vishwin: URL: https://cgit.FreeBSD.org/ports/commit/?id=80762637bb7d34dcc3e8049b869db0908f404b2c commit 80762637bb7d34dcc3e8049b869db0908f404b2c Author: Charlie Li AuthorDate: 2021-05-12 04:21:02 +0000 Commit: Charlie Li CommitDate: 2021-05-14 02:48:39 +0000 net-im/telegram-desktop: fix build with GTK option Telegram now includes a WebView feature when GTK is enabled, which uses www/webkit2-gtk3. While here, fix the following minor items: - allow building with Python newer than 3.7 - devel/dee is not needed for build, remove - clean up USES= syntax in the GTK option Obtained from: https://github.com/desktop-app/lib_webview/commit/0b4100d7cecc4e748c51f3f51ebfd1392ec3978a https://github.com/desktop-app/lib_webview/commit/48d70e5258754b2415b07c88f0376212596e09a7 Approved by: Henry Hu (maintainer), arrowd (mentor), fluffy (mentor) PR: 255719 Differential Revision: https://reviews.freebsd.org/D30224 --- net-im/telegram-desktop/Makefile | 11 +++-------- ...ew_platform_linux_webview__linux__webkit__gtk.cpp | 20 ++++++++++++++++++++ ...view_platform_linux_webview__linux__webkit__gtk.h | 13 +++++++++++++ 3 files changed, 36 insertions(+), 8 deletions(-) diff --git a/net-im/telegram-desktop/Makefile b/net-im/telegram-desktop/Makefile index ddbc4ec6c8e9..b635bbefee83 100644 --- a/net-im/telegram-desktop/Makefile +++ b/net-im/telegram-desktop/Makefile @@ -16,7 +16,6 @@ NOT_FOR_ARCHS= powerpc powerpc64 powerpcspe NOT_FOR_ARCHS_REASON= Only little endian is supported BUILD_DEPENDS= alsa-lib>0:audio/alsa-lib \ - dee>0:devel/dee \ microsoft-gsl>0:devel/microsoft-gsl \ pulseaudio>0:audio/pulseaudio \ range-v3>0:devel/range-v3 \ @@ -40,7 +39,7 @@ LIB_DEPENDS= libavformat.so:multimedia/ffmpeg \ libxxhash.so:devel/xxhash USES= cmake compiler:c++17-lang desktop-file-utils gl \ - gnome pkgconfig python:3.7,build qt:5 ssl xorg + gnome pkgconfig python:3.7+,build qt:5 ssl xorg USE_GITHUB= nodefault GH_ACCOUNT= telegramdesktop @@ -81,16 +80,12 @@ GTK_DESC= Gtk integration (Use Gtk dialogs, etc.) ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib GTK_CMAKE_BOOL_OFF= DESKTOP_APP_DISABLE_GTK_INTEGRATION +GTK_LIB_DEPENDS= libwebkit2gtk-4.0.so:www/webkit2-gtk3 +GTK_USE= GNOME=gtk30 PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio # Telegram asks each custom build to have its own API ID and hash. TELEGRAM_API_HASH= 20a3432aab43f24bb4460fceac5ba38d TELEGRAM_API_ID= 601761 -.include - -.if ${PORT_OPTIONS:MGTK} -USE_GNOME+= gtk30 -.endif - .include diff --git a/net-im/telegram-desktop/files/patch-Telegram_lib__webview_webview_platform_linux_webview__linux__webkit__gtk.cpp b/net-im/telegram-desktop/files/patch-Telegram_lib__webview_webview_platform_linux_webview__linux__webkit__gtk.cpp new file mode 100644 index 000000000000..55842e691436 --- /dev/null +++ b/net-im/telegram-desktop/files/patch-Telegram_lib__webview_webview_platform_linux_webview__linux__webkit__gtk.cpp @@ -0,0 +1,20 @@ +--- Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.cpp.orig 2021-04-14 05:42:51 UTC ++++ Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.cpp +@@ -26,7 +26,7 @@ bool Resolve() { + auto >k = BaseGtkIntegration::Instance()->library(); + + auto webkit2gtk = QLibrary(); +- const auto result = LOAD_GTK_SYMBOL(gtk, gtk_widget_get_type) ++ const auto result = LOAD_GTK_SYMBOL(gtk, gtk_widget_get_type) + && LOAD_GTK_SYMBOL(gtk, gtk_widget_grab_focus) + && LOAD_GTK_SYMBOL(gtk, gtk_container_get_type) + && LOAD_GTK_SYMBOL(gtk, gtk_container_add) +@@ -38,7 +38,7 @@ bool Resolve() { + && LOAD_GTK_SYMBOL(gtk, gtk_window_get_type) + && LOAD_GTK_SYMBOL(gtk, gtk_window_set_decorated) + && LOAD_GTK_SYMBOL(gtk, gdk_x11_window_get_xid) +- && base::Platform::Gtk::LoadLibrary(webkit2gtk, "libwebkit2gtk-4.0.so.37", 0) ++ && base::Platform::Gtk::LoadGtkLibrary(webkit2gtk, "libwebkit2gtk-4.0.so.37") + && LOAD_GTK_SYMBOL(webkit2gtk, webkit_web_view_new) + && LOAD_GTK_SYMBOL(webkit2gtk, webkit_web_view_get_type) + && LOAD_GTK_SYMBOL(webkit2gtk, webkit_web_view_get_user_content_manager) diff --git a/net-im/telegram-desktop/files/patch-Telegram_lib__webview_webview_platform_linux_webview__linux__webkit__gtk.h b/net-im/telegram-desktop/files/patch-Telegram_lib__webview_webview_platform_linux_webview__linux__webkit__gtk.h new file mode 100644 index 000000000000..64864b80978b --- /dev/null +++ b/net-im/telegram-desktop/files/patch-Telegram_lib__webview_webview_platform_linux_webview__linux__webkit__gtk.h @@ -0,0 +1,13 @@ +--- Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.h.orig 2021-04-14 05:42:51 UTC ++++ Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.h +@@ -11,9 +11,9 @@ + extern "C" { + #undef signals + #include ++#include + #include + #include +-#include + #define signals public + } // extern "C" +