reinit the tree, so we can have metadata

13 files changed, 590 insertions, 0 deletions

diff --git a/app-office/scribus/files/scribus-1.4.0-minizip.patch b/app-office/scribus/files/scribus-1.4.0-minizip.patch
new file mode 100644
index 000000000000..c0a4b7cb38eb
--- /dev/null
+++ b/app-office/scribus/files/scribus-1.4.0-minizip.patch
@@ -0,0 +1,60 @@
+ Scribus.pro            |    4 ----
+ scribus/CMakeLists.txt |    2 --
+ 2 files changed, 0 insertions(+), 6 deletions(-)
+
+diff --git a/Scribus.pro b/Scribus.pro
+index 17b5417..0cc23c9 100644
+--- a/Scribus.pro
++++ b/Scribus.pro
+@@ -276,7 +276,6 @@ HEADERS += scribus/about.h \
+            scribus/insertaframe.h \
+            scribus/insertTable.h \
+            scribus/inspage.h \
+-           scribus/ioapi.h \
+            scribus/javadocs.h \
+            scribus/KarbonCurveFit.h \
+            scribus/langmgr.h \
+@@ -496,7 +495,6 @@ HEADERS += scribus/about.h \
+            scribus/undostate.h \
+            scribus/unicodesearch.h \
+            scribus/units.h \
+-           scribus/unzip.h \
+            scribus/updatemanager.h \
+            scribus/upgradechecker.h \
+            scribus/urllauncher.h \
+@@ -933,7 +931,6 @@ SOURCES += scribus/about.cpp \
+            scribus/insertaframe.cpp \
+            scribus/insertTable.cpp \
+            scribus/inspage.cpp \
+-           scribus/ioapi.c \
+            scribus/javadocs.cpp \
+            scribus/KarbonCurveFit.cpp \
+            scribus/langmgr.cpp \
+@@ -1143,7 +1140,6 @@ SOURCES += scribus/about.cpp \
+            scribus/undostate.cpp \
+            scribus/unicodesearch.cpp \
+            scribus/units.cpp \
+-           scribus/unzip.c \
+            scribus/updatemanager.cpp \
+            scribus/upgradechecker.cpp \
+            scribus/urllauncher.cpp \
+diff --git a/scribus/CMakeLists.txt b/scribus/CMakeLists.txt
+index dcd7e10..3aca69b 100644
+--- a/scribus/CMakeLists.txt
++++ b/scribus/CMakeLists.txt
+@@ -405,7 +405,6 @@ SET(SCRIBUS_SOURCES
+   insertTable.cpp
+   insertaframe.cpp
+   inspage.cpp
+-  ioapi.c
+   javadocs.cpp
+   KarbonCurveFit.cpp
+   langmgr.cpp
+@@ -613,7 +612,6 @@ SET(SCRIBUS_SOURCES
+   undostate.cpp
+   unicodesearch.cpp
+   units.cpp
+-  unzip.c
+   updatemanager.cpp
+   upgradechecker.cpp
+   urllauncher.cpp
diff --git a/app-office/scribus/files/scribus-1.5.0-QObject.patch b/app-office/scribus/files/scribus-1.5.0-QObject.patch
new file mode 100644
index 000000000000..1ad2d1a575cc
--- /dev/null
+++ b/app-office/scribus/files/scribus-1.5.0-QObject.patch
@@ -0,0 +1,15 @@
+ scribus/sclayer.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/scribus/sclayer.cpp b/scribus/sclayer.cpp
+index 502112b..4da7bd5 100644
+--- a/scribus/sclayer.cpp
++++ b/scribus/sclayer.cpp
+@@ -9,6 +9,7 @@ for which a new license (GPL+exception) is in place.
+ 

+ #include <QHash>   //necessary to avoid msvc warnings induced by SCRIBUS_API on ScLayers + early instanciation of templates

+ #include <QVector> //necessary to avoid msvc warnings induced by SCRIBUS_API on ScLayers + early instanciation of templates

++#include <QObject>

+ #include <QtAlgorithms>

+ 

+ ScLayer::ScLayer(void)

diff --git a/app-office/scribus/files/scribus-1.5.0-docdir.patch b/app-office/scribus/files/scribus-1.5.0-docdir.patch
new file mode 100644
index 000000000000..2ff316a91b57
--- /dev/null
+++ b/app-office/scribus/files/scribus-1.5.0-docdir.patch
@@ -0,0 +1,42 @@
+ CMakeLists.txt | 28 +++++++++++++++-------------
+ 1 file changed, 15 insertions(+), 13 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 29d66f3..1c08cdd 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -244,19 +244,21 @@ ELSE()
+ ENDIF()
+ 
+ #SHARE - use the default on Apple as TAG_VERSION is empty
+-IF(WIN32 OR OS2)
+-	SET(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/")
+-ELSE (WIN32 OR OS2)
+-	IF(TAG_VERSION OR BUILD_OSX_BUNDLE)
+-		SET(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}${TAG_VERSION}/")
+-	ELSE(TAG_VERSION OR BUILD_OSX_BUNDLE)
+-		IF(NOT WANT_VERSIONING)
+-			SET(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}/")
+-		ELSE(NOT WANT_VERSIONING)
+-			SET(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}-${VERSION}/")
+-		ENDIF(NOT WANT_VERSIONING)
+-	ENDIF (TAG_VERSION OR BUILD_OSX_BUNDLE)
+-ENDIF (WIN32 OR OS2)
++IF(NOT DOCDIR)
++	IF(WIN32 OR OS2)
++		SET(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/")
++	ELSE (WIN32 OR OS2)
++		IF(TAG_VERSION OR BUILD_OSX_BUNDLE)
++			SET(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}${TAG_VERSION}/")
++		ELSE(TAG_VERSION OR BUILD_OSX_BUNDLE)
++			IF(NOT WANT_VERSIONING)
++				SET(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}/")
++			ELSE(NOT WANT_VERSIONING)
++				SET(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}-${VERSION}/")
++			ENDIF(NOT WANT_VERSIONING)
++		ENDIF (TAG_VERSION OR BUILD_OSX_BUNDLE)
++	ENDIF (WIN32 OR OS2)
++ENDIF(NOT DOCDIR)
+ IF(NOT IS_ABSOLUTE ${DOCDIR})
+ 	ADD_DEFINITIONS("-DDOCDIR=\\\"${CMAKE_INSTALL_PREFIX}/${DOCDIR}\\\"")
+ ELSE()
diff --git a/app-office/scribus/files/scribus-1.5.0-fpic.patch b/app-office/scribus/files/scribus-1.5.0-fpic.patch
new file mode 100644
index 000000000000..9f6a6c4e0aba
--- /dev/null
+++ b/app-office/scribus/files/scribus-1.5.0-fpic.patch
@@ -0,0 +1,178 @@
+ CMakeLists.txt                              | 15 +++++++++++++++
+ scribus/colormgmt/CMakeLists.txt            |  2 ++
+ scribus/desaxe/CMakeLists.txt               |  1 +
+ scribus/fonts/CMakeLists.txt                |  1 +
+ scribus/styles/CMakeLists.txt               |  2 ++
+ scribus/text/CMakeLists.txt                 |  1 +
+ scribus/third_party/lib2geom/CMakeLists.txt |  8 +-------
+ scribus/third_party/pgf/CMakeLists.txt      |  2 ++
+ scribus/third_party/prc/CMakeLists.txt      |  2 ++
+ scribus/third_party/wpg/CMakeLists.txt      |  7 ++++---
+ scribus/third_party/zip/CMakeLists.txt      |  2 ++
+ 11 files changed, 33 insertions(+), 10 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 29d66f3..a92da7e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -131,6 +131,21 @@ IF (_machine_sparc64)
+ 	SET(ARCH64BIT 1)
+ ENDIF (_machine_sparc64)
+ 
++STRING(REGEX MATCH "(hppa*)" _machine_hppa "${MACHINE}")
++IF (_machine_hppa)
++	MESSAGE(STATUS "Found target Hppa")
++	SET(ARCH_HPPA 1)
++ENDIF (_machine_hppa)
++
++
++# We need to pass -fPIC to lib2geom on amd64, mips, mipsel, and hppa. See:
++# http://www.gentoo.org/proj/en/base/amd64/howtos/index.xml?part=1&chap=3 and
++# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=559133
++
++IF (ARCH_X86_64 EQUAL 1 OR ARCH_HPPA EQUAL 1 OR ARCH_MIPS EQUAL 1 OR ARCH_MIPS_64 EQUAL 1 OR ARCH_PPC_64 EQUAL 1)
++	SET(CMAKE_CXX_FLAGS_FPIC "-fPIC")
++ENDIF (ARCH_X86_64 EQUAL 1 OR ARCH_HPPA EQUAL 1 OR ARCH_MIPS EQUAL 1 OR ARCH_MIPS_64 EQUAL 1 OR ARCH_PPC_64 EQUAL 1)
++
+ ## Do our Apple OSX version setup
+ IF (APPLE AND CMAKE_SIZEOF_VOID_P EQUAL 8 AND (ARCH_X86 EQUAL 1 OR ARCH_X86_64 EQUAL 1))
+ 	STRING(REGEX REPLACE ".*-darwin([0-9]+).*" "\\1" _apple_ver "${MACHINE}")
+diff --git a/scribus/colormgmt/CMakeLists.txt b/scribus/colormgmt/CMakeLists.txt
+index 7298a28..87c4f5e 100644
+--- a/scribus/colormgmt/CMakeLists.txt
++++ b/scribus/colormgmt/CMakeLists.txt
+@@ -3,6 +3,8 @@ ${CMAKE_SOURCE_DIR}
+ ${CMAKE_SOURCE_DIR}/scribus

+ )

+ 

++SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}")

++

+ INCLUDE_DIRECTORIES( ${LCMS2_INCLUDE_DIR} )

+ SET(SCRIBUS_LCMS_IMPL_SOURCES

+ 	sclcms2colormgmtengineimpl.cpp

+diff --git a/scribus/desaxe/CMakeLists.txt b/scribus/desaxe/CMakeLists.txt
+index 0098028..85e76b6 100644
+--- a/scribus/desaxe/CMakeLists.txt
++++ b/scribus/desaxe/CMakeLists.txt
+@@ -4,6 +4,7 @@ ${CMAKE_SOURCE_DIR}/scribus
+ ${FREETYPE_INCLUDE_DIRS}
+ )
+ 
++SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}")
+ 
+ SET(SCRIBUS_DESAXE_LIB_SOURCES
+ saxXML.cpp
+diff --git a/scribus/fonts/CMakeLists.txt b/scribus/fonts/CMakeLists.txt
+index 799e102..f04c680 100644
+--- a/scribus/fonts/CMakeLists.txt
++++ b/scribus/fonts/CMakeLists.txt
+@@ -4,6 +4,7 @@ ${CMAKE_SOURCE_DIR}/scribus
+ ${FREETYPE_INCLUDE_DIRS}
+ )
+ 
++SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}")
+ 
+ SET(SCRIBUS_FONTS_LIB_SOURCES
+   scface.cpp
+diff --git a/scribus/styles/CMakeLists.txt b/scribus/styles/CMakeLists.txt
+index 6e0cf0a..2839689 100644
+--- a/scribus/styles/CMakeLists.txt
++++ b/scribus/styles/CMakeLists.txt
+@@ -4,6 +4,8 @@ INCLUDE_DIRECTORIES(
+ 	${FREETYPE_INCLUDE_DIRS}
+ )
+ 
++SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}")
++
+ SET(SCRIBUS_STYLES_MOC_CLASSES
+ )
+ 
+diff --git a/scribus/text/CMakeLists.txt b/scribus/text/CMakeLists.txt
+index 1cd112f..4f658e3 100644
+--- a/scribus/text/CMakeLists.txt
++++ b/scribus/text/CMakeLists.txt
+@@ -4,6 +4,7 @@ INCLUDE_DIRECTORIES(
+ 	${FREETYPE_INCLUDE_DIRS}
+ )
+ 
++SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}")
+ 
+ SET(SCRIBUS_TEXT_MOC_CLASSES
+ 	storytext.h
+diff --git a/scribus/third_party/lib2geom/CMakeLists.txt b/scribus/third_party/lib2geom/CMakeLists.txt
+index 6187d96..3106f6e 100755
+--- a/scribus/third_party/lib2geom/CMakeLists.txt
++++ b/scribus/third_party/lib2geom/CMakeLists.txt
+@@ -5,13 +5,7 @@ ${CMAKE_SOURCE_DIR}/scribus
+ 

+ SET(2GEOM_VERSION 0.1.0)

+ 

+-# We need to pass -fPIC to lib2geom on amd64, mips, mipsel, and hppa. See:

+-# http://www.gentoo.org/proj/en/base/amd64/howtos/index.xml?part=1&chap=3 and

+-# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=559133

+-

+-IF (ARCH_X86_64 EQUAL 1 OR ARCH_HPPA EQUAL 1 OR ARCH_MIPS EQUAL 1 OR ARCH_MIPS_64 EQUAL 1 OR ARCH_PPC_64 EQUAL 1)

+-  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")

+-ENDIF (ARCH_X86_64 EQUAL 1 OR ARCH_HPPA EQUAL 1 OR ARCH_MIPS EQUAL 1 OR ARCH_MIPS_64 EQUAL 1 OR ARCH_PPC_64 EQUAL 1)

++SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}")

+ 

+ OPTION(2GEOM_BUILD_SHARED

+   "Build lib2geom and libtoy as shared libraries."

+diff --git a/scribus/third_party/pgf/CMakeLists.txt b/scribus/third_party/pgf/CMakeLists.txt
+index f84b3d4..d3b1db6 100644
+--- a/scribus/third_party/pgf/CMakeLists.txt
++++ b/scribus/third_party/pgf/CMakeLists.txt
+@@ -3,6 +3,8 @@ ${CMAKE_SOURCE_DIR}
+ ${CMAKE_SOURCE_DIR}/scribus
+ )
+ 
++SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}")
++
+ SET(SCRIBUS_PGF_LIB_SOURCES
+         Decoder.cpp
+         Encoder.cpp
+diff --git a/scribus/third_party/prc/CMakeLists.txt b/scribus/third_party/prc/CMakeLists.txt
+index 5f7c2c6..1da7177 100644
+--- a/scribus/third_party/prc/CMakeLists.txt
++++ b/scribus/third_party/prc/CMakeLists.txt
+@@ -5,6 +5,8 @@ ${OPENGL_INCLUDE_DIR}
+ ${FREETYPE_INCLUDE_DIRS}
+ )
+ 
++SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}")
++
+ SET(SCRIBUS_PRC_LIB_SOURCES
+     oPRCFile.cc
+     PRCbitStream.cc
+diff --git a/scribus/third_party/wpg/CMakeLists.txt b/scribus/third_party/wpg/CMakeLists.txt
+index ff31e9f..fbc5cd4 100644
+--- a/scribus/third_party/wpg/CMakeLists.txt
++++ b/scribus/third_party/wpg/CMakeLists.txt
+@@ -2,10 +2,11 @@ INCLUDE_DIRECTORIES(
+ ${CMAKE_SOURCE_DIR}

+ ${CMAKE_SOURCE_DIR}/scribus

+ )

++

+ SET(LIB_TYPE STATIC)

+-IF (ARCH_X86_64 EQUAL 1)

+-  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")

+-ENDIF (ARCH_X86_64 EQUAL 1)

++

++SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}")

++

+ SET(WPG_SOURCES

+     WPG1Parser.cpp

+     WPG2Parser.cpp

+diff --git a/scribus/third_party/zip/CMakeLists.txt b/scribus/third_party/zip/CMakeLists.txt
+index edf9683..f7676ab 100644
+--- a/scribus/third_party/zip/CMakeLists.txt
++++ b/scribus/third_party/zip/CMakeLists.txt
+@@ -4,6 +4,8 @@ ${CMAKE_SOURCE_DIR}/scribus
+ ${ZLIB_INCLUDE_DIR}
+ )
+ 
++SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}")
++
+ SET(SCRIBUS_ZIP_LIB_SOURCES
+         unzip.cpp
+         zip.cpp
diff --git a/app-office/scribus/files/scribus-1.5.2-cmake-qt57.patch b/app-office/scribus/files/scribus-1.5.2-cmake-qt57.patch
new file mode 100644
index 000000000000..214fab4257e4
--- /dev/null
+++ b/app-office/scribus/files/scribus-1.5.2-cmake-qt57.patch
@@ -0,0 +1,31 @@
+commit 413c8c8a0ded5aa4b0f8d85dbc335082e809f3b2
+Author: Craig Bradney <mrb@scribus.info>
+Date:   Thu Jun 16 20:01:34 2016 +0000
+
+    Add better support for C++11/Qt 5.7.0. CMAKE minimum bumped to 3.2
+    
+    git-svn-id: svn://scribus.net/trunk/Scribus@21377 11d20701-8431-0410-a711-e3c959e3b870
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index bc1ec57..9e92a38 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -3,8 +3,9 @@
+ 
+ #Set our CMake minimum version
+ #Require 2.8.9 for Qt5
++#Require 3.1.0 for Qt 5.7 C++ 11 easy support
+ #Require 3.2.0 for add_custom_target with byproducts
+-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.9 FATAL_ERROR)
++CMAKE_MINIMUM_REQUIRED(VERSION 3.2.0 FATAL_ERROR)
+ 
+ #Pretty colors
+ SET(CMAKE_COLOR_MAKEFILE ON)
+@@ -382,6 +383,7 @@ ADD_DEFINITIONS("-DLIBDIR=\\\"${CMAKE_INSTALL_PREFIX}/${LIBDIR}\\\"")
+ #C++11 Support
+ IF(WANT_CPP11)
+ 	MESSAGE(STATUS "Enabling C++11 compiler features")
++	set(CMAKE_CXX_STANDARD 11)
+ 	ADD_DEFINITIONS("-std=c++11")
+ ENDIF(WANT_CPP11)
+ 
diff --git a/app-office/scribus/files/scribus-1.5.2-cxx-build.patch b/app-office/scribus/files/scribus-1.5.2-cxx-build.patch
new file mode 100644
index 000000000000..da8d50dee92d
--- /dev/null
+++ b/app-office/scribus/files/scribus-1.5.2-cxx-build.patch
@@ -0,0 +1,24 @@
+commit 1a9bdbc7ab793b15e93f1ab29ce06dd69c061f58
+Author: Jean Ghali <jghali@libertysurf.fr>
+Date:   Sat Jun 18 12:49:45 2016 +0000
+
+    fix build issue when not compiling with c++11 : std::isinf is c++11 only
+    
+    git-svn-id: svn://scribus.net/trunk/Scribus@21382 11d20701-8431-0410-a711-e3c959e3b870
+
+diff --git a/scribus/third_party/fparser/fpoptimizer.cc b/scribus/third_party/fparser/fpoptimizer.cc
+index 673e1b6..0c1bad5 100644
+--- a/scribus/third_party/fparser/fpoptimizer.cc
++++ b/scribus/third_party/fparser/fpoptimizer.cc
+@@ -7296,7 +7296,11 @@ namespace FPoptimizer_CodeTree
+                             //if(imm >= 0.0)
+                             {
+                                 double new_base_immed = std::pow(base_immed, imm);
++#if __cplusplus < 201103L
++								if(isinf(new_base_immed) || new_base_immed == 0.0)
++#else
+ 								if(std::isinf(new_base_immed) || new_base_immed == 0.0)
++#endif
+                                 {
+                                     // It produced an infinity. Do not change.
+                                     break;
diff --git a/app-office/scribus/files/scribus-1.5.2-fpic.patch b/app-office/scribus/files/scribus-1.5.2-fpic.patch
new file mode 100644
index 000000000000..58283645e726
--- /dev/null
+++ b/app-office/scribus/files/scribus-1.5.2-fpic.patch
@@ -0,0 +1,16 @@
+ scribus/third_party/prc/CMakeLists.txt | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/scribus/third_party/prc/CMakeLists.txt b/scribus/third_party/prc/CMakeLists.txt
+index 5f7c2c6..1da7177 100644
+--- a/scribus/third_party/prc/CMakeLists.txt
++++ b/scribus/third_party/prc/CMakeLists.txt
+@@ -5,6 +5,8 @@ ${OPENGL_INCLUDE_DIR}
+ ${FREETYPE_INCLUDE_DIRS}
+ )
+ 
++SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}")
++
+ SET(SCRIBUS_PRC_LIB_SOURCES
+     oPRCFile.cc
+     PRCbitStream.cc
diff --git a/app-office/scribus/files/scribus-1.5.2-gcc6-warn.patch b/app-office/scribus/files/scribus-1.5.2-gcc6-warn.patch
new file mode 100644
index 000000000000..224ebe40d99e
--- /dev/null
+++ b/app-office/scribus/files/scribus-1.5.2-gcc6-warn.patch
@@ -0,0 +1,87 @@
+commit bb3066704e987210c324ec7f3bfb2c8153d9710e
+Author: Jean Ghali <jghali@libertysurf.fr>
+Date:   Sat Aug 20 12:18:31 2016 +0000
+
+    fix a few gcc 6 warnings related to auto_ptr deprecation in c++11 by replacing it with QScopedPointer
+    
+    git-svn-id: svn://scribus.net/trunk/Scribus@21430 11d20701-8431-0410-a711-e3c959e3b870
+
+diff --git a/scribus/sclistboxpixmap.h b/scribus/sclistboxpixmap.h
+index 044d45a..a067b79 100644
+--- a/scribus/sclistboxpixmap.h
++++ b/scribus/sclistboxpixmap.h
+@@ -13,6 +13,7 @@ for which a new license (GPL+exception) is in place.
+ #include <QDebug>
+ #include <QPainter>
+ #include <QPixmap>
++#include <QScopedPointer>
+ #include <QVariant>
+ 
+ #include "scguardedptr.h"
+@@ -30,19 +31,19 @@ public:
+ 	virtual QSize sizeHint (const QStyleOptionViewItem & option, const QModelIndex & index ) const;
+ 	virtual void paint(QPainter * painter, const QStyleOptionViewItem & option, const QModelIndex & index ) const;
+ protected:
+-	static std::auto_ptr<QPixmap> pmap;
++	static QScopedPointer<QPixmap> pmap;
+ 	// The drawPixmap function must not modify pixmap size
+ 	virtual void redraw(const QVariant&) const = 0;
+ };
+ 
+ template<unsigned int pixWidth, unsigned int pixHeight> 
+-std::auto_ptr<QPixmap> ScListBoxPixmap<pixWidth, pixHeight>::pmap;
++QScopedPointer<QPixmap> ScListBoxPixmap<pixWidth, pixHeight>::pmap;
+ 
+ 
+ template<unsigned int pixWidth, unsigned int pixHeight>
+ ScListBoxPixmap<pixWidth, pixHeight>::ScListBoxPixmap(void) : QAbstractItemDelegate()
+ {
+-	if (!pmap.get())
++	if (pmap.isNull())
+ 	{
+ 		pmap.reset( new QPixmap(pixWidth, pixHeight) );
+ 	}
+diff --git a/scribus/ui/colorlistbox.cpp b/scribus/ui/colorlistbox.cpp
+index 9f3897b..99f280f 100644
+--- a/scribus/ui/colorlistbox.cpp
++++ b/scribus/ui/colorlistbox.cpp
+@@ -83,7 +83,7 @@ public:
+ 
+ void ColorSmallItemDelegate::redraw(const QVariant& data) const
+ {
+-	QPixmap* pPixmap = ScListBoxPixmap<15,15>::pmap.get();
++	QPixmap* pPixmap = ScListBoxPixmap<15,15>::pmap.data();
+ 	pPixmap->fill(Qt::transparent);
+ 	if (data.canConvert<ColorPixmapValue>())
+ 	{
+@@ -101,7 +101,7 @@ void ColorSmallItemDelegate::redraw(const QVariant& data) const
+ 
+ void ColorWideItemDelegate::redraw(const QVariant& data) const
+ {
+-	QPixmap* pPixmap = ScListBoxPixmap<30,15>::pmap.get();
++	QPixmap* pPixmap = ScListBoxPixmap<30,15>::pmap.data();
+ 	pPixmap->fill(Qt::transparent);
+ 	if (data.canConvert<ColorPixmapValue>())
+ 	{
+@@ -134,7 +134,7 @@ void ColorFancyItemDelegate::redraw(const QVariant& data) const
+ 		iconsInitialized = true;
+ 	}
+ 
+-	QPixmap* pPixmap = ScListBoxPixmap<60,15>::pmap.get();
++	QPixmap* pPixmap = ScListBoxPixmap<60,15>::pmap.data();
+ 	pPixmap->fill(Qt::transparent);
+ 
+ 	if (data.canConvert<ColorPixmapValue>())
+diff --git a/scribus/ui/propertiespalette_utils.cpp b/scribus/ui/propertiespalette_utils.cpp
+index f76743c..cadbb11 100644
+--- a/scribus/ui/propertiespalette_utils.cpp
++++ b/scribus/ui/propertiespalette_utils.cpp
+@@ -66,7 +66,7 @@ void LineFormatItemDelegate::redraw(const QVariant& data) const
+ 	QColor tmpf;
+ 	pmap->fill(Qt::white);
+ 	QPainter p;
+-	p.begin(pmap.get());
++	p.begin(pmap.data());
+ 	for (int its = item.m_Line.size()-1; its > -1; its--)
+ 	{
+ 		const ScColor& col = item.m_doc->PageColors[item.m_Line[its].Color];
diff --git a/app-office/scribus/files/scribus-1.5.2-qt57-build.patch b/app-office/scribus/files/scribus-1.5.2-qt57-build.patch
new file mode 100644
index 000000000000..0584c2907911
--- /dev/null
+++ b/app-office/scribus/files/scribus-1.5.2-qt57-build.patch
@@ -0,0 +1,21 @@
+commit ddb5688ae4f4ff40ba1204a413fcf15279b35f2b
+Author: Franz Schmid <Franz.Schmid@altmuehlnet.de>
+Date:   Sat Jun 18 09:14:21 2016 +0000
+
+    Compile Fix for compiling with Qt-5.7
+    
+    git-svn-id: svn://scribus.net/trunk/Scribus@21381 11d20701-8431-0410-a711-e3c959e3b870
+
+diff --git a/scribus/third_party/fparser/fpoptimizer.cc b/scribus/third_party/fparser/fpoptimizer.cc
+index ae8c0f6..673e1b6 100644
+--- a/scribus/third_party/fparser/fpoptimizer.cc
++++ b/scribus/third_party/fparser/fpoptimizer.cc
+@@ -7296,7 +7296,7 @@ namespace FPoptimizer_CodeTree
+                             //if(imm >= 0.0)
+                             {
+                                 double new_base_immed = std::pow(base_immed, imm);
+-                                if(isinf(new_base_immed) || new_base_immed == 0.0)
++								if(std::isinf(new_base_immed) || new_base_immed == 0.0)
+                                 {
+                                     // It produced an infinity. Do not change.
+                                     break;
diff --git a/app-office/scribus/files/scribus-1.5.3-docdir.patch b/app-office/scribus/files/scribus-1.5.3-docdir.patch
new file mode 100644
index 000000000000..d866922fa18a
--- /dev/null
+++ b/app-office/scribus/files/scribus-1.5.3-docdir.patch
@@ -0,0 +1,42 @@
+ CMakeLists.txt | 28 +++++++++++++++-------------
+ 1 file changed, 15 insertions(+), 13 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 29d66f3..1c08cdd 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -244,19 +244,21 @@ else()
+ endif()
+ 
+ #SHARE - use the default on Apple as TAG_VERSION is empty
+-if(WIN32 OR OS2)
+-	set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/")
+-else()
+-	if(TAG_VERSION OR BUILD_OSX_BUNDLE)
+-		set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}${TAG_VERSION}/")
+-	else()
+-		if(NOT WANT_VERSIONING)
+-			set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}/")
+-		else()
+-			set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}-${VERSION}/")
+-		endif()
+-	endif()
+-endif()
++if(NOT DOCDIR)
++	if(WIN32 OR OS2)
++		set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/")
++	else()
++		if(TAG_VERSION OR BUILD_OSX_BUNDLE)
++			set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}${TAG_VERSION}/")
++		else()
++			if(NOT WANT_VERSIONING)
++				set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}/")
++			else()
++				set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}-${VERSION}/")
++			endif()
++		endif()
++	endif()
++endif()
+ if(NOT IS_ABSOLUTE ${DOCDIR})
+ 	add_definitions("-DDOCDIR=\\\"${CMAKE_INSTALL_PREFIX}/${DOCDIR}\\\"")
+ else()
diff --git a/app-office/scribus/files/scribus-1.5.3-fpic.patch b/app-office/scribus/files/scribus-1.5.3-fpic.patch
new file mode 100644
index 000000000000..ba0721955ef8
--- /dev/null
+++ b/app-office/scribus/files/scribus-1.5.3-fpic.patch
@@ -0,0 +1,16 @@
+ scribus/third_party/prc/CMakeLists.txt | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/scribus/third_party/prc/CMakeLists.txt b/scribus/third_party/prc/CMakeLists.txt
+index 5f7c2c6..1da7177 100644
+--- a/scribus/third_party/prc/CMakeLists.txt
++++ b/scribus/third_party/prc/CMakeLists.txt
+@@ -5,6 +5,8 @@ ${OPENGL_INCLUDE_DIR}
+ ${FREETYPE_INCLUDE_DIRS}
+ )
+ 
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}")
++
+ set(SCRIBUS_PRC_LIB_SOURCES
+     oPRCFile.cc
+     PRCbitStream.cc
diff --git a/app-office/scribus/files/scribus-9999-docdir.patch b/app-office/scribus/files/scribus-9999-docdir.patch
new file mode 100644
index 000000000000..d866922fa18a
--- /dev/null
+++ b/app-office/scribus/files/scribus-9999-docdir.patch
@@ -0,0 +1,42 @@
+ CMakeLists.txt | 28 +++++++++++++++-------------
+ 1 file changed, 15 insertions(+), 13 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 29d66f3..1c08cdd 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -244,19 +244,21 @@ else()
+ endif()
+ 
+ #SHARE - use the default on Apple as TAG_VERSION is empty
+-if(WIN32 OR OS2)
+-	set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/")
+-else()
+-	if(TAG_VERSION OR BUILD_OSX_BUNDLE)
+-		set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}${TAG_VERSION}/")
+-	else()
+-		if(NOT WANT_VERSIONING)
+-			set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}/")
+-		else()
+-			set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}-${VERSION}/")
+-		endif()
+-	endif()
+-endif()
++if(NOT DOCDIR)
++	if(WIN32 OR OS2)
++		set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/")
++	else()
++		if(TAG_VERSION OR BUILD_OSX_BUNDLE)
++			set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}${TAG_VERSION}/")
++		else()
++			if(NOT WANT_VERSIONING)
++				set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}/")
++			else()
++				set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}-${VERSION}/")
++			endif()
++		endif()
++	endif()
++endif()
+ if(NOT IS_ABSOLUTE ${DOCDIR})
+ 	add_definitions("-DDOCDIR=\\\"${CMAKE_INSTALL_PREFIX}/${DOCDIR}\\\"")
+ else()
diff --git a/app-office/scribus/files/scribus-9999-fpic.patch b/app-office/scribus/files/scribus-9999-fpic.patch
new file mode 100644
index 000000000000..ba0721955ef8
--- /dev/null
+++ b/app-office/scribus/files/scribus-9999-fpic.patch
@@ -0,0 +1,16 @@
+ scribus/third_party/prc/CMakeLists.txt | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/scribus/third_party/prc/CMakeLists.txt b/scribus/third_party/prc/CMakeLists.txt
+index 5f7c2c6..1da7177 100644
+--- a/scribus/third_party/prc/CMakeLists.txt
++++ b/scribus/third_party/prc/CMakeLists.txt
+@@ -5,6 +5,8 @@ ${OPENGL_INCLUDE_DIR}
+ ${FREETYPE_INCLUDE_DIRS}
+ )
+ 
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}")
++
+ set(SCRIBUS_PRC_LIB_SOURCES
+     oPRCFile.cc
+     PRCbitStream.cc