Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

netwhere: fix compilation with newer libmicrohttpd

Browse source 
API change.

Cleaned up Makefile.

Fixed license information.

Remove pointless CMAKE_INSTALL. This is not needed in InstallDev.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev 2020-07-24 14:37:04 -07:00
parent 11c2d4d21c
commit 92b443fa3d
No known key found for this signature in database
GPG key ID: 36D31CFA845F0E3B
2 changed files with 32 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
utils/netwhere/Makefile
View file

@ -2,18 +2,17 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=netwhere PKG_NAME:=netwhere
PKG_VERSION:=0.9 PKG_VERSION:=0.9
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_LICENSE:=MIT
PKG_SOURCE:=netwhere-$(PKG_VERSION).tar.gz PKG_SOURCE:=netwhere-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://github.com/benhsmith/netwhere/archive/$(PKG_VERSION)/ PKG_SOURCE_URL:=https://github.com/benhsmith/netwhere/archive/$(PKG_VERSION)/
PKG_HASH:=94a672bdcd9d4455b85429dddd81ffc778e0b26fe87af19ad75c27858ec9dbe2 PKG_HASH:=94a672bdcd9d4455b85429dddd81ffc778e0b26fe87af19ad75c27858ec9dbe2
PKG_BUILD_DEPENDS:=boost
PKG_MAINTAINER:=Ben Smith <le.ben.smith@gmail.com> PKG_MAINTAINER:=Ben Smith <le.ben.smith@gmail.com>
PKG_LICENSE:=MIT
PKG_LICENSE_FILES:=LICENSE
CMAKE_INSTALL:=1 PKG_BUILD_DEPENDS:=boost
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/cmake.mk include $(INCLUDE_DIR)/cmake.mk
@ -22,7 +21,7 @@ define Package/netwhere
SECTION:=utils SECTION:=utils
CATEGORY:=Utilities CATEGORY:=Utilities
TITLE:=Netwhere TITLE:=Netwhere
MAINTAINER:=Ben Smith URL:=https://github.com/benhsmith/netwhere
DEPENDS:=+libtins +libmicrohttpd DEPENDS:=+libtins +libmicrohttpd
endef endef

27
utils/netwhere/patches/010-libmicrohttpd.patch Normal file
View file

@ -0,0 +1,27 @@
--- a/webservice.hpp
+++ b/webservice.hpp
@@ -38,13 +38,13 @@ class WebService {
MHD_Daemon* daemon;
Functor functor;
- static int on_request(void * cls, struct MHD_Connection * connection, const char * url, const char * method, const char * version,
+ static enum MHD_Result on_request(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 ** ptr);
};
template <typename Functor>
-int WebService<Functor>::on_request(void * cls,
+enum MHD_Result WebService<Functor>::on_request(void * cls,
struct MHD_Connection * connection,
const char * url,
const char * method,
@@ -53,7 +53,7 @@ int WebService<Functor>::on_request(void * cls,
size_t * upload_data_size,
void ** ptr) {
static int dummy;
- int ret;
+ enum MHD_Result ret;
if (std::string("GET") != method)
return MHD_NO; /* unexpected method */