* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/files/
@ 2017-12-12 20:17 Patrice Clement
0 siblings, 0 replies; 5+ messages in thread
From: Patrice Clement @ 2017-12-12 20:17 UTC (permalink / raw
To: gentoo-commits
commit: c900914ed16732bb5404483793e98984dedfa755
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sat Dec 2 08:04:18 2017 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Tue Dec 12 20:14:52 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c900914e
app-office/scribus: remove unused patches.
Closes: https://github.com/gentoo/gentoo/pull/6390
.../scribus/files/scribus-1.5.0-QObject.patch | 15 --
.../scribus/files/scribus-1.5.0-docdir.patch | 42 -----
app-office/scribus/files/scribus-1.5.0-fpic.patch | 178 ---------------------
.../scribus/files/scribus-1.5.2-cmake-qt57.patch | 31 ----
.../scribus/files/scribus-1.5.2-cxx-build.patch | 24 ---
app-office/scribus/files/scribus-1.5.2-fpic.patch | 16 --
.../scribus/files/scribus-1.5.2-gcc6-warn.patch | 87 ----------
.../scribus/files/scribus-1.5.2-qt57-build.patch | 21 ---
8 files changed, 414 deletions(-)
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 1ad2d1a575c..00000000000
--- 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 2ff316a91b5..00000000000
--- 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 9f6a6c4e0ab..00000000000
--- 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 214fab4257e..00000000000
--- 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 da8d50dee92..00000000000
--- 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 58283645e72..00000000000
--- 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 224ebe40d99..00000000000
--- 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 0584c290791..00000000000
--- 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;
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/files/
@ 2019-01-16 18:39 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2019-01-16 18:39 UTC (permalink / raw
To: gentoo-commits
commit: 9d9bf65384f04e9f25d598c65428784a9bbeed2e
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 16 18:25:26 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jan 16 18:39:19 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d9bf653
app-office/scribus: Improve poppler-0.73 patch
Package-Manager: Portage-2.3.56, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../scribus-1.5.5_pre20190113-poppler-0.73.patch | 24 +++++++++++-----------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/app-office/scribus/files/scribus-1.5.5_pre20190113-poppler-0.73.patch b/app-office/scribus/files/scribus-1.5.5_pre20190113-poppler-0.73.patch
index af98da7050c..f63f4c6d1ee 100644
--- a/app-office/scribus/files/scribus-1.5.5_pre20190113-poppler-0.73.patch
+++ b/app-office/scribus/files/scribus-1.5.5_pre20190113-poppler-0.73.patch
@@ -1,24 +1,24 @@
-From 5a3255ac6dd1f19fb5fb5ab17452083bfe573f42 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Mon, 14 Jan 2019 23:58:59 +0100
-Subject: [PATCH] Drop obsolete header, does not exist in poppler-0.73
+From d34e59bfe495250ba023ba0f99e672ee32300a27 Mon Sep 17 00:00:00 2001
+From: Jean Ghali <jghali@libertysurf.fr>
+Date: Wed, 16 Jan 2019 00:30:35 +0000
+Subject: [PATCH] #15537: changes in poppler 0.73.0 cause build failure
+git-svn-id: svn://scribus.net/trunk/Scribus@22806 11d20701-8431-0410-a711-e3c959e3b870
---
- scribus/plugins/import/pdf/slaoutput.h | 1 -
- 1 file changed, 1 deletion(-)
+ scribus/plugins/import/pdf/slaoutput.h | 2 ++
+ 1 file changed, 2 insertions(+)
diff --git a/scribus/plugins/import/pdf/slaoutput.h b/scribus/plugins/import/pdf/slaoutput.h
-index c46448b..83e010c 100644
+index c46448b80a..4dac7c3983 100644
--- a/scribus/plugins/import/pdf/slaoutput.h
+++ b/scribus/plugins/import/pdf/slaoutput.h
-@@ -28,7 +28,6 @@ for which a new license (GPL+exception) is in place.
+@@ -28,7 +28,9 @@ for which a new license (GPL+exception) is in place.
#include "selection.h"
#include "vgradient.h"
--#include <poppler/goo/gtypes.h>
++#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(0, 73, 0)
+ #include <poppler/goo/gtypes.h>
++#endif
#include <poppler/Object.h>
#include <poppler/OutputDev.h>
#include <poppler/Gfx.h>
---
-2.20.1
-
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/files/
@ 2020-01-01 23:08 Aaron Bauman
0 siblings, 0 replies; 5+ messages in thread
From: Aaron Bauman @ 2020-01-01 23:08 UTC (permalink / raw
To: gentoo-commits
commit: 534c58cdbefddb55d4fd9689b1a59c9b8768765b
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Wed Jan 1 21:12:22 2020 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Wed Jan 1 23:08:11 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=534c58cd
app-office/scribus: remove unused patch
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/14205
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
.../scribus/files/scribus-1.5.3-docdir.patch | 42 ----------------------
1 file changed, 42 deletions(-)
diff --git a/app-office/scribus/files/scribus-1.5.3-docdir.patch b/app-office/scribus/files/scribus-1.5.3-docdir.patch
deleted file mode 100644
index d866922fa18..00000000000
--- a/app-office/scribus/files/scribus-1.5.3-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()
-- 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()
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/files/
@ 2021-10-10 0:54 Sam James
0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2021-10-10 0:54 UTC (permalink / raw
To: gentoo-commits
commit: 7b8c6af798cc7d82e658888be5e6699558016dd3
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 10 00:54:34 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Oct 10 00:54:34 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b8c6af7
app-office/scribus: fix with Harfbuzz 3 (again)
Bug: https://bugs.gentoo.org/813711
Closes: https://bugs.gentoo.org/817281
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../scribus/files/scribus-1.5.8-harfbuzz-3.patch | 41 +++++++++++++++++++++-
1 file changed, 40 insertions(+), 1 deletion(-)
diff --git a/app-office/scribus/files/scribus-1.5.8-harfbuzz-3.patch b/app-office/scribus/files/scribus-1.5.8-harfbuzz-3.patch
index 11e251866f0..f1645e516fa 100644
--- a/app-office/scribus/files/scribus-1.5.8-harfbuzz-3.patch
+++ b/app-office/scribus/files/scribus-1.5.8-harfbuzz-3.patch
@@ -1,7 +1,46 @@
+https://github.com/scribusproject/scribus/commit/1b546978bc4ea0b2a73fbe4d7cf947887e865162.patch
https://github.com/scribusproject/scribus/commit/68ec41169eaceea4a6e1d6f359762a191c7e61d5.patch
https://bugs.scribus.net/view.php?id=16635
+https://bugs.gentoo.org/817281
https://bugs.gentoo.org/813711
+From 1b546978bc4ea0b2a73fbe4d7cf947887e865162 Mon Sep 17 00:00:00 2001
+From: Jean Ghali <jghali@libertysurf.fr>
+Date: Sat, 21 Aug 2021 20:05:43 +0000
+Subject: [PATCH] Use new hb-subset api with harfbuzz >= 2.9.0 in order to
+ prepeare for removal of legacy API in 3.0
+
+git-svn-id: svn://scribus.net/trunk/Scribus@24696 11d20701-8431-0410-a711-e3c959e3b870
+---
+ scribus/fonts/sfnt.cpp | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/scribus/fonts/sfnt.cpp b/scribus/fonts/sfnt.cpp
+index 50777f66e3..fca8b39158 100644
+--- a/scribus/fonts/sfnt.cpp
++++ b/scribus/fonts/sfnt.cpp
+@@ -1256,11 +1256,19 @@ namespace sfnt {
+
+ for (int i = 0; i < cids.count(); ++i)
+ hb_set_add(glyphSet, cids.at(i));
+-
++
++#if HB_VERSION_ATLEAST(2, 9, 0)
++ uint32_t subsetFlags = (uint32_t) hb_subset_input_get_flags(hbSubsetInput.get());
++ subsetFlags |= HB_SUBSET_FLAGS_RETAIN_GIDS;
++ subsetFlags &= ~HB_SUBSET_FLAGS_NO_HINTING;
++ subsetFlags |= HB_SUBSET_FLAGS_NAME_LEGACY;
++ hb_subset_input_set_flags(hbSubsetInput.get(), subsetFlags);
++#else
+ hb_subset_input_set_retain_gids(hbSubsetInput.get(), true);
+ hb_subset_input_set_drop_hints(hbSubsetInput.get(), false);
+ #if HB_VERSION_ATLEAST(2, 6, 5)
+ hb_subset_input_set_name_legacy(hbSubsetInput.get(), true);
++#endif
+ #endif
+
+ QScopedPointer<hb_face_t, HbFaceDeleter> hbSubsetFace(hb_subset(hbFullFace.get(), hbSubsetInput.get()));
+
From 68ec41169eaceea4a6e1d6f359762a191c7e61d5 Mon Sep 17 00:00:00 2001
From: Jean Ghali <jghali@libertysurf.fr>
Date: Sun, 19 Sep 2021 11:59:50 +0000
@@ -26,4 +65,4 @@ git-svn-id: svn://scribus.net/trunk/Scribus@24707 11d20701-8431-0410-a711-e3c959
+#endif
QScopedPointer<hb_blob_t, HbBlobDeleter> hbSubsetBlob(hb_face_reference_blob(hbSubsetFace.get()));
- if (hbSubsetBlob.isNull())
+ if (hbSubsetBlob.isNull())
\ No newline at end of file
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/files/
@ 2024-01-13 18:51 Michał Górny
0 siblings, 0 replies; 5+ messages in thread
From: Michał Górny @ 2024-01-13 18:51 UTC (permalink / raw
To: gentoo-commits
commit: e6ac94fc102dc2e801cad6e3661f6c4981529c3c
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sat Jan 13 14:46:08 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Jan 13 18:50:50 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6ac94fc
app-office/scribus: remove unused patch
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
.../scribus/files/scribus-1.6.0-fix-desktop.patch | 20 --------------------
1 file changed, 20 deletions(-)
diff --git a/app-office/scribus/files/scribus-1.6.0-fix-desktop.patch b/app-office/scribus/files/scribus-1.6.0-fix-desktop.patch
deleted file mode 100644
index ad4d88818295..000000000000
--- a/app-office/scribus/files/scribus-1.6.0-fix-desktop.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/scribus.desktop.in
-+++ b/scribus.desktop.in
-@@ -1,11 +1,11 @@
- [Desktop Entry]
- Type=Application
--Name=Scribus
--Name[ar]=سكريبس
--Name[fa]=اسکریباس
--Name[lo]=ສະຄຣີບັດສ໌
--Name[ru]=Scribus
--Name[ta]=ஸ்கிரிபஸ்
-+Name=Scribus@TAG_VERSION@
-+Name[ar]=سكريبس@TAG_VERSION@
-+Name[fa]=اسکریباس@TAG_VERSION@
-+Name[lo]=ສະຄຣີບັດສ໌@TAG_VERSION@
-+Name[ru]=Scribus@TAG_VERSION@
-+Name[ta]=ஸ்கிரிபஸ்@TAG_VERSION@
- Comment=Page Layout and Publication
- Comment[ar]=سكريبس
- Comment[fa]=اسکریباس
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-01-13 18:51 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-10-10 0:54 [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2024-01-13 18:51 Michał Górny
2020-01-01 23:08 Aaron Bauman
2019-01-16 18:39 Andreas Sturmlechner
2017-12-12 20:17 Patrice Clement
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox