Update win64 build files for devlibs64 update

(bzr r14673)

2 files changed, 148 insertions, 161 deletions

diff --git a/build-x64-gtk3.xml b/build-x64-gtk3.xml
index 542125e56..73e9ab898 100644
--- a/build-x64-gtk3.xml
+++ b/build-x64-gtk3.xml
@@ -35,6 +35,7 @@
     <description>
         Build file for the Inkscape SVG editor.  This file
         was written for GTK-3 on Win64.
+
         Note that the default target is 'dist-all'.  You can execute other
         targets instead, by "btool {target}",  like  "btool compile", if
         you want to save time, or "dist-inkscape" if you don't want inkview.
@@ -109,7 +110,7 @@
             char const *version_string = "${version}";
         }
     </makefile-->
-    <makefile file="${src}/inkscape-version.cpp">
+    <makefile file="${src}/inkscape-version.cpp" force="true">
         namespace Inkscape {
             char const *version_string = "${version} ${bzr.revision}";
         }
@@ -159,6 +160,7 @@
         #define HAVE_LIBLCMS2                 1
 
         #define WITH_GTKMM_3_0                1
+        #define WITH_GTKMM_3_10               1
         //#define WITH_GLIBMM_2_32              1
         #define HAVE_GLIBMM_THREADS_H         1
         #define WITH_EXT_GDL                  1
@@ -185,9 +187,6 @@
         #define HAVE_POPPLER                  1
         #define HAVE_POPPLER_GLIB             1
         #define HAVE_POPPLER_CAIRO            1
-        #define POPPLER_NEW_ERRORAPI          1 <!-- poppler changed the error api >= 0.20.0 -->
-        #define POPPLER_NEW_GFXPATCH          1
-        #define POPPLER_NEW_GFXFONT           1 <!-- poppler changed the api for 0.8.3 -->
 
         /* do we want bitmap manipulation? */
         #define WITH_IMAGE_MAGICK             1
@@ -196,17 +195,17 @@
         #define HAVE_EXIF                     1
         #define HAVE_JPEG                     1
 
-        /* Allow reading WordPerfect? */
+        /* WordPerfect import filter */
         #define WITH_LIBWPG                   1
-
-        /* Default  to libwpg 0.2.x */
-        #define WITH_LIBWPG02                 1
+        #define WITH_LIBWPG03                 1
 
         /* Visio import filter */
         #define WITH_LIBVISIO                 1
+        #define WITH_LIBVISIO01               1
 
         /* Corel Draw import filter */
         #define WITH_LIBCDR                   1
+        #define WITH_LIBCDR01                 1
 
         /* Do we support SVG Fonts? */
         #define ENABLE_SVG_FONTS              1
@@ -222,6 +221,8 @@
 
         #define HAVE_ASPELL                   1
 
+        #define HAVE_POTRACE                  1
+
         #endif /* _CONFIG_H_ */
     </makefile>
   </target>
@@ -363,7 +364,7 @@
         <flags>
             -Wall -Wformat -Werror=format-security -Wextra -Wpointer-arith -Wcast-align -Wsign-compare -Wswitch
             -Werror=return-type
-            <!-- - ->  -Werror <!-- -->
+            <!-- -Werror -->
             <!-- A list of warnings that should not error *yet*, any help is welcome in fixing the code generating these warnings! -->
             <!-- libcroco is using guchar where it should use gchar, so we need: --> -Wno-error=pointer-sign
             -Wno-error=unused-parameter -Wno-error=unused-but-set-variable -Wno-error=strict-overflow -Wno-error=write-strings
@@ -376,9 +377,10 @@
             -fopenmp
         </flags>
         <cxxflags>
-            -std=gnu++11 -DCPP11  
+            -std=gnu++11 -DCPP11
             -Woverloaded-virtual
             <!-- -Wno-unused-local-typedefs -->
+            -Wno-deprecated-declarations <!-- silcence warnings about usage of auto_ptr -->
         </cxxflags>
         <defines>
             -DVERSION=\"${version}\"
@@ -386,6 +388,11 @@
             -D_INTL_REDIRECT_INLINE
             -DHAVE_SSL
             -DRELAYTOOL_SSL="static const int libssl_is_present=1; static int __attribute__((unused)) libssl_symbol_is_present(char *s){ return 1; }" <!-- inkboard -->
+            -DPOPPLER_NEW_GFXFONT <!-- poppler changed the api for 0.8.3 -->
+            -DPOPPLER_NEW_GFXPATCH <!-- GfxPatch no longer uses GfxColor in >= 0.15.1 -->
+            -DPOPPLER_NEW_ERRORAPI <!-- poppler changed the error api for 0.20.0 -->
+            -DPOPPLER_EVEN_NEWER_COLOR_SPACE_API <!-- poppler changed the colorspace api for 0.26.0 -->
+            -DPOPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API <!-- poppler changed the colorspace api for 0.29.0 -->
             <!-- GTK+3 migration -->
             -DGLIBMM_DISABLE_DEPRECATED
             -DG_DISABLE_DEPRECATED
@@ -404,16 +411,19 @@
             ${pcc.gdk-3.0}
             ${pcc.gdl-3.0}
             ${pcc.glibmm-2.4}
+
+
             ${pcc.pangomm-1.4}
             ${pcc.cairomm-1.0}
             <!-- OTHER -->
-			${pcc.Magick++}
-			${pcc.libxml-2.0}
+            ${pcc.Magick++}
+            ${pcc.libxml-2.0}
             ${pcc.freetype2}
             ${pcc.cairo}
             ${pcc.poppler}
             -I${devlibs}/include/gc
-            ${pcc.libwpg-0.2} ${pcc.libvisio-0.0} ${pcc.libcdr-0.0}
+            -I${devlibs}/include/potracelib
+            ${pcc.libwpg-0.3} ${pcc.libvisio-0.1} ${pcc.libcdr-0.1}
             -I${cxxtest}
             <!-- PERL -->
             <!-- -Wno-comment -I${devlibs}/perl/lib/CORE -->
@@ -492,8 +502,10 @@
            ${devlibs}/bin/libxslt-1.dll
            ${devlibs}/bin/libexslt-0.dll
            ${pcl.cairo} ${pcl.cairomm-1.0}
-           ${pcl.libwpg-0.2} ${pcl.libvisio-0.0} ${pcl.libcdr-0.0}
+           ${pcl.librevenge-stream-0.0} ${pcl.libwpg-0.3} ${pcl.libvisio-0.1} ${pcl.libcdr-0.1}
            ${pcl.glibmm-2.4}
+
+
            ${pcl.pangomm-1.4}
            ${pcl.cairomm-1.0}
            -liconv
@@ -502,9 +514,9 @@
            ${pcl.lcms2}
            ${pcl.gsl}
            -lpng -ljpeg -ltiff -lexif -lpopt -lz
-           -lgc
+           -lgc -lpotrace
            -lws2_32 -lintl -lgdi32 -lcomdlg32 -lm
-           -lgomp -lwinpthread-1
+           -lgomp -lwinpthread
            -laspell
            -lmscms  <!-- required for color profiles -->
        </libs>
@@ -581,8 +593,10 @@
            ${devlibs}/bin/libxslt-1.dll
            ${devlibs}/bin/libexslt-0.dll
            ${pcl.cairo} ${pcl.cairomm-1.0}
-           ${pcl.libwpg-0.2} ${pcl.libvisio-0.0} ${pcl.libcdr-0.0}
+           ${pcl.librevenge-stream-0.0} ${pcl.libwpg-0.3} ${pcl.libvisio-0.1} ${pcl.libcdr-0.1}
            ${pcl.glibmm-2.4}
+
+
            ${pcl.pangomm-1.4}
            ${pcl.cairomm-1.0}
            -liconv
@@ -591,9 +605,9 @@
            ${pcl.lcms2}
            ${pcl.gsl}
            -lpng -ljpeg -ltiff -lexif -lpopt -lz
-           -lgc
+           -lgc -lpotrace
            -lws2_32 -lintl -lgdi32 -lcomdlg32 -lm
-           -lgomp -lwinpthread-1
+           -lgomp -lwinpthread
            -laspell
            -lmscms  <!-- required for color profiles -->
        </libs>
@@ -638,8 +652,10 @@
            ${devlibs}/bin/libxslt-1.dll
            ${devlibs}/bin/libexslt-0.dll
            ${pcl.cairo} ${pcl.cairomm-1.0}
-           ${pcl.libwpg-0.2} ${pcl.libvisio-0.0} ${pcl.libcdr-0.0}
+           ${pcl.librevenge-stream-0.0} ${pcl.libwpg-0.3} ${pcl.libvisio-0.1} ${pcl.libcdr-0.1}
            ${pcl.glibmm-2.4}
+
+
            ${pcl.pangomm-1.4}
            ${pcl.cairomm-1.0}
            -liconv
@@ -648,9 +664,9 @@
            ${pcl.lcms2}
            ${pcl.gsl}
            -lpng -ljpeg -ltiff -lexif -lpopt -lz
-           -lgc
+           -lgc -lpotrace
            -lws2_32 -lintl -lgdi32 -lcomdlg32 -lm
-           -lgomp -lwinpthread-1
+           -lgomp -lwinpthread
            -laspell
            -lmscms  <!-- required for color profiles -->
        </libs>
@@ -687,7 +703,7 @@
 
     <copy todir="${dist}" file="${devlibs}/bin/libffi-6.dll"/>
     <copy todir="${dist}" file="${devlibs}/bin/libgc-1.dll"/>
-    <copy todir="${dist}" file="${devlibs}/bin/libgsl-0.dll"/>
+    <copy todir="${dist}" file="${devlibs}/bin/libgsl-19.dll"/>
     <copy todir="${dist}" file="${devlibs}/bin/libgslcblas-0.dll"/>
     <copy todir="${dist}" file="${devlibs}/bin/libharfbuzz-0.dll"/>
     <copy todir="${dist}" file="${devlibs}/bin/liblzma-5.dll"/>
@@ -704,7 +720,7 @@
     <copy todir="${dist}" file="${devlibs}/bin/libgio-2.0-0.dll"/>
     <copy todir="${dist}" file="${devlibs}/bin/libcairo-2.dll"/>
     <copy todir="${dist}" file="${devlibs}/bin/libpixman-1-0.dll"/>
-    <copy todir="${dist}" file="${devlibs}/bin/libpoppler-43.dll"/>
+    <copy todir="${dist}" file="${devlibs}/bin/libpoppler-58.dll"/>
     <copy todir="${dist}" file="${devlibs}/bin/libpoppler-glib-8.dll"/>
     <copy todir="${dist}" file="${devlibs}/bin/libpangocairo-1.0-0.dll"/>
     <copy todir="${dist}" file="${devlibs}/bin/libpango-1.0-0.dll"/>
@@ -714,16 +730,18 @@
     <copy todir="${dist}" file="${devlibs}/bin/libxml2-2.dll"/>
     <copy todir="${dist}" file="${devlibs}/bin/libxslt-1.dll"/>
     <copy todir="${dist}" file="${devlibs}/bin/libexslt-0.dll"/>
-    <!-- <copy todir="${dist}" file="${devlibs}/bin/libexpat-1.dll"/> -->
-
-    <copy todir="${dist}" file="${devlibs}/bin/libwpg-0.2.dll"/>
-    <copy todir="${dist}" file="${devlibs}/bin/libwpd-0.9.dll"/>
-    <copy todir="${dist}" file="${devlibs}/bin/libwpd-stream-0.9.dll"/>
-    <copy todir="${dist}" file="${devlibs}/bin/libvisio-0.0.dll"/>
-    <copy todir="${dist}" file="${devlibs}/bin/libcdr-0.0.dll"/>
-    <copy todir="${dist}" file="${devlibs}/bin/icuin53.dll"/>
-    <copy todir="${dist}" file="${devlibs}/bin/icudt53.dll"/>
-    <copy todir="${dist}" file="${devlibs}/bin/icuuc53.dll"/>
+    <copy todir="${dist}" file="${devlibs}/bin/libexpat-1.dll"/>
+    <copy todir="${dist}" file="${devlibs}/bin/libepoxy-0.dll"/>
+
+    <copy todir="${dist}" file="${devlibs}/bin/librevenge-0.0.dll"/>
+    <copy todir="${dist}" file="${devlibs}/bin/librevenge-stream-0.0.dll"/>
+    <copy todir="${dist}" file="${devlibs}/bin/libwpg-0.3.dll"/>
+    <copy todir="${dist}" file="${devlibs}/bin/libwpd-0.10.dll"/>
+    <copy todir="${dist}" file="${devlibs}/bin/libvisio-0.1.dll"/>
+    <copy todir="${dist}" file="${devlibs}/bin/libcdr-0.1.dll"/>
+    <copy todir="${dist}" file="${devlibs}/bin/icuin56.dll"/>
+    <copy todir="${dist}" file="${devlibs}/bin/icudt56.dll"/>
+    <copy todir="${dist}" file="${devlibs}/bin/icuuc56.dll"/>
 
     <copy todir="${dist}" file="${devlibs}/bin/libjpeg-9.dll"/>
     <copy todir="${dist}" file="${devlibs}/bin/libpng16-16.dll"/>
@@ -732,21 +750,23 @@
 <!--    
     <copy todir="${dist}" file="${devlibs}/bin/libopenjpeg-2.dll"/>
   -->
-    <copy todir="${dist}" file="${devlibs}/bin/msvcr70.dll"/>
-    <copy todir="${dist}" file="${devlibs}/bin/msvcr71.dll"/>
+    <!-- <copy todir="${dist}" file="${devlibs}/bin/msvcr70.dll"/> -->
+    <!-- <copy todir="${dist}" file="${devlibs}/bin/msvcr71.dll"/> -->
+    <copy todir="${dist}" file="${devlibs}/bin/libcurl-4.dll"/>
     <copy todir="${dist}" file="${devlibs}/bin/zlib1.dll"/>
     <copy todir="${dist}" file="${devlibs}/bin/bz2-1.dll"/>
     <copy todir="${dist}" file="${devlibs}/bin/libiconv-2.dll"/>
     <copy todir="${dist}" file="${devlibs}/bin/libpopt-0.dll"/>
     <copy todir="${dist}" file="${devlibs}/bin/liblcms2-2.dll"/>
-    <copy todir="${dist}" file="${devlibs}/bin/libMagick++-6.Q16-3.dll"/>
+    <copy todir="${dist}" file="${devlibs}/bin/libMagick++-6.Q16-6.dll"/>
     <copy todir="${dist}" file="${devlibs}/bin/libMagickCore-6.Q16-2.dll"/>
     <copy todir="${dist}" file="${devlibs}/bin/libMagickWand-6.Q16-2.dll"/>
     <copy todir="${dist}" file="${devlibs}/bin/libintl-8.dll"/>
+    <copy todir="${dist}" file="${devlibs}/bin/libpotrace-0.dll"/>
     <!-- MINGW support DLLs -->
     <copy todir="${dist}" file="${mingw_bin}/libstdc++-6.dll"/>
     <copy todir="${dist}" file="${mingw_bin}/libwinpthread-1.dll"/>
-    <copy todir="${dist}" file="${mingw_bin}/libgcc_s_sjlj-1.dll"/>
+    <copy todir="${dist}" file="${mingw_bin}/libgcc_s_seh-1.dll"/>
     <!-- MINGW support DLLs needed for openmp support  -->
     <copy todir="${dist}" file="${mingw_bin}/libgomp-1.dll"/>
 
@@ -769,29 +789,32 @@
             <exclude name="gtk-2.0/.*"/>
         </fileset>
     </copy>
+    <copy todir="${dist}/share/icons"> <fileset dir="${devlibs}/share/icons/Adwaita" /> </copy>
+
     <copy todir="${dist}">
         <fileset dir="share">
-          <exclude name=".*\.am"/>
-          <exclude name=".*\.in"/>
-          <exclude name=".*\.sh"/>
-          <exclude name="icons/hicolor/index.theme"/>
+            <exclude name=".*\.am"/>
+            <exclude name=".*\.in"/>
+            <exclude name=".*\.sh"/>
+            <exclude name="icons/hicolor/index.theme"/>
         </fileset>
     </copy>
-    <!-- Quick fix for the following problem: having the hicolor folder there with empty index file bugs booting inkscape... -->
-    <delete dir="${dist}/share/icons/hicolor"/>
-
-    <copy todir="${dist}/share"> <fileset dir="${devlibs}/share/locale"/> </copy>
+    <delete dir="${dist}/share/icons/hicolor"/> <!-- Quick fix for the following problem: having the hicolor folder there with empty index file bugs booting inkscape... -->
     <copy todir="${dist}/share"> <fileset dir="${devlibs}/share/themes"/> </copy>
     <copy todir="${dist}/share"> <fileset dir="${devlibs}/share/icons"/> </copy>
     <copy todir="${dist}/share/glib-2.0"> <fileset dir="${devlibs}/share/glib-2.0/schemas"/> </copy>
     <copy todir="${dist}/lib">
         <fileset dir="${devlibs}/lib/gdk-pixbuf-2.0">
-          <exclude name=".*\.la"/>
-          <exclude name=".*\.dll.a"/>
+            <exclude name=".*\.la"/>
+            <exclude name=".*\.dll\.a"/>
         </fileset>
     </copy>
-<!--    <copy todir="${dist}/share"> <fileset dir="${devlibs}/share/poppler"/> </copy> -->
-    <copy todir="${dist}" file="${devlibs}/bin/gdb.exe"/>
+
+    <!-- Poppler data files -->
+    <copy todir="${dist}/share"> <fileset dir="${devlibs}/share/poppler"/> </copy>
+
+    <!-- Locales for libraries (few should be needed) -->
+    <copy todir="${dist}/share"> <fileset dir="${devlibs}/share/locale"/> </copy>
 
     <!-- Aspell dictionaries -->
     <copy todir="${dist}/lib"> <fileset dir="${devlibs}/lib/aspell-0.60"/> </copy>
@@ -804,9 +827,9 @@
     <copy todir="${dist}" file="${devlibs}/perl/bin/perl58.dll"/>
 
     <!-- PYTHON -->
-    <copy todir="${dist}" file="${devlibs}/python/python26.dll"/>
     <copy todir="${dist}/python" file="${devlibs}/python/python.exe" />
     <copy todir="${dist}/python" file="${devlibs}/python/pythonw.exe"/>
+    <copy todir="${dist}/python" file="${devlibs}/python/python27.dll"/>
     <copy todir="${dist}/python"> <fileset dir="${devlibs}/python/Lib"/> </copy>
     <copy todir="${dist}/python"> <fileset dir="${devlibs}/python/DLLs"/> </copy>
     <!-- <copy todir="${dist}/python"> <fileset dir="${devlibs}/python/Scripts"/> </copy> -->
@@ -814,8 +837,9 @@
     <!--<copy file="${devlibs}/share/themes/MS-Windows/gtk-2.0/gtkrc" todir="${dist}/etc/gtk-2.0"/>-->
     <makefile file="${dist}/etc/gtk-3.0/settings.ini">
 [Settings] 
-gtk-font-name=Tahoma 8
-gtk-theme-name = Adwaita
+#gtk-font-name = Tahoma 8
+#gtk-theme-name = Adwaita
+gtk-menu-images = true
     </makefile>
 
   </target>
@@ -857,6 +881,7 @@ gtk-theme-name = Adwaita
   -->
   <target name="check" depends="linkcxxtests,distbase"
       description="perform unit tests">
+
     <cxxtestrun command="${build}/cxxtests" workingdir="${dist}" />
   </target>
 
diff --git a/build-x64.xml b/build-x64.xml
index 76b2a467f..c3fe58a2b 100644
--- a/build-x64.xml
+++ b/build-x64.xml
@@ -110,7 +110,7 @@
             char const *version_string = "${version}";
         }
     </makefile-->
-    <makefile file="${src}/inkscape-version.cpp">
+    <makefile file="${src}/inkscape-version.cpp" force="true">
         namespace Inkscape {
             char const *version_string = "${version} ${bzr.revision}";
         }
@@ -182,9 +182,6 @@
         #define HAVE_POPPLER                  1
         #define HAVE_POPPLER_GLIB             1
         #define HAVE_POPPLER_CAIRO            1
-        #define POPPLER_NEW_ERRORAPI          1 <!-- poppler changed the error api >= 0.20.0 -->
-        #define POPPLER_NEW_GFXPATCH          1
-        #define POPPLER_NEW_GFXFONT           1 <!-- poppler changed the api for 0.8.3 -->
 
         /* do we want bitmap manipulation? */
         #define WITH_IMAGE_MAGICK             1
@@ -193,17 +190,17 @@
         #define HAVE_EXIF                     1
         #define HAVE_JPEG                     1
 
-        /* Allow reading WordPerfect? */
+        /* WordPerfect import filter */
         #define WITH_LIBWPG                   1
-
-        /* Default  to libwpg 0.2.x */
-        #define WITH_LIBWPG02                 1
+        #define WITH_LIBWPG03                 1
 
         /* Visio import filter */
         #define WITH_LIBVISIO                 1
+        #define WITH_LIBVISIO01               1
 
         /* Corel Draw import filter */
         #define WITH_LIBCDR                   1
+        #define WITH_LIBCDR01                 1
 
         /* Do we support SVG Fonts? */
         #define ENABLE_SVG_FONTS              1
@@ -219,6 +216,8 @@
 
         #define HAVE_ASPELL                   1
 
+        #define HAVE_POTRACE                  1
+
         #endif /* _CONFIG_H_ */
     </makefile>
   </target>
@@ -359,7 +358,7 @@
         <flags>
             -Wall -Wformat -Werror=format-security -Wextra -Wpointer-arith -Wcast-align -Wsign-compare -Wswitch
             -Werror=return-type
-            <!-- - ->  -Werror <!-- -->
+            <!-- -Werror -->
             <!-- A list of warnings that should not error *yet*, any help is welcome in fixing the code generating these warnings! -->
             <!-- libcroco is using guchar where it should use gchar, so we need: --> -Wno-error=pointer-sign
             -Wno-error=unused-parameter -Wno-error=unused-but-set-variable -Wno-error=strict-overflow -Wno-error=write-strings
@@ -372,9 +371,10 @@
             -fopenmp
         </flags>
         <cxxflags>
-            -std=gnu++0x -DCPP11  
+            -std=gnu++11 -DCPP11
             -Woverloaded-virtual
             <!-- -Wno-unused-local-typedefs -->
+            -Wno-deprecated-declarations <!-- silcence warnings about usage of auto_ptr -->
         </cxxflags>
         <defines>
             -DVERSION=\"${version}\"
@@ -382,6 +382,11 @@
             -D_INTL_REDIRECT_INLINE
             -DHAVE_SSL
             -DRELAYTOOL_SSL="static const int libssl_is_present=1; static int __attribute__((unused)) libssl_symbol_is_present(char *s){ return 1; }" <!-- inkboard -->
+            -DPOPPLER_NEW_GFXFONT <!-- poppler changed the api for 0.8.3 -->
+            -DPOPPLER_NEW_GFXPATCH <!-- GfxPatch no longer uses GfxColor in >= 0.15.1 -->
+            -DPOPPLER_NEW_ERRORAPI <!-- poppler changed the error api for 0.20.0 -->
+            -DPOPPLER_EVEN_NEWER_COLOR_SPACE_API <!-- poppler changed the colorspace api for 0.26.0 -->
+            -DPOPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API <!-- poppler changed the colorspace api for 0.29.0 -->
             <!-- GTK+3 migration -->
             -DGLIBMM_DISABLE_DEPRECATED
             -DG_DISABLE_DEPRECATED
@@ -401,13 +406,14 @@
             ${pcc.pangomm-1.4}
             ${pcc.cairomm-1.0}
             <!-- OTHER -->
-			      ${pcc.Magick++}
-			      ${pcc.libxml-2.0}
+            ${pcc.Magick++}
+            ${pcc.libxml-2.0}
             ${pcc.freetype2}
             ${pcc.cairo}
             ${pcc.poppler}
             -I${devlibs}/include/gc
-            ${pcc.libwpg-0.2} ${pcc.libvisio-0.0} ${pcc.libcdr-0.0}
+            -I${devlibs}/include/potracelib
+            ${pcc.libwpg-0.3} ${pcc.libvisio-0.1} ${pcc.libcdr-0.1}
             -I${cxxtest}
             <!-- PERL -->
             <!-- -Wno-comment -I${devlibs}/perl/lib/CORE -->
@@ -483,7 +489,7 @@
            ${devlibs}/bin/libxslt-1.dll
            ${devlibs}/bin/libexslt-0.dll
            ${pcl.cairo} ${pcl.cairomm-1.0}
-           ${pcl.libwpg-0.2} ${pcl.libvisio-0.0} ${pcl.libcdr-0.0}
+           ${pcl.librevenge-stream-0.0} ${pcl.libwpg-0.3} ${pcl.libvisio-0.1} ${pcl.libcdr-0.1}
            ${pcl.glibmm-2.4}
            ${pcl.gtk+-2.0}
            ${pcl.gdkmm-2.4}
@@ -495,9 +501,9 @@
            ${pcl.lcms2}
            ${pcl.gsl}
            -lpng -ljpeg -ltiff -lexif -lpopt -lz
-           -lgc
+           -lgc -lpotrace
            -lws2_32 -lintl -lgdi32 -lcomdlg32 -lm
-           -lgomp -lwinpthread-1
+           -lgomp -lwinpthread
            -laspell
            -lmscms  <!-- required for color profiles -->
        </libs>
@@ -571,7 +577,7 @@
            ${devlibs}/bin/libxslt-1.dll
            ${devlibs}/bin/libexslt-0.dll
            ${pcl.cairo} ${pcl.cairomm-1.0}
-           ${pcl.libwpg-0.2} ${pcl.libvisio-0.0} ${pcl.libcdr-0.0}
+           ${pcl.librevenge-stream-0.0} ${pcl.libwpg-0.3} ${pcl.libvisio-0.1} ${pcl.libcdr-0.1}
            ${pcl.glibmm-2.4}
            ${pcl.gtk+-2.0}
            ${pcl.gdkmm-2.4}
@@ -583,7 +589,7 @@
            ${pcl.lcms2}
            ${pcl.gsl}
            -lpng -ljpeg -ltiff -lexif -lpopt -lz
-           -lgc
+           -lgc -lpotrace
            -lws2_32 -lintl -lgdi32 -lcomdlg32 -lm
            -lgomp -lwinpthread
            -laspell
@@ -627,7 +633,7 @@
            ${devlibs}/bin/libxslt-1.dll
            ${devlibs}/bin/libexslt-0.dll
            ${pcl.cairo} ${pcl.cairomm-1.0}
-           ${pcl.libwpg-0.2} ${pcl.libvisio-0.0} ${pcl.libcdr-0.0}
+           ${pcl.librevenge-stream-0.0} ${pcl.libwpg-0.3} ${pcl.libvisio-0.1} ${pcl.libcdr-0.1}
            ${pcl.glibmm-2.4}
            ${pcl.gtk+-2.0}
            ${pcl.gdkmm-2.4}
@@ -639,9 +645,9 @@
            ${pcl.lcms2}
            ${pcl.gsl}
            -lpng -ljpeg -ltiff -lexif -lpopt -lz
-           -lgc
+           -lgc -lpotrace
            -lws2_32 -lintl -lgdi32 -lcomdlg32 -lm
-           -lgomp -lwinpthread-1
+           -lgomp -lwinpthread
            -laspell
            -lmscms  <!-- required for color profiles -->
        </libs>
@@ -674,12 +680,12 @@
     <copy todir="${dist}" file="${devlibs}/bin/libsigc-2.0-0.dll"/>
     <copy todir="${dist}" file="${devlibs}/bin/libfreetype-6.dll"/>
 
-<copy todir="${dist}" file="${devlibs}/bin/libffi-6.dll"/>
-<copy todir="${dist}" file="${devlibs}/bin/libgc-1.dll"/>
-<copy todir="${dist}" file="${devlibs}/bin/libgsl-0.dll"/>
-<copy todir="${dist}" file="${devlibs}/bin/libgslcblas-0.dll"/>
-<copy todir="${dist}" file="${devlibs}/bin/libharfbuzz-0.dll"/>
-<copy todir="${dist}" file="${devlibs}/bin/liblzma-5.dll"/>
+    <copy todir="${dist}" file="${devlibs}/bin/libffi-6.dll"/>
+    <copy todir="${dist}" file="${devlibs}/bin/libgc-1.dll"/>
+    <copy todir="${dist}" file="${devlibs}/bin/libgsl-19.dll"/>
+    <copy todir="${dist}" file="${devlibs}/bin/libgslcblas-0.dll"/>
+    <copy todir="${dist}" file="${devlibs}/bin/libharfbuzz-0.dll"/>
+    <copy todir="${dist}" file="${devlibs}/bin/liblzma-5.dll"/>
 
     <copy todir="${dist}" file="${devlibs}/bin/libaspell-15.dll"/>
     <copy todir="${dist}" file="${devlibs}/bin/libatk-1.0-0.dll"/>
@@ -693,7 +699,7 @@
     <copy todir="${dist}" file="${devlibs}/bin/libgio-2.0-0.dll"/>
     <copy todir="${dist}" file="${devlibs}/bin/libcairo-2.dll"/>
     <copy todir="${dist}" file="${devlibs}/bin/libpixman-1-0.dll"/>
-    <copy todir="${dist}" file="${devlibs}/bin/libpoppler-43.dll"/>
+    <copy todir="${dist}" file="${devlibs}/bin/libpoppler-58.dll"/>
     <copy todir="${dist}" file="${devlibs}/bin/libpoppler-glib-8.dll"/>
     <copy todir="${dist}" file="${devlibs}/bin/libpangocairo-1.0-0.dll"/>
     <copy todir="${dist}" file="${devlibs}/bin/libpango-1.0-0.dll"/>
@@ -703,18 +709,17 @@
     <copy todir="${dist}" file="${devlibs}/bin/libxml2-2.dll"/>
     <copy todir="${dist}" file="${devlibs}/bin/libxslt-1.dll"/>
     <copy todir="${dist}" file="${devlibs}/bin/libexslt-0.dll"/>
-    <copy todir="${dist}" file="${devlibs}/bin/librsvg-2-2.dll"/>
-    <copy todir="${dist}" file="${devlibs}/bin/libcroco-0.6-3.dll"/>
-    <!-- <copy todir="${dist}" file="${devlibs}/bin/libexpat-1.dll"/> -->
-
-    <copy todir="${dist}" file="${devlibs}/bin/libwpg-0.2.dll"/>
-    <copy todir="${dist}" file="${devlibs}/bin/libwpd-0.9.dll"/>
-    <copy todir="${dist}" file="${devlibs}/bin/libwpd-stream-0.9.dll"/>
-    <copy todir="${dist}" file="${devlibs}/bin/libvisio-0.0.dll"/>
-    <copy todir="${dist}" file="${devlibs}/bin/libcdr-0.0.dll"/>
-    <copy todir="${dist}" file="${devlibs}/bin/icuin53.dll"/>
-    <copy todir="${dist}" file="${devlibs}/bin/icudt53.dll"/>
-    <copy todir="${dist}" file="${devlibs}/bin/icuuc53.dll"/>
+    <copy todir="${dist}" file="${devlibs}/bin/libexpat-1.dll"/>
+
+    <copy todir="${dist}" file="${devlibs}/bin/librevenge-0.0.dll"/>
+    <copy todir="${dist}" file="${devlibs}/bin/librevenge-stream-0.0.dll"/>
+    <copy todir="${dist}" file="${devlibs}/bin/libwpg-0.3.dll"/>
+    <copy todir="${dist}" file="${devlibs}/bin/libwpd-0.10.dll"/>
+    <copy todir="${dist}" file="${devlibs}/bin/libvisio-0.1.dll"/>
+    <copy todir="${dist}" file="${devlibs}/bin/libcdr-0.1.dll"/>
+    <copy todir="${dist}" file="${devlibs}/bin/icuin56.dll"/>
+    <copy todir="${dist}" file="${devlibs}/bin/icudt56.dll"/>
+    <copy todir="${dist}" file="${devlibs}/bin/icuuc56.dll"/>
 
     <copy todir="${dist}" file="${devlibs}/bin/libjpeg-9.dll"/>
     <copy todir="${dist}" file="${devlibs}/bin/libpng16-16.dll"/>
@@ -723,21 +728,23 @@
 <!--    
     <copy todir="${dist}" file="${devlibs}/bin/libopenjpeg-2.dll"/>
   -->
-    <copy todir="${dist}" file="${devlibs}/bin/msvcr70.dll"/>
-    <copy todir="${dist}" file="${devlibs}/bin/msvcr71.dll"/>
+    <!-- <copy todir="${dist}" file="${devlibs}/bin/msvcr70.dll"/> -->
+    <!-- <copy todir="${dist}" file="${devlibs}/bin/msvcr71.dll"/> -->
+    <copy todir="${dist}" file="${devlibs}/bin/libcurl-4.dll"/>
     <copy todir="${dist}" file="${devlibs}/bin/zlib1.dll"/>
     <copy todir="${dist}" file="${devlibs}/bin/bz2-1.dll"/>
     <copy todir="${dist}" file="${devlibs}/bin/libiconv-2.dll"/>
     <copy todir="${dist}" file="${devlibs}/bin/libpopt-0.dll"/>
     <copy todir="${dist}" file="${devlibs}/bin/liblcms2-2.dll"/>
-    <copy todir="${dist}" file="${devlibs}/bin/libMagick++-6.Q16-3.dll"/>
+    <copy todir="${dist}" file="${devlibs}/bin/libMagick++-6.Q16-6.dll"/>
     <copy todir="${dist}" file="${devlibs}/bin/libMagickCore-6.Q16-2.dll"/>
     <copy todir="${dist}" file="${devlibs}/bin/libMagickWand-6.Q16-2.dll"/>
     <copy todir="${dist}" file="${devlibs}/bin/libintl-8.dll"/>
+    <copy todir="${dist}" file="${devlibs}/bin/libpotrace-0.dll"/>
     <!-- MINGW support DLLs -->
     <copy todir="${dist}" file="${mingw_bin}/libstdc++-6.dll"/>
     <copy todir="${dist}" file="${mingw_bin}/libwinpthread-1.dll"/>
-    <copy todir="${dist}" file="${mingw_bin}/libgcc_s_sjlj-1.dll"/>
+    <copy todir="${dist}" file="${mingw_bin}/libgcc_s_seh-1.dll"/>
     <!-- MINGW support DLLs needed for openmp support  -->
     <copy todir="${dist}" file="${mingw_bin}/libgomp-1.dll"/>
 
@@ -754,29 +761,34 @@
     <mkdir dir="${dist}/plugins"/>
 
     <!-- GTK -->
-    <copy todir="${dist}">     <fileset dir="${devlibs}/etc"/> </copy>
+    <copy todir="${dist}">
+        <fileset dir="${devlibs}/etc">
+            <exclude name="gtk-3.0/.*"/>
+        </fileset>
+    </copy>
     <copy todir="${dist}/lib"> <fileset dir="${devlibs}/lib/gtk-2.0"/> </copy>
-    <copy todir="${dist}/lib"> <fileset dir="${devlibs}/lib/glib-2.0"/> </copy>
+    <!-- <copy todir="${dist}/lib"> <fileset dir="${devlibs}/lib/glib-2.0"/> </copy> -->
     <copy todir="${dist}">
         <fileset dir="share">
-          <exclude name=".*\.am"/>
-          <exclude name=".*\.in"/>
-          <exclude name=".*\.sh"/>
+            <exclude name=".*\.am"/>
+            <exclude name=".*\.in"/>
+            <exclude name=".*\.sh"/>
         </fileset>
     </copy>
-    <!-- Quick fix for the following problem: having the hicolor folder there with empty index file bugs booting inkscape... -->
-    <delete dir="${dist}/share/icons/hicolor"/>
-
-    <copy todir="${dist}/share"> <fileset dir="${devlibs}/share/locale"/> </copy>
+    <delete dir="${dist}/share/icons/hicolor"/> <!-- Quick fix for the following problem: having the hicolor folder there with empty index file bugs booting inkscape... -->
     <copy todir="${dist}/share"> <fileset dir="${devlibs}/share/themes"/> </copy>
     <copy todir="${dist}/lib">
         <fileset dir="${devlibs}/lib/gdk-pixbuf-2.0">
-          <exclude name=".*\.la"/>
-          <exclude name=".*\.dll.a"/>
+            <exclude name=".*\.la"/>
+            <exclude name=".*\.dll\.a"/>
         </fileset>
     </copy>
-<!--    <copy todir="${dist}/share"> <fileset dir="${devlibs}/share/poppler"/> </copy> -->
-    <copy todir="${dist}" file="${devlibs}/bin/gdb.exe"/>
+
+    <!-- Poppler data files -->
+    <copy todir="${dist}/share"> <fileset dir="${devlibs}/share/poppler"/> </copy>
+
+    <!-- Locales for libraries (few should be needed) -->
+    <copy todir="${dist}/share"> <fileset dir="${devlibs}/share/locale"/> </copy>
 
     <!-- Aspell dictionaries -->
     <copy todir="${dist}/lib"> <fileset dir="${devlibs}/lib/aspell-0.60"/> </copy>
@@ -789,63 +801,13 @@
     <copy todir="${dist}" file="${devlibs}/perl/bin/perl58.dll"/>
 
     <!-- PYTHON -->
-    <copy todir="${dist}" file="${devlibs}/python/python26.dll"/>
     <copy todir="${dist}/python" file="${devlibs}/python/python.exe" />
     <copy todir="${dist}/python" file="${devlibs}/python/pythonw.exe"/>
+    <copy todir="${dist}/python" file="${devlibs}/python/python27.dll"/>
     <copy todir="${dist}/python"> <fileset dir="${devlibs}/python/Lib"/> </copy>
     <copy todir="${dist}/python"> <fileset dir="${devlibs}/python/DLLs"/> </copy>
     <!-- <copy todir="${dist}/python"> <fileset dir="${devlibs}/python/Scripts"/> </copy> -->
 
-    <!--<copy file="${devlibs}/share/themes/MS-Windows/gtk-2.0/gtkrc" todir="${dist}/etc/gtk-2.0"/>-->
-    <makefile file="${dist}/etc/gtk-2.0/gtkrc">
-    gtk-icon-sizes = "gtk-menu=16,16:gtk-small-toolbar=16,16:gtk-large-toolbar=24,24:gtk-dnd=32,32:inkscape-decoration=16,16"
-    gtk-toolbar-icon-size = small-toolbar
-
-    # disable images in buttons. i've only seen ugly delphi apps use this feature.
-    gtk-button-images = 0
-    
-    # disable the annoying beep in editable controls
-    gtk-error-bell = 0
-
-    # enable/disable images in menus. most "stock" microsoft apps don't use these, except sparingly.
-    # the office apps use them heavily, though.
-    gtk-menu-images = 1
-
-    # use the win32 button ordering instead of the GNOME HIG one, where applicable
-    gtk-alternative-button-order = 1
-
-    style "msw-default"
-    {
-      GtkWidget::interior-focus = 1
-      GtkOptionMenu::indicator-size = { 9, 5 }
-      GtkOptionMenu::indicator-spacing = { 7, 5, 2, 2 }
-      GtkSpinButton::shadow-type = in
-
-      # Owen and I disagree that these should be themable
-      #GtkUIManager::add-tearoffs = 0
-      #GtkComboBox::add-tearoffs = 0
-
-      GtkComboBox::appears-as-list = 1
-      GtkComboBox::focus-on-click = 0
-
-      GOComboBox::add_tearoffs = 0
-
-      GtkTreeView::allow-rules = 0
-      GtkTreeView::expander-size = 12
-
-      GtkExpander::expander-size = 12
-
-      GtkScrolledWindow::scrollbar_spacing = 1
-
-      GtkSeparatorMenuItem::horizontal-padding = 2
-
-      engine "wimp"
-      {
-      }
-    }
-    class "*" style "msw-default"
-    </makefile>
-
   </target>