Skip to content

Commit 049e82b

Browse files
committed
telegram-desktop-lily: sync with Arch to handle new dep
1 parent d8b0e6a commit 049e82b

File tree

2 files changed

+81
-31
lines changed

2 files changed

+81
-31
lines changed

archlinuxcn/telegram-desktop-lily/PKGBUILD

Lines changed: 75 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -2,40 +2,80 @@
22
# Contributor: Megumi_fox <megumifox@archlinuxcn.org>
33
# Contributor: Sven-Hendrik Haase <svenstaro@gmail.com>
44
# Contributor: hexchain <i@hexchain.org>
5+
56
pkgname=telegram-desktop-lily
67
_pkgname=telegram-desktop
78
pkgver=5.13.1
89
pkgrel=5
910
pkgdesc="Official Telegram Desktop client with lilydjwg's patch"
1011
arch=('x86_64')
1112
url="https://desktop.telegram.org/"
12-
license=('GPL-3.0-only WITH x11vnc-openssl-exception')
13-
depends=('hunspell' 'ffmpeg' 'libavfilter.so' 'libavformat.so' 'libavcodec.so' 'libavutil.so' 'hicolor-icon-theme' 'lz4' 'minizip' 'openal'
14-
'qt6-base=6.9.0' 'qt6-imageformats' 'qt6-svg' 'qt6-wayland' 'xxhash' 'ada'
15-
'rnnoise' 'pipewire' 'libxtst' 'libxrandr' 'libxcomposite' 'libxdamage' 'abseil-cpp' 'libdispatch'
16-
'openssl' 'libcrypto.so' 'libssl.so'
17-
'protobuf' 'libprotobuf-lite.so'
18-
'libvpx' 'libvpx.so'
19-
'glib2' 'kcoreaddons' 'openh264' 'libopenh264.so')
20-
makedepends=('cmake' 'ninja' 'python' 'range-v3' 'tl-expected' 'microsoft-gsl'
21-
'libtg_owt' 'gobject-introspection' 'boost' 'glib2-devel')
22-
optdepends=('geoclue: geoinformation support'
23-
'geocode-glib: geocoding support'
24-
'geocode-glib-2: geocoding support'
25-
'webkit2gtk: embedded browser features provided by webkit2gtk'
26-
'webkit2gtk-4.1: embedded browser features provided by webkit2gtk-4.1'
27-
'webkitgtk-6.0: embedded browser features provided by webkitgtk-6.0 (Wayland only)'
28-
'xdg-desktop-portal: desktop integration')
13+
license=('GPL-3.0-or-later WITH OpenSSL-exception')
14+
depends=(
15+
'abseil-cpp'
16+
'ada'
17+
'ffmpeg' 'libavfilter.so' 'libavformat.so' 'libavcodec.so' 'libavutil.so'
18+
'glib2'
19+
'hicolor-icon-theme'
20+
'hunspell'
21+
'kcoreaddons'
22+
'libdispatch'
23+
'libxcomposite'
24+
'libxdamage'
25+
'libxrandr'
26+
'libxtst'
27+
'libvpx' 'libvpx.so'
28+
'lz4'
29+
'minizip'
30+
'openal'
31+
'openh264' 'libopenh264.so'
32+
'openssl' 'libcrypto.so' 'libssl.so'
33+
'pipewire'
34+
'protobuf' 'libprotobuf-lite.so'
35+
'qt6-base=6.9.0'
36+
'qt6-imageformats'
37+
'qt6-svg'
38+
'qt6-wayland'
39+
'rnnoise'
40+
'xxhash'
41+
)
42+
makedepends=(
43+
'boost'
44+
'cmake'
45+
'git'
46+
'glib2-devel'
47+
'gobject-introspection'
48+
'gperf'
49+
'libtg_owt'
50+
'microsoft-gsl'
51+
'ninja'
52+
'python'
53+
'range-v3'
54+
'tl-expected'
55+
)
56+
optdepends=(
57+
'geoclue: geoinformation support'
58+
'geocode-glib-2: geocoding support'
59+
'geocode-glib: geocoding support'
60+
'webkit2gtk-4.1: embedded browser features provided by webkit2gtk-4.1'
61+
'webkit2gtk: embedded browser features provided by webkit2gtk'
62+
'webkitgtk-6.0: embedded browser features provided by webkitgtk-6.0 (Wayland only)'
63+
'xdg-desktop-portal: desktop integration'
64+
)
2965
provides=('telegram-desktop')
3066
conflicts=('telegram-desktop')
3167
replaces=('telegram-desktop-megumifox')
32-
source=("https://github.com/telegramdesktop/tdesktop/releases/download/v${pkgver}/tdesktop-${pkgver}-full.tar.gz"
33-
"no-embolded-font.patch"
34-
"dont-adjust-fontsize.patch"
35-
"0001-add-TDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME-back.patch"
36-
"0002-make-blockquote-markup-less-distractive.patch"
37-
"0004-make-animated-avatar-follow-power-settings.patch"
38-
"0001-don-t-ask-which-program-to-use-when-opening-a-file-w.patch")
68+
_td_commit=51743dfd01dff6179e2d8f7095729caa4e2222e9
69+
source=(
70+
"https://github.com/telegramdesktop/tdesktop/releases/download/v${pkgver}/tdesktop-${pkgver}-full.tar.gz"
71+
"git+https://github.com/tdlib/td.git#tag=${_td_commit}"
72+
"no-embolded-font.patch"
73+
"dont-adjust-fontsize.patch"
74+
"0001-add-TDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME-back.patch"
75+
"0002-make-blockquote-markup-less-distractive.patch"
76+
"0004-make-animated-avatar-follow-power-settings.patch"
77+
"0001-don-t-ask-which-program-to-use-when-opening-a-file-w.patch"
78+
)
3979
sha512sums=('6d15ad0641e0e47e4d48869885c63e6d1ddbfb5461c121cf33ac77d231a6fc77a6eb5333ad7b76d3aa2e1111d9a5f58846fae83cd36886838d6791dbfaa65929'
4080
'1c5ace38926fe8e2c2dfec6b0d9073c77031fc15b60220ffcad626a0f933d6d71d31bdb7e1ccb8bfaa76c1d0338ddd2193a2e75ac1623dd66bbc8e3ee9be4885'
4181
'a5cc0b821d493333ee71957e71be51fb753bb3c0b97ca44b63ee1f2c93fa5ea2d8dda0560a37cbe55bb9dd17b557ab8e95725cafe32e6bec1989bcd3f42945c6'
@@ -59,12 +99,22 @@ prepare() {
5999
build() {
60100
CXXFLAGS+=' -ffat-lto-objects'
61101

62-
# Turns out we're allowed to use the official API key that telegram uses for their snap builds:
102+
cmake -S td -B td/build \
103+
-DCMAKE_BUILD_TYPE=None \
104+
-DCMAKE_INSTALL_PREFIX="$PWD/td/install" \
105+
-Wno-dev \
106+
-DTD_E2E_ONLY=ON
107+
cmake --build td/build
108+
cmake --install td/build
109+
110+
# Turns out we're allowed to use the official API key that telegram uses for
111+
# their snap builds:
63112
# https://github.com/telegramdesktop/tdesktop/blob/8fab9167beb2407c1153930ed03a4badd0c2b59f/snap/snapcraft.yaml#L87-L88
64113
# Thanks @primeos!
65114
cmake -B build -S tdesktop-$pkgver-full -G Ninja \
66115
-DCMAKE_VERBOSE_MAKEFILE=ON \
67116
-DCMAKE_INSTALL_PREFIX="/usr" \
117+
-Dtde2e_DIR="$PWD/td/install/lib/cmake/tde2e" \
68118
-DCMAKE_BUILD_TYPE=Release \
69119
-DTDESKTOP_API_ID=611335 \
70120
-DTDESKTOP_API_HASH=d524b414d21f4d37f08684c1df41ac9c \

archlinuxcn/telegram-desktop-lily/lilac.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ maintainers:
22
- github: lilydjwg
33

44
update_on:
5-
# - source: github
6-
# github: telegramdesktop/tdesktop
7-
# branch: dev
8-
# use_latest_release: true
9-
- source: manual
10-
manual: v5.13.1
5+
- source: github
6+
github: telegramdesktop/tdesktop
7+
branch: dev
8+
use_latest_release: true
9+
# - source: manual
10+
# manual: v5.13.1
1111
- source: alpm
1212
alpm: ffmpeg
1313
provided: libavcodec.so

0 commit comments

Comments
 (0)