tdesktop: 1.8.9 -> 1.8.13

This commit is contained in:
Michael Weiss 2019-10-04 21:03:36 +02:00
parent b52fb3b078
commit c1b1270255
No known key found for this signature in database
GPG key ID: 5BE487C4D4771D83

View file

@ -8,7 +8,7 @@ with lib;
mkDerivation rec {
pname = "telegram-desktop";
version = "1.8.9";
version = "1.8.13";
# Note: Due to our strong dependency on the Arch patches it's probably best
# to also wait for the Arch update (especially if the patches don't apply).
@ -17,7 +17,7 @@ mkDerivation rec {
owner = "telegramdesktop";
repo = "tdesktop";
rev = "v${version}";
sha256 = "0b1c903ah3fhxr9qjg23p8x9k895k3cxkzz5ckcr7r4pmmbnnvkp";
sha256 = "19p4cjzk7jyhrd4sd8dq1r1zksff23zyg5rh5vlr3kqd372bffzz";
fetchSubmodules = true;
};
@ -25,8 +25,8 @@ mkDerivation rec {
archPatches = fetchsvn {
url = "svn://svn.archlinux.org/community/telegram-desktop/trunk";
# svn log svn://svn.archlinux.org/community/telegram-desktop/trunk
rev = "509240";
sha256 = "1sf4mspbsqsnjzp9ys9l0asrx1bhj273d163i2bv1zhl4mmgpl3k";
rev = "512849";
sha256 = "1hl7znvv6qr4cwpkj8wlplpa63i1lhk2iax7hb4l1s1a4mijx9ls";
};
privateHeadersPatch = fetchpatch {
url = "https://github.com/telegramdesktop/tdesktop/commit/b9d3ba621eb8af638af46c6b3cfd7a8330bf0dd5.patch";
@ -38,8 +38,10 @@ mkDerivation rec {
patches = [
"${archPatches}/tdesktop.patch"
"${archPatches}/no-gtk2.patch"
# "${archPatches}/Use-system-wide-font.patch"
"${archPatches}/Revert-Disable-DemiBold-fallback-for-Semibold.patch"
"${archPatches}/tdesktop_lottie_animation_qtdebug.patch"
# "${archPatches}/Revert-Change-some-private-header-includes.patch"
# "${archPatches}/Use-system-wide-font.patch"
];
postPatch = ''
@ -87,7 +89,6 @@ mkDerivation rec {
preConfigure = ''
# Patches to revert:
patch -R -Np1 -i "${archPatches}/demibold.patch"
patch -R -Np1 -i "${privateHeadersPatch}"
# Patches to apply:
@ -98,17 +99,17 @@ mkDerivation rec {
# disable static-qt for rlottie
sed "/RLOTTIE_WITH_STATIC_QT/d" -i "Telegram/gyp/lib_rlottie.gyp"
sed -i Telegram/gyp/telegram_linux.gypi \
sed -i Telegram/gyp/telegram/linux.gypi \
-e 's,/usr,/does-not-exist,g' \
-e 's,appindicator-0.1,appindicator3-0.1,g' \
-e 's,-flto,,g'
sed -i Telegram/gyp/qt.gypi \
sed -i Telegram/gyp/modules/qt.gypi \
-e "s,/usr/include/qt/QtCore/,${qtbase.dev}/include/QtCore/,g" \
-e 's,\d+",\d+" | head -n1,g'
sed -i Telegram/gyp/qt_moc.gypi \
sed -i Telegram/gyp/modules/qt_moc.gypi \
-e "s,/usr/bin/moc,moc,g"
sed -i Telegram/gyp/qt_rcc.gypi \
sed -i Telegram/gyp/modules/qt_rcc.gypi \
-e "s,/usr/bin/rcc,rcc,g"
# Build system assumes x86, but it works fine on non-x86 if we patch this one flag out