From f105d8e930dae8aa5fcf7dea6511b454932ed8fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A7=8B=E9=9B=A8=E8=90=BD?= Date: Tue, 20 Aug 2024 18:44:21 +0800 Subject: [PATCH] updpatch: nominatim-ui 3.5.3-1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 秋雨落 --- nominatim-ui/longer-timeout.patch | 25 ------------------------- nominatim-ui/riscv64.patch | 14 +++++++++++--- 2 files changed, 11 insertions(+), 28 deletions(-) delete mode 100644 nominatim-ui/longer-timeout.patch diff --git a/nominatim-ui/longer-timeout.patch b/nominatim-ui/longer-timeout.patch deleted file mode 100644 index 474cebd1c..000000000 --- a/nominatim-ui/longer-timeout.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git .mocharc.json .mocharc.json -index 49e0f0e..8c1a379 100644 ---- .mocharc.json -+++ .mocharc.json -@@ -2,5 +2,5 @@ - { - "ignore": ["test/_bootstrap.js"], - "require": ["test/_bootstrap.js"], -- "timeout": "5s" -+ "timeout": "10s" - } -\ No newline at end of file -diff --git test/_bootstrap.js test/_bootstrap.js -index 746d15d..e608d2b 100644 ---- test/_bootstrap.js -+++ test/_bootstrap.js -@@ -62,7 +62,7 @@ Nominatim_Config.Reverse_Only = ${reverse_only}; - // 3. Create browser instance - global.browser = await puppeteer.launch({ - defaultViewport: { width: 1024, height: 768 }, -- timeout: 10000, -+ timeout: 20000, - // latency: 1000, - headless: 'new', - args: [ diff --git a/nominatim-ui/riscv64.patch b/nominatim-ui/riscv64.patch index 49d1cd866..fd0ab8808 100644 --- a/nominatim-ui/riscv64.patch +++ b/nominatim-ui/riscv64.patch @@ -1,15 +1,23 @@ --- PKGBUILD +++ PKGBUILD -@@ -14,9 +14,10 @@ backup=('etc/webapps/nominatim-ui/config.theme.js') +@@ -14,13 +14,18 @@ backup=('etc/webapps/nominatim-ui/config.theme.js') install=nominatim-ui.install source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/tags/v${pkgver}.tar.gz" 'nginx.conf' -) -+ 'longer-timeout.patch') ++ 'timeout1.patch::https://github.com/osm-search/nominatim-ui/commit/f48bd9485e7befbf3f4b055b5a6c67f3feb1b989.patch' ++ 'timeout2.patch::https://github.com/osm-search/nominatim-ui/commit/2e5823e5ced30b6e83259a73fa16a3b2b5451ea0.patch') sha256sums=('31f793bafda4a3259e9b1a4be0cb4dd1a70d856c2fd96db760cbbf64462f8cd6' - '045dda10d978acedba43b071271731b2b63a8ad2743cdd6eda7dab2fd98a52ae') + '045dda10d978acedba43b071271731b2b63a8ad2743cdd6eda7dab2fd98a52ae' -+ '914520cf86ec3c212b798a4be3b3619ed1ae12f6ae8746b617069709bb83ceee') ++ 'a26295d5c92ec5cae912702f5a388164cd9fa1370a61c6e474b683ee2f84ecf7' ++ 'cf46a712d62265a9d4ab974a6bf3cc786a330bf950e4fc4b83d88bc91f7ccf2e') prepare() { cd "${pkgname}-tags-v${pkgver}" + ++ patch -p1 -i ../timeout1.patch ++ patch -p1 -i ../timeout2.patch + yarn install + } +