From a2d815db8465e05e46eb7008b46ddfcb7aee6481 Mon Sep 17 00:00:00 2001 From: Andrew Belt Date: Tue, 19 Dec 2017 03:51:55 -0500 Subject: [PATCH 1/3] Leave Add Module popup metadata window open after mouse leaves module section --- src/app/AddModuleWindow.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/app/AddModuleWindow.cpp b/src/app/AddModuleWindow.cpp index 48f2d91d..ac99389e 100644 --- a/src/app/AddModuleWindow.cpp +++ b/src/app/AddModuleWindow.cpp @@ -70,7 +70,7 @@ struct MetadataMenu : ListMenu { // Plugin metadata if (!model->plugin->website.empty()) { - addChild(construct(&MenuEntry::text, "Website", &UrlItem::url, model->plugin->path)); + addChild(construct(&MenuEntry::text, "Website", &UrlItem::url, model->plugin->website)); } if (!model->plugin->manual.empty()) { addChild(construct(&MenuEntry::text, "Manual", &UrlItem::url, model->plugin->manual)); @@ -120,10 +120,6 @@ struct ModelItem : MenuItem { sModel = model; MenuItem::onMouseEnter(e); } - void onMouseLeave(EventMouseLeave &e) override { - sModel = NULL; - MenuItem::onMouseLeave(e); - } }; From d558f1d316711f69aa6c53c43fccd885328fee95 Mon Sep 17 00:00:00 2001 From: Andrew Belt Date: Tue, 19 Dec 2017 04:55:00 -0500 Subject: [PATCH 2/3] Fix Windows build --- dep/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dep/Makefile b/dep/Makefile index 7c3f884e..485b13e6 100755 --- a/dep/Makefile +++ b/dep/Makefile @@ -53,7 +53,8 @@ ifeq ($(ARCH),win) libcurl = bin/libcurl-4.dll libzip = bin/libzip-5.dll rtmidi = bin/librtmidi-4.dll - rtaudio = bin/librtaudio-6.dll + rtaudio = bin/librtaudio.dll + openssl = bin/libssl-1_1-x64.dll endif # Library configuration From e2239bcc6dc6625c76d91aff036b1ffca4428922 Mon Sep 17 00:00:00 2001 From: Andrew Belt Date: Tue, 19 Dec 2017 05:38:53 -0500 Subject: [PATCH 3/3] Disable SSL cert verification, add openssl dlls to Windows build --- Makefile | 2 ++ dep/Makefile | 3 ++- src/util/request.cpp | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index ee75ac3c..b4c75ff5 100644 --- a/Makefile +++ b/Makefile @@ -145,6 +145,8 @@ ifeq ($(ARCH), win) cp dep/bin/libsamplerate-0.dll dist/Rack/ cp dep/bin/libzip-5.dll dist/Rack/ cp dep/bin/librtaudio.dll dist/Rack/ + cp dep/bin/libcrypto-1_1-x64.dll dist/Rack/ + cp dep/bin/libssl-1_1-x64.dll dist/Rack/ mkdir -p dist/Rack/plugins cp -R plugins/Fundamental/dist/Fundamental dist/Rack/plugins/ # Make ZIP diff --git a/dep/Makefile b/dep/Makefile index 485b13e6..de3b1915 100755 --- a/dep/Makefile +++ b/dep/Makefile @@ -126,7 +126,8 @@ $(libcurl): $(openssl) $(UNTAR) curl-7.56.0.tar.gz cd curl-7.56.0 && ./configure --prefix="$(LOCAL)" \ --disable-ftp --disable-file --disable-ldap --disable-ldaps --disable-rtsp --disable-proxy --disable-dict --disable-telnet --disable-tftp --disable-pop3 --disable-imap --disable-smb --disable-smtp --disable-gopher --disable-manual \ - --without-zlib --without-ca-bundle --without-ca-fallback --without-libpsl --without-libmetalink --without-libssh2 --without-librtmp --without-winidn --without-libidn2 --without-nghttp2 --with-ssl="$(LOCAL)" + --without-zlib --without-libpsl --without-libmetalink --without-libssh2 --without-librtmp --without-winidn --without-libidn2 --without-nghttp2 \ + --without-ca-bundle --with-ca-fallback --with-ssl="$(LOCAL)" $(MAKE) -C curl-7.56.0 $(MAKE) -C curl-7.56.0 install diff --git a/src/util/request.cpp b/src/util/request.cpp index 2c9ea524..72702c04 100644 --- a/src/util/request.cpp +++ b/src/util/request.cpp @@ -80,6 +80,7 @@ json_t *requestJson(RequestMethod method, std::string url, json_t *dataJ) { curl_easy_setopt(curl, CURLOPT_POSTFIELDS, reqStr); std::string resText; + curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, false); curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, writeStringCallback); curl_easy_setopt(curl, CURLOPT_WRITEDATA, &resText); @@ -132,6 +133,7 @@ bool requestDownload(std::string url, std::string filename, float *progress) { curl_easy_setopt(curl, CURLOPT_XFERINFOFUNCTION, xferInfoCallback); curl_easy_setopt(curl, CURLOPT_XFERINFODATA, progress); curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, true); + curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, false); info("Downloading %s", url.c_str()); CURLcode res = curl_easy_perform(curl);