diff options
Diffstat (limited to 'net-im/telegram-desktop')
| -rw-r--r-- | net-im/telegram-desktop/Manifest | 3 | ||||
| -rw-r--r-- | net-im/telegram-desktop/files/tdesktop-2.7.4-webview-fix-gcc11.patch | 25 | ||||
| -rw-r--r-- | net-im/telegram-desktop/telegram-desktop-2.7.4.ebuild | 2 |
3 files changed, 29 insertions, 1 deletions
diff --git a/net-im/telegram-desktop/Manifest b/net-im/telegram-desktop/Manifest index 44bd25f08afa..ee46de7bec6d 100644 --- a/net-im/telegram-desktop/Manifest +++ b/net-im/telegram-desktop/Manifest @@ -2,8 +2,9 @@ AUX fix-tgcalls-gcc10.patch 949 BLAKE2B 7a065fcbf5b8e7b49b6b866d199c67315484312c AUX tdesktop-2.7.1-fix-disable-dbus-integration.patch 632 BLAKE2B 92aa9006febe4cb52e4273233f8592827e5d74afebc9d996c41cfc33588c0040b3b573a3730d0541ba8e0641e6733c491861c1bb60a5dc0f26f53b7941bf4572 SHA512 74557a9ac798f47d76cc9a0a514d3891c1a9f3c0667d5938be11d53d44704390dbf97d1e7be3c304cce2c9b8e3110ee04e6759ed28bf5f39d1cfee9f5c77f703 AUX tdesktop-2.7.3-disable-webkit-separately.patch 3536 BLAKE2B 1bf255ba137c12a4d4a75321763327192f6cff81879843f042716daef0a9f9eb18b2a88e3048917adc5f36b9e4959be2a2c757f74a6aeeb9ca312ffcd7f55554 SHA512 aa62ae0319ad5ec86334e763e4c751f6508d7768a8916661fb217b91bf6a897802bc8f4820d058dc341bae69f6a0f0c34321e2a97e63bd0c715d36aa56532fef AUX tdesktop-2.7.3-webview-include-gdkx.patch 570 BLAKE2B 4d92c1e14e9df4609ab332c057977a9485867b3a23fc96c46a97d092a5f7083fccb479f87681bfc66964e4be13b4883c0d86ee079e9fd67e932daa2140c9610b SHA512 446a59387f3a76270d9242a19648d86acc0e589833e3aaedff708da0a90d5b55ae0108f28d79da45b4c8dc68c5ac6f6af4ec50203b411c0fcf2eccf4f8c9c753 +AUX tdesktop-2.7.4-webview-fix-gcc11.patch 880 BLAKE2B 581425190b3951d1027c572587e1039d0cf2c5b91d0cebe6be8bd25943eedc3b9e481729f94c920e699526d864ac660d295b4a50ad6aba9ef178513a00b08099 SHA512 7098bca2a1538f66badac21639b3e10a3988acf1e16e50b3f32ed06571687493e87280b992ea1c24fcbd3e3215ccc6e27f327eec8acc7318f9c53b5dfa290c90 DIST tdesktop-2.7.1-full.tar.gz 36770178 BLAKE2B 21379cc970da07725e7a46d18a4f0bc459b1da1b730587595448b8f78133ce701e374e7faefc649a973342c203eee510872b5a4ed2ff6be92daec25157e400a4 SHA512 dffd184c4369c5c5947b1ca085add533e54313ce39aebcdca4f0958431a305aa5e95c2f2b48592f6992e666b2d33eeba5697f9e09f6048a53b807f2950fbd17b DIST tdesktop-2.7.4-full.tar.gz 36894673 BLAKE2B e04749fb0168f8bae69a9ad85c5bff315faf0b355ff5f3a85a34ee36e3305c6b550553284d5179aff9283bbd1a94f9ec3c41e293d0ad8c86e4d08283189e42b3 SHA512 0a796d7a8c5e5982bc60f19c41da53996a609bf794fad224e7beea5fc3816b5cf35f16b0ec2cc7279085c69996063a44085f48e1596dfe746d260a2e8f1b2d14 EBUILD telegram-desktop-2.7.1-r2.ebuild 3955 BLAKE2B ebd8a7ce7cbb217f7277879a0b65cf13d99a78af157fb85f7453f8239fce90523ac0644146cc7a0ad8f87e66eb327c061896df4fafbf40931475713e693f5d9c SHA512 6a388a597113e102213b591f91395a59eef26458d4d4173d6a2e6e8d76c45a1f6e4b34dd83ae495bf4ff1d2639861608a73031460c43f9af97542eb9c755a68a -EBUILD telegram-desktop-2.7.4.ebuild 4159 BLAKE2B 9ce7844f86fd7010d6ea8a3888b6876ba994f1ac5f430a8d9dd2e930e727d75016cffe94011dafc25a24594becf6fa3f6415320e5278c1ce880b1dca9c8238f3 SHA512 74870605d74efdcfef32a4edc37d598875a9f27a9c453640d97eb0eec7ad5479cdfefbed0b39d8a777b198a89ca55c0d66f5f42c67129a4f35a016f0a228aa7b +EBUILD telegram-desktop-2.7.4.ebuild 4266 BLAKE2B b7102112ec4afb170ff44ec54b34e0795d361e07dec623e7e3775ef4d993b8e0562124f5ec9dd74453aff20758f0ce7ef56c6dbfb5fd7cdcaba96191314f734d SHA512 d213159ee7e55e19d59aa693e841cf71df6a637e50d4eaea35a67af00a4f091d378c69a9e587925b3b59f538223f27b51a10affcec93c61635e84c24eb74475b MISC metadata.xml 587 BLAKE2B 1f49c91d650d26ba9fd95e9cbcb793ed527d58bf0ccc81ebddb624d54c4af38cc7aff3cf799814932a69b2a6f36dad7fe1c5ce4eb82e562e46dcebca9b751308 SHA512 5e74bb555b2b1a513bd8c7450a3db2f46daa426eecc0d3cebf11d46e58124ef117697bc422f7fccd8757f2e6e8ce6bd8ff0e317b58740dd302c1ea2f2476ff3f diff --git a/net-im/telegram-desktop/files/tdesktop-2.7.4-webview-fix-gcc11.patch b/net-im/telegram-desktop/files/tdesktop-2.7.4-webview-fix-gcc11.patch new file mode 100644 index 000000000000..0188eaf76f8a --- /dev/null +++ b/net-im/telegram-desktop/files/tdesktop-2.7.4-webview-fix-gcc11.patch @@ -0,0 +1,25 @@ +Index: tdesktop-2.7.4-full/Telegram/lib_webview/webview/webview_embed.cpp +=================================================================== +--- tdesktop-2.7.4-full.orig/Telegram/lib_webview/webview/webview_embed.cpp ++++ tdesktop-2.7.4-full/Telegram/lib_webview/webview/webview_embed.cpp +@@ -14,7 +14,6 @@ + + #include <QtWidgets/QWidget> + #include <QtGui/QWindow> +-#include <QtCore/QJsonDocument> + + namespace Webview { + namespace { +Index: tdesktop-2.7.4-full/Telegram/lib_webview/webview/webview_embed.h +=================================================================== +--- tdesktop-2.7.4-full.orig/Telegram/lib_webview/webview/webview_embed.h ++++ tdesktop-2.7.4-full/Telegram/lib_webview/webview/webview_embed.h +@@ -9,6 +9,8 @@ + #include "base/unique_qptr.h" + #include "base/basic_types.h" + ++#include <QtCore/QJsonDocument> ++ + class QString; + class QWidget; + class QWindow; diff --git a/net-im/telegram-desktop/telegram-desktop-2.7.4.ebuild b/net-im/telegram-desktop/telegram-desktop-2.7.4.ebuild index 609781f96cb7..8081b9da583e 100644 --- a/net-im/telegram-desktop/telegram-desktop-2.7.4.ebuild +++ b/net-im/telegram-desktop/telegram-desktop-2.7.4.ebuild @@ -71,6 +71,8 @@ PATCHES=( "${FILESDIR}/tdesktop-2.7.3-disable-webkit-separately.patch" # https://github.com/desktop-app/lib_webview/commit/0b4100d7cecc4e748c51f3f51ebfd1392ec3978a "${FILESDIR}/tdesktop-2.7.3-webview-include-gdkx.patch" + # https://github.com/desktop-app/lib_webview/pull/3 + "${FILESDIR}/tdesktop-2.7.4-webview-fix-gcc11.patch" ) pkg_pretend() { |