Merge branch 'su-v/inkscape-fix-MSYS2-libsoup-req'

4 files changed, 6 insertions, 3 deletions

diff --git a/CMakeScripts/InstallMSYS2.cmake b/CMakeScripts/InstallMSYS2.cmake
index 8ada439c1..5ef2db3b8 100644
--- a/CMakeScripts/InstallMSYS2.cmake
+++ b/CMakeScripts/InstallMSYS2.cmake
@@ -92,6 +92,8 @@ if(WIN32)
     ${MINGW_BIN}/librevenge-stream-0.0.dll

     ${MINGW_BIN}/librtmp-1.dll

     ${MINGW_BIN}/libsigc-2.0-0.dll

+    ${MINGW_BIN}/libsoup-2.4-1.dll

+    ${MINGW_BIN}/libsqlite3-0.dll

     ${MINGW_BIN}/libssh2-1.dll

     ${MINGW_BIN}/libstdc++-6.dll

     ${MINGW_BIN}/libtasn1-6.dll

diff --git a/msys2installdeps.sh b/msys2installdeps.sh
index e05411ea3..e400a9e7b 100755
--- a/msys2installdeps.sh
+++ b/msys2installdeps.sh
@@ -46,7 +46,8 @@ $ARCH-gtk2 \
 $ARCH-gtkmm \
 $ARCH-gtk3 \
 $ARCH-gtkmm3 \
-$ARCH-gdl
+$ARCH-gdl \
+$ARCH-libsoup
 
 # install Inkscape dependecies (optional)
 eval pacman -S --needed --noconfirm \
diff --git a/src/io/http.cpp b/src/io/http.cpp
index dfaa59a31..883f6f56c 100644
--- a/src/io/http.cpp
+++ b/src/io/http.cpp
@@ -87,7 +87,7 @@ void _get_file_callback(SoupSession *session, SoupMessage *msg, gpointer user_da
  *        your func will be called in a blocking way BEFORE this function returns.
  *
  */
-Glib::ustring get_file(Glib::ustring uri, uint timeout, callback func) {
+Glib::ustring get_file(Glib::ustring uri, unsigned int timeout, callback func) {
 
     SoupURI *s_uri = soup_uri_new(uri.c_str());
     const char *host = soup_uri_get_host(s_uri);
diff --git a/src/io/http.h b/src/io/http.h
index dd58fe9a3..8327ca79d 100644
--- a/src/io/http.h
+++ b/src/io/http.h
@@ -27,7 +27,7 @@ namespace Inkscape {
 namespace IO {
 namespace HTTP {
 
-    Glib::ustring get_file(Glib::ustring uri, uint timeout=0, std::function<void(Glib::ustring)> func=NULL);
+    Glib::ustring get_file(Glib::ustring uri, unsigned int timeout=0, std::function<void(Glib::ustring)> func=NULL);
 
 }
 }