diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2017-12-15 17:25:28 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2017-12-15 17:25:28 +0000 |
commit | 6b933047f46efec1aa747570f945344254227457 (patch) | |
tree | a12a4b87b38f954c4de435272cf4b90d721df5e8 /app-office/scribus | |
parent | f45955e60d4da9b7f4a1088c98042f9c06669039 (diff) |
gentoo resync : 15.12.2017
Diffstat (limited to 'app-office/scribus')
-rw-r--r-- | app-office/scribus/Manifest | 8 | ||||
-rw-r--r-- | app-office/scribus/files/scribus-1.5.0-QObject.patch | 15 | ||||
-rw-r--r-- | app-office/scribus/files/scribus-1.5.0-docdir.patch | 42 | ||||
-rw-r--r-- | app-office/scribus/files/scribus-1.5.0-fpic.patch | 178 | ||||
-rw-r--r-- | app-office/scribus/files/scribus-1.5.2-cmake-qt57.patch | 31 | ||||
-rw-r--r-- | app-office/scribus/files/scribus-1.5.2-cxx-build.patch | 24 | ||||
-rw-r--r-- | app-office/scribus/files/scribus-1.5.2-fpic.patch | 16 | ||||
-rw-r--r-- | app-office/scribus/files/scribus-1.5.2-gcc6-warn.patch | 87 | ||||
-rw-r--r-- | app-office/scribus/files/scribus-1.5.2-qt57-build.patch | 21 |
9 files changed, 0 insertions, 422 deletions
diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest index 98766a062993..fae0e8992cb1 100644 --- a/app-office/scribus/Manifest +++ b/app-office/scribus/Manifest @@ -1,12 +1,4 @@ AUX scribus-1.4.0-minizip.patch 1891 BLAKE2B 407d5a46210573f511572ef3dd3e25f7b23a7a83b86e48878df9b71c4669a53a6bb8df80de51e42049dc363a14e4246d11c67c046bcebb85748db78300be14cb SHA512 99feefb8e4ba9ae903e6a7a68b4cd497572ef254b550c864135e20392902e3595ea4414916474d5e80ceabc66e6cc5fac09af41955cbb2ba8e8d41480009bd86 -AUX scribus-1.5.0-QObject.patch 596 BLAKE2B 2d8fc40b48a47ae5faf6b6dbc8b74d202bb8c6c8954ef7e59302c22926d39c91eae4bd92216731318e795034cf34ddd8df1aab2737980fba3c831148243953c0 SHA512 97d21d7c301baaf2b610a8adb626401214c174a8f377547ce1484a341bc06a712bcd4009ee8ebc987fd35affb3cb870fc4855843f5f94097dcefa52ab1369c7d -AUX scribus-1.5.0-docdir.patch 1573 BLAKE2B 876923932a66a6f13965f90a996ff12a8616d175e3cd70d71217116e815a2fee03bee949237899d6c7f92c76c921f26ffdea43ac072cd3f70197fb870f141949 SHA512 fd65a84a2d1f3c432b776b722f68d28b4471b27c8e49dfbc6b616d6ff7f02c96e9c73ff94df3c4aa055b6868dc2a8e80dd6367c474c353f96b55359abff0844a -AUX scribus-1.5.0-fpic.patch 6395 BLAKE2B 58298e8569333c5a363c6fc3501517d272ca8d88e843652f1b3bd995683e6175b8bb516f37a4b212df5662f1f82b80e40d2fa38727917714adf40f0d048cff3c SHA512 b26e921271656d579b4578a6118fc26fc77557e4842e24231ba7702b024aac0f43954d46857ac2056ee992a485565cc781dbfe0ec9b3eb993429924b6a76f501 -AUX scribus-1.5.2-cmake-qt57.patch 996 BLAKE2B e97980484ffa44812bca401253ad4f8104266a217abffa55637edd33e3d2feb53f79f797eee5e1acc00d9448905f6219ed2cf93bbaf25185b35464641490d891 SHA512 952c86c51762e1cba4a9b49ada87ee8bd411a0fb048691b438b94b20af6e6337a081ba88084a43384821caa59881fbb9c2bbfa4b0ff69646c24daae2e2b3ab61 -AUX scribus-1.5.2-cxx-build.patch 1075 BLAKE2B 764b02fe26cf148c476fa247c7fe88ae58d0338ad33abb4792922944ff48a440e356702c9549019c3ec724c728fd9490c39fa0ec8157fb36b1c38ee9cf467f82 SHA512 7074bc0271237f067930b099c0dea5294b81d2056e56f8d83bf14b747f91b5ee2d34a14d76ce8fb8eca688bdb2fc3c4f1089b4d18302919d11965ad0fbba5446 -AUX scribus-1.5.2-fpic.patch 499 BLAKE2B c34f0c228a41c04ddf37d58a705815993679138d548b6d8a6cca953790a9f9f75de756c79132e6521ae507d83c9c91eddee13226813223c6f2806698efa29aac SHA512 eadc94ba950494cb6ed88ca7eac1c66d74a1eb3b8ce68ad9bfc2c209d241790a5ce1e9c4d27000a77b40b98dde6edb57bdf61a747a7f4128a5c96e1b910bc9d8 -AUX scribus-1.5.2-gcc6-warn.patch 3239 BLAKE2B 63c1cf60ba7dbe825571125a6e0fb9cf1957e2de34ef264da8004166b34e5473081a37164e6db9ab504c7d768397f73156e203ab9d55a0b3b33c43ea54fd1166 SHA512 f721cf349bc5f1de9d310d030dc7f53756933e3d654707efb34402a6ab456dac0a4f77f83e80572b97c0bd35d7797337055057d10373fbaeb4c56884dbb0dfd0 -AUX scribus-1.5.2-qt57-build.patch 1029 BLAKE2B c010ad1c5d4937686b9c7c3a66ffbf0382ca418eb999e82ba9377d6405f0da1fbb64a95ea67aa4e199fcc69d05c32576acc9752f7cb9c7ace38f43ef85c57ce2 SHA512 7cef141856b53d85fa7fced612be2ea862f60371f45ca116a4d838a7e5dba3dd38312221667b8c4b39b134d5a81d27f7f51921e43a17e79bb77b7f04d7434296 AUX scribus-1.5.3-docdir.patch 1309 BLAKE2B 978a5b54992bc2d2e84cc7435ffe15c2ace03a649de6b240a5b7a8a513134eb1ffac3f9a0f8adcf8679bf07f7beef47b4216102f9d3e3c84333b208b68e41e00 SHA512 5f3bd4fe4f61a2c8d2a58e3f480c95d32280358366a7eabc3c483abe1f3ef07ef5e3864be8ffce8b48584da23f81cb9b96b81c83a59ad4f3da5c7a5c34234063 AUX scribus-1.5.3-fpic.patch 499 BLAKE2B 68790e6d7a76c4ae01490956b0db09bc79e1c27269fa4cd4c4752bd60b228e36973a1c32d5d8156c12782091fa15614ba274be07dee0d92df9ef521f2d4361a2 SHA512 e38fc85e72af67c0fea4c14dad92a759f5065cd4e337ef2257a90f27e39297c6991c467e53e9c51ae247bf2f8c34fa62fa76cf839a53b386c9c378e53756d015 AUX scribus-9999-docdir.patch 1309 BLAKE2B 978a5b54992bc2d2e84cc7435ffe15c2ace03a649de6b240a5b7a8a513134eb1ffac3f9a0f8adcf8679bf07f7beef47b4216102f9d3e3c84333b208b68e41e00 SHA512 5f3bd4fe4f61a2c8d2a58e3f480c95d32280358366a7eabc3c483abe1f3ef07ef5e3864be8ffce8b48584da23f81cb9b96b81c83a59ad4f3da5c7a5c34234063 diff --git a/app-office/scribus/files/scribus-1.5.0-QObject.patch b/app-office/scribus/files/scribus-1.5.0-QObject.patch deleted file mode 100644 index 1ad2d1a575cc..000000000000 --- a/app-office/scribus/files/scribus-1.5.0-QObject.patch +++ /dev/null @@ -1,15 +0,0 @@ - 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 deleted file mode 100644 index 2ff316a91b57..000000000000 --- a/app-office/scribus/files/scribus-1.5.0-docdir.patch +++ /dev/null @@ -1,42 +0,0 @@ - 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 deleted file mode 100644 index 9f6a6c4e0aba..000000000000 --- a/app-office/scribus/files/scribus-1.5.0-fpic.patch +++ /dev/null @@ -1,178 +0,0 @@ - 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 deleted file mode 100644 index 214fab4257e4..000000000000 --- a/app-office/scribus/files/scribus-1.5.2-cmake-qt57.patch +++ /dev/null @@ -1,31 +0,0 @@ -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 deleted file mode 100644 index da8d50dee92d..000000000000 --- a/app-office/scribus/files/scribus-1.5.2-cxx-build.patch +++ /dev/null @@ -1,24 +0,0 @@ -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 deleted file mode 100644 index 58283645e726..000000000000 --- a/app-office/scribus/files/scribus-1.5.2-fpic.patch +++ /dev/null @@ -1,16 +0,0 @@ - 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 deleted file mode 100644 index 224ebe40d99e..000000000000 --- a/app-office/scribus/files/scribus-1.5.2-gcc6-warn.patch +++ /dev/null @@ -1,87 +0,0 @@ -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 deleted file mode 100644 index 0584c2907911..000000000000 --- a/app-office/scribus/files/scribus-1.5.2-qt57-build.patch +++ /dev/null @@ -1,21 +0,0 @@ -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; |