[arch-commits] Commit in telegram-desktop/trunk (3 files)
Jiachen Yang
farseerfc at archlinux.org
Fri Aug 9 19:17:15 UTC 2019
Date: Friday, August 9, 2019 @ 19:17:14
Author: farseerfc
Revision: 498563
upgpkg: telegram-desktop 1.8.0-1
telegram-desktop 1.8.0
Modified:
telegram-desktop/trunk/CMakeLists.inj
telegram-desktop/trunk/PKGBUILD
Deleted:
telegram-desktop/trunk/issue6219.patch
-----------------+
CMakeLists.inj | 1
PKGBUILD | 15 +---
issue6219.patch | 172 ------------------------------------------------------
3 files changed, 7 insertions(+), 181 deletions(-)
Modified: CMakeLists.inj
===================================================================
--- CMakeLists.inj 2019-08-09 18:54:23 UTC (rev 498562)
+++ CMakeLists.inj 2019-08-09 19:17:14 UTC (rev 498563)
@@ -11,6 +11,7 @@
add_precompiled_header(lib_base ../../Telegram/SourceFiles/base/base_pch.h)
add_precompiled_header(lib_export ../../Telegram/SourceFiles/export/export_pch.h)
add_precompiled_header(lib_storage ../../Telegram/SourceFiles/storage/storage_pch.h)
+add_precompiled_header(lib_mtproto ../../Telegram/SourceFiles/mtproto/mtp_pch.h)
# You can discover new PCHs using this link:
# https://github.com/telegramdesktop/tdesktop/search?q=pch_header&unscoped_q=pch_header
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2019-08-09 18:54:23 UTC (rev 498562)
+++ PKGBUILD 2019-08-09 19:17:14 UTC (rev 498563)
@@ -5,8 +5,8 @@
# https://github.com/mymedia2/tdesktop
pkgname=telegram-desktop
-pkgver=1.7.14
-pkgrel=3
+pkgver=1.8.0
+pkgrel=1
pkgdesc='Official Telegram Desktop client'
arch=('x86_64')
url="https://desktop.telegram.org/"
@@ -32,7 +32,7 @@
"demibold.patch"
"Use-system-wide-font.patch"
"tdesktop_lottie_animation_qtdebug.patch"
- "issue6219.patch"
+ "revert-private-headers.patch::https://github.com/telegramdesktop/tdesktop/commit/b9d3ba621eb8af638af46c6b3cfd7a8330bf0dd5.patch"
)
sha512sums=('SKIP'
'SKIP'
@@ -43,7 +43,7 @@
'SKIP'
'SKIP'
'b87414ceaae19185a8a5749cea1f6d9f3fc3c69b8dd729e3db8790cde00b987c3c827cd30baf0eac579d1884e34aa2f37bb90778c3c0bc9ca211d75a82891b9d'
- 'b20674f61ff6378749d1f59a6a0da194d33ccc786bd783f6ed62027924a3a8a8d27c9763bf376480432d6536896b0c7eeb8c495c5b8cefff7cf5fe84da50947e'
+ '16874fabcb0d04d6bf8db1ee2fd77fbd09eeb6acc28bb5fd915d378f7a5ed7ebf4aae01c390e516695572cf9ef0e2cb59493e21a35643fd63ddf3fec446858a6'
'3b6a0450f7981c2ce5f90c1ea46d9fb504194609f357b957b5c4a741681d3c531252394df116f8b77780a3a110783c047c9a081f9651e0792e7423573e390392'
'a8f1708616a598fea3cb94e3b63b02a7b13b55abd129a5dc02ad502529f4ebe7a673b6a350b669290fd26135358d21e2e10bf4a11d88f58f0685b7c4ab515bc5'
'd60694dc701aa985b0e82a12c9732b945082470441c687b33167a94f94efcf253baf43bb7280ec160ba338485ee5c62de138e4804cae05f27cc5cf4298166d39'
@@ -50,7 +50,7 @@
'6d0bac5aa4c4992b5400a9a9318f7a4e92d5eab961917cf0b05cdd251ab66a77c52ec8fbef246e8019606a7624d7b5420b87f8153e071e9724c7d2f5c94e47c0'
'ce6be003220267bac5483caf8302b492e1581892bc36d35a61236ebf9f9d766b8bd2159557a1c36256aa85f461797a38bfaae57b12da7a72101b21c0b17ed653'
'a83b80668b2dc2cc77c857069fdb45b487793fda01ad8a63bab66c6a1c71e5d032050e4ec7efb5b4c3216badc5377c856ef1f4a59c2e02b24ee53b1d83124bf3'
- 'f3ec62dfcace74e0b07396427fa6cdfa849c3feab251bdf629512984bbb2ad4b0389a2543ae6d299a5b3788609e4aeabb0dabc1fa51a3a099287c1b199626ec0')
+ 'e25dc1c54d6001a7a3740c6cee40a12a2313a3fd2e41986268f0ee5d9d8bf2d34812f539efb0eb5d26d3f263b2e4a7849016711532bf215aa9ff38da30175557')
prepare() {
cd "$srcdir/tdesktop"
@@ -69,11 +69,8 @@
patch -R -Np1 -i "$srcdir/demibold.patch"
patch -Np1 -i "$srcdir/Use-system-wide-font.patch"
patch -Np1 -i "$srcdir/tdesktop_lottie_animation_qtdebug.patch"
+ patch -R -Np1 -i "$srcdir/revert-private-headers.patch"
- # backport from https://github.com/telegramdesktop/tdesktop/commit/0710dde4d5526454318b2748331e887c01ecfdce
- # as discussed in https://github.com/telegramdesktop/tdesktop/issues/6219
- patch -Np1 -i "$srcdir/issue6219.patch"
-
# disable static-qt for rlottie
sed "/RLOTTIE_WITH_STATIC_QT/d" -i "$srcdir/tdesktop/Telegram/gyp/lib_rlottie.gyp"
Deleted: issue6219.patch
===================================================================
--- issue6219.patch 2019-08-09 18:54:23 UTC (rev 498562)
+++ issue6219.patch 2019-08-09 19:17:14 UTC (rev 498563)
@@ -1,172 +0,0 @@
-From 0710dde4d5526454318b2748331e887c01ecfdce Mon Sep 17 00:00:00 2001
-From: John Preston <johnprestonmail at gmail.com>
-Date: Tue, 9 Jul 2019 13:43:57 +0200
-Subject: [PATCH] Use private Qt color API only in official build.
-
-Fixes #6219.
----
- .../SourceFiles/ffmpeg/ffmpeg_utility.cpp | 100 ++++++++++++------
- Telegram/gyp/lib_ffmpeg.gyp | 6 +-
- 2 files changed, 71 insertions(+), 35 deletions(-)
-
-diff --git a/Telegram/SourceFiles/ffmpeg/ffmpeg_utility.cpp b/Telegram/SourceFiles/ffmpeg/ffmpeg_utility.cpp
-index 5d0e50926..3775f7503 100644
---- a/Telegram/SourceFiles/ffmpeg/ffmpeg_utility.cpp
-+++ b/Telegram/SourceFiles/ffmpeg/ffmpeg_utility.cpp
-@@ -11,7 +11,10 @@ For license and copyright information please follow this link:
- #include "logs.h"
-
- #include <QImage>
-+
-+#ifdef TDESKTOP_OFFICIAL_TARGET
- #include <private/qdrawhelper_p.h>
-+#endif // TDESKTOP_OFFICIAL_TARGET
-
- extern "C" {
- #include <libavutil/opt.h>
-@@ -44,6 +47,58 @@ void AlignedImageBufferCleanupHandler(void* data) {
- && !(image.bytesPerLine() % kAlignImageBy);
- }
-
-+void UnPremultiplyLine(uchar *dst, const uchar *src, int intsCount) {
-+#ifdef TDESKTOP_OFFICIAL_TARGET
-+ const auto layout = &qPixelLayouts[QImage::Format_ARGB32];
-+ const auto convert = layout->convertFromARGB32PM;
-+#else // TDESKTOP_OFFICIAL_TARGET
-+ const auto layout = nullptr;
-+ const auto convert = [](
-+ uint *dst,
-+ const uint *src,
-+ int count,
-+ std::nullptr_t,
-+ std::nullptr_t) {
-+ for (auto i = 0; i != count; ++i) {
-+ dst[i] = qUnpremultiply(src[i]);
-+ }
-+ };
-+#endif // TDESKTOP_OFFICIAL_TARGET
-+
-+ convert(
-+ reinterpret_cast<uint*>(dst),
-+ reinterpret_cast<const uint*>(src),
-+ intsCount,
-+ layout,
-+ nullptr);
-+}
-+
-+void PremultiplyLine(uchar *dst, const uchar *src, int intsCount) {
-+#ifdef TDESKTOP_OFFICIAL_TARGET
-+ const auto layout = &qPixelLayouts[QImage::Format_ARGB32];
-+ const auto convert = layout->convertToARGB32PM;
-+#else // TDESKTOP_OFFICIAL_TARGET
-+ const auto layout = nullptr;
-+ const auto convert = [](
-+ uint *dst,
-+ const uint *src,
-+ int count,
-+ std::nullptr_t,
-+ std::nullptr_t) {
-+ for (auto i = 0; i != count; ++i) {
-+ dst[i] = qPremultiply(src[i]);
-+ }
-+ };
-+#endif // TDESKTOP_OFFICIAL_TARGET
-+
-+ convert(
-+ reinterpret_cast<uint*>(dst),
-+ reinterpret_cast<const uint*>(src),
-+ intsCount,
-+ layout,
-+ nullptr);
-+}
-+
- } // namespace
-
- IOPointer MakeIOPointer(
-@@ -360,58 +415,35 @@ void UnPremultiply(QImage &to, const QImage &from) {
- if (!GoodStorageForFrame(to, from.size())) {
- to = CreateFrameStorage(from.size());
- }
--
-- const auto layout = &qPixelLayouts[QImage::Format_ARGB32];
-- const auto convert = layout->convertFromARGB32PM;
- const auto fromPerLine = from.bytesPerLine();
- const auto toPerLine = to.bytesPerLine();
- const auto width = from.width();
-+ const auto height = from.height();
-+ auto fromBytes = from.bits();
-+ auto toBytes = to.bits();
- if (fromPerLine != width * 4 || toPerLine != width * 4) {
-- auto fromBytes = from.bits();
-- auto toBytes = to.bits();
-- for (auto i = 0; i != to.height(); ++i) {
-- convert(
-- reinterpret_cast<uint*>(toBytes),
-- reinterpret_cast<const uint*>(fromBytes),
-- width,
-- layout,
-- nullptr);
-+ for (auto i = 0; i != height; ++i) {
-+ UnPremultiplyLine(toBytes, fromBytes, width);
- fromBytes += fromPerLine;
- toBytes += toPerLine;
- }
- } else {
-- convert(
-- reinterpret_cast<uint*>(to.bits()),
-- reinterpret_cast<const uint*>(from.bits()),
-- from.width() * from.height(),
-- layout,
-- nullptr);
-+ UnPremultiplyLine(toBytes, fromBytes, width * height);
- }
- }
-
- void PremultiplyInplace(QImage &image) {
-- const auto layout = &qPixelLayouts[QImage::Format_ARGB32];
-- const auto convert = layout->convertToARGB32PM;
- const auto perLine = image.bytesPerLine();
- const auto width = image.width();
-+ const auto height = image.height();
-+ auto bytes = image.bits();
- if (perLine != width * 4) {
-- auto bytes = image.bits();
-- for (auto i = 0; i != image.height(); ++i) {
-- convert(
-- reinterpret_cast<uint*>(bytes),
-- reinterpret_cast<const uint*>(bytes),
-- width,
-- layout,
-- nullptr);
-+ for (auto i = 0; i != height; ++i) {
-+ PremultiplyLine(bytes, bytes, width);
- bytes += perLine;
- }
- } else {
-- convert(
-- reinterpret_cast<uint*>(image.bits()),
-- reinterpret_cast<const uint*>(image.bits()),
-- image.width() * image.height(),
-- layout,
-- nullptr);
-+ PremultiplyLine(bytes, bytes, width * height);
- }
- }
-
-diff --git a/Telegram/gyp/lib_ffmpeg.gyp b/Telegram/gyp/lib_ffmpeg.gyp
-index 9971d76ae..b9ada5362 100644
---- a/Telegram/gyp/lib_ffmpeg.gyp
-+++ b/Telegram/gyp/lib_ffmpeg.gyp
-@@ -46,7 +46,11 @@
- '<(src_loc)/ffmpeg/ffmpeg_utility.cpp',
- '<(src_loc)/ffmpeg/ffmpeg_utility.h',
- ],
-- 'conditions': [[ 'build_macold', {
-+ 'conditions': [[ '"<(official_build_target)" != ""', {
-+ 'defines': [
-+ 'TDESKTOP_OFFICIAL_TARGET=<(official_build_target)',
-+ ],
-+ }], [ 'build_macold', {
- 'xcode_settings': {
- 'OTHER_CPLUSPLUSFLAGS': [ '-nostdinc++' ],
- },
More information about the arch-commits
mailing list