remove bundled glibmm-2.77.0

2 files changed, 6 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3bf1b44f8755..ad6102960d15 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = 64gram-desktop
 	pkgdesc = Unofficial desktop version of Telegram messaging app
 	pkgver = 1.0.97
-	pkgrel = 1
+	pkgrel = 2
 	epoch = 1
 	url = https://github.com/TDesktop-x64/tdesktop
 	arch = x86_64
@@ -48,6 +48,7 @@ pkgbase = 64gram-desktop
 	depends = boost-libs
 	depends = libsigc++-3.0
 	depends = cppgir
+	depends = glibmm-2.68
 	optdepends = webkit2gtk: embedded browser features
 	optdepends = xdg-desktop-portal: desktop integration
 	provides = telegram-desktop
@@ -56,10 +57,8 @@ pkgbase = 64gram-desktop
 	source = https://github.com/TDesktop-x64/tdesktop/releases/download/v1.0.97/64Gram-1.0.97-full.tar.gz
 	source = block-sponsored_messages.patch
 	source = fix-lzma-link.patch
-	source = https://download.gnome.org/sources/glibmm/2.77/glibmm-2.77.0.tar.xz
 	sha512sums = 36b1c859955fcd429c4c227439aa88cf0fd86dbf731bd7fe35e8e6314a2ae2094e159fc4d0dbae0e096e81bdce4780399ac92d04e5a9732a66aefc72638ca2a0
 	sha512sums = c662524ca4f4a8df021ee94696d84896ed9a271df321933942806dda4544ea25f51a650ec8b4fc72f9a2219ea54cbfaf37b9604124f7263c86f74f1d647587ae
 	sha512sums = d813a5ac6ff2208b693ecf494d7bf036087e223662f9f34aaaeafea0afe0fe798e867b9610f7221ea80319865502c20b61310d5a31634b888793873d63322463
-	sha512sums = 6650e822de2529582d93291025500afb6a182a0c5a564f656f164d79d8765bb4ca9c9d16227148431cc71c2677923b9364e81bbd4ca4f07f68e36bb380fb9574
 
 pkgname = 64gram-desktop
diff --git a/PKGBUILD b/PKGBUILD
index cd50f05d1814..9cf7520cefab 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 pkgname=64gram-desktop
 _pkgname=64Gram
 pkgver=1.0.97
-pkgrel=1
+pkgrel=2
 epoch=1
 pkgdesc='Unofficial desktop version of Telegram messaging app'
 arch=('x86_64')
@@ -14,7 +14,7 @@ license=('GPL3')
 depends=('hunspell' 'ffmpeg' 'hicolor-icon-theme' 'lz4' 'minizip' 'openal' 'ttf-opensans'
          'qt6-imageformats' 'qt6-svg' 'qt6-wayland' 'xxhash'
          'rnnoise' 'pipewire' 'libxtst' 'libxrandr' 'jemalloc' 'abseil-cpp' 'libdispatch'
-         'openssl' 'protobuf' 'glib2' 'boost-libs' 'libsigc++-3.0' 'cppgir')
+         'openssl' 'protobuf' 'glib2' 'boost-libs' 'libsigc++-3.0' 'cppgir' 'glibmm-2.68')
 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' 'p7zip')
@@ -24,13 +24,11 @@ provides=(telegram-desktop)
 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"
-        "https://download.gnome.org/sources/glibmm/2.77/glibmm-2.77.0.tar.xz")
+        "fix-lzma-link.patch")
 noextract=("${_pkgname}-${pkgver}-full.tar.gz")
 sha512sums=('36b1c859955fcd429c4c227439aa88cf0fd86dbf731bd7fe35e8e6314a2ae2094e159fc4d0dbae0e096e81bdce4780399ac92d04e5a9732a66aefc72638ca2a0'
             'c662524ca4f4a8df021ee94696d84896ed9a271df321933942806dda4544ea25f51a650ec8b4fc72f9a2219ea54cbfaf37b9604124f7263c86f74f1d647587ae'
-            'd813a5ac6ff2208b693ecf494d7bf036087e223662f9f34aaaeafea0afe0fe798e867b9610f7221ea80319865502c20b61310d5a31634b888793873d63322463'
-            '6650e822de2529582d93291025500afb6a182a0c5a564f656f164d79d8765bb4ca9c9d16227148431cc71c2677923b9364e81bbd4ca4f07f68e36bb380fb9574')
+            'd813a5ac6ff2208b693ecf494d7bf036087e223662f9f34aaaeafea0afe0fe798e867b9610f7221ea80319865502c20b61310d5a31634b888793873d63322463')
 
 prepare() {
     7za x ${_pkgname}-${pkgver}-full.tar.gz
@@ -43,18 +41,12 @@ prepare() {
 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