Commit c4f93e39 authored by Bart Ribbers's avatar Bart Ribbers
Browse files

testing/osmscout-server: upgrade to 2.0.1

parent 82a34770
From 46231ff29f2c21d7c0f9d9b594322d27dc11d191 Mon Sep 17 00:00:00 2001
From: Tom Hall <tahall256@protonmail.ch>
Date: Sat, 2 Jan 2021 19:19:44 +0000
Subject: [PATCH] Update MHD_* function signatures for libmicrohttpd >= 0.9.71
---
src/requestmapper.cpp | 2 +-
src/uhttp/microhttpserver.cpp | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/requestmapper.cpp b/src/requestmapper.cpp
index de0afc24..9aa28216 100644
--- a/src/requestmapper.cpp
+++ b/src/requestmapper.cpp
@@ -254,7 +254,7 @@ static bool has(const QString &key, QJsonObject &options, MHD_Connection *q)
// return MHD_YES;
//}
-static int query_json_iterator(void *cls, enum MHD_ValueKind /*kind*/, const char *key, const char *value)
+static MHD_Result query_json_iterator(void *cls, enum MHD_ValueKind /*kind*/, const char *key, const char *value)
{
QString *s = (QString*)cls;
if ( !s->isEmpty() ) (*s) += ",";
diff --git a/src/uhttp/microhttpserver.cpp b/src/uhttp/microhttpserver.cpp
index 6faaf9d0..a7f0ae9f 100644
--- a/src/uhttp/microhttpserver.cpp
+++ b/src/uhttp/microhttpserver.cpp
@@ -87,7 +87,7 @@ static ssize_t content_reader_callback (void *cls, uint64_t pos, char *buf, size
return tosend;
}
-static int answer_to_connection (void *cls, struct MHD_Connection *connection,
+static MHD_Result answer_to_connection (void *cls, struct MHD_Connection *connection,
const char *url, const char *method,
const char */*version*/, const char *upload_data,
size_t *upload_data_size, void **con_cls)
@@ -139,7 +139,7 @@ static int answer_to_connection (void *cls, struct MHD_Connection *connection,
struct MHD_Response *response;
- int ret;
+ MHD_Result ret;
response =
MHD_create_response_from_callback(-1, 1024*1024,
# Contributor: Bart Ribbers <bribbers@disroot.org>
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=osmscout-server
pkgver=2.0.0
pkgver=2.0.1
pkgrel=0
_pkgver_geocoder_nlp=1.0.0
pkgdesc="Maps server providing tiles, geocoder, and router"
url="https://rinigus.github.io/osmscout-server"
# armhf blocked by kirigami2
......@@ -25,18 +24,10 @@ makedepends="
sqlite3pp
valhalla-dev
"
source="https://github.com/rinigus/osmscout-server/archive/$pkgver/osmscout-server-$pkgver.tar.gz
https://github.com/rinigus/geocoder-nlp/archive/$_pkgver_geocoder_nlp/geocoder-nlp-$_pkgver_geocoder_nlp.tar.gz
source="https://github.com/rinigus/osmscout-server/releases/download/$pkgver/osmscout-server-$pkgver.tar.gz
osmscout-server.desktop
"
prepare() {
default_prepare
rmdir server/src/geocoder-nlp
mv "$srcdir/geocoder-nlp-$_pkgver_geocoder_nlp" server/src/geocoder-nlp
}
build() {
qmake-qt5 \
PREFIX=/usr \
......@@ -58,6 +49,5 @@ package() {
install -Dm644 "$srcdir"/osmscout-server.desktop -t "$pkgdir"/etc/xdg/autostart/
}
sha512sums="7324cb31eed2c3cf01a7d11eaf995067b15ba84cf243ef70e1f6a028f2345692bd9823b94aa796d6409400bfd31f7b396e927094cb04e3991edae925a98d4c89 osmscout-server-2.0.0.tar.gz
c5edb82f2ef7d5917959fc99abfe53647cf01c972a4cac8da4549ab12cc5eca18b41ff1ea3e5dec3b16e6c8adc78bd118dd9e87b9a0c657a1876a38e48a3ed44 geocoder-nlp-1.0.0.tar.gz
sha512sums="b61910d30f41949c08cf98b1ceae73fe7fc6bf833c0a75d8753a46a21d7f1c8354ea08e78d8efa14dc144e51268a11489cd376ec198b5721c810fefdcfd965e1 osmscout-server-2.0.1.tar.gz
cc0fe88824d23335a0cf80d89f1ace0405798e086b21f0cbf2cb24cb6436f38f843bdf12df07ee0bc32ba137f5dd7b6c04a377cf40cbdd872176302b8dce10f0 osmscout-server.desktop"
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment