Remove redundant dependencies

2 files changed, 30 insertions, 36 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 91129b1b6bb8..9f96196d5d9b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = telegram-desktop-git
 	pkgdesc = Official desktop version of Telegram messaging app.
-	pkgver = 1.1.23.r15.g247f8f4f
+	pkgver = 1.1.23.r16.g62463d2c
 	pkgrel = 1
 	url = https://desktop.telegram.org/
 	arch = i686
@@ -8,34 +8,32 @@ pkgbase = telegram-desktop-git
 	license = GPL3
 	makedepends = chrpath
 	makedepends = cmake
+	makedepends = fontconfig
 	makedepends = git
 	makedepends = google-breakpad-git
+	makedepends = harfbuzz-icu
+	makedepends = jasper
 	makedepends = libappindicator-gtk2
 	makedepends = libexif
-	makedepends = libunity
-	makedepends = libva
-	makedepends = mtdev
-	makedepends = python
-	makedepends = python2
-	makedepends = fontconfig
-	makedepends = harfbuzz-icu
 	makedepends = libgl
 	makedepends = libinput
-	makedepends = libsm
-	makedepends = libxi
-	makedepends = libxrender
-	makedepends = sqlite
-	makedepends = tslib
-	makedepends = jasper
 	makedepends = libjpeg-turbo
 	makedepends = libmng
 	makedepends = libpng
+	makedepends = libsm
 	makedepends = libtiff
+	makedepends = libunity
+	makedepends = libva
 	makedepends = libwebp
+	makedepends = libxi
+	makedepends = libxrender
+	makedepends = mtdev
+	makedepends = python
+	makedepends = python2
+	makedepends = sqlite
+	makedepends = tslib
 	makedepends = wayland
 	depends = ffmpeg
-	depends = hicolor-icon-theme
-	depends = icu
 	depends = libproxy
 	depends = libxkbcommon-x11
 	depends = openal
diff --git a/PKGBUILD b/PKGBUILD
index dff4ec5f9fe5..0e9c44029d35 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,13 +1,13 @@
 # Maintainer: Lenovsky <lenovsky@protonmail.ch>
 
 pkgname=telegram-desktop-git
-pkgver=1.1.23.r15.g247f8f4f
+pkgver=1.1.23.r16.g62463d2c
 pkgrel=1
 pkgdesc="Official desktop version of Telegram messaging app."
 arch=('i686' 'x86_64')
 url="https://desktop.telegram.org/"
 license=('GPL3')
-depends=('ffmpeg' 'hicolor-icon-theme' 'icu' 'libproxy' 'libxkbcommon-x11' 'openal' 'openssl-1.0'
+depends=('ffmpeg' 'libproxy' 'libxkbcommon-x11' 'openal' 'openssl-1.0'
          'xcb-util-image' 'xcb-util-keysyms' 'xcb-util-renderutil' 'xcb-util-wm')
 makedepends=('chrpath' 'cmake' 'fontconfig' 'git' 'google-breakpad-git' 'harfbuzz-icu' 'jasper'
              'libappindicator-gtk2' 'libexif' 'libgl' 'libinput' 'libjpeg-turbo' 'libmng' 'libpng'
@@ -51,23 +51,23 @@ pkgver() {
   git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g' 
 }
 prepare() {
-  local qt_patch_file="$srcdir/tdesktop/Telegram/Patches/qtbase_${_qt_version//./_}.diff"
-  local qt_base_dir="$srcdir/qtbase-opensource-src-$_qt_version"
-  local fcitx_dir="$srcdir/qtbase-opensource-src-$_qt_version/src/plugins/platforminputcontexts/fcitx"
-  local hime_dir="$srcdir/qtbase-opensource-src-$_qt_version/src/plugins/platforminputcontexts/hime"
+  local _qt_patch_file="$srcdir/tdesktop/Telegram/Patches/qtbase_${_qt_version//./_}.diff"
+  local _qt_base_dir="$srcdir/qtbase-opensource-src-$_qt_version"
+  local _fcitx_dir="$_qt_base_dir/src/plugins/platforminputcontexts/fcitx"
+  local _hime_dir="$_qt_base_dir/src/plugins/platforminputcontexts/hime"
 
   # Apply Telegram Qt patch
-  cd "$qt_base_dir" 
-  patch -p1 -i "$qt_patch_file"
+  cd "$_qt_base_dir" 
+  patch -p1 -i "$_qt_patch_file"
 
   # Use OpenSSL 1.0
-  echo "INCLUDEPATH += /usr/include/openssl-1.0" >> "$qt_base_dir/src/network/network.pro"
+  echo "INCLUDEPATH += /usr/include/openssl-1.0" >> "$_qt_base_dir/src/network/network.pro"
 
   # Move additional input method plugins to proper directory
-  [ -d "$fcitx_dir" ] && rm -rf "$fcitx_dir" 
-  mv "$srcdir/fcitx" "$fcitx_dir"
-  [ -d "$hime_dir" ] && rm -rf "$hime_dir"
-  mv "$srcdir/hime" "$hime_dir"
+  [ -d "$_fcitx_dir" ] && rm -rf "$_fcitx_dir" 
+  mv "$srcdir/fcitx" "$_fcitx_dir"
+  [ -d "$_hime_dir" ] && rm -rf "$_hime_dir"
+  mv "$srcdir/hime" "$_hime_dir"
 
   # Apply Telegram gyp patch
   cd "$srcdir/gyp/"
@@ -95,13 +95,9 @@ prepare() {
 }
 
 build() {
-  local qt_base_dir="$srcdir/qtbase-opensource-src-$_qt_version"
-  local qt_imageformats_dir="$srcdir/qtimageformats-opensource-src-$_qt_version"
-  local qt_wayland_dir="$srcdir/qtwayland-opensource-src-$_qt_version"
-
   # Build slightly patched Qt
   export OPENSSL_LIBS='-L/usr/lib/openssl-1.0 -lssl -lcrypto'
-  cd "$qt_base_dir"
+  cd "$srcdir/qtbase-opensource-src-$_qt_version"
   ./configure \
     -prefix "$srcdir/qt" \
     -release \
@@ -124,12 +120,12 @@ build() {
   make install
   export PATH="$srcdir/qt/bin:$PATH"
 
-  cd "$qt_imageformats_dir"
+  cd "$srcdir/qtimageformats-opensource-src-$_qt_version"
   qmake .
   make
   make install
 
-  cd "$qt_wayland_dir"
+  cd "$srcdir/qtwayland-opensource-src-$_qt_version"
   qmake .
   make
   make install