[arch-commits] Commit in telegram-desktop/repos/community-x86_64 (9 files)

Jiachen Yang farseerfc at archlinux.org
Thu Jan 23 15:34:54 UTC 2020


    Date: Thursday, January 23, 2020 @ 15:34:53
  Author: farseerfc
Revision: 554986

archrelease: copy trunk to community-x86_64

Added:
  telegram-desktop/repos/community-x86_64/0005-Use-system-wide-fonts.patch
    (from rev 554983, telegram-desktop/trunk/0005-Use-system-wide-fonts.patch)
  telegram-desktop/repos/community-x86_64/PKGBUILD
    (from rev 554983, telegram-desktop/trunk/PKGBUILD)
  telegram-desktop/repos/community-x86_64/series
    (from rev 554983, telegram-desktop/trunk/series)
  telegram-desktop/repos/community-x86_64/telegram-desktop.sh
    (from rev 554983, telegram-desktop/trunk/telegram-desktop.sh)
Deleted:
  telegram-desktop/repos/community-x86_64/0005-Use-system-wide-fonts.patch
  telegram-desktop/repos/community-x86_64/0006-Revert-Disable-DemiBold-fallback-for-Semibold.patch
  telegram-desktop/repos/community-x86_64/PKGBUILD
  telegram-desktop/repos/community-x86_64/series
  telegram-desktop/repos/community-x86_64/telegram-desktop.sh

----------------------------------------------------------+
 0005-Use-system-wide-fonts.patch                         |  118 +++----
 0006-Revert-Disable-DemiBold-fallback-for-Semibold.patch |   25 -
 PKGBUILD                                                 |  209 ++++++-------
 series                                                   |    3 
 telegram-desktop.sh                                      |    6 
 5 files changed, 169 insertions(+), 192 deletions(-)

Deleted: 0005-Use-system-wide-fonts.patch
===================================================================
--- 0005-Use-system-wide-fonts.patch	2020-01-23 15:34:41 UTC (rev 554985)
+++ 0005-Use-system-wide-fonts.patch	2020-01-23 15:34:53 UTC (rev 554986)
@@ -1,59 +0,0 @@
-Do not force custom fontconfig configuration.
-Index: tdesktop-1.9.4-full/Telegram/lib_ui/fonts/fonts.qrc
-===================================================================
---- tdesktop-1.9.4-full.orig/Telegram/lib_ui/fonts/fonts.qrc
-+++ tdesktop-1.9.4-full/Telegram/lib_ui/fonts/fonts.qrc
-@@ -1,10 +1,4 @@
- <RCC>
-   <qresource prefix="/gui/fonts">
--    <file>DAOpenSansRegular.ttf</file>
--    <file>DAOpenSansRegularItalic.ttf</file>
--    <file>DAOpenSansBold.ttf</file>
--    <file>DAOpenSansBoldItalic.ttf</file>
--    <file>DAOpenSansSemibold.ttf</file>
--    <file>DAOpenSansSemiboldItalic.ttf</file>
-   </qresource>
- </RCC>
-Index: tdesktop-1.9.4-full/Telegram/lib_ui/ui/style/style_core_font.cpp
-===================================================================
---- tdesktop-1.9.4-full.orig/Telegram/lib_ui/ui/style/style_core_font.cpp
-+++ tdesktop-1.9.4-full/Telegram/lib_ui/ui/style/style_core_font.cpp
-@@ -94,12 +94,12 @@ enum {
- 	FontTypesCount,
- };
- QString FontTypeNames[FontTypesCount] = {
--	"DAOpenSansRegular",
--	"DAOpenSansRegularItalic",
--	"DAOpenSansBold",
--	"DAOpenSansBoldItalic",
--	"DAOpenSansSemibold",
--	"DAOpenSansSemiboldItalic",
-+	"Open Sans",
-+	"Open Sans",
-+	"Open Sans",
-+	"Open Sans",
-+	"Open Sans Semibold",
-+	"Open Sans Semibold",
- };
- int32 FontTypeFlags[FontTypesCount] = {
- 	0,
-@@ -135,7 +135,7 @@ void StartFonts() {
- 	for (auto i = 0; i != FontTypesCount; ++i) {
- 		const auto name = FontTypeNames[i];
- 		const auto flags = FontTypeFlags[i];
--		areGood[i] = LoadCustomFont(":/gui/fonts/" + name + ".ttf", name, flags);
-+		areGood[i] = ValidateFont(name, flags);
- 		Overrides[i] = name;
- #ifdef Q_OS_WIN
- 		// Attempt to workaround a strange font bug with Open Sans Semibold not loading.
-Index: tdesktop-1.9.4-full/Telegram/lib_ui/qt_conf/linux.qrc
-===================================================================
---- tdesktop-1.9.4-full.orig/Telegram/lib_ui/qt_conf/linux.qrc
-+++ tdesktop-1.9.4-full/Telegram/lib_ui/qt_conf/linux.qrc
-@@ -3,6 +3,5 @@
-     <file alias="qt.conf">qt_linux.conf</file>
-   </qresource>
-   <qresource prefix="/fc">
--    <file>fc-custom.conf</file>
-   </qresource>
- </RCC>

Copied: telegram-desktop/repos/community-x86_64/0005-Use-system-wide-fonts.patch (from rev 554983, telegram-desktop/trunk/0005-Use-system-wide-fonts.patch)
===================================================================
--- 0005-Use-system-wide-fonts.patch	                        (rev 0)
+++ 0005-Use-system-wide-fonts.patch	2020-01-23 15:34:53 UTC (rev 554986)
@@ -0,0 +1,59 @@
+Do not force custom fontconfig configuration.
+Index: tdesktop-1.9.4-full/Telegram/lib_ui/fonts/fonts.qrc
+===================================================================
+--- tdesktop-1.9.4-full.orig/Telegram/lib_ui/fonts/fonts.qrc
++++ tdesktop-1.9.4-full/Telegram/lib_ui/fonts/fonts.qrc
+@@ -1,10 +1,4 @@
+ <RCC>
+   <qresource prefix="/gui/fonts">
+-    <file>DAOpenSansRegular.ttf</file>
+-    <file>DAOpenSansRegularItalic.ttf</file>
+-    <file>DAOpenSansBold.ttf</file>
+-    <file>DAOpenSansBoldItalic.ttf</file>
+-    <file>DAOpenSansSemibold.ttf</file>
+-    <file>DAOpenSansSemiboldItalic.ttf</file>
+   </qresource>
+ </RCC>
+Index: tdesktop-1.9.4-full/Telegram/lib_ui/ui/style/style_core_font.cpp
+===================================================================
+--- tdesktop-1.9.4-full.orig/Telegram/lib_ui/ui/style/style_core_font.cpp
++++ tdesktop-1.9.4-full/Telegram/lib_ui/ui/style/style_core_font.cpp
+@@ -94,12 +94,12 @@ enum {
+ 	FontTypesCount,
+ };
+ QString FontTypeNames[FontTypesCount] = {
+-	"DAOpenSansRegular",
+-	"DAOpenSansRegularItalic",
+-	"DAOpenSansBold",
+-	"DAOpenSansBoldItalic",
+-	"DAOpenSansSemibold",
+-	"DAOpenSansSemiboldItalic",
++	"Open Sans",
++	"Open Sans",
++	"Open Sans",
++	"Open Sans",
++	"Open Sans Semibold",
++	"Open Sans Semibold",
+ };
+ int32 FontTypeFlags[FontTypesCount] = {
+ 	0,
+@@ -135,7 +135,7 @@ void StartFonts() {
+ 	for (auto i = 0; i != FontTypesCount; ++i) {
+ 		const auto name = FontTypeNames[i];
+ 		const auto flags = FontTypeFlags[i];
+-		areGood[i] = LoadCustomFont(":/gui/fonts/" + name + ".ttf", name, flags);
++		areGood[i] = ValidateFont(name, flags);
+ 		Overrides[i] = name;
+ #ifdef Q_OS_WIN
+ 		// Attempt to workaround a strange font bug with Open Sans Semibold not loading.
+Index: tdesktop-1.9.4-full/Telegram/lib_ui/qt_conf/linux.qrc
+===================================================================
+--- tdesktop-1.9.4-full.orig/Telegram/lib_ui/qt_conf/linux.qrc
++++ tdesktop-1.9.4-full/Telegram/lib_ui/qt_conf/linux.qrc
+@@ -3,6 +3,5 @@
+     <file alias="qt.conf">qt_linux.conf</file>
+   </qresource>
+   <qresource prefix="/fc">
+-    <file>fc-custom.conf</file>
+   </qresource>
+ </RCC>

Deleted: 0006-Revert-Disable-DemiBold-fallback-for-Semibold.patch
===================================================================
--- 0006-Revert-Disable-DemiBold-fallback-for-Semibold.patch	2020-01-23 15:34:41 UTC (rev 554985)
+++ 0006-Revert-Disable-DemiBold-fallback-for-Semibold.patch	2020-01-23 15:34:53 UTC (rev 554986)
@@ -1,25 +0,0 @@
-From b7effa2fd838afc049ec5cc00df3bd0810a95da4 Mon Sep 17 00:00:00 2001
-From: Jiachen YANG <farseerfc at gmail.com>
-Date: Fri, 4 Oct 2019 16:59:26 +0900
-Subject: [PATCH 3/6] Revert "Disable DemiBold fallback for Semibold."
-
-This reverts commit 310c68a744ae8163c96b88944d96a6f6b14b3cdf.
----
- Telegram/lib_ui/ui/style/style_core_font.cpp | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
---- a/Telegram/lib_ui/ui/style/style_core_font.cpp
-+++ b/Telegram/lib_ui/ui/style/style_core_font.cpp
-@@ -225,9 +225,9 @@
- 
- 	f.setPixelSize(size);
- 	if (_flags & FontBold) {
--		f.setBold(true);
--	//} else if (fontFamilies[family] == "Open Sans Semibold") {
--	//	f.setWeight(QFont::DemiBold);
-+		f.setBold(_flags & FontBold);
-+	} else if (fontFamilies[family] == "Open Sans Semibold") {
-+		f.setWeight(QFont::DemiBold);
- 	}
- 	f.setItalic(_flags & FontItalic);
- 	f.setUnderline(_flags & FontUnderline);

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-01-23 15:34:41 UTC (rev 554985)
+++ PKGBUILD	2020-01-23 15:34:53 UTC (rev 554986)
@@ -1,103 +0,0 @@
-# Maintainer: Sven-Hendrik Haase <svenstaro at gmail.com>
-# Contributor: hexchain <i at hexchain.org>
-
-# Thanks Nicholas Guriev <guriev-ns at ya.ru> for the patches!
-# https://github.com/mymedia2/tdesktop
-
-pkgname=telegram-desktop
-pkgver=1.9.4
-pkgrel=2
-pkgdesc='Official Telegram Desktop client'
-arch=('x86_64')
-url="https://desktop.telegram.org/"
-license=('GPL3')
-depends=(
-    'enchant'
-    'ffmpeg'
-    'hicolor-icon-theme'
-    'lz4'
-    'minizip'
-    'openal'
-    'qt5-imageformats'
-    'xxhash'
-    'libappindicator-gtk3'
-)
-# for libappindicator-gtk3 see https://bugs.archlinux.org/task/65080
-
-makedepends=(
-    'cmake'
-    'git'
-    'ninja'
-    'python'
-    'quilt'
-    'range-v3'
-)
-optdepends=(
-    'ttf-opensans: default Open Sans font family'
-)
-source=(
-    "https://github.com/telegramdesktop/tdesktop/releases/download/v${pkgver}/tdesktop-${pkgver}-full.tar.gz"
-    telegram-desktop.sh
-    0005-Use-system-wide-fonts.patch
-    0006-Revert-Disable-DemiBold-fallback-for-Semibold.patch
-    series
-)
-sha512sums=('0967f60dd978a5fc5ec2501a22e8865afd4ddeaacfd1b0acfb133cd511767ff1c6f03a099aef3de03b0f837c8eccac1caea14c395ee54c8d3ab5b35de7551745'
-            '3c21c871e28bac365400f7bc439a16ad1a9a8d87590ad764ce262f1db968c10387caed372d4e064cb50f43da726cebaa9b24bcbcc7c6d5489515620f44dbf56b'
-            'e12021af0c95c967f80240abd683bf197f3c4f8f21315b48c5dadeb399dc39cd1e352352daba1c30691c6d1c6e66078af95b9262e8fe0c2174709fcb1a8a3f5d'
-            '41f22a8b63b1929288cca5638c2719ce9754aa4334deb9004370c44f780fb8ac57f2b4075d529c494f4eac49dde22885f0f9efc0911840f79cb5fcf8d737061d'
-            'd66adb920b318520146cf7a29f13e28e16c0cfb28f4d27ef743a8d7acea4b45b5c62e7dfc3928ec23a97b12dd42845f311aaa7c317df632f7926bdd5bfb8f2b3')
-
-prepare() {
-    cd tdesktop-$pkgver-full
-
-    QUILT_PATCHES=.. quilt --quiltrc=/dev/null push -a
-
-    mkdir build
-}
-
-build() {
-    cd tdesktop-$pkgver-full
-
-    export CXXFLAGS="$CXXFLAGS -ffile-prefix-map=$srcdir/tdesktop-$pkgver-full="
-    cmake -B build -G Ninja . \
-        -Ddisable_autoupdate=1 \
-        -DCMAKE_INSTALL_PREFIX=/usr \
-        -DCMAKE_BUILD_TYPE=Release \
-        -DTDESKTOP_API_ID=17349 \
-        -DTDESKTOP_API_HASH=344583e45741c457fe1862106095a5eb \
-        -DDESKTOP_APP_USE_GLIBC_WRAPS=OFF \
-        -DDESKTOP_APP_USE_PACKAGED=ON \
-        -DDESKTOP_APP_USE_PACKAGED_RLOTTIE=OFF \
-        -DDESKTOP_APP_DISABLE_CRASH_REPORTS=ON \
-        -DTDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME=ON \
-        -DTDESKTOP_DISABLE_DESKTOP_FILE_GENERATION=ON \
-        -DTDESKTOP_USE_PACKAGED_TGVOIP=OFF \
-        -DDESKTOP_APP_SPECIAL_TARGET=""
-    ninja -C build
-}
-
-package() {
-    install -dm755 "$pkgdir/usr/bin"
-    install -m755 telegram-desktop.sh "$pkgdir/usr/bin/telegram-desktop"
-
-    cd tdesktop-$pkgver-full
-    install -m755 build/bin/Telegram "$pkgdir/usr/bin/telegram-desktop-bin"
-
-    install -d "$pkgdir/usr/share/applications"
-    install -m644 lib/xdg/telegramdesktop.desktop "$pkgdir/usr/share/applications/telegramdesktop.desktop"
-
-    install -d "$pkgdir/usr/share/kservices5"
-    install -m644 lib/xdg/tg.protocol "$pkgdir/usr/share/kservices5/tg.protocol"
-
-    install -d "$pkgdir/usr/share/metainfo/"
-    install -m644 lib/xdg/telegramdesktop.appdata.xml "$pkgdir/usr/share/metainfo/telegramdesktop.appdata.xml"
-
-    local icon_size icon_dir
-    for icon_size in 16 32 48 64 128 256 512; do
-        icon_dir="$pkgdir/usr/share/icons/hicolor/${icon_size}x${icon_size}/apps"
-
-        install -d "$icon_dir"
-        install -m644 "Telegram/Resources/art/icon${icon_size}.png" "$icon_dir/telegram.png"
-    done
-}

Copied: telegram-desktop/repos/community-x86_64/PKGBUILD (from rev 554983, telegram-desktop/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-01-23 15:34:53 UTC (rev 554986)
@@ -0,0 +1,106 @@
+# Maintainer: Sven-Hendrik Haase <svenstaro at gmail.com>
+# Contributor: hexchain <i at hexchain.org>
+
+# Thanks Nicholas Guriev <guriev-ns at ya.ru> for the patches!
+# https://github.com/mymedia2/tdesktop
+
+pkgname=telegram-desktop
+pkgver=1.9.7
+pkgrel=1
+pkgdesc='Official Telegram Desktop client'
+arch=('x86_64')
+url="https://desktop.telegram.org/"
+license=('GPL3')
+depends=(
+    'enchant'
+    'ffmpeg'
+    'hicolor-icon-theme'
+    'lz4'
+    'minizip'
+    'openal'
+    'qt5-imageformats'
+    'xxhash'
+    'libappindicator-gtk3'
+)
+# for libappindicator-gtk3 see https://bugs.archlinux.org/task/65080
+
+makedepends=(
+    'cmake'
+    'git'
+    'ninja'
+    'python'
+    'quilt'
+    'range-v3'
+)
+optdepends=(
+    'ttf-opensans: default Open Sans font family'
+)
+source=(
+    "https://github.com/telegramdesktop/tdesktop/releases/download/v${pkgver}/tdesktop-${pkgver}-full.tar.gz"
+    telegram-desktop.sh
+    0005-Use-system-wide-fonts.patch
+    #"gcc9-cpp2a.patch::https://github.com/desktop-app/cmake_helpers/commit/67cf2a5abdb01658c1cf852b29e25808dcc02c56.patch"
+    series
+)
+sha512sums=('7fd2e2ab8813fad187ca711aafc42c1ad76102ee23ce2dbfa4ccc6898b80a152ecbdf842a175b67db05937c099ddf45889ad493a5bac91da9331ee645bb691bf'
+            '3c21c871e28bac365400f7bc439a16ad1a9a8d87590ad764ce262f1db968c10387caed372d4e064cb50f43da726cebaa9b24bcbcc7c6d5489515620f44dbf56b'
+            'e12021af0c95c967f80240abd683bf197f3c4f8f21315b48c5dadeb399dc39cd1e352352daba1c30691c6d1c6e66078af95b9262e8fe0c2174709fcb1a8a3f5d'
+            'bff9dea22b659f37a5e3508e5da381f2cffcc83f4f0aa85d0ef9a9ff5666acb36af70a6396aa9d9610626cf8c81fb4fefb63ee511f94bf58c1c9830d93853ffe')
+
+prepare() {
+    cd tdesktop-$pkgver-full
+
+    QUILT_PATCHES=.. quilt --quiltrc=/dev/null push -a
+
+    mkdir build
+
+    #cd cmake
+    #patch -Np1 -i "$srcdir/gcc9-cpp2a.patch"
+}
+
+build() {
+    cd tdesktop-$pkgver-full
+
+    export CXXFLAGS="$CXXFLAGS -ffile-prefix-map=$srcdir/tdesktop-$pkgver-full="
+    cmake -B build -G Ninja . \
+        -Ddisable_autoupdate=1 \
+        -DCMAKE_INSTALL_PREFIX=/usr \
+        -DCMAKE_BUILD_TYPE=Release \
+        -DTDESKTOP_API_ID=17349 \
+        -DTDESKTOP_API_HASH=344583e45741c457fe1862106095a5eb \
+        -DDESKTOP_APP_USE_GLIBC_WRAPS=OFF \
+        -DDESKTOP_APP_USE_PACKAGED=ON \
+        -DDESKTOP_APP_USE_PACKAGED_RLOTTIE=OFF \
+        -DDESKTOP_APP_DISABLE_CRASH_REPORTS=ON \
+        -DTDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME=ON \
+        -DTDESKTOP_DISABLE_DESKTOP_FILE_GENERATION=ON \
+        -DTDESKTOP_USE_PACKAGED_TGVOIP=OFF \
+        -DDESKTOP_APP_SPECIAL_TARGET="" \
+        -DTDESKTOP_LAUNCHER_BASENAME="telegramdesktop"
+    ninja -C build
+}
+
+package() {
+    install -dm755 "$pkgdir/usr/bin"
+    install -m755 telegram-desktop.sh "$pkgdir/usr/bin/telegram-desktop"
+
+    cd tdesktop-$pkgver-full
+    install -m755 build/bin/telegram-desktop "$pkgdir/usr/bin/telegram-desktop-bin"
+
+    install -d "$pkgdir/usr/share/applications"
+    install -m644 lib/xdg/telegramdesktop.desktop "$pkgdir/usr/share/applications/telegramdesktop.desktop"
+
+    install -d "$pkgdir/usr/share/kservices5"
+    install -m644 lib/xdg/tg.protocol "$pkgdir/usr/share/kservices5/tg.protocol"
+
+    install -d "$pkgdir/usr/share/metainfo/"
+    install -m644 lib/xdg/telegramdesktop.appdata.xml "$pkgdir/usr/share/metainfo/telegramdesktop.appdata.xml"
+
+    local icon_size icon_dir
+    for icon_size in 16 32 48 64 128 256 512; do
+        icon_dir="$pkgdir/usr/share/icons/hicolor/${icon_size}x${icon_size}/apps"
+
+        install -d "$icon_dir"
+        install -m644 "Telegram/Resources/art/icon${icon_size}.png" "$icon_dir/telegram.png"
+    done
+}

Deleted: series
===================================================================
--- series	2020-01-23 15:34:41 UTC (rev 554985)
+++ series	2020-01-23 15:34:53 UTC (rev 554986)
@@ -1,2 +0,0 @@
-0005-Use-system-wide-fonts.patch
-0006-Revert-Disable-DemiBold-fallback-for-Semibold.patch

Copied: telegram-desktop/repos/community-x86_64/series (from rev 554983, telegram-desktop/trunk/series)
===================================================================
--- series	                        (rev 0)
+++ series	2020-01-23 15:34:53 UTC (rev 554986)
@@ -0,0 +1 @@
+0005-Use-system-wide-fonts.patch

Deleted: telegram-desktop.sh
===================================================================
--- telegram-desktop.sh	2020-01-23 15:34:41 UTC (rev 554985)
+++ telegram-desktop.sh	2020-01-23 15:34:53 UTC (rev 554986)
@@ -1,3 +0,0 @@
-#!/usr/bin/sh
-unset QT_QPA_PLATFORMTHEME
-exec /usr/bin/telegram-desktop-bin "$@"

Copied: telegram-desktop/repos/community-x86_64/telegram-desktop.sh (from rev 554983, telegram-desktop/trunk/telegram-desktop.sh)
===================================================================
--- telegram-desktop.sh	                        (rev 0)
+++ telegram-desktop.sh	2020-01-23 15:34:53 UTC (rev 554986)
@@ -0,0 +1,3 @@
+#!/usr/bin/sh
+unset QT_QPA_PLATFORMTHEME
+exec /usr/bin/telegram-desktop-bin "$@"



More information about the arch-commits mailing list