5.5.6-3

author: xiota 2024-10-02 21:15:14 +0000
committer: xiota 2024-10-02 21:15:14 +0000
commit: 76ea980d91f7756f737ebc7dc84e67f251739f80 (patch)
tree: 3845d991eec6c601df046086bc1189580fc5ea13
parent: adec3c20e91eb34fdd5cc3d787b3eeb56db225e6 (diff)
download: aur-76ea980d91f7756f737ebc7dc84e67f251739f80.tar.gz
4 files changed, 125 insertions, 86 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 96413d078640..44995cde1d7f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,63 +1,61 @@
 pkgbase = forkgram
-	pkgdesc = Fork of Telegram Desktop messaging app.
+	pkgdesc = Fork of the Telegram Desktop messaging app
 	pkgver = 5.5.6
-	pkgrel = 2
+	pkgrel = 3
 	url = https://github.com/Forkgram/tdesktop
 	arch = x86_64
 	license = GPL-3.0-or-later
 	makedepends = boost
 	makedepends = cmake
-	makedepends = dos2unix
 	makedepends = extra-cmake-modules
 	makedepends = fmt
 	makedepends = git
 	makedepends = glib2-devel
 	makedepends = gobject-introspection
 	makedepends = libtg_owt
-	makedepends = meson
 	makedepends = microsoft-gsl
 	makedepends = mm-common
 	makedepends = ninja
 	makedepends = perl-xml-parser
 	makedepends = plasma-wayland-protocols
 	makedepends = python
+	makedepends = python-packaging
 	makedepends = range-v3
 	makedepends = tl-expected
 	makedepends = wayland-protocols
-	depends = abseil-cpp
 	depends = ada
 	depends = ffmpeg
-	depends = glib2
-	depends = hicolor-icon-theme
 	depends = hunspell
+	depends = jemalloc
 	depends = kcoreaddons
 	depends = libdispatch
-	depends = libsigc++-3.0
+	depends = libpipewire
 	depends = libvpx
 	depends = libxcomposite
 	depends = libxdamage
 	depends = libxrandr
 	depends = libxtst
-	depends = lz4
 	depends = minizip
 	depends = openal
 	depends = openh264
-	depends = openssl
-	depends = pipewire
+	depends = opus
 	depends = protobuf
-	depends = qt6-imageformats
+	depends = qt6-base
+	depends = qt6-declarative
 	depends = qt6-svg
 	depends = qt6-wayland
 	depends = rnnoise
+	depends = xcb-util-keysyms
 	depends = xxhash
 	optdepends = webkit2gtk: embedded browser features
 	optdepends = xdg-desktop-portal: desktop integration
 	provides = forkgram-bin
 	conflicts = forkgram-bin
-	conflicts = telegram-desktop
-	source = https://github.com/Forkgram/tdesktop/releases/download/v5.5.6/frk-v5.5.6-full.tar.gz
-	source = forkgram.desktop
-	sha512sums = 594311efa25b0027b12659320e27637980c50e0c49c7310b7cfdd261e210acd510fed173c1f1fdd694f92151a41d4a02788ee80a8d6e860bab2d7d79691880a8
-	sha512sums = d6d54a5a396c0a84645ca5f38cd2d0c774d1a00f081cdf6151228b581ff1c05234550d4829aab4fe2221dec8e0477199da5a0cb1bc3a60fa1fbfe0336db365dd
+	options = !debug
+	options = !emptydirs
+	source = forkgram-5.5.6.tar.gz::https://github.com/Forkgram/tdesktop/releases/download/v5.5.6/frk-v5.5.6-full.tar.gz
+	source = tg-5.5.5-fix_build_with_cppgir-b1060b9.patch::https://gitlab.archlinux.org/archlinux/packaging/packages/telegram-desktop/-/raw/b1060b9deef05a3efaadf61d3e99dafa155710ea/telegram-desktop-5_5_5-fix_build_with_cppgir.patch
+	sha256sums = 9e5a0397a95778b38b48c3292f6dda8af46aa4a23094cb77a8f1607d5785b28d
+	sha256sums = ee54bdf8fe67c8fadfffc794763fc62f4c6a15eb535c80ba7b1b74d6ec178882
 
 pkgname = forkgram
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..018a3de08144
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+*
+!PKGBUILD
+!.SRCINFO
+!.gitignore
diff --git a/PKGBUILD b/PKGBUILD
index 006ed920d9b0..c2381dc4dd95 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,112 +1,162 @@
-# Maintainer: Peter Jung ptr1337 <admin@ptr1337.dev>
-# Maintainer: SoulHarsh007 <admin@soulharsh007.dev>
+# Maintainer:
+# Contributor: Peter Jung ptr1337 <admin@ptr1337.dev>
+# Contributor: SoulHarsh007 <admin@soulharsh007.dev>
 # Contributor: MedzikUser <nivua1fn@duck.com>
 
-pkgname=forkgram
-_pkgname=frk
+_pkgname="forkgram"
+pkgname="$_pkgname"
 pkgver=5.5.6
-pkgrel=2
-pkgdesc='Fork of Telegram Desktop messaging app.'
-arch=('x86_64')
+pkgrel=3
+pkgdesc="Fork of the Telegram Desktop messaging app"
 url="https://github.com/Forkgram/tdesktop"
 license=('GPL-3.0-or-later')
+arch=('x86_64')
+
 depends=(
-  abseil-cpp
   ada
   ffmpeg
-  glib2
-  hicolor-icon-theme
   hunspell
+  jemalloc
   kcoreaddons
   libdispatch
-  libsigc++-3.0
+  libpipewire
   libvpx
   libxcomposite
   libxdamage
   libxrandr
   libxtst
-  lz4
   minizip
   openal
   openh264
-  openssl
-  pipewire
+  opus
   protobuf
-  qt6-imageformats
+  qt6-base
+  qt6-declarative
   qt6-svg
   qt6-wayland
   rnnoise
+  xcb-util-keysyms
   xxhash
 )
 makedepends=(
   boost
   cmake
-  dos2unix
   extra-cmake-modules
   fmt
   git
   glib2-devel
   gobject-introspection
   libtg_owt
-  meson
   microsoft-gsl
   mm-common
   ninja
   perl-xml-parser
   plasma-wayland-protocols
   python
+  python-packaging
   range-v3
   tl-expected
   wayland-protocols
 )
-optdepends=('webkit2gtk: embedded browser features'
-            'xdg-desktop-portal: desktop integration')
-provides=(forkgram-bin)
-conflicts=(forkgram-bin telegram-desktop)
-source=("https://github.com/Forkgram/tdesktop/releases/download/v${pkgver}/${_pkgname}-v${pkgver}-full.tar.gz"
-        "${pkgname}.desktop")
-sha512sums=('594311efa25b0027b12659320e27637980c50e0c49c7310b7cfdd261e210acd510fed173c1f1fdd694f92151a41d4a02788ee80a8d6e860bab2d7d79691880a8'
-            'd6d54a5a396c0a84645ca5f38cd2d0c774d1a00f081cdf6151228b581ff1c05234550d4829aab4fe2221dec8e0477199da5a0cb1bc3a60fa1fbfe0336db365dd')
-
-prepare() {
-    cd ${_pkgname}-v${pkgver}-full
-}
+optdepends=(
+  'webkit2gtk: embedded browser features'
+  'xdg-desktop-portal: desktop integration'
+)
+
+provides=("forkgram-bin")
+conflicts=("forkgram-bin")
+
+options=('!debug' '!emptydirs')
+
+: ${_patch_commit:='b1060b9deef05a3efaadf61d3e99dafa155710ea'}
+
+_pkgsrc="frk-v$pkgver-full"
+_pkgext="tar.gz"
+source=(
+  "$_pkgname-$pkgver.$_pkgext"::"https://github.com/Forkgram/tdesktop/releases/download/v$pkgver/$_pkgsrc.$_pkgext"
+  "tg-5.5.5-fix_build_with_cppgir-${_patch_commit::7}.patch"::"https://gitlab.archlinux.org/archlinux/packaging/packages/telegram-desktop/-/raw/$_patch_commit/telegram-desktop-5_5_5-fix_build_with_cppgir.patch"
+)
+sha256sums=(
+  '9e5a0397a95778b38b48c3292f6dda8af46aa4a23094cb77a8f1607d5785b28d'
+  'ee54bdf8fe67c8fadfffc794763fc62f4c6a15eb535c80ba7b1b74d6ec178882'
+)
+
+prepare() (
+  apply-patch() {
+    printf '\nApplying patch %s\n' "$1"
+    patch -Np1 -F100 -i "$1"
+  }
+
+  cd "$_pkgsrc/cmake/external/glib/cppgir"
+  apply-patch "$srcdir/tg-5.5.5-fix_build_with_cppgir-${_patch_commit::7}.patch"
+)
 
 build() {
-    CXXFLAGS+=' -ffat-lto-objects'
-
-    cmake -B build $_pkgname-v$pkgver-full -G Ninja \
-        -DCMAKE_VERBOSE_MAKEFILE=ON \
-        -DCMAKE_INSTALL_PREFIX="/usr" \
-        -DCMAKE_BUILD_TYPE=Release \
-        -DTDESKTOP_API_ID=611335 \
-        -DTDESKTOP_API_HASH=d524b414d21f4d37f08684c1df41ac9c
-    cmake --build build
+  local _cmake_options=(
+    -B build
+    -S "$_pkgsrc"
+    -G Ninja
+    -DCMAKE_BUILD_TYPE=None
+    -DCMAKE_INSTALL_PREFIX=/usr
+    -DDESKTOP_APP_DISABLE_AUTOUPDATE=ON
+    -DTDESKTOP_API_TEST=ON
+    -DTDESKTOP_API_ID=611335
+    -DTDESKTOP_API_HASH=d524b414d21f4d37f08684c1df41ac9c
+    -DDESKTOP_APP_USE_PACKAGED_FONTS=OFF
+    -Wno-dev
+  )
+
+  cmake "${_cmake_options[@]}"
+  cmake --build build
 }
 
 package() {
   DESTDIR="$pkgdir" cmake --install build
-  install -Dm644 /dev/null "${pkgdir}/etc/tdesktop/externalupdater"
+  #install -Dm644 /dev/null "$pkgdir/etc/tdesktop/externalupdater"
+
+  # remove unwanted files
+  find "$pkgdir/usr/share/icons" -name '*.png' -delete
+  find "$pkgdir/usr/share/icons" -name '*.svg' -delete
+  rm "$pkgdir/usr/share/applications/org.telegram.desktop.desktop"
+  rm "$pkgdir/usr/share/metainfo/org.telegram.desktop.metainfo.xml"
+  rm "$pkgdir/usr/share/dbus-1/services/org.telegram.desktop.service"
 
-  # Remove default icon
-  find "${pkgdir}/usr/share/icons" -name telegram.png -delete
-  rm "${pkgdir}/usr/share/applications/org.telegram.desktop.desktop" "${pkgdir}/usr/share/metainfo/org.telegram.desktop.metainfo.xml"
+  # rename executable
+  mv -v "$pkgdir"/usr/bin/{telegram-desktop,"$_pkgname"}
 
-  # Rename executable
-  mv -v "${pkgdir}"/usr/bin/{telegram-desktop,Forkgram}
+  # icon
+  install -Dm644 "$srcdir/$_pkgsrc/Telegram/Resources/art/forkgram/logo_256.png" "$pkgdir/usr/share/pixmaps/$_pkgname.png"
 
-  # Main icons
-  install -dm755 "${pkgdir}/usr/share/pixmaps/"
-  install -Dm644 "${srcdir}/${_pkgname}-v${pkgver}-full/Telegram/Resources/art/forkgram/logo_256.png" "${pkgdir}/usr/share/pixmaps/"
+  # service
+  install -Dm644 /dev/stdin "$pkgdir/usr/share/dbus-1/services/forkgram.service" << END
+[D-BUS Service]
+Name=org.telegram.desktop
+Exec=/usr/bin/$_pkgname
+END
 
-  # Desktop launcher
-  install -Dm644 "${srcdir}/${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
+  # .desktop
+  install -Dm644 /dev/stdin "$pkgdir/usr/share/applications/$_pkgname.desktop" << END
+[Desktop Entry]
+Name=${_pkgname^}
+Comment=$pkgdesc
+TryExec=$_pkgname
+Exec=$_pkgname -- %u
+Icon=$_pkgname
+Terminal=false
+StartupWMClass=TelegramDesktop
+Type=Application
+Categories=Chat;Network;InstantMessaging;Qt;
+MimeType=x-scheme-handler/tg;x-scheme-handler/tonsite;
+Keywords=tg;chat;im;messaging;messenger;sms;tdesktop;$_pkgname
+Actions=quit;
+DBusActivatable=true
+SingleMainWindow=true
+X-GNOME-UsesNotifications=true
+X-GNOME-SingleWindow=true
 
-  # Icons
-  local icon_size icon_dir
-  for icon_size in 16 32 48 64 128 256 512; do
-    icon_dir="${pkgdir}/usr/share/icons/hicolor/${icon_size}x${icon_size}/apps"
-    install -d "${icon_dir}"
-    install -m644 "${srcdir}/${_pkgname}-v${pkgver}-full/Telegram/Resources/art/icon${icon_size}.png" "${icon_dir}/${pkgname}.png"
-  done
+[Desktop Action quit]
+Exec=$_pkgname -quit
+Name=Quit ${_pkgname^}
+Icon=application-exit
+END
 }
diff --git a/forkgram.desktop b/forkgram.desktop
deleted file mode 100644
index e7b085f60238..000000000000
--- a/forkgram.desktop
+++ /dev/null
@@ -1,13 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Name=Forkgram
-Comment=Forkgram is the fork of the official Telegram Desktop application
-Exec=Forkgram -- %u
-StartupWMClass=Forkgram
-Icon=forkgram
-Terminal=false
-Type=Application
-Categories=Network;
-MimeType=application/x-xdg-protocol-tg;x-scheme-handler/tg;
-X-Desktop-File-Install-Version=0.22
author	xiota	2024-10-02 21:15:14 +0000
committer	xiota	2024-10-02 21:15:14 +0000
commit	76ea980d91f7756f737ebc7dc84e67f251739f80 (patch)
tree	3845d991eec6c601df046086bc1189580fc5ea13
parent	adec3c20e91eb34fdd5cc3d787b3eeb56db225e6 (diff)
download	aur-76ea980d91f7756f737ebc7dc84e67f251739f80.tar.gz