r22166 by jghali -

scribus-commit scribus-commit at lists.scribus.net
Sun Sep 24 19:49:59 UTC 2017 

Author: jghali
Date: Sun Sep 24 19:49:59 2017
New Revision: 22166

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=22166
Log:
#14997: add a QuarkXPress importer (using libqxp) <dtardon>

Added:
    trunk/Scribus/scribus/plugins/import/qxp/
    trunk/Scribus/scribus/plugins/import/qxp/CMakeLists.txt
    trunk/Scribus/scribus/plugins/import/qxp/importqxp.cpp
    trunk/Scribus/scribus/plugins/import/qxp/importqxp.h
    trunk/Scribus/scribus/plugins/import/qxp/importqxpplugin.cpp
    trunk/Scribus/scribus/plugins/import/qxp/importqxpplugin.h
    trunk/Scribus/win32/msvc2015/qxpimport/
    trunk/Scribus/win32/msvc2015/qxpimport/qxpimport.vcxproj
    trunk/Scribus/win32/msvc2015/qxpimport/qxpimport.vcxproj.filters
Modified:
    trunk/Scribus/README
    trunk/Scribus/scribus/pageitem_textframe.cpp
    trunk/Scribus/scribus/plugins/import/CMakeLists.txt
    trunk/Scribus/win32/msvc2015/Scribus-build-props.props
    trunk/Scribus/win32/msvc2015/Scribus.sln

Modified: trunk/Scribus/README
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22166&path=/trunk/Scribus/README
==============================================================================
--- trunk/Scribus/README	(original)
+++ trunk/Scribus/README	Sun Sep 24 19:49:59 2017
@@ -110,6 +110,7 @@
 - Open Raster File (ORA): Open Raster is an open standard for complex bitmap files. It’s supported by all major Free image editors, including GIMP and Krita.
 - Photoshop Custom Shapes (CSH): CSH is a vector format used for simple vector graphics collections in Adobe Photoshop. They can be imported via the new "Custom Shapes" manager. 
 - Progressive Graphics File (PGF): This is a fairly new image format, designed to replace JPEG, just like JPEG 2000 does, but emphasizing speed and quality over compression ratio.
+- QuarkXPress (QXD, QXT): An importer for QuarkXPress files has been made possible by the creation of libqxp, wich is also used for QuarkXPress import into LibreOffice. It is supposed to import at least QuarkXPress versions 3.1–4.1.
 - Rich Text Format (RTF): One of the most widely used exchange formats for formatted text, RTF is also very common in DTP workflows and can be exported by almost every word processor since the 90s.
 - StarView Metafile (SVM): This is an old Metafile format (similar to WMF) that was used by OpenOffice’s / LibreOffice’s predecessor StarOffice. Since both successors still use SVM in - OpenDocument Graphics, the SVM import filter was a by-product of the new ODG filter. 
 - UniConvertor Plug-in: As with the GraphicsMagick plug-in, Scribus won’t list any of the file types supported by UniConvertor to save space in file selectors. It will also ignore UniConvertor for importing file formats for which Scribus provides generic importers.

Modified: trunk/Scribus/scribus/pageitem_textframe.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22166&path=/trunk/Scribus/scribus/pageitem_textframe.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_textframe.cpp	(original)
+++ trunk/Scribus/scribus/pageitem_textframe.cpp	Sun Sep 24 19:49:59 2017
@@ -1440,6 +1440,9 @@
 			m_availableRegion = matrix.map(m_availableRegion);
 		}
 
+		// update Bullet & number list if any.
+		updateBulletsNum();
+
 		ITextContext* context = this;
 		//TextShaper textShaper(this, itemText, firstInFrame());
 		ShapedTextFeed shapedText(&itemText, firstInFrame(), context);
@@ -1480,8 +1483,6 @@
 			desc = -itemText.defaultStyle().charStyle().font().descent(itemText.defaultStyle().charStyle().fontSize() / 10.0);
 			current.yPos = itemText.defaultStyle().lineSpacing() + m_textDistanceMargins.top() + lineCorr - desc;
 		}
-		// update Bullet & number list if any.
-		updateBulletsNum();
 
 		current.startLine(0);
 
@@ -2244,19 +2245,17 @@
 				current.xPos = qMax(current.xPos, current.colLeft);
 			}
 			// remember possible break
-			if (shapedText.haveMoreText(i + 1, glyphClusters) && glyphClusters[i + 1].hasFlag(ScLayout_LineBoundary))
-			{
-				if (current.glyphs.length() > 1
-					&& (current.glyphs[currentIndex - 1].lastChar() != SpecialChars::CJK_NOBREAK_AFTER)
-					&& (current.glyphs[currentIndex].firstChar() != SpecialChars::CJK_NOBREAK_BEFORE))
-				{
-//					qDebug() << "rememberBreak LineBoundry @" << i-1;
-					current.rememberBreak(i - 1, breakPos, style.rightMargin());
-				}
-				if (!current.glyphs[currentIndex].hasFlag(ScLayout_LineBoundary))
-				{
-//					qDebug() << "rememberBreak 2nd LineBoundry @" << i;
-					current.rememberBreak(i, breakPos, style.rightMargin());
+			if (shapedText.haveMoreText(i + 1, glyphClusters))
+			{
+				const GlyphCluster& nextCluster = glyphClusters[i + 1];
+				if (nextCluster.hasFlag(ScLayout_LineBoundary))
+				{
+					if (!current.glyphs[currentIndex].hasFlag(ScLayout_HyphenationPossible)
+						&& (itemText.text(a) != '-')
+						&& (itemText.text(a) != SpecialChars::SHYPHEN))
+					{
+						current.rememberBreak(i, breakPos, style.rightMargin());
+					}
 				}
 			}
 			if (HasObject)

Modified: trunk/Scribus/scribus/plugins/import/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22166&path=/trunk/Scribus/scribus/plugins/import/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/import/CMakeLists.txt	Sun Sep 24 19:49:59 2017
@@ -19,6 +19,7 @@
 # add_subdirectory(ppp)
 add_subdirectory(pm)
 add_subdirectory(pub)
+add_subdirectory(qxp)
 add_subdirectory(shape)
 add_subdirectory(sml)
 add_subdirectory(svg)

Modified: trunk/Scribus/win32/msvc2015/Scribus-build-props.props
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22166&path=/trunk/Scribus/win32/msvc2015/Scribus-build-props.props
==============================================================================
--- trunk/Scribus/win32/msvc2015/Scribus-build-props.props	(original)
+++ trunk/Scribus/win32/msvc2015/Scribus-build-props.props	Sun Sep 24 19:49:59 2017
@@ -2,10 +2,13 @@
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ImportGroup Label="PropertySheets">
   </ImportGroup>
+  <!-- Import Scribus dependencies (other than Qt) -->
   <PropertyGroup Label="UserMacros">
-	<!-- Scribus libs root path -->
-	<SCRIBUS_COMMON_LIB_ROOT>F:\Scribus Libs\scribus-common-libs</SCRIBUS_COMMON_LIB_ROOT>
 	<SCRIBUS_LIB_ROOT>F:\Scribus Libs\scribus-1.5.x-libs-msvc2015</SCRIBUS_LIB_ROOT>
+  </PropertyGroup>
+  <Import Project="$(SCRIBUS_LIB_ROOT)\scribus-lib-paths.props" />
+  <!-- Import Qt5 -->
+  <PropertyGroup Label="UserMacros">
 	<!-- Qt5 -->
 	<QT5_DIR Condition="'$(Platform)' == 'Win32' and '$(PlatformToolset)' == 'v140'"   >F:\Libraries-vcall\Qt-5.6.2\msvc2015</QT5_DIR>
 	<QT5_DIR Condition="'$(Platform)' == 'Win32' and '$(PlatformToolset)' == 'v140_xp'">F:\Libraries-vcall\Qt-5.6.2\msvc2015_xp</QT5_DIR>
@@ -22,149 +25,13 @@
 	<QT5WIDGETS_LIB Condition="'$(Configuration)' == 'Release'">Qt5Widgets.lib</QT5WIDGETS_LIB>
 	<QT5XML_LIB Condition="'$(Configuration)' == 'Debug'">Qt5Xmld.lib</QT5XML_LIB>
 	<QT5XML_LIB Condition="'$(Configuration)' == 'Release'">Qt5Xml.lib</QT5XML_LIB>
-	<!-- Boost -->
-	<BOOST_DIR>$(SCRIBUS_COMMON_LIB_ROOT)\boost-1.58.0</BOOST_DIR>
-	<!-- Cairo -->
-	<CAIRO_DIR>$(SCRIBUS_LIB_ROOT)\cairo-1.14.10</CAIRO_DIR>
-	<CAIRO_INCLUDE_DIR>$(CAIRO_DIR)\include</CAIRO_INCLUDE_DIR>
-	<CAIRO_LIB_DIR>$(CAIRO_DIR)\lib\$(Platform)-$(PlatformToolset)</CAIRO_LIB_DIR>
-	<CAIRO_LIB Condition="'$(Configuration)' == 'Debug'">cairo2d.lib</CAIRO_LIB>
-	<CAIRO_LIB Condition="'$(Configuration)' == 'Release'">cairo2.lib</CAIRO_LIB>
-	<!-- Freetype -->
-	<FREETYPE_DIR>$(SCRIBUS_LIB_ROOT)\freetype-2.8</FREETYPE_DIR>
-	<FREETYPE_INCLUDE_DIR>$(FREETYPE_DIR)\include</FREETYPE_INCLUDE_DIR>
-	<FREETYPE_LIB_DIR>$(FREETYPE_DIR)\lib\$(Platform)-$(PlatformToolset)</FREETYPE_LIB_DIR>
-	<FREETYPE_LIB Condition="'$(Configuration)' == 'Debug'">freetype_d.lib</FREETYPE_LIB>
-	<FREETYPE_LIB Condition="'$(Configuration)' == 'Release'">freetype.lib</FREETYPE_LIB>
-	<!-- Harfbuzz -->
-	<HARFBUZZ_DIR>$(SCRIBUS_LIB_ROOT)\harfbuzz-1.4.6</HARFBUZZ_DIR>
-	<HARFBUZZ_INCLUDE_DIR>$(HARFBUZZ_DIR)\include</HARFBUZZ_INCLUDE_DIR>
-	<HARFBUZZ_LIB_DIR>$(HARFBUZZ_DIR)\lib\$(Platform)-$(PlatformToolset)</HARFBUZZ_LIB_DIR>
-	<HARFBUZZ_LIB Condition="'$(Configuration)' == 'Debug'">harfbuzz_d.lib</HARFBUZZ_LIB>
-	<HARFBUZZ_LIB Condition="'$(Configuration)' == 'Release'">harfbuzz.lib</HARFBUZZ_LIB>
-	<!-- Hunspell -->
-	<HUNSPELL_DIR>$(SCRIBUS_LIB_ROOT)\hunspell-1.6.1</HUNSPELL_DIR>
-	<HUNSPELL_INCLUDE_DIR>$(HUNSPELL_DIR)\include</HUNSPELL_INCLUDE_DIR>
-	<HUNSPELL_LIB_DIR>$(HUNSPELL_DIR)\lib\$(Platform)-$(PlatformToolset)</HUNSPELL_LIB_DIR>
-	<HUNSPELL_LIB Condition="'$(Configuration)' == 'Debug'">libhunspell_staticD.lib</HUNSPELL_LIB>
-	<HUNSPELL_LIB Condition="'$(Configuration)' == 'Release'">libhunspell_static.lib</HUNSPELL_LIB>
-	<!-- Iconv -->
-	<ICONV_DIR>$(SCRIBUS_LIB_ROOT)\libiconv-1.15</ICONV_DIR>
-	<ICONV_INCLUDE_DIR>$(ICONV_DIR)\include</ICONV_INCLUDE_DIR>
-	<ICONV_LIB_DIR>$(ICONV_DIR)\lib\$(Platform)-$(PlatformToolset)</ICONV_LIB_DIR>
-	<ICONV_LIB Condition="'$(Configuration)' == 'Debug'">iconv_d.lib</ICONV_LIB>
-	<ICONV_LIB Condition="'$(Configuration)' == 'Release'">iconv.lib</ICONV_LIB>
-	<!-- Icu -->
-	<ICU_INCLUDE_DIR>$(SCRIBUS_LIB_ROOT)\icu-58.2\include</ICU_INCLUDE_DIR>
-	<ICU_LIB_DIR>$(SCRIBUS_LIB_ROOT)\icu-58.2\lib\$(Platform)-$(PlatformToolset)</ICU_LIB_DIR>
-	<ICU_LIB>icudt.lib;icuin.lib;icuuc.lib</ICU_LIB>
-	<!-- Littlecms -->
-	<LCMS_DIR>$(SCRIBUS_LIB_ROOT)\lcms2-2.8</LCMS_DIR>
-	<LCMS_INCLUDE_DIR>$(LCMS_DIR)\include</LCMS_INCLUDE_DIR>
-	<LCMS_LIB_DIR>$(LCMS_DIR)\lib\$(Platform)-$(PlatformToolset)</LCMS_LIB_DIR>
-	<LCMS_LIB Condition="'$(Configuration)' == 'Debug'">lcms2_staticd.lib</LCMS_LIB>
-	<LCMS_LIB Condition="'$(Configuration)' == 'Release'">lcms2_static.lib</LCMS_LIB>
-	<!-- Libcdr -->
-	<LIBCDR_DIR>$(SCRIBUS_LIB_ROOT)\libcdr-0.1.3</LIBCDR_DIR>
-	<LIBCDR_INCLUDE_DIR>$(LIBCDR_DIR)\inc</LIBCDR_INCLUDE_DIR>
-	<LIBCDR_LIB_DIR>$(LIBCDR_DIR)\lib\$(Platform)-$(PlatformToolset)</LIBCDR_LIB_DIR>
-	<LIBCDR_LIB Condition="'$(Configuration)' == 'Debug'">libcdr_d.lib</LIBCDR_LIB>
-	<LIBCDR_LIB Condition="'$(Configuration)' == 'Release'">libcdr.lib</LIBCDR_LIB>
-	<!-- Libfreehand -->
-	<LIBFREEHAND_DIR>$(SCRIBUS_LIB_ROOT)\libfreehand-0.1.1</LIBFREEHAND_DIR>
-	<LIBFREEHAND_INCLUDE_DIR>$(LIBFREEHAND_DIR)\inc</LIBFREEHAND_INCLUDE_DIR>
-	<LIBFREEHAND_LIB_DIR>$(LIBFREEHAND_DIR)\lib\$(Platform)-$(PlatformToolset)</LIBFREEHAND_LIB_DIR>
-	<LIBFREEHAND_LIB Condition="'$(Configuration)' == 'Debug'">libfreehand_d.lib</LIBFREEHAND_LIB>
-	<LIBFREEHAND_LIB Condition="'$(Configuration)' == 'Release'">libfreehand.lib</LIBFREEHAND_LIB>
-	<!-- Libjpeg -->
-	<LIBJPEG_DIR>$(SCRIBUS_LIB_ROOT)\libjpeg-9a</LIBJPEG_DIR>
-	<LIBJPEG_INCLUDE_DIR>$(LIBJPEG_DIR)\include</LIBJPEG_INCLUDE_DIR>
-	<LIBJPEG_LIB_DIR>$(LIBJPEG_DIR)\lib\$(Platform)-$(PlatformToolset)</LIBJPEG_LIB_DIR>
-	<LIBJPEG_LIB Condition="'$(Configuration)' == 'Debug'">libjpeg9a_d.lib</LIBJPEG_LIB>
-	<LIBJPEG_LIB Condition="'$(Configuration)' == 'Release'">libjpeg9a.lib</LIBJPEG_LIB>
-	<!-- Libmspub -->
-	<LIBMSPUB_DIR>$(SCRIBUS_LIB_ROOT)\libmspub-0.1.2</LIBMSPUB_DIR>
-	<LIBMSPUB_INCLUDE_DIR>$(LIBMSPUB_DIR)\inc</LIBMSPUB_INCLUDE_DIR>
-	<LIBMSPUB_LIB_DIR>$(LIBMSPUB_DIR)\lib\$(Platform)-$(PlatformToolset)</LIBMSPUB_LIB_DIR>
-	<LIBMSPUB_LIB Condition="'$(Configuration)' == 'Debug'">libmspub_d.lib</LIBMSPUB_LIB>
-	<LIBMSPUB_LIB Condition="'$(Configuration)' == 'Release'">libmspub.lib</LIBMSPUB_LIB>
-	<!-- Libpagemaker -->
-	<LIBPAGEMAKER_DIR>$(SCRIBUS_LIB_ROOT)\libpagemaker-0.0.3</LIBPAGEMAKER_DIR>
-	<LIBPAGEMAKER_INCLUDE_DIR>$(LIBPAGEMAKER_DIR)\inc</LIBPAGEMAKER_INCLUDE_DIR>
-	<LIBPAGEMAKER_LIB_DIR>$(LIBPAGEMAKER_DIR)\lib\$(Platform)-$(PlatformToolset)</LIBPAGEMAKER_LIB_DIR>
-	<LIBPAGEMAKER_LIB Condition="'$(Configuration)' == 'Debug'">libpagemaker_d.lib</LIBPAGEMAKER_LIB>
-	<LIBPAGEMAKER_LIB Condition="'$(Configuration)' == 'Release'">libpagemaker.lib</LIBPAGEMAKER_LIB>
-	<!-- Libpng -->
-	<LIBPNG_DIR>$(SCRIBUS_LIB_ROOT)\libpng-1.6.32</LIBPNG_DIR>
-	<LIBPNG_INCLUDE_DIR>$(LIBPNG_DIR)</LIBPNG_INCLUDE_DIR>
-	<LIBPNG_LIB_DIR>$(LIBPNG_DIR)\lib\$(Platform)-$(PlatformToolset)</LIBPNG_LIB_DIR>
-	<LIBPNG_LIB Condition="'$(Configuration)' == 'Debug'">libpng16_d.lib</LIBPNG_LIB>
-	<LIBPNG_LIB Condition="'$(Configuration)' == 'Release'">libpng16.lib</LIBPNG_LIB>
-	<!-- Librevenge -->
-	<LIBREVENGE_DIR>$(SCRIBUS_LIB_ROOT)\librevenge-0.0.4</LIBREVENGE_DIR>
-	<LIBREVENGE_INCLUDE_DIR>$(LIBREVENGE_DIR)\inc</LIBREVENGE_INCLUDE_DIR>
-	<LIBREVENGE_LIB_DIR>$(LIBREVENGE_DIR)\lib\$(Platform)-$(PlatformToolset)</LIBREVENGE_LIB_DIR>
-	<LIBREVENGE_LIB Condition="'$(Configuration)' == 'Debug'">librevenge-0.0d.lib</LIBREVENGE_LIB>
-	<LIBREVENGE_LIB Condition="'$(Configuration)' == 'Release'">librevenge-0.0.lib</LIBREVENGE_LIB>
-	<LIBREVENGE_GENERATORS_LIB Condition="'$(Configuration)' == 'Debug'">librevenge-generators-0.0d.lib</LIBREVENGE_GENERATORS_LIB>
-	<LIBREVENGE_GENERATORS_LIB Condition="'$(Configuration)' == 'Release'">librevenge-generators-0.0.lib</LIBREVENGE_GENERATORS_LIB>
-	<LIBREVENGE_STREAM_LIB Condition="'$(Configuration)' == 'Debug'">librevenge-stream-0.0d.lib</LIBREVENGE_STREAM_LIB>
-	<LIBREVENGE_STREAM_LIB Condition="'$(Configuration)' == 'Release'">librevenge-stream-0.0.lib</LIBREVENGE_STREAM_LIB>
-	<!-- Libtiff -->
-	<LIBTIFF_DIR>$(SCRIBUS_LIB_ROOT)\libtiff-4.0.7</LIBTIFF_DIR>
-	<LIBTIFF_INCLUDE_DIR>$(LIBTIFF_DIR)\include</LIBTIFF_INCLUDE_DIR>
-	<LIBTIFF_LIB_DIR>$(LIBTIFF_DIR)\lib\$(Platform)-$(PlatformToolset)</LIBTIFF_LIB_DIR>
-	<LIBTIFF_LIB Condition="'$(Configuration)' == 'Debug'">libtiff5_d.lib</LIBTIFF_LIB>
-	<LIBTIFF_LIB Condition="'$(Configuration)' == 'Release'">libtiff5.lib</LIBTIFF_LIB>
-	<!-- Libvisio -->
-	<LIBVISIO_DIR>$(SCRIBUS_LIB_ROOT)\libvisio-0.1.5</LIBVISIO_DIR>
-	<LIBVISIO_INCLUDE_DIR>$(LIBVISIO_DIR)\inc</LIBVISIO_INCLUDE_DIR>
-	<LIBVISIO_LIB_DIR>$(LIBVISIO_DIR)\lib\$(Platform)-$(PlatformToolset)</LIBVISIO_LIB_DIR>
-	<LIBVISIO_LIB Condition="'$(Configuration)' == 'Debug'">libvisio_d.lib</LIBVISIO_LIB>
-	<LIBVISIO_LIB Condition="'$(Configuration)' == 'Release'">libvisio.lib</LIBVISIO_LIB>
-	<!-- Libxml2 -->
-	<LIBXML2_DIR>$(SCRIBUS_LIB_ROOT)\libxml2-2.9.5</LIBXML2_DIR>
-	<LIBXML2_INCLUDE_DIR>$(LIBXML2_DIR)\include</LIBXML2_INCLUDE_DIR>
-	<LIBXML2_LIB_DIR>$(LIBXML2_DIR)\lib\$(Platform)-$(PlatformToolset)</LIBXML2_LIB_DIR>
-	<LIBXML2_LIB Condition="'$(Configuration)' == 'Debug'">libxml2_d.lib</LIBXML2_LIB>
-	<LIBXML2_LIB Condition="'$(Configuration)' == 'Release'">libxml2.lib</LIBXML2_LIB>
-	<!-- Libzmf -->
-    <LIBZMF_INCLUDE_DIR>$(SCRIBUS_LIB_ROOT)\libzmf-0.0.2\inc</LIBZMF_INCLUDE_DIR>
-	<LIBZMF_LIB_DIR>$(SCRIBUS_LIB_ROOT)\libzmf-0.0.2\lib\$(Platform)-$(PlatformToolset)</LIBZMF_LIB_DIR>
-    <LIBZMF_LIB Condition="'$(Configuration)' == 'Debug'">libzmf_d.lib</LIBZMF_LIB>
-    <LIBZMF_LIB Condition="'$(Configuration)' == 'Release'">libzmf.lib</LIBZMF_LIB>
-	<!-- OpenSSL -->
-	<OPENSSL_DIR>$(SCRIBUS_LIB_ROOT)\openssl-1.0.2l</OPENSSL_DIR>
-	<OPENSSL_INCLUDE_DIR>$(OPENSSL_DIR)\include</OPENSSL_INCLUDE_DIR>
-	<OPENSSL_LIB_DIR>$(OPENSSL_DIR)\lib\$(Platform)-$(PlatformToolset)</OPENSSL_LIB_DIR>
-    <OPENSSL_LIB Condition="'$(Configuration)' == 'Debug'">libeay32_d.lib</OPENSSL_LIB>
-    <OPENSSL_LIB Condition="'$(Configuration)' == 'Release'">libeay32.lib</OPENSSL_LIB>
-	<!-- PoDoFo -->
-	<PODOFO_DIR>$(SCRIBUS_LIB_ROOT)\podofo-0.9.5</PODOFO_DIR>
-	<PODOFO_INCLUDE_DIR>$(PODOFO_DIR)\include</PODOFO_INCLUDE_DIR>
-	<PODOFO_LIB_DIR>$(PODOFO_DIR)\lib\$(Platform)-$(PlatformToolset)</PODOFO_LIB_DIR>
-	<PODOFO_LIB Condition="'$(Configuration)' == 'Debug'">podofo_d.lib</PODOFO_LIB>
-	<PODOFO_LIB Condition="'$(Configuration)' == 'Release'">podofo.lib</PODOFO_LIB>
-	<!-- Poppler -->
-	<POPPLER_DIR>$(SCRIBUS_LIB_ROOT)\poppler-0.59.0</POPPLER_DIR>
-	<POPPLER_INCLUDE_DIR>$(POPPLER_DIR)\include</POPPLER_INCLUDE_DIR>
-	<POPPLER_LIB_DIR>$(POPPLER_DIR)\lib\$(Platform)-$(PlatformToolset)</POPPLER_LIB_DIR>
-	<POPPLER_LIB Condition="'$(Configuration)' == 'Debug'">poppler_staticD.lib</POPPLER_LIB>
-	<POPPLER_LIB Condition="'$(Configuration)' == 'Release'">poppler_static.lib</POPPLER_LIB>
-	<!-- Python -->
-	<PYTHON_DIR Condition="'$(Platform)' == 'Win32'">$(SCRIBUS_COMMON_LIB_ROOT)\python-2.7.13-win32</PYTHON_DIR>
-	<PYTHON_DIR Condition="'$(Platform)' == 'x64'">$(SCRIBUS_COMMON_LIB_ROOT)\python-2.7.13-amd64</PYTHON_DIR>
-	<PYTHON_INCLUDE_DIR>$(PYTHON_DIR)\include</PYTHON_INCLUDE_DIR>
-	<PYTHON_LIB_DIR>$(PYTHON_DIR)\lib</PYTHON_LIB_DIR>
-	<PYTHON_LIB Condition="'$(Configuration)' == 'Debug'">python27_d.lib</PYTHON_LIB>
-	<PYTHON_LIB Condition="'$(Configuration)' == 'Release'">python27.lib</PYTHON_LIB>
-	<!-- Zlib -->
-	<ZLIB_DIR>$(SCRIBUS_LIB_ROOT)\zlib-1.2.8</ZLIB_DIR>
-	<ZLIB_INCLUDE_DIR>$(ZLIB_DIR)\include</ZLIB_INCLUDE_DIR>
-	<ZLIB_LIB_DIR>$(ZLIB_DIR)\lib\$(Platform)-$(PlatformToolset)</ZLIB_LIB_DIR>
-	<ZLIB_LIB Condition="'$(Configuration)' == 'Debug'">zlib1d.lib</ZLIB_LIB>
-	<ZLIB_LIB Condition="'$(Configuration)' == 'Release'">zlib1.lib</ZLIB_LIB>
+	<!-- LittleCMS 2 -->
+	<LCMS_DIR>$(LCMS2_DIR)</LCMS_DIR>
+	<LCMS_INCLUDE_DIR>$(LCMS2_INCLUDE_DIR)</LCMS_INCLUDE_DIR>
+	<LCMS_LIB_DIR>$(LCMS2_LIB_DIR)</LCMS_LIB_DIR>
+	<LCMS_LIB>$(LCMS2_LIB)</LCMS_LIB>
   </PropertyGroup>
+  <!-- MSVC stuff -->
   <PropertyGroup>
     <_ProjectFileVersion>11.0.60610.1</_ProjectFileVersion>
   </PropertyGroup>

Modified: trunk/Scribus/win32/msvc2015/Scribus.sln
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22166&path=/trunk/Scribus/win32/msvc2015/Scribus.sln
==============================================================================
--- trunk/Scribus/win32/msvc2015/Scribus.sln	(original)
+++ trunk/Scribus/win32/msvc2015/Scribus.sln	Sun Sep 24 19:49:59 2017
@@ -351,6 +351,11 @@
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zmfimport", "zmfimport\zmfimport.vcxproj", "{2ED8F6D8-AB32-401F-B662-6F91A00849FC}"
+	ProjectSection(ProjectDependencies) = postProject
+		{B17FCD80-7978-4544-93C4-2FE1AC6FE9F3} = {B17FCD80-7978-4544-93C4-2FE1AC6FE9F3}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qxpimport", "qxpimport\qxpimport.vcxproj", "{630E2D8B-919E-4C52-9894-75D3873B4A7A}"
 	ProjectSection(ProjectDependencies) = postProject
 		{B17FCD80-7978-4544-93C4-2FE1AC6FE9F3} = {B17FCD80-7978-4544-93C4-2FE1AC6FE9F3}
 	EndProjectSection
@@ -931,6 +936,14 @@
 		{2ED8F6D8-AB32-401F-B662-6F91A00849FC}.Release|Win32.Build.0 = Release|Win32
 		{2ED8F6D8-AB32-401F-B662-6F91A00849FC}.Release|x64.ActiveCfg = Release|x64
 		{2ED8F6D8-AB32-401F-B662-6F91A00849FC}.Release|x64.Build.0 = Release|x64
+		{630E2D8B-919E-4C52-9894-75D3873B4A7A}.Debug|Win32.ActiveCfg = Debug|Win32
+		{630E2D8B-919E-4C52-9894-75D3873B4A7A}.Debug|Win32.Build.0 = Debug|Win32
+		{630E2D8B-919E-4C52-9894-75D3873B4A7A}.Debug|x64.ActiveCfg = Debug|x64
+		{630E2D8B-919E-4C52-9894-75D3873B4A7A}.Debug|x64.Build.0 = Debug|x64
+		{630E2D8B-919E-4C52-9894-75D3873B4A7A}.Release|Win32.ActiveCfg = Release|Win32
+		{630E2D8B-919E-4C52-9894-75D3873B4A7A}.Release|Win32.Build.0 = Release|Win32
+		{630E2D8B-919E-4C52-9894-75D3873B4A7A}.Release|x64.ActiveCfg = Release|x64
+		{630E2D8B-919E-4C52-9894-75D3873B4A7A}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

More information about the scribus-commit mailing list