upgpkg: 64gram-desktop 1.0.89-1

2 files changed, 28 insertions, 28 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c2548ade1943..349bfa876013 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = 64gram-desktop
 	pkgdesc = Unofficial desktop version of Telegram messaging app
-	pkgver = 1.0.85
-	pkgrel = 2
+	pkgver = 1.0.89
+	pkgrel = 1
 	epoch = 1
 	url = https://github.com/TDesktop-x64/tdesktop
 	arch = x86_64
@@ -19,9 +19,10 @@ pkgbase = 64gram-desktop
 	makedepends = plasma-wayland-protocols
 	makedepends = libtg_owt
 	makedepends = gobject-introspection
-	makedepends = glib2
 	makedepends = boost
 	makedepends = fmt
+	makedepends = mm-common
+	makedepends = perl-xml-parser
 	makedepends = p7zip
 	depends = hunspell
 	depends = ffmpeg
@@ -34,7 +35,6 @@ pkgbase = 64gram-desktop
 	depends = qt6-svg
 	depends = qt6-wayland
 	depends = xxhash
-	depends = glibmm-2.68
 	depends = rnnoise
 	depends = pipewire
 	depends = libxtst
@@ -44,23 +44,22 @@ pkgbase = 64gram-desktop
 	depends = libdispatch
 	depends = openssl
 	depends = protobuf
+	depends = glib2
 	depends = boost-libs
+	depends = libsigc++-3.0
+	depends = cppgir
 	optdepends = webkit2gtk: embedded browser features
 	optdepends = xdg-desktop-portal: desktop integration
 	provides = telegram-desktop
 	conflicts = telegram-desktop
-	noextract = 64Gram-1.0.85-full.tar.gz
-	source = https://github.com/TDesktop-x64/tdesktop/releases/download/v1.0.85/64Gram-1.0.85-full.tar.gz
+	noextract = 64Gram-1.0.89-full.tar.gz
+	source = https://github.com/TDesktop-x64/tdesktop/releases/download/v1.0.89/64Gram-1.0.89-full.tar.gz
 	source = block-sponsored_messages.patch
 	source = fix-lzma-link.patch
-	source = expected-lite-1.0.85.tar.gz::https://github.com/martinmoene/expected-lite/archive/refs/tags/v0.6.3.tar.gz
-	source = https://gitlab.com/mnauw/cppgir/-/archive/960fe054ffaab7cf55722fea6094c56a8ee8f18e/cppgir-960fe054ffaab7cf55722fea6094c56a8ee8f18e.tar.gz
-	source = https://github.com/desktop-app/cmake_helpers/commit/6b0eeb2c15aa278ffa577bcefebcff8f2c98aca9.patch
-	sha512sums = f4b2e281879994e43836bb2bab320de8166495e696a5230a8ec67b549fcf27a43f8800563e3449803ee363052a1c6a6c6ec8495f86d53892f6f5063ebccc1bf1
+	source = https://download.gnome.org/sources/glibmm/2.77/glibmm-2.77.0.tar.xz
+	sha512sums = 7762f6d059ea8b029ed0f49074dc3255e1569c47e77c98d3e9458e0636772fd108987e78a54cbf08e25957ccefb70fb475a11449db50e953cc30d0e876df3848
 	sha512sums = c662524ca4f4a8df021ee94696d84896ed9a271df321933942806dda4544ea25f51a650ec8b4fc72f9a2219ea54cbfaf37b9604124f7263c86f74f1d647587ae
 	sha512sums = d813a5ac6ff2208b693ecf494d7bf036087e223662f9f34aaaeafea0afe0fe798e867b9610f7221ea80319865502c20b61310d5a31634b888793873d63322463
-	sha512sums = d6a4f30f90494dda002ad27d227f17ce0201752178418d7dfada26441e853590d46816c88922e7d458dda68ad4414ddfe6b7fa4ed2a5854e4e3b22675b13f92a
-	sha512sums = 8ed54513511ec8ce6d7c9c311924b6d662102ffec3af75ccc8c4ebc6d48aaf162fd004b9c5fd31e50b83bc5872e82674eeaa2766423d9dc7d2338eb941ae8d40
-	sha512sums = 6d69aae0b470ac4d6cc90cfc241b185c6c483065cae8ff94532950bec2b7047d95f0c5002f460e09d8143f723ad7e1b2c767c2725ac0d456a64b78702bf510ea
+	sha512sums = 6650e822de2529582d93291025500afb6a182a0c5a564f656f164d79d8765bb4ca9c9d16227148431cc71c2677923b9364e81bbd4ca4f07f68e36bb380fb9574
 
 pkgname = 64gram-desktop
diff --git a/PKGBUILD b/PKGBUILD
index 97cada04e2a8..0807d5fb105b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,20 +4,20 @@
 # Contributor: Daniil Kovalev <daniil@kovalev.website>
 pkgname=64gram-desktop
 _pkgname=64Gram
-pkgver=1.0.85
-pkgrel=2
+pkgver=1.0.89
+pkgrel=1
 epoch=1
 pkgdesc='Unofficial desktop version of Telegram messaging app'
 arch=('x86_64')
 url="https://github.com/TDesktop-x64/tdesktop"
 license=('GPL3')
 depends=('hunspell' 'ffmpeg' 'hicolor-icon-theme' 'lz4' 'minizip' 'openal' 'ttf-opensans'
-         'qt6-imageformats' 'qt6-svg' 'qt6-wayland' 'xxhash' 'glibmm-2.68'
+         'qt6-imageformats' 'qt6-svg' 'qt6-wayland' 'xxhash'
          'rnnoise' 'pipewire' 'libxtst' 'libxrandr' 'jemalloc' 'abseil-cpp' 'libdispatch'
-         'openssl' 'protobuf' 'boost-libs')
+         'openssl' 'protobuf' 'glib2' 'boost-libs' 'libsigc++-3.0' 'cppgir')
 makedepends=('cmake' 'git' 'ninja' 'python' 'range-v3' 'tl-expected' 'microsoft-gsl' 'meson'
              'extra-cmake-modules' 'wayland-protocols' 'plasma-wayland-protocols' 'libtg_owt'
-             'gobject-introspection' 'glib2' 'boost' 'fmt' 'p7zip')
+             'gobject-introspection' 'boost' 'fmt' 'mm-common' 'perl-xml-parser' 'p7zip')
 optdepends=('webkit2gtk: embedded browser features'
             'xdg-desktop-portal: desktop integration')
 provides=(telegram-desktop)
@@ -25,16 +25,12 @@ conflicts=(telegram-desktop)
 source=("https://github.com/TDesktop-x64/tdesktop/releases/download/v${pkgver}/${_pkgname}-${pkgver}-full.tar.gz"
         "block-sponsored_messages.patch"
         "fix-lzma-link.patch"
-        expected-lite-$pkgver.tar.gz::https://github.com/martinmoene/expected-lite/archive/refs/tags/v0.6.3.tar.gz
-        https://gitlab.com/mnauw/cppgir/-/archive/960fe054ffaab7cf55722fea6094c56a8ee8f18e/cppgir-960fe054ffaab7cf55722fea6094c56a8ee8f18e.tar.gz
-        https://github.com/desktop-app/cmake_helpers/commit/6b0eeb2c15aa278ffa577bcefebcff8f2c98aca9.patch)
+        "https://download.gnome.org/sources/glibmm/2.77/glibmm-2.77.0.tar.xz")
 noextract=("${_pkgname}-${pkgver}-full.tar.gz")
-sha512sums=('f4b2e281879994e43836bb2bab320de8166495e696a5230a8ec67b549fcf27a43f8800563e3449803ee363052a1c6a6c6ec8495f86d53892f6f5063ebccc1bf1'
+sha512sums=('7762f6d059ea8b029ed0f49074dc3255e1569c47e77c98d3e9458e0636772fd108987e78a54cbf08e25957ccefb70fb475a11449db50e953cc30d0e876df3848'
             'c662524ca4f4a8df021ee94696d84896ed9a271df321933942806dda4544ea25f51a650ec8b4fc72f9a2219ea54cbfaf37b9604124f7263c86f74f1d647587ae'
             'd813a5ac6ff2208b693ecf494d7bf036087e223662f9f34aaaeafea0afe0fe798e867b9610f7221ea80319865502c20b61310d5a31634b888793873d63322463'
-            'd6a4f30f90494dda002ad27d227f17ce0201752178418d7dfada26441e853590d46816c88922e7d458dda68ad4414ddfe6b7fa4ed2a5854e4e3b22675b13f92a'
-            '8ed54513511ec8ce6d7c9c311924b6d662102ffec3af75ccc8c4ebc6d48aaf162fd004b9c5fd31e50b83bc5872e82674eeaa2766423d9dc7d2338eb941ae8d40'
-            '6d69aae0b470ac4d6cc90cfc241b185c6c483065cae8ff94532950bec2b7047d95f0c5002f460e09d8143f723ad7e1b2c767c2725ac0d456a64b78702bf510ea')
+            '6650e822de2529582d93291025500afb6a182a0c5a564f656f164d79d8765bb4ca9c9d16227148431cc71c2677923b9364e81bbd4ca4f07f68e36bb380fb9574')
 
 prepare() {
     7za x ${_pkgname}-${pkgver}-full.tar.gz
@@ -42,18 +38,23 @@ prepare() {
     cd $_pkgname-$pkgver-full
     patch -Np1 --binary -i ../block-sponsored_messages.patch
     patch -p1 --binary < ../fix-lzma-link.patch
-    cd $srcdir
-    tar xf "$srcdir"/expected-lite-$pkgver.tar.gz -C $_pkgname-$pkgver-full/cmake/external/glib/cppgir/expected-lite --strip-components 1
-    tar xf "$srcdir"/cppgir-960fe054ffaab7cf55722fea6094c56a8ee8f18e.tar.gz -C $_pkgname-$pkgver-full/cmake/external/glib/cppgir --strip-components 1
 }
 
 build() {
     CXXFLAGS+=' -ffat-lto-objects'
+
+    meson setup -D maintainer-mode=true --default-library static --prefix "$srcdir/glibmm" glibmm-2.77.0 glibmm-build
+    meson compile -C glibmm-build
+    meson install -C glibmm-build
+
+    export PKG_CONFIG_PATH="$srcdir"/glibmm/usr/local/lib/pkgconfig
     cmake \
         -B build \
         -S $_pkgname-$pkgver-full \
         -G Ninja \
+        -DCMAKE_VERBOSE_MAKEFILE=ON \
         -DCMAKE_INSTALL_PREFIX="/usr" \
+        -DCMAKE_PREFIX_PATH="$srcdir/glibmm" \
         -DCMAKE_BUILD_TYPE=Release \
         -DDESKTOP_APP_DISABLE_AUTOUPDATE=ON \
         -DTDESKTOP_API_TEST=ON