summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancesco Minnocci2021-06-09 19:45:49 +0200
committerFrancesco Minnocci2021-06-09 19:45:49 +0200
commitc1c58051297a3f089cc29041b23deec384550425 (patch)
treec6e20baefc5673fc8c79445a9877d7dc0ce6d12d
parent9c823e0618469f61ef1312bd1b491b8b933a8f17 (diff)
downloadaur-c1c58051297a3f089cc29041b23deec384550425.tar.gz
Add gtk loading fix patch
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD5
-rw-r--r--lib_base-gtk-loading-fix.patch13
3 files changed, 21 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index b672e58fb5b0..0b13ffc4858d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = kotatogram-dev-git
pkgdesc = Kotatogram – experimental Telegram Desktop fork - Dev branch
- pkgver = k1.4.12.g40df43998
- pkgrel = 2
+ pkgver = k1.4.1.9.g5124ca1b6
+ pkgrel = 1
url = https://github.com/kotatogram/kotatogram-desktop
arch = x86_64
license = GPL3
@@ -56,6 +56,7 @@ pkgbase = kotatogram-dev-git
source = https://github.com/telegramdesktop/tdesktop/commit/98180d3a9e994081a134196adad0023651d28bf3.patch
source = https://github.com/telegramdesktop/tdesktop/commit/383acf0ffc489990302797ff0f048519b3c7c9bf.patch
source = lib_base-gcc11-fix.patch
+ source = lib_base-gtk-loading-fix.patch
source = https://github.com/desktop-app/lib_webview/commit/8816639c74a4cb6d512cba8e2271aceb404b0492.patch
source = mallocng.patch
source = https://github.com/desktop-app/cmake_helpers/commit/5318ac7c54dbf33b17ccc4bd3281bb8b8db25e02.patch
@@ -90,6 +91,7 @@ pkgbase = kotatogram-dev-git
sha512sums = fcc4c5f649381ace974a3b73cd76f7dd3e78c3a8c0d0bffeccd3e66ec45b84c0cada1f6fd91e1498e0442ed70b679d6b975b499b1f37d25113053b38c873e9e7
sha512sums = c5511bd073095a171b998ae8425d01305ac7927398640c0b62d5dcbcc2184e8dae25c1430a5950c45fac38ec5de353449765454f428fa6e16dc588214edd8db8
sha512sums = ce364d20b9c3e8d65d4d0def6c2f025e16814c8782c78f720ee5e9891e0b296c6edca9f3a7fa46652516c6a748e29a8cdbbf5f7d1273e4e1a64c7216275c5cda
+ sha512sums = 956cd39e5a488b8ce02eddbca75c3f05467dcd4ff0f62907a966a1ad36b7d9329130e48f570f2e3ee95c135a085106442ce87bd48e0288db3bf8d8f06821f28d
sha512sums = c82e41e9fab49d7eca4602327ebb10c795cf6db414a3c5fe91271af336c327fed5a5c67e3219734e20b7559ff7cbca220be8b94b3b551bf33c162c90370e5af3
sha512sums = 12c6a439b3960cb5a25edd2b2b1959f96fdbba634f281890f5ec91420834a852a7bcfa5d11051dfdf4fe719137345b23ae77a8e48eb6b9444ad973a34574cb84
sha512sums = 2f7c24851e9879b238366c82f35a046c5a69ec5059e6441ac6eae578450669f094bb659a63b79be635dcae93ddd388bc957e29a219cc3cfc0e6591f0f333d7e3
diff --git a/PKGBUILD b/PKGBUILD
index 4c385571cba0..bf611ab334e2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
pkgname=kotatogram-dev-git
_pkgname=kotatogram-desktop
-pkgver=k1.4.1.6.gb0fed1a6a
+pkgver=k1.4.1.9.g5124ca1b6
pkgrel=1
pkgdesc="Kotatogram – experimental Telegram Desktop fork - Dev branch"
arch=(x86_64)
@@ -66,6 +66,7 @@ source=(
"https://github.com/telegramdesktop/tdesktop/commit/98180d3a9e994081a134196adad0023651d28bf3.patch"
"https://github.com/telegramdesktop/tdesktop/commit/383acf0ffc489990302797ff0f048519b3c7c9bf.patch"
"lib_base-gcc11-fix.patch"
+ "lib_base-gtk-loading-fix.patch"
"https://github.com/desktop-app/lib_webview/commit/8816639c74a4cb6d512cba8e2271aceb404b0492.patch"
"mallocng.patch"
"https://github.com/desktop-app/cmake_helpers/commit/5318ac7c54dbf33b17ccc4bd3281bb8b8db25e02.patch"
@@ -101,6 +102,7 @@ sha512sums=(
'fcc4c5f649381ace974a3b73cd76f7dd3e78c3a8c0d0bffeccd3e66ec45b84c0cada1f6fd91e1498e0442ed70b679d6b975b499b1f37d25113053b38c873e9e7'
'c5511bd073095a171b998ae8425d01305ac7927398640c0b62d5dcbcc2184e8dae25c1430a5950c45fac38ec5de353449765454f428fa6e16dc588214edd8db8'
'ce364d20b9c3e8d65d4d0def6c2f025e16814c8782c78f720ee5e9891e0b296c6edca9f3a7fa46652516c6a748e29a8cdbbf5f7d1273e4e1a64c7216275c5cda'
+ '956cd39e5a488b8ce02eddbca75c3f05467dcd4ff0f62907a966a1ad36b7d9329130e48f570f2e3ee95c135a085106442ce87bd48e0288db3bf8d8f06821f28d'
'c82e41e9fab49d7eca4602327ebb10c795cf6db414a3c5fe91271af336c327fed5a5c67e3219734e20b7559ff7cbca220be8b94b3b551bf33c162c90370e5af3'
'12c6a439b3960cb5a25edd2b2b1959f96fdbba634f281890f5ec91420834a852a7bcfa5d11051dfdf4fe719137345b23ae77a8e48eb6b9444ad973a34574cb84'
'2f7c24851e9879b238366c82f35a046c5a69ec5059e6441ac6eae578450669f094bb659a63b79be635dcae93ddd388bc957e29a219cc3cfc0e6591f0f333d7e3'
@@ -154,6 +156,7 @@ prepare() {
patch -p1 < ${srcdir}/383acf0ffc489990302797ff0f048519b3c7c9bf.patch
pushd Telegram/lib_base
patch -p1 < ${srcdir}/lib_base-gcc11-fix.patch
+ patch -p1 < ${srcdir}/lib_base-gtk-loading-fix.patch
popd
pushd Telegram/lib_webview
patch -p1 < ${srcdir}/8816639c74a4cb6d512cba8e2271aceb404b0492.patch
diff --git a/lib_base-gtk-loading-fix.patch b/lib_base-gtk-loading-fix.patch
new file mode 100644
index 000000000000..acc27f7d0bff
--- /dev/null
+++ b/lib_base-gtk-loading-fix.patch
@@ -0,0 +1,13 @@
+diff --git a/base/platform/linux/base_linux_gtk_integration.cpp b/base/platform/linux/base_linux_gtk_integration.cpp
+index 41f2908..9b8e852 100644
+--- a/base/platform/linux/base_linux_gtk_integration.cpp
++++ b/base/platform/linux/base_linux_gtk_integration.cpp
+@@ -262,8 +262,6 @@ void GtkIntegration::load() {
+ DEBUG_LOG(("Icon theme: %1").arg(QIcon::themeName()));
+ DEBUG_LOG(("Fallback icon theme: %1").arg(QIcon::fallbackThemeName()));
+
+- _lib.setLoadHints(QLibrary::DeepBindHint);
+-
+ if (LoadLibrary(_lib, "gtk-3", 0)) {
+ Loaded = SetupGtkBase(_lib);
+ }