From: voidlinux-github@inbox.vuxu.org
To: ml@inbox.vuxu.org
Subject: [PR PATCH] telegram-desktop: update to 1.8.4.
Date: Sat, 07 Sep 2019 20:26:23 +0200 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-14290@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 399 bytes --]
There is a new pull request by Johnnynator against master on the void-packages repository
https://github.com/Johnnynator/void-packages telegram-desktop-1.8.4
https://github.com/void-linux/void-packages/pull/14290
telegram-desktop: update to 1.8.4.
Test repo: https://void.johnnynator.dev/telegram-desktop/
A patch file from https://github.com/void-linux/void-packages/pull/14290.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-telegram-desktop-1.8.4-14290.patch --]
[-- Type: text/x-diff, Size: 3958 bytes --]
From 857151679648ebc06992b7ffbcd33ed906d572dc Mon Sep 17 00:00:00 2001
From: John <johnz@posteo.net>
Date: Fri, 6 Sep 2019 21:10:09 +0200
Subject: [PATCH] telegram-desktop: update to 1.8.4.
---
.../patches/gdk-wayland-backend.patch | 48 +++++++++++++++++++
srcpkgs/telegram-desktop/template | 4 +-
2 files changed, 50 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/telegram-desktop/patches/gdk-wayland-backend.patch
diff --git a/srcpkgs/telegram-desktop/patches/gdk-wayland-backend.patch b/srcpkgs/telegram-desktop/patches/gdk-wayland-backend.patch
new file mode 100644
index 00000000000..b905b6b022a
--- /dev/null
+++ b/srcpkgs/telegram-desktop/patches/gdk-wayland-backend.patch
@@ -0,0 +1,48 @@
+Reason: Make sure that Telegram only tries gtk3 when running under wayland and allow the GDK wayland
+ Possible fix for void-linux/void-packages#14251
+Athor: John <johnz@posteo.net>
+
+--- Telegram/SourceFiles/platform/linux/linux_libs.cpp 2019-09-07 19:39:53.957208036 +0200
++++ - 2019-09-07 19:46:41.632839765 +0200
+@@ -106,8 +106,13 @@
+ // Otherwise we get segfault in Ubuntu 17.04 in gtk_init_check() call.
+ // See https://github.com/telegramdesktop/tdesktop/issues/3176
+ // See https://github.com/telegramdesktop/tdesktop/issues/3162
+- DEBUG_LOG(("Limit allowed GDK backends to x11"));
+- gdk_set_allowed_backends("x11");
++ if(QApplication::platformName().startsWith(qsl("wayland"), Qt::CaseInsensitive)) {
++ DEBUG_LOG(("Limit allowed GDK backends to wayland"));
++ gdk_set_allowed_backends("wayland");
++ } else if (QApplication::platformName() == qsl("xcb")) {
++ DEBUG_LOG(("Limit allowed GDK backends to x11"));
++ gdk_set_allowed_backends("x11");
++ }
+ }
+
+ DEBUG_LOG(("Library gtk functions loaded!"));
+@@ -228,6 +233,7 @@
+
+ bool gtkLoaded = false;
+ bool indicatorLoaded = false;
++ bool isWayland = QApplication::platformName().startsWith(qsl("wayland"), Qt::CaseInsensitive);
+ QLibrary lib_gtk, lib_indicator;
+ if (loadLibrary(lib_indicator, "ayatana-appindicator3", 1) || loadLibrary(lib_indicator, "appindicator3", 1)) {
+ if (loadLibrary(lib_gtk, "gtk-3", 0)) {
+@@ -235,7 +241,7 @@
+ indicatorLoaded = setupAppIndicator(lib_indicator);
+ }
+ }
+- if (!gtkLoaded || !indicatorLoaded) {
++ if (!gtkLoaded || !indicatorLoaded && !isWayland) {
+ if (loadLibrary(lib_indicator, "ayatana-appindicator", 1) || loadLibrary(lib_indicator, "appindicator", 1)) {
+ if (loadLibrary(lib_gtk, "gtk-x11-2.0", 0)) {
+ gtkLoaded = indicatorLoaded = false;
+@@ -250,7 +256,7 @@
+ if (loadLibrary(lib_gtk, "gtk-3", 0)) {
+ gtkLoaded = setupGtkBase(lib_gtk);
+ }
+- if (!gtkLoaded && loadLibrary(lib_gtk, "gtk-x11-2.0", 0)) {
++ if (!gtkLoaded && !isWayland && loadLibrary(lib_gtk, "gtk-x11-2.0", 0)) {
+ gtkLoaded = setupGtkBase(lib_gtk);
+ }
+ }
diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template
index ccd9b9a9e93..6334f09c02f 100644
--- a/srcpkgs/telegram-desktop/template
+++ b/srcpkgs/telegram-desktop/template
@@ -1,6 +1,6 @@
# Template file for 'telegram-desktop'
pkgname=telegram-desktop
-version=1.8.2
+version=1.8.4
revision=1
_libtgvoip_commit=d4a0f719ffd8d29e88474f67abc9fc862661c3b9
_GSL_commit=d846fe50a3f0bb7767c7e087a05f4be95f4da0ec
@@ -30,7 +30,7 @@ distfiles="https://github.com/telegramdesktop/tdesktop/archive/v${version}.tar.g
https://github.com/mapbox/variant/archive/${_variant_commit}.tar.gz
https://github.com/telegramdesktop/crl/archive/${_crl_commit}.tar.gz
https://github.com/catchorg/Catch2/archive/${_Catch_commit}.tar.gz"
-checksum="bbacd3aa6ae5f78321346e9bff0b202e8aa64fccafcb06e5e2777c2f0cd908c6
+checksum="97f034d78447c99002b8742c75a3a436e709cdf2f5dff79f7ca04a8c76298627
bb75188b900907a5b00594ad3ddb78195c8d1fdc144e5a458b314dd666eba996
be81db4ab1b57102a0fa1cd0c4a6469294eb9daf24294347592245b754f65ff6
aa794dfefe0a90501587e36d977b958d0df888503117a8d9aa43dc14f8526d9d
next reply other threads:[~2019-09-07 18:26 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-07 18:26 voidlinux-github [this message]
2019-09-08 6:27 ` [PR PATCH] [Updated] " voidlinux-github
2019-09-08 6:27 ` voidlinux-github
2019-09-08 6:43 ` [PR PATCH] [Merged]: " voidlinux-github
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-14290@inbox.vuxu.org \
--to=voidlinux-github@inbox.vuxu.org \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).