Github messages for voidlinux
 help / color / mirror / Atom feed
From: not-chicken <not-chicken@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] telegram-desktop: update to 2.8.10.
Date: Sat, 17 Jul 2021 16:45:13 +0200	[thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-32021@inbox.vuxu.org> (raw)

[-- Attachment #1: Type: text/plain, Size: 1623 bytes --]

There is a new pull request by not-chicken against master on the void-packages repository

https://github.com/not-chicken/void-packages telegam
https://github.com/void-linux/void-packages/pull/32021

telegram-desktop: update to 2.8.10.
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->
cc @Johnnynator 


A patch file from https://github.com/void-linux/void-packages/pull/32021.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-telegam-32021.patch --]
[-- Type: text/x-diff, Size: 4048 bytes --]

From e377f9f5a2674469247a0fd568da8a966309ed7c Mon Sep 17 00:00:00 2001
From: Lorem <notloremipsum@protonmail.com>
Date: Sat, 17 Jul 2021 19:17:05 +0530
Subject: [PATCH] telegram-desktop: update to 2.8.10.

---
 .../patches/0003-gdk-include.patch            | 10 -------
 .../0003-remove-redundant-extern-c.patch      | 28 +++++++++++++++++++
 srcpkgs/telegram-desktop/template             |  6 ++--
 3 files changed, 31 insertions(+), 13 deletions(-)
 delete mode 100644 srcpkgs/telegram-desktop/patches/0003-gdk-include.patch
 create mode 100644 srcpkgs/telegram-desktop/patches/0003-remove-redundant-extern-c.patch

diff --git a/srcpkgs/telegram-desktop/patches/0003-gdk-include.patch b/srcpkgs/telegram-desktop/patches/0003-gdk-include.patch
deleted file mode 100644
index 87c82f074d10..000000000000
--- a/srcpkgs/telegram-desktop/patches/0003-gdk-include.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.h	2021-04-26 18:33:58.641158572 +0200
-+++ b/Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.h	2021-04-26 18:33:58.641158572 +0200
-@@ -12,6 +12,7 @@
- #undef signals
- #include <JavaScriptCore/JavaScript.h>
- #include <gtk/gtk.h>
-+#include <gdk/gdkx.h>
- #include <webkit2/webkit2.h>
- #include <X11/Xlib.h>
- #define signals public
diff --git a/srcpkgs/telegram-desktop/patches/0003-remove-redundant-extern-c.patch b/srcpkgs/telegram-desktop/patches/0003-remove-redundant-extern-c.patch
new file mode 100644
index 000000000000..0bb89b65c7ff
--- /dev/null
+++ b/srcpkgs/telegram-desktop/patches/0003-remove-redundant-extern-c.patch
@@ -0,0 +1,28 @@
+https://github.com/desktop-app/lib_webview/pull/9
+
+From 75e924934eee8624020befbef1f3cb5b865d3b86 Mon Sep 17 00:00:00 2001
+From: Vitaly Lipatov <lav@altlinux.ru>
+Date: Fri, 9 Jul 2021 16:56:50 +0300
+Subject: [PATCH] webview_linux_webkit_gtk.h: there are already exists extern C
+ in the included headers
+
+---
+ webview/platform/linux/webview_linux_webkit_gtk.h | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/webview/platform/linux/webview_linux_webkit_gtk.h b/webview/platform/linux/webview_linux_webkit_gtk.h
+index 8d180c1..e894c75 100644
+--- a/Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.h
++++ b/Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.h
+@@ -6,11 +6,9 @@
+ //
+ #pragma once
+
+-extern "C" {
+ #include <JavaScriptCore/JavaScript.h>
+ #include <gtk/gtk.h>
+ #include <webkit2/webkit2.h>
+-} // extern "C"
+
+ namespace Webview::WebkitGtk {
+
diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template
index 8c0981763b83..ca30e932a5ad 100644
--- a/srcpkgs/telegram-desktop/template
+++ b/srcpkgs/telegram-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'telegram-desktop'
 pkgname=telegram-desktop
-version=2.8.4
+version=2.8.10
 revision=1
 wrksrc="tdesktop-${version}-full"
 build_style=cmake
@@ -19,7 +19,7 @@ makedepends="alsa-lib-devel ffmpeg-devel libdbusmenu-glib-devel libopenal-devel
  libva-devel rapidjson liblz4-devel liblzma-devel gtk+3-devel
  MesaLib-devel libdbusmenu-qt5-devel qt5-wayland-devel libatomic-devel
  xcb-util-keysyms-devel $(vopt_if spellcheck hunspell-devel)
- kwayland-devel glibmm-devel tg_owt webkit2gtk-devel rnnoise-devel"
+ kwayland-devel glibmm-devel tg_owt webkit2gtk-devel rnnoise-devel jemalloc-devel"
 depends="qt5-imageformats qt5-core>=5.15.2<5.16.0"
 short_desc="Telegram Desktop messaging app"
 maintainer="John <me@johnnynator.dev>"
@@ -27,7 +27,7 @@ license="GPL-3.0-or-later, OpenSSL"
 homepage="https://desktop.telegram.org/"
 changelog="https://github.com/telegramdesktop/tdesktop/blob/v${version}/changelog.txt"
 distfiles="https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz"
-checksum=0a2a68590cdbccb40ff835516e9c575c761c91f83712891f69a5310fcb23a6a0
+checksum=60a81f447ee9a46982d66a85672041bba496d728c042865a65e4950e1b631013
 
 build_options="spellcheck"
 build_options_default="spellcheck"

             reply	other threads:[~2021-07-17 14:45 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-17 14:45 not-chicken [this message]
2021-07-17 16:57 ` [PR PATCH] [Merged]: " Johnnynator

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-32021@inbox.vuxu.org \
    --to=not-chicken@users.noreply.github.com \
    --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).