This commit is contained in:
Kovid Goyal 2024-08-04 10:14:38 +05:30
parent 0a6e387483
commit e18430c2fe
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
6 changed files with 34 additions and 29 deletions

View File

@ -508,51 +508,51 @@
{
"name": "qt-base",
"version": "6.5.3",
"version": "6.7.2",
"hashes": {
"unix": "md5:9b3b8e45d0923bc6928833d185b29e40"
"unix": "sha256:c5f22a5e10fb162895ded7de0963328e7307611c688487b5d152c9ee64767599"
}
},
{
"name": "qt-svg",
"hashes": {
"unix": "md5:6e29e50c706d1ef870d232f260cf05c2"
"unix": "sha256:fb0d1286a35be3583fee34aeb5843c94719e07193bdf1d4d8b0dc14009caef01"
}
},
{
"name": "qt-shadertools",
"hashes": {
"unix": "md5:e751ba53872f74546e01277b51e0218d"
"unix": "sha256:edfa34c0ac8c00fcaa949df1d8e7a77d89dadd6386e683ce6c3e3b117e2f7cc1"
}
},
{
"name": "qt-declarative",
"hashes": {
"unix": "md5:c6f3840960803d8c1654ba48f9742814"
"unix": "sha256:4c29cba1af8c42d425d8eb6e01bad24cb80f4b983d71eef566a0542dfdb9b999"
}
},
{
"name": "qt-imageformats",
"hashes": {
"unix": "md5:47838764e104e7cb2390038989ba91ea"
"unix": "sha256:e1a1d8785fae67d16ad0a443b01d5f32663a6b68d275f1806ebab257485ce5d6"
}
},
{
"name": "qt-webchannel",
"hashes": {
"unix": "md5:d92af561c15f5af61656eabcdbaf1d27"
"unix": "sha256:ac5d96607b10e7de546eaf93bb9f65c0fd631ef9b91ef8a794e26fd57db4501c"
}
},
{
"name": "qt-positioning",
"hashes": {
"unix": "md5:c1eb22c2cdd18a8228e433e4e5d1577a"
"unix": "sha256:020009f0aa8f6b1042963a45b6e19f2784cc937949cdb673f3b876153e087b1c"
}
},
@ -560,21 +560,21 @@
"name": "qt-wayland",
"os": "linux",
"hashes": {
"unix": "md5:b73feecf0fef221ed748ea7c984f45be"
"unix": "sha256:a2a057e1dd644bd44abb9990fecc194b2e25c2e0f39e81aa9fee4c1e5e2a8a5b"
}
},
{
"name": "qt-sensors",
"hashes": {
"unix": "md5:c4a48b39a3aaba6534f7fa5fbc363b0f"
"unix": "sha256:ead1dec787c56ed4dc02ed810af54ff1e1f6875cb5cc2506c74eeb9554e6bb59"
}
},
{
"name": "qt-webengine",
"hashes": {
"unix": "md5:b418c1b4e333a06609dac451c4484e23"
"unix": "sha256:c7755875594d8be382b07bf3634d44fd77012805794d8b588891709a6405ffd1"
}
},
@ -1039,8 +1039,8 @@
"name": "sip",
"comment": "build time dependency",
"unix": {
"filename": "sip-6.7.11.tar.gz",
"hash": "sha256:f0dc3287a0b172e5664931c87847750d47e4fdcda4fe362b514af8edd655b469",
"filename": "sip-6.8.6.tar.gz",
"hash": "sha256:7fc959e48e6ec5d5af8bd026f69f5e24d08b3cb8abb342176f5ab8030cc07d7a",
"urls": ["pypi"]
}
},
@ -1049,8 +1049,8 @@
"name": "pyqt-builder",
"comment": "build time dependency",
"unix": {
"filename": "PyQt_builder-1.15.2-py3-none-any.whl",
"hash": "sha256:9e5acbe6ddffc2b8e7a619c5053d1f7da53f5db0faff8ce2b573f0e6604ad981",
"filename": "PyQt_builder-1.16.4-py3-none-any.whl",
"hash": "sha256:fe6e75bcf8426feee3eb73ae7f6aaa4e38edc2f8d670d8cf28638b21d9924eb7",
"urls": ["pypi"]
}
},
@ -1059,8 +1059,8 @@
"name": "pyqt-sip",
"comment": "runtime sip module for PyQt",
"unix": {
"filename": "PyQt6_sip-13.5.2.tar.gz",
"hash": "sha256:ebf6264b6feda01ba37d3b60a4bb87493bdb87be70f7b2a5384a7acd4902d88d",
"filename": "PyQt6_sip-13.8.0.tar.gz",
"hash": "sha256:2f74cf3d6d9cab5152bd9f49d570b2dfb87553ebb5c4919abfde27f5b9fd69d4",
"urls": ["pypi"]
}
},
@ -1068,8 +1068,8 @@
{
"name": "pyqt",
"unix": {
"filename": "PyQt6-6.5.2.tar.gz",
"hash": "sha256:1487ee7350f9ffb66d60ab4176519252c2b371762cbe8f8340fd951f63801280",
"filename": "PyQt6-6.7.1.tar.gz",
"hash": "sha256:3672a82ccd3a62e99ab200a13903421e2928e399fda25ced98d140313ad59cb9",
"urls": ["pypi"]
}
},
@ -1077,8 +1077,8 @@
{
"name": "pyqt-webengine",
"unix": {
"filename": "PyQt6_WebEngine-6.5.0.tar.gz",
"hash": "sha256:8ba9db56c4c181a2a2fab1673ca35e5b63dc69113f085027ddc43c710b6d6ee9",
"filename": "PyQt6_WebEngine-6.7.0.tar.gz",
"hash": "sha256:68edc7adb6d9e275f5de956881e79cca0d71fad439abeaa10d823bff5ac55001",
"urls": ["pypi"]
}
},

View File

@ -45,6 +45,8 @@ get_install_locations(void) {
get_app_dirw();
_snwprintf_s(qt_prefix_dir, MAX_PATH-1, _TRUNCATE, L"%ls\\ossl-modules", interpreter_data.executables_path);
_wputenv_s(L"OPENSSL_MODULES", qt_prefix_dir);
// Have to disable sandbox or Qt WebEngine Render Process crashes as of Qt 6.6
_wputenv_s(L"QTWEBENGINE_DISABLE_SANDBOX", "1");
_snwprintf_s(qt_prefix_dir, MAX_PATH-1, _TRUNCATE, L"%ls\\app", interpreter_data.app_dir);
_wputenv_s(L"CALIBRE_QT_PREFIX", qt_prefix_dir);
}

View File

@ -86,7 +86,7 @@ class Liberation(BasicNewsRecipe):
oldest_article = 1.15
remove_empty_feeds = True
articles_are_obfuscated = True
timefmt = '[ %s]' % datetime.now().strftime(m_fr[datetime.now().month] '%d, %Y')
timefmt = '[ %s]' % datetime.now().strftime(m_fr[datetime.now().month] + ' %d, %Y')
ignore_duplicate_articles = {'title', 'url'}
key = 'ZWplZVBlaW5nZWl0YWVnaG8zd2VlbmdlZXlvaHB1'
masthead_url = 'https://journal.liberation.fr/img/logo.svg'

View File

@ -3,6 +3,7 @@
from calibre.web.feeds.news import BasicNewsRecipe
class NovayaGazta(BasicNewsRecipe):
title = u'Novaya Gazeta'
__author__ = 'muwa (with fixes by bugmen00t)'

View File

@ -1,14 +1,16 @@
#!/usr/bin/env python
# vim:fileencoding=utf-8
from __future__ import unicode_literals, division, absolute_import, print_function
from __future__ import absolute_import, division, print_function, unicode_literals
from calibre.web.feeds.news import BasicNewsRecipe
class PaperPaper(BasicNewsRecipe):
title = '\u0411\u0443\u043C\u0430\u0433\u0430'
__author__ = 'bugmen00t'
description = '\u0418\u0437\u0434\u0430\u043D\u0438\u0435 \u043E \u043F\u0440\u0435\u043A\u0440\u0430\u0441\u043D\u043E\u043C \u0433\u043E\u0440\u043E\u0434\u0435 \u0421\u0430\u043D\u043A\u0442-\u041F\u0435\u0442\u0435\u0440\u0431\u0443\u0440\u0433\u0435, \u0432 \u043A\u043E\u0442\u043E\u0440\u043E\u043C, \u043A\u043E\u043D\u0435\u0447\u043D\u043E, \u0434\u0430\u043B\u0435\u043A\u043E \u043D\u0435 \u0432\u0441\u0451 \u0438\u0434\u0435\u0430\u043B\u044C\u043D\u043E, \u2014 \u0438 \u043F\u043E\u044D\u0442\u043E\u043C\u0443 \u043C\u044B \u0437\u0430\u043D\u0438\u043C\u0430\u0435\u043C\u0441\u044F \u0436\u0443\u0440\u043D\u0430\u043B\u0438\u0441\u0442\u0438\u043A\u043E\u0439, \u0447\u0442\u043E\u0431\u044B \u043F\u0440\u0438\u0432\u043B\u0435\u043A\u0430\u0442\u044C \u0432\u043D\u0438\u043C\u0430\u043D\u0438\u0435 \u043A \u0432\u0430\u0436\u043D\u044B\u043C \u0434\u043B\u044F \u0432\u0441\u0435\u0445 \u043F\u0440\u043E\u0431\u043B\u0435\u043C\u0430\u043C \u0438 \u0432\u043B\u0438\u044F\u0442\u044C \u043D\u0430 \u0438\u0445 \u0440\u0435\u0448\u0435\u043D\u0438\u0435.'
publisher = '\u041A\u0438\u0440\u0438\u043B\u043B \u0410\u0440\u0442\u0451\u043C\u0435\u043D\u043A\u043E, \u0422\u0430\u0442\u044C\u044F\u043D\u0430 \u0418\u0432\u0430\u043D\u043E\u0432\u0430'
description = '\u0418\u0437\u0434\u0430\u043D\u0438\u0435 \u043E \u043F\u0440\u0435\u043A\u0440\u0430\u0441\u043D\u043E\u043C \u0433\u043E\u0440\u043E\u0434\u0435 \u0421\u0430\u043D\u043A\u0442-\u041F\u0435\u0442\u0435\u0440\u0431\u0443\u0440\u0433\u0435, \u0432 \u043A\u043E\u0442\u043E\u0440\u043E\u043C, \u043A\u043E\u043D\u0435\u0447\u043D\u043E, \u0434\u0430\u043B\u0435\u043A\u043E \u043D\u0435 \u0432\u0441\u0451 \u0438\u0434\u0435\u0430\u043B\u044C\u043D\u043E, \u2014 \u0438 \u043F\u043E\u044D\u0442\u043E\u043C\u0443 \u043C\u044B \u0437\u0430\u043D\u0438\u043C\u0430\u0435\u043C\u0441\u044F \u0436\u0443\u0440\u043D\u0430\u043B\u0438\u0441\u0442\u0438\u043A\u043E\u0439, \u0447\u0442\u043E\u0431\u044B \u043F\u0440\u0438\u0432\u043B\u0435\u043A\u0430\u0442\u044C \u0432\u043D\u0438\u043C\u0430\u043D\u0438\u0435 \u043A \u0432\u0430\u0436\u043D\u044B\u043C \u0434\u043B\u044F \u0432\u0441\u0435\u0445 \u043F\u0440\u043E\u0431\u043B\u0435\u043C\u0430\u043C \u0438 \u0432\u043B\u0438\u044F\u0442\u044C \u043D\u0430 \u0438\u0445 \u0440\u0435\u0448\u0435\u043D\u0438\u0435.' # noqa
publisher = '\u041A\u0438\u0440\u0438\u043B\u043B \u0410\u0440\u0442\u0451\u043C\u0435\u043D\u043A\u043E, \u0422\u0430\u0442\u044C\u044F\u043D\u0430 \u0418\u0432\u0430\u043D\u043E\u0432\u0430' # noqa
category = 'newspaper'
cover_url = u'https://upload.wikimedia.org/wikipedia/commons/1/1f/Paperpaper_logo.jpg'
language = 'ru'
@ -19,13 +21,13 @@ class PaperPaper(BasicNewsRecipe):
max_articles_per_feed = 50
remove_tags_before = dict(name='article')
remove_tags_after = dict(name='article')
remove_tags = [
dict(name='div', attrs={'class': 'bottom-block '}),
dict(name='div', attrs={'class': 'bottom-block news'})
]
]
feeds = [
('\u0412\u0441\u0435 \u043C\u0430\u0442\u0435\u0440\u0438\u0430\u043B\u044B', 'https://paperpaper.ru/feed/?service'),
@ -41,4 +43,4 @@ class PaperPaper(BasicNewsRecipe):
('\u0412\u043E\u0435\u043D\u043D\u044B\u0435 \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u044F \u0432 \u0423\u043A\u0440\u0430\u0438\u043D\u0435', 'https://paperpaper.ru/tag/obostrenie-vokrug-ukrainy-2022/feed/'),
('\u0423\u043A\u0440\u0430\u0438\u043D\u0430', 'https://paperpaper.ru/tag/ukraine/feed/'),
('\u041D\u0430\u0443\u043A\u0430', 'https://paperpaper.ru/tag/science/feed/'),
]
]

View File

@ -1475,7 +1475,7 @@ def sanitize_env_vars():
'LD_LIBRARY_PATH':'/lib', 'OPENSSL_MODULES': '/lib/ossl-modules',
}
elif iswindows:
env_vars = {'OPENSSL_MODULES': None}
env_vars = {'OPENSSL_MODULES': None, 'QTWEBENGINE_DISABLE_SANDBOX': None}
elif ismacos:
env_vars = {k:None for k in (
'FONTCONFIG_FILE FONTCONFIG_PATH SSL_CERT_FILE OPENSSL_ENGINES OPENSSL_MODULES').split()}