Commit 18ec824d authored by Francesco Marinucci's avatar Francesco Marinucci

telegram-desktop: finally updated to 1.7.0.

parent 0aa76b3d
Pipeline #3528 passed with stages
in 16 minutes and 31 seconds
......@@ -2,7 +2,7 @@
pkgname=telegram-desktop
pkgver=1.7.0
pkgrel=3
pkgrel=4
pkgdesc='Official Telegram Desktop client'
arch=('x86_64')
url="https://desktop.telegram.org/"
......@@ -38,7 +38,7 @@ sha512sums=('SKIP'
'SKIP'
'b87414ceaae19185a8a5749cea1f6d9f3fc3c69b8dd729e3db8790cde00b987c3c827cd30baf0eac579d1884e34aa2f37bb90778c3c0bc9ca211d75a82891b9d'
'b20674f61ff6378749d1f59a6a0da194d33ccc786bd783f6ed62027924a3a8a8d27c9763bf376480432d6536896b0c7eeb8c495c5b8cefff7cf5fe84da50947e'
'710af6c851aa8535aec8fb32e8c05d934970bab227f935dec0e2fbcad5b8b2ad277793e4226bd1d4e46e77150fa05bc3326cce1118f91de87e1b0e477315523f'
'2ee135390c317e665134c6ce6041f163840d4fb565f28f329d64ba395be826ceb57f2a73f513e63967e281e71cb7d6f0f087b2ff9aaa0d38cd30e2b97ef9064c'
'd60694dc701aa985b0e82a12c9732b945082470441c687b33167a94f94efcf253baf43bb7280ec160ba338485ee5c62de138e4804cae05f27cc5cf4298166d39'
'6d0bac5aa4c4992b5400a9a9318f7a4e92d5eab961917cf0b05cdd251ab66a77c52ec8fbef246e8019606a7624d7b5420b87f8153e071e9724c7d2f5c94e47c0'
'ce6be003220267bac5483caf8302b492e1581892bc36d35a61236ebf9f9d766b8bd2159557a1c36256aa85f461797a38bfaae57b12da7a72101b21c0b17ed653'
......
......@@ -273,7 +273,7 @@ index 0b783ec21..3f917765a 100644
'qt_version%': '5.3.2',
}, {
- 'qt_version%': '5.6.2',
+ 'qt_version%': '<!(echo /usr/include/qt/QtCore/*/ | grep -Po "\d+\.\d+\.\d+")',
+ 'qt_version%': '<!(echo /usr/include/qt5/QtCore/*/ | grep -Po "\d+\.\d+\.\d+")',
}]
],
},
......@@ -292,7 +292,7 @@ index 0b783ec21..3f917765a 100644
'linux_path_qt%': '/usr/local/macold/Qt-<(qt_version)',
}, {
- 'linux_path_qt%': '/usr/local/tdesktop/Qt-<(qt_version)',
+ 'linux_path_qt%': '/usr/lib/qt',
+ 'linux_path_qt%': '/usr/lib/qt5',
}]
]
},
......@@ -356,14 +356,14 @@ index 0b783ec21..3f917765a 100644
- '<(qt_loc)/include/QtGui/<(qt_version)',
- '<(qt_loc)/include/QtCore/<(qt_version)/QtCore',
- '<(qt_loc)/include/QtGui/<(qt_version)/QtGui',
+ '/usr/include/qt',
+ '/usr/include/qt/QtCore',
+ '/usr/include/qt/QtGui',
+ '/usr/include/qt/QtDBus',
+ '/usr/include/qt/QtCore/<(qt_version)',
+ '/usr/include/qt/QtGui/<(qt_version)',
+ '/usr/include/qt/QtCore/<(qt_version)/QtCore',
+ '/usr/include/qt/QtGui/<(qt_version)/QtGui',
+ '/usr/include/qt5',
+ '/usr/include/qt5/QtCore',
+ '/usr/include/qt5/QtGui',
+ '/usr/include/qt5/QtDBus',
+ '/usr/include/qt5/QtCore/<(qt_version)',
+ '/usr/include/qt5/QtGui/<(qt_version)',
+ '/usr/include/qt5/QtCore/<(qt_version)/QtCore',
+ '/usr/include/qt5/QtGui/<(qt_version)/QtGui',
],
'library_dirs': [
'<(qt_loc)/lib',
......@@ -403,7 +403,7 @@ index 464d3c818..f350da8f3 100644
],
'action': [
- '<(qt_loc)/bin/moc<(exe_ext)',
+ '/usr/bin/moc',
+ '/usr/bin/moc-qt5',
# Silence "Note: No relevant classes found. No output generated."
'--no-notes',
......@@ -416,7 +416,7 @@ index f5624a82b..1129a95c5 100644
],
'action': [
- '<(qt_loc)/bin/rcc<(exe_ext)',
+ '/usr/bin/rcc',
+ '/usr/bin/rcc-qt5',
'-name', '<(RULE_INPUT_ROOT)',
'-no-compress',
'<(RULE_INPUT_PATH)',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment