[arch-commits] Commit in telegram-desktop/trunk (PKGBUILD)

[Jiachen Yang]

    Date: Friday, September 13, 2019 @ 06:26:16
  Author: farseerfc
Revision: 510074

change range-v3 fixes to proper patch for next release

Modified:
  telegram-desktop/trunk/PKGBUILD

----------+
 PKGBUILD |   14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-09-13 06:19:49 UTC (rev 510073)
+++ PKGBUILD	2019-09-13 06:26:16 UTC (rev 510074)
@@ -33,6 +33,7 @@
     "Use-system-wide-font.patch"
     "tdesktop_lottie_animation_qtdebug.patch"
     "revert-private-headers.patch::https://github.com/telegramdesktop/tdesktop/commit/b9d3ba621eb8af638af46c6b3cfd7a8330bf0dd5.patch"
+    "range-v3-0.9-pr6501.patch::https://patch-diff.githubusercontent.com/raw/telegramdesktop/tdesktop/pull/6501.patch"
 )
 sha512sums=('SKIP'
             'SKIP'
@@ -50,7 +51,8 @@
             '6d0bac5aa4c4992b5400a9a9318f7a4e92d5eab961917cf0b05cdd251ab66a77c52ec8fbef246e8019606a7624d7b5420b87f8153e071e9724c7d2f5c94e47c0'
             'ce6be003220267bac5483caf8302b492e1581892bc36d35a61236ebf9f9d766b8bd2159557a1c36256aa85f461797a38bfaae57b12da7a72101b21c0b17ed653'
             'a83b80668b2dc2cc77c857069fdb45b487793fda01ad8a63bab66c6a1c71e5d032050e4ec7efb5b4c3216badc5377c856ef1f4a59c2e02b24ee53b1d83124bf3'
-            'e25dc1c54d6001a7a3740c6cee40a12a2313a3fd2e41986268f0ee5d9d8bf2d34812f539efb0eb5d26d3f263b2e4a7849016711532bf215aa9ff38da30175557')
+            'e25dc1c54d6001a7a3740c6cee40a12a2313a3fd2e41986268f0ee5d9d8bf2d34812f539efb0eb5d26d3f263b2e4a7849016711532bf215aa9ff38da30175557'
+            'f0d72da52164d36c52abf057e73768d4a1afd414c3ce861c4b300dd0258eff589e628ef61a4a61401cbb6d88bda48e1c5c27899a0986514752157d89175ca904')
 
 prepare() {
     cd "$srcdir/tdesktop"
@@ -70,19 +72,11 @@
     patch -Np1 -i "$srcdir/Use-system-wide-font.patch"
     patch -Np1 -i "$srcdir/tdesktop_lottie_animation_qtdebug.patch"
     patch -R -Np1 -i "$srcdir/revert-private-headers.patch"
+    patch -Np1 -i "$srcdir/range-v3-0.9-pr6501.patch"
 
     # disable static-qt for rlottie
     sed "/RLOTTIE_WITH_STATIC_QT/d" -i "$srcdir/tdesktop/Telegram/gyp/lib_rlottie.gyp"
 
-    # fix C++ ranges::sized_iterator_range
-    sed "s/ranges::make_iterator_range/ranges::subrange/g" -i "$srcdir/tdesktop/Telegram/SourceFiles/data/data_channel.cpp"
-    sed "s/ranges::make_iterator_range/ranges::subrange/g" -i "$srcdir/tdesktop/Telegram/SourceFiles/chat_helpers/emoji_keywords.cpp"
-    sed "s/ranges::make_iterator_range/ranges::subrange/g" -i "$srcdir/tdesktop/Telegram/SourceFiles/media/streaming/media_streaming_reader.cpp"
-    sed "s/ranges::make_iterator_range/ranges::subrange/g" -i "$srcdir/tdesktop/Telegram/SourceFiles/ui/widgets/input_fields.cpp"
-    sed "s/ranges::make_iterator_range/ranges::subrange/g" -i "$srcdir/tdesktop/Telegram/SourceFiles/ui/text/text_entity.cpp"
-    sed "s/make_iterator_range/ranges::subrange/g" -i "$srcdir/tdesktop/Telegram/SourceFiles/history/history_inner_widget.cpp"
-    sed "/int remainder = 0;/a inline bool operator==(const PercentCounterItem &o) const { return !(*this < o) && !(o < *this);}" -i "$srcdir/tdesktop/Telegram/SourceFiles/history/view/media/history_view_poll.cpp"
-
     cd "$srcdir/tdesktop"
     cd "Telegram/ThirdParty/libtgvoip"
     patch -Np1 -i "$srcdir/libtgvoip.patch"