summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO13
-rw-r--r--.gitignore1
-rw-r--r--64gramdesktop.desktop1
-rw-r--r--PKGBUILD34
4 files changed, 38 insertions, 11 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 4679fab6a134..ef345b8a7a30 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = 64gram-desktop
pkgdesc = Unofficial desktop version of Telegram messaging app
- pkgver = 1.0.44
+ pkgver = 1.0.46
pkgrel = 1
epoch = 1
url = https://github.com/TDesktop-x64/tdesktop
@@ -18,6 +18,7 @@ pkgbase = 64gram-desktop
makedepends = wayland-protocols
makedepends = plasma-wayland-protocols
makedepends = libtg_owt
+ makedepends = qt6-tools
depends = hunspell
depends = ffmpeg4.4
depends = hicolor-icon-theme
@@ -40,13 +41,17 @@ pkgbase = 64gram-desktop
depends = libdispatch
optdepends = webkit2gtk: embedded browser features
optdepends = xdg-desktop-portal: desktop integration
- source = https://github.com/TDesktop-x64/tdesktop/releases/download/v1.0.44/64Gram-1.0.44-full.tar.gz
+ source = https://github.com/TDesktop-x64/tdesktop/releases/download/v1.0.46/64Gram-1.0.46-full.tar.gz
source = block-sponsored_messages.patch
source = fix-tgcalls-cstdint.patch
source = 64gramdesktop.desktop
- sha512sums = 2a035f4391dc5f7deb10d21297b8371d0cb9199aa32d8bab06e7efbba491fd1f3cdbed3e68a2ffe10fa8fcd4f07349cc2cd0eeae9da58aeeaaa4ce632c32c103
+ source = https://download.kde.org/stable/frameworks/5.98/kcoreaddons-5.98.0.tar.xz
+ source = https://invent.kde.org/frameworks/kcoreaddons/-/merge_requests/258.patch
+ sha512sums = e7e68b1f911ad8d2096f67b0d59efd7141d82d49401a3f4b4ba0f3f48258dd735258b0ec16234bf0784f47e67803eea30084f995bfc1b5bb1706938d4075be4e
sha512sums = c662524ca4f4a8df021ee94696d84896ed9a271df321933942806dda4544ea25f51a650ec8b4fc72f9a2219ea54cbfaf37b9604124f7263c86f74f1d647587ae
sha512sums = 7b66b1dc928c9107a5f47ba8782eec0f811fe5988449afcb24e1e15cbc7c4c3e284d0480e272a4ba7a15d4acc374cae72ba3caa382cc9e67dd23c7ed6bad0e8c
- sha512sums = a24fd473835d808da987ebf1433b16273debb7a85304e3ef7ea2eadae949051a4a800a40ca76b73febbb9e66901c324bdda7a33d1bac894271af82975a8bb428
+ sha512sums = 71e91adfa3d8fb198380069e42a6119fb37a588df2ad47b8eeaf5a87c874cb257da1e45eaa8229333bb7fc8a9218fb3411977642239bc93f01e37a2fdf58db3e
+ sha512sums = 7370860c300a2ceb009622a3ed543ffda7cd36ae4a339abc6fb4bc39a08abbbd8d09eb5da08b2702e9dfa2db3c35572df654ff265275d3cd96b076123a022198
+ sha512sums = fbb61e884094d3b259f0562809e1c058365346815541c85a3309b4f13e55629f9b14148d6a9c929ad5057901a26aaaef48fba6f094ef6484f81ff1a034cbf54f
pkgname = 64gram-desktop
diff --git a/.gitignore b/.gitignore
index 63ffb3c1ec5a..c0e54e88e5dd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
src/
pkg/
*.log
+kcoreaddons*.tar.xz \ No newline at end of file
diff --git a/64gramdesktop.desktop b/64gramdesktop.desktop
index 08be2c420045..784abcfe63f9 100644
--- a/64gramdesktop.desktop
+++ b/64gramdesktop.desktop
@@ -1,5 +1,4 @@
[Desktop Entry]
-Version=1.5
Name=64Gram Desktop
Comment=Unofficial desktop version of Telegram messaging app
TryExec=64gram-desktop
diff --git a/PKGBUILD b/PKGBUILD
index dc570dc69dd4..dae7f24a95f4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,8 @@
# Contributor: KspLite <ksplite@outlook.com>
pkgname=64gram-desktop
_pkgname=64Gram
-pkgver=1.0.44
+_kcorever=5.98.0
+pkgver=1.0.46
pkgrel=1
epoch=1
pkgdesc='Unofficial desktop version of Telegram messaging app'
@@ -13,30 +14,51 @@ depends=('hunspell' 'ffmpeg4.4' 'hicolor-icon-theme' 'lz4' 'minizip' 'openal' 't
'qt6-imageformats' 'qt6-svg' 'qt6-wayland' 'qt6-5compat' 'xxhash' 'glibmm'
'rnnoise' 'pipewire' 'libxtst' 'libxrandr' 'jemalloc' 'abseil-cpp' 'libdispatch')
makedepends=('cmake' 'git' 'ninja' 'python' 'range-v3' 'tl-expected' 'microsoft-gsl' 'meson'
- 'extra-cmake-modules' 'wayland-protocols' 'plasma-wayland-protocols' 'libtg_owt')
+ 'extra-cmake-modules' 'wayland-protocols' 'plasma-wayland-protocols' 'libtg_owt' 'qt6-tools')
optdepends=('webkit2gtk: embedded browser features'
'xdg-desktop-portal: desktop integration')
source=("https://github.com/TDesktop-x64/tdesktop/releases/download/v${pkgver}/${_pkgname}-${pkgver}-full.tar.gz"
"block-sponsored_messages.patch"
"fix-tgcalls-cstdint.patch"
- "64gramdesktop.desktop")
-sha512sums=('2a035f4391dc5f7deb10d21297b8371d0cb9199aa32d8bab06e7efbba491fd1f3cdbed3e68a2ffe10fa8fcd4f07349cc2cd0eeae9da58aeeaaa4ce632c32c103'
+ "64gramdesktop.desktop"
+ "https://download.kde.org/stable/frameworks/${_kcorever%.*}/kcoreaddons-${_kcorever}.tar.xz"
+ "https://invent.kde.org/frameworks/kcoreaddons/-/merge_requests/258.patch")
+sha512sums=('e7e68b1f911ad8d2096f67b0d59efd7141d82d49401a3f4b4ba0f3f48258dd735258b0ec16234bf0784f47e67803eea30084f995bfc1b5bb1706938d4075be4e'
'c662524ca4f4a8df021ee94696d84896ed9a271df321933942806dda4544ea25f51a650ec8b4fc72f9a2219ea54cbfaf37b9604124f7263c86f74f1d647587ae'
'7b66b1dc928c9107a5f47ba8782eec0f811fe5988449afcb24e1e15cbc7c4c3e284d0480e272a4ba7a15d4acc374cae72ba3caa382cc9e67dd23c7ed6bad0e8c'
- 'a24fd473835d808da987ebf1433b16273debb7a85304e3ef7ea2eadae949051a4a800a40ca76b73febbb9e66901c324bdda7a33d1bac894271af82975a8bb428')
+ '71e91adfa3d8fb198380069e42a6119fb37a588df2ad47b8eeaf5a87c874cb257da1e45eaa8229333bb7fc8a9218fb3411977642239bc93f01e37a2fdf58db3e'
+ '7370860c300a2ceb009622a3ed543ffda7cd36ae4a339abc6fb4bc39a08abbbd8d09eb5da08b2702e9dfa2db3c35572df654ff265275d3cd96b076123a022198'
+ 'fbb61e884094d3b259f0562809e1c058365346815541c85a3309b4f13e55629f9b14148d6a9c929ad5057901a26aaaef48fba6f094ef6484f81ff1a034cbf54f')
prepare() {
cd $_pkgname-$pkgver-full
patch -Np1 --binary -i ../block-sponsored_messages.patch
patch -Np1 --binary -i "$srcdir"/fix-tgcalls-cstdint.patch -d Telegram/ThirdParty/tgcalls
+
+ cd ../kcoreaddons-$_kcorever
+ patch -Np1 -i ../258.patch
}
build() {
- cd $_pkgname-$pkgver-full
+ cd kcoreaddons-$_kcorever
+ cmake \
+ -B build \
+ -G Ninja \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX="${srcdir}/kcoreaddons" \
+ -DBUILD_TESTING=OFF \
+ -DBUILD_WITH_QT6=ON \
+ -DEXCLUDE_DEPRECATED_BEFORE_AND_AT=5.78.0 \
+ -DBUILD_SHARED_LIBS=OFF
+ ninja -C build
+ ninja -C build install
+
+ cd "${srcdir}/$_pkgname-$pkgver-full"
export PKG_CONFIG_PATH='/usr/lib/ffmpeg4.4/pkgconfig'
cmake \
-B build \
-G Ninja \
-DCMAKE_INSTALL_PREFIX="/usr" \
+ -DKF5CoreAddons_DIR="${srcdir}/kcoreaddons/lib/cmake/KF5CoreAddons" \
-DCMAKE_BUILD_TYPE=Release \
-DDESKTOP_APP_DISABLE_AUTOUPDATE=ON \
-DTDESKTOP_API_TEST=ON \