--- a/src/build-perl.mk	Thu Aug 30 08:09:12 2018 -0400
+++ b/src/build-perl.mk	Thu Aug 30 08:10:29 2018 -0400
@@ -11,6 +11,7 @@
 $(PKG)_DEPS     := 
 
 ifeq ($(BUILD_SHARED),yes)
+  ## Without this, building libproxy fails.
   $(PKG)_CONFIGURE_ARGS := -Duseshrplib
 endif
 
@@ -27,5 +28,7 @@
       && $(CONFIGURE_POST_HOOK)
 
     $(MAKE) -C '$(1)' -j '$(JOBS)' install DESTDIR='$(3)'
+    $(INSTALL) -m755 '$(1)/libperl.so' '$(3)/$(HOST_LIBDIR)'
+
   endef
 endif

--- a/src/ncurses.mk	Thu Aug 30 08:09:12 2018 -0400
+++ b/src/ncurses.mk	Thu Aug 30 08:10:29 2018 -0400
@@ -30,14 +30,13 @@
 endif
 endif
 
-define $(PKG)_BUILD
-    cd '$(1)' && ./configure \
+$(PKG)_COMMON_CONFIG_OPTS := \
         $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \
         $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         --prefix=$(HOST_PREFIX) \
         --disable-home-terminfo \
+        --with-termlib \
         --enable-sp-funcs \
-        --enable-term-driver \
         --enable-interop \
         --without-debug \
         --without-ada \
@@ -46,13 +45,37 @@
         CONFIG_SITE=/dev/null \
         $($(PKG)_CONFIG_OPTS)
 
+define $(PKG)_BUILD
+
+    ## Normal char version:
+
+    mkdir '$(1)/.build' && cd '$(1)/.build' && ../configure \
+        $($(PKG)_COMMON_CONFIG_OPTS)
+
     # MSVC generates invalid code in panel library when using -O2
     # command-line flag. Bug is reported. Disable optimization for
     # the time being.
     if test x$(MXE_SYSTEM) = xmsvc; then \
-        find '$(1)' -name Makefile \
+        find '$(1)/.build' -name Makefile \
             -exec $(SED) -i 's,-\<O2\>,,' {} \; ; \
     fi
 
-    $(MAKE) -C '$(1)' -j '$(JOBS)' install DESTDIR='$(3)'
+    $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install DESTDIR='$(3)'
+
+    ## Wide char version:
+
+    mkdir '$(1)/.build-widec' && cd '$(1)/.build-widec' && ../configure \
+        --enable-widec \
+        $($(PKG)_COMMON_CONFIG_OPTS)
+
+    # MSVC generates invalid code in panel library when using -O2
+    # command-line flag. Bug is reported. Disable optimization for
+    # the time being.
+    if test x$(MXE_SYSTEM) = xmsvc; then \
+        find '$(1)/.build-widec' -name Makefile \
+            -exec $(SED) -i 's,-\<O2\>,,' {} \; ; \
+    fi
+
+    $(MAKE) -C '$(1)/.build-widec' -j '$(JOBS)' install DESTDIR='$(3)'
+
 endef

--- a/src/of-dicom.mk	Thu Aug 30 08:09:12 2018 -0400
+++ b/src/of-dicom.mk	Thu Aug 30 08:10:29 2018 -0400
@@ -9,7 +9,7 @@
 $(PKG)_SUBDIR   := dicom-$($(PKG)_VERSION)
 $(PKG)_FILE     := dicom-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/octave/$($(PKG)_FILE)?download
-$(PKG)_DEPS     := gdcm cmake
+$(PKG)_DEPS     := gdcm
 
 ifeq ($(ENABLE_BINARY_PACKAGES),yes)
     $(PKG)_DEPS += $(OCTAVE_TARGET)

--- a/src/qtbase.mk	Thu Aug 30 08:09:12 2018 -0400
+++ b/src/qtbase.mk	Thu Aug 30 08:10:29 2018 -0400
@@ -57,7 +57,7 @@
 else
   $(PKG)_CONFIGURE_PREFIX_OPTION := -prefix '$(HOST_PREFIX)'
   $(PKG)_CONFIGURE_INCLUDE_OPTION += -I '$(HOST_INCDIR)/freetype2'
-  $(PKG)_CONFIGURE_OPTS += -qpa xcb -xcb
+  $(PKG)_CONFIGURE_OPTS += -qpa xcb -qt-xcb
 endif
 
 ## These are needed whether cross compiling or not.