summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authordetiam2024-04-11 04:30:47 +0800
committerdetiam2024-04-11 04:30:47 +0800
commita6fa73587bbd263e3af05572132aa39623f2f7b2 (patch)
tree665bfb3ebea43d4b784a757ac4887beee1ecbec8
parent3f8f354cc0e330f83126f3fce7843e542c9ed86f (diff)
downloadaur-a6fa73587bbd263e3af05572132aa39623f2f7b2.tar.gz
upgpkg: 4.16.6-1: Sync all patches and upstream
Diffstat
-rw-r--r--.SRCINFO16
-rw-r--r--PKGBUILD48
-rw-r--r--kde-theme-injection-fix.patch (renamed from 0001-kde-theme-injection-fix.patch)12
3 files changed, 38 insertions, 38 deletions
diff --git a/.SRCINFO b/.SRCINFO
index c44d27d2bcab..ad5ce9da5964 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = telegram-desktop-kdefix-userfonts-altscroll
- pkgdesc = Official Telegram Desktop client, with KDE unread counter bug reverted, with your fonts as set by fontconfig and alt scroll mechanism in media view
- pkgver = 4.15.6
- pkgrel = 2
+ pkgdesc = Official Telegram Desktop client, with changes: disable built-in unread indicator (so KDE unread counter can be used), fonts to yours as set by fontconfig, alt scroll mechanism in media view
+ pkgver = 4.16.6
+ pkgrel = 1
url = https://desktop.telegram.org/
arch = x86_64
license = GPL3
@@ -30,7 +30,6 @@ pkgbase = telegram-desktop-kdefix-userfonts-altscroll
depends = lz4
depends = minizip
depends = openal
- depends = ttf-opensans
depends = qt6-imageformats
depends = qt6-svg
depends = qt6-wayland
@@ -47,18 +46,17 @@ pkgbase = telegram-desktop-kdefix-userfonts-altscroll
depends = protobuf
depends = glib2
depends = libsigc++-3.0
- depends = glibmm-2.68
depends = kcoreaddons
optdepends = webkit2gtk: embedded browser features
optdepends = xdg-desktop-portal: desktop integration
provides = telegram-desktop
conflicts = telegram-desktop
options = !debug
- source = https://github.com/telegramdesktop/tdesktop/releases/download/v4.15.6/tdesktop-4.15.6-full.tar.gz
+ source = https://github.com/telegramdesktop/tdesktop/releases/download/v4.16.6/tdesktop-4.16.6-full.tar.gz
+ source = kde-theme-injection-fix.patch
source = mediaview-altscroll.patch
- source = 0001-kde-theme-injection-fix.patch
- sha512sums = 965790e34dcbb1ff84c054a0d241f9ef628ee03526c7fd6a3cb5e0d419082b495e377a55bf9aeafc03d7851077d3703fb11df497d181ddbf6699455c2945c158
+ sha512sums = 5b580d36c8b8a90981c3541d4c148df37bb7ebdec0970bfbfe4c1a9a1175e3cf41c2a14d854d7d917482aa9086ee712844ec40780741df22ad6d42fcf3c48f1f
+ sha512sums = 7b3dd58276cbe2145887e3c127519a461be83485d9874c08d98d21e97bfb194a4355d0766746157b20d15027db8c265600b5d279cc07456153b2a2736832bae6
sha512sums = 38ff8627090ac9766a8d409fa26cbd4381640e08abcb677f4524a5305d011aa0f6ce81d69313a01f0db5c1a3794805bff2a059095258f5e8d9bd1133550cca2e
- sha512sums = e78f6c769c026214efaf988dc3a2aac632909f553c348fd357fe8dc353646866238c5e30bbb0f420a4352be6b4efa32e582f3e3d8390772889f8933f54db491c
pkgname = telegram-desktop-kdefix-userfonts-altscroll
diff --git a/PKGBUILD b/PKGBUILD
index 42445abd713f..49505cf38983 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,46 +7,47 @@
# Contributor: hexchain <i@hexchain.org>
pkgname=telegram-desktop-kdefix-userfonts-altscroll
-pkgver=4.15.6
-pkgrel=2
+pkgver=4.16.6
+pkgrel=1
conflicts=('telegram-desktop')
provides=('telegram-desktop')
-pkgdesc='Official Telegram Desktop client, with KDE unread counter bug reverted, with your fonts as set by fontconfig and alt scroll mechanism in media view'
+pkgdesc='Official Telegram Desktop client, with changes: disable built-in unread indicator (so KDE unread counter can be used), fonts to yours as set by fontconfig, alt scroll mechanism in media view'
arch=('x86_64')
url="https://desktop.telegram.org/"
license=('GPL3')
options=('!debug')
-depends=('hunspell' 'ffmpeg' 'hicolor-icon-theme' 'lz4' 'minizip' 'openal' 'ttf-opensans'
+depends=('hunspell' 'ffmpeg' 'hicolor-icon-theme' 'lz4' 'minizip' 'openal'
'qt6-imageformats' 'qt6-svg' 'qt6-wayland' 'xxhash'
'rnnoise' 'pipewire' 'libxtst' 'libxrandr' 'libxcomposite' 'libxdamage' 'abseil-cpp' 'libdispatch'
- 'openssl' 'protobuf' 'glib2' 'libsigc++-3.0' 'glibmm-2.68' 'kcoreaddons')
+ 'openssl' 'protobuf' 'glib2' 'libsigc++-3.0' 'kcoreaddons')
makedepends=('cmake' 'git' 'ninja' 'python' 'range-v3' 'tl-expected' 'microsoft-gsl' 'meson'
'extra-cmake-modules' 'wayland-protocols' 'plasma-wayland-protocols' 'libtg_owt'
'gobject-introspection' 'boost' 'fmt' 'mm-common' 'perl-xml-parser' 'python-packaging' 'patch')
optdepends=('webkit2gtk: embedded browser features'
'xdg-desktop-portal: desktop integration')
source=("https://github.com/telegramdesktop/tdesktop/releases/download/v${pkgver}/tdesktop-${pkgver}-full.tar.gz"
- 'mediaview-altscroll.patch'
- "0001-kde-theme-injection-fix.patch")
-sha512sums=('965790e34dcbb1ff84c054a0d241f9ef628ee03526c7fd6a3cb5e0d419082b495e377a55bf9aeafc03d7851077d3703fb11df497d181ddbf6699455c2945c158'
- '38ff8627090ac9766a8d409fa26cbd4381640e08abcb677f4524a5305d011aa0f6ce81d69313a01f0db5c1a3794805bff2a059095258f5e8d9bd1133550cca2e'
- 'e78f6c769c026214efaf988dc3a2aac632909f553c348fd357fe8dc353646866238c5e30bbb0f420a4352be6b4efa32e582f3e3d8390772889f8933f54db491c')
+ "kde-theme-injection-fix.patch"
+ "mediaview-altscroll.patch") # https://github.com/telegramdesktop/tdesktop/pull/27245
+sha512sums=('5b580d36c8b8a90981c3541d4c148df37bb7ebdec0970bfbfe4c1a9a1175e3cf41c2a14d854d7d917482aa9086ee712844ec40780741df22ad6d42fcf3c48f1f'
+ '7b3dd58276cbe2145887e3c127519a461be83485d9874c08d98d21e97bfb194a4355d0766746157b20d15027db8c265600b5d279cc07456153b2a2736832bae6'
+ '38ff8627090ac9766a8d409fa26cbd4381640e08abcb677f4524a5305d011aa0f6ce81d69313a01f0db5c1a3794805bff2a059095258f5e8d9bd1133550cca2e')
prepare() {
cd tdesktop-$pkgver-full
- # userfonts
- for ttf in Telegram/lib_ui/fonts/*.ttf; do
- rm "$ttf"
- touch "$ttf"
+ # patching
+ for patch in "${source[@]}"; do
+ if [[ $patch == *.patch ]]; then
+ msg2 "Applying $patch"
+ patch --no-backup-if-mismatch -Np1 -i "$srcdir/$patch"
+ fi
done
- sed -i 's/DemiBold/Bold/g' Telegram/lib_ui/ui/style/style_core_font.cpp
-
- # altscroll
- patch -Np1 < '../mediaview-altscroll.patch'
- # kdefix
- patch -Np1 -i "$srcdir"/0001-kde-theme-injection-fix.patch
+ # userfonts
+ for ttf in Telegram/lib_ui/fonts/*.ttf; do
+ rm "$ttf" && touch "$ttf"
+ done && sed -i 's/DemiBold/Bold/g' \
+ Telegram/lib_ui/ui/style/style_core_custom_font.cpp
}
build() {
@@ -56,12 +57,13 @@ build() {
# https://github.com/telegramdesktop/tdesktop/blob/8fab9167beb2407c1153930ed03a4badd0c2b59f/snap/snapcraft.yaml#L87-L88
# Thanks @primeos!
cmake -B build -S tdesktop-$pkgver-full -G Ninja \
- -DCMAKE_VERBOSE_MAKEFILE=ON \
+ -DCMAKE_CXX_FLAGS=-g0 \
+ -DCMAKE_VERBOSE_MAKEFILE=OFF \
-DCMAKE_INSTALL_PREFIX="/usr" \
-DCMAKE_BUILD_TYPE=Release \
+ -DDESKTOP_APP_USE_PACKAGED_FONTS=OFF \
-DTDESKTOP_API_ID=611335 \
- -DTDESKTOP_API_HASH=d524b414d21f4d37f08684c1df41ac9c \
- -DDESKTOP_APP_USE_PACKAGED_FONTS=OFF
+ -DTDESKTOP_API_HASH=d524b414d21f4d37f08684c1df41ac9c
cmake --build build
}
diff --git a/0001-kde-theme-injection-fix.patch b/kde-theme-injection-fix.patch
index c23ade475dca..884959e956cf 100644
--- a/0001-kde-theme-injection-fix.patch
+++ b/kde-theme-injection-fix.patch
@@ -1,13 +1,13 @@
diff --git a/Telegram/SourceFiles/platform/linux/tray_linux.cpp b/Telegram/SourceFiles/platform/linux/tray_linux.cpp
-index 82fe8f7d8..c4729df0b 100644
+index ab1e34df8..a1eb8d507 100644
--- a/Telegram/SourceFiles/platform/linux/tray_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/tray_linux.cpp
-@@ -166,7 +166,7 @@ QIcon IconGraphic::trayIcon(
+@@ -164,7 +164,7 @@ QIcon IconGraphic::trayIcon(
+ return _trayIcon;
}
-
-
-- if (systemIcon.name() == panelIconName(counter, muted)) {
-+ if (0 && systemIcon.name() == panelIconName(counter, muted)) {
+
+- if (systemIcon.name() == PanelIconName(counter, muted)) {
++ if (0 && systemIcon.name() == PanelIconName(counter, muted)) {
updateIconRegenerationNeeded(
systemIcon,
systemIcon,