[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/, app-office/scribus/files/
commit: 8a730783c2223dac336f7864ba9b323f6cebbe9b
Author: Miroslav Šulc gentoo org>
AuthorDate: Thu Jul 18 08:44:28 2024 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Thu Jul 18 08:44:28 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a730783
app-office/scribus: dropped obsolete 1.6.1-r1
Bug: https://bugs.gentoo.org/936207
Signed-off-by: Miroslav Šulc gentoo.org>
app-office/scribus/Manifest| 1 -
.../scribus/files/scribus-1.6.1-boost-1.85-2.patch | 27
.../scribus/files/scribus-1.6.1-boost-1.85.patch | 39 --
.../files/scribus-1.6.1-poppler-24.03.patch| 64 -
.../files/scribus-1.6.1-poppler-24.05.patch| 24
app-office/scribus/scribus-1.6.1-r1.ebuild | 154 -
6 files changed, 309 deletions(-)
diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index 48266e2a2a49..ac8f96b07636 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -1,2 +1 @@
-DIST scribus-1.6.1.tar.xz 73266900 BLAKE2B
b8120823cf98201ed197748cffe3f12019acfbd4831b497585ad7d04fa6d6e470bf4bc85dac15700483dfc977c56136cb49bcee20106f482cd9b0022d75d28d5
SHA512
ffde5628ea314dab8f212f78e7dd96cd258ceaebccc5b8de2c21e338a433f82d7fbbb047d05882abb07b4dceac031141b77fef933c9a3ed0e26f29bb94377e7e
DIST scribus-1.6.2.tar.xz 73129400 BLAKE2B
2da98dc322319db18a157f66aef024b7392dbbfaf22adba14f719b48c644d1cc1546cc4d0cccf6dfe479571cf84de6f5645e5d452154f96ddc886e390702d547
SHA512
2f691c1f6b7beada89be410a2936b23641913bf26bd2152974bbaa747aeafb05aa797356a85bd55c14f60f0031ce1addedc9a3ce3e92546ebbb45f96a5ff3e62
diff --git a/app-office/scribus/files/scribus-1.6.1-boost-1.85-2.patch
b/app-office/scribus/files/scribus-1.6.1-boost-1.85-2.patch
deleted file mode 100644
index 55bc9934964b..
--- a/app-office/scribus/files/scribus-1.6.1-boost-1.85-2.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 3116328e804c7366ec64c4224cbf20b0f14e52c8 Mon Sep 17 00:00:00 2001
-From: Jean Ghali
-Date: Sun, 31 Mar 2024 21:40:42 +
-Subject: [PATCH] Fix C++20 related warning "template-id is not allowed for
- constructor in C++20"
-
-git-svn-id: svn://scribus.net/trunk/Scribus@26079
11d20701-8431-0410-a711-e3c959e3b870
a/scribus/third_party/lib2geom/rect.h
-+++ b/scribus/third_party/lib2geom/rect.h
-@@ -56,14 +56,14 @@ class D2 {
- private:
- Interval f[2];
- public:
--D2() { f[X] = f[Y] = Interval(0, 0); }
-+D2() { f[X] = f[Y] = Interval(0, 0); }
-
--D2(Interval const &a, Interval const &b) {
-+D2(Interval const &a, Interval const &b) {
- f[X] = a;
- f[Y] = b;
- }
-
--D2(Point const & a, Point const & b) {
-+D2(Point const & a, Point const & b) {
- f[X] = Interval(a[X], b[X]);
- f[Y] = Interval(a[Y], b[Y]);
- }
diff --git a/app-office/scribus/files/scribus-1.6.1-boost-1.85.patch
b/app-office/scribus/files/scribus-1.6.1-boost-1.85.patch
deleted file mode 100644
index 9d5dc0868843..
--- a/app-office/scribus/files/scribus-1.6.1-boost-1.85.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 3e80b387a226f1abac2bcce6e4300467c189d264 Mon Sep 17 00:00:00 2001
-From: Jean Ghali
-Date: Sat, 1 Jun 2024 22:04:13 +
-Subject: [PATCH] #17229: scribus fails to compile with boost 1.85.0
-
-git-svn-id: svn://scribus.net/branches/Version16x/Scribus@26170
11d20701-8431-0410-a711-e3c959e3b870
a/scribus/third_party/lib2geom/point.h
-+++ b/scribus/third_party/lib2geom/point.h
-@@ -121,10 +121,14 @@ class Point {
-
- Point &operator*=(Matrix const &m);
-
--inline int operator == (const Point &in_pnt) {
-+inline bool operator==(const Point &in_pnt) const {
- return ((_pt[X] == in_pnt[X]) && (_pt[Y] == in_pnt[Y]));
- }
-
-+inline bool operator!=(const Point &in_pnt) const {
-+return ((_pt[X] != in_pnt[X]) || (_pt[Y] != in_pnt[Y]));
-+}
-+
- friend inline std::ostream &operator<< (std::ostream &out_file, const
Geom::Point &in_pnt);
- };
-
-@@ -144,14 +148,6 @@ inline Point operator^(Point const &a, Point const &b) {
- return ret;
- }
-
--//IMPL: boost::EqualityComparableConcept
--inline bool operator==(Point const &a, Point const &b) {
--return (a[X] == b[X]) && (a[Y] == b[Y]);
--}
--inline bool operator!=(Point const &a, Point const &b) {
--return (a[X] != b[X]) || (a[Y] != b[Y]);
--}
--
- /** This is a lexicographical ordering for points. It is remarkably useful
for sweepline algorithms*/
- inline bool operator<=(Point const &a, Point const &b) {
- return ( ( a[Y] < b[Y] ) ||
diff --git a/app-office/scribus/files/scribus-1.6.1-poppler-24.03.patch
b/app-office/scribus/files/scribus-1.6.1-poppler-24.03.patch
deleted file mode 100644
index 0a8d317b6109..
--- a/app-office/scribus/files/scribus-1.6.1-poppler-24.03.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From dc2470990ab73c87fdd60068c99518ced01a3edd Mon Sep 17 00:00:00 2001
-From: Andreas S
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/, app-office/scribus/files/
commit: 58e71948274b0119266597be72b352fbf3ea83f7
Author: Miroslav Šulc gentoo org>
AuthorDate: Tue Jun 4 10:34:45 2024 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Tue Jun 4 10:34:45 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58e71948
app-office/scribus: fixed building with boost 1.85
Closes: https://bugs.gentoo.org/932492
Signed-off-by: Miroslav Šulc gentoo.org>
.../scribus/files/scribus-1.6.1-boost-1.85-2.patch | 27 ++
app-office/scribus/scribus-1.6.1-r1.ebuild | 1 +
2 files changed, 28 insertions(+)
diff --git a/app-office/scribus/files/scribus-1.6.1-boost-1.85-2.patch
b/app-office/scribus/files/scribus-1.6.1-boost-1.85-2.patch
new file mode 100644
index ..55bc9934964b
--- /dev/null
+++ b/app-office/scribus/files/scribus-1.6.1-boost-1.85-2.patch
@@ -0,0 +1,27 @@
+From 3116328e804c7366ec64c4224cbf20b0f14e52c8 Mon Sep 17 00:00:00 2001
+From: Jean Ghali
+Date: Sun, 31 Mar 2024 21:40:42 +
+Subject: [PATCH] Fix C++20 related warning "template-id is not allowed for
+ constructor in C++20"
+
+git-svn-id: svn://scribus.net/trunk/Scribus@26079
11d20701-8431-0410-a711-e3c959e3b870
+--- a/scribus/third_party/lib2geom/rect.h
b/scribus/third_party/lib2geom/rect.h
+@@ -56,14 +56,14 @@ class D2 {
+ private:
+ Interval f[2];
+ public:
+-D2() { f[X] = f[Y] = Interval(0, 0); }
++D2() { f[X] = f[Y] = Interval(0, 0); }
+
+-D2(Interval const &a, Interval const &b) {
++D2(Interval const &a, Interval const &b) {
+ f[X] = a;
+ f[Y] = b;
+ }
+
+-D2(Point const & a, Point const & b) {
++D2(Point const & a, Point const & b) {
+ f[X] = Interval(a[X], b[X]);
+ f[Y] = Interval(a[Y], b[Y]);
+ }
diff --git a/app-office/scribus/scribus-1.6.1-r1.ebuild
b/app-office/scribus/scribus-1.6.1-r1.ebuild
index e112af815030..3b20f7808237 100644
--- a/app-office/scribus/scribus-1.6.1-r1.ebuild
+++ b/app-office/scribus/scribus-1.6.1-r1.ebuild
@@ -79,6 +79,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.6.1-poppler-24.03.patch
"${FILESDIR}"/${PN}-1.6.1-poppler-24.05.patch
"${FILESDIR}"/${PN}-1.6.1-boost-1.85.patch
+ "${FILESDIR}"/${PN}-1.6.1-boost-1.85-2.patch
)
src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/, app-office/scribus/files/
commit: badb43a76d2ba1cc0e1fdd33b076c4d0161fdf1c
Author: Miroslav Šulc gentoo org>
AuthorDate: Mon Mar 4 10:27:51 2024 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Mon Mar 4 10:29:55 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=badb43a7
app-office/scribus: dropped obsolete 1.5.8-r6
Bug: https://bugs.gentoo.org/925325
Signed-off-by: Miroslav Šulc gentoo.org>
app-office/scribus/Manifest| 3 -
.../scribus/files/scribus-1.5.6-docdir.patch | 27
.../scribus/files/scribus-1.5.6-findhyphen.patch | 19 ---
.../scribus/files/scribus-1.5.8-findhyphen-1.patch | 50 --
.../scribus/files/scribus-1.5.8-python-3.12.patch | 32
app-office/scribus/scribus-1.5.8-r6.ebuild | 171 -
6 files changed, 302 deletions(-)
diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index 8980478a95bb..0ffc05a70363 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -1,4 +1 @@
-DIST scribus-1.5.8-patchset-1.tar.xz 7396 BLAKE2B
f8c7b6eb83bfdca715a46c09f4168db332d52b4d4bdc12946bd3ca88bd9b6c67a22c034b58ca62149cbe483ca75efa646589d367245db68136b0bdbcf91dae20
SHA512
ee9bc984b0593fb2f0e727e45dac12b6d1fd1117d0e42d531ab7a49b55b0d72b5c36fc40709750571eb8c70e19f5b59e69faefa40c5706d82f1b6db18baff28d
-DIST scribus-1.5.8-podofo-0.10.tar.xz 19116 BLAKE2B
3aa6ecc6726fece8c3b1645096493615eafc67daf45bb5e5ff56a01e75a08418aaad9cfd67e1de3114b4e1e8dd7478c2be3da63ea29560948ddd5295f586e00e
SHA512
7d03cedbdae5147c6f2b662ae8c9bd009d5eb9efcb3087bd841e785b4a4a1942a2811f29d433590022d9dc68f716b8b20c30b818d5c91197cbe79fe3260d0db7
-DIST scribus-1.5.8.tar.xz 74543476 BLAKE2B
6eacf3089db88b673bd146a9727af4faa4e64901b332dbe08e6c62c912212bfd0e9e2003796df51621ee7d66262388ecfc3bed057a22d1d7fb1740e77fe50686
SHA512
eb46be0165eeb0d8974aa744fc8ffac321b206ca0015da39bb2f50d9fd4a5e28300a49ada0f963b4e0cf9a3301dc746ffba74f359f5e76d308d80b71ee669c2d
DIST scribus-1.6.1.tar.xz 73266900 BLAKE2B
b8120823cf98201ed197748cffe3f12019acfbd4831b497585ad7d04fa6d6e470bf4bc85dac15700483dfc977c56136cb49bcee20106f482cd9b0022d75d28d5
SHA512
ffde5628ea314dab8f212f78e7dd96cd258ceaebccc5b8de2c21e338a433f82d7fbbb047d05882abb07b4dceac031141b77fef933c9a3ed0e26f29bb94377e7e
diff --git a/app-office/scribus/files/scribus-1.5.6-docdir.patch
b/app-office/scribus/files/scribus-1.5.6-docdir.patch
deleted file mode 100644
index 06d878af55fd..
--- a/app-office/scribus/files/scribus-1.5.6-docdir.patch
+++ /dev/null
@@ -1,27 +0,0 @@
a/CMakeLists_Directories.cmake
-+++ b/CMakeLists_Directories.cmake
-@@ -36,14 +36,16 @@ else()
- endif()
-
- #SHARE - use the default on Apple as TAG_VERSION is empty
--if(WIN32 OR OS2)
-- set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/")
--elseif(TAG_VERSION OR BUILD_OSX_BUNDLE)
-- set(DOCDIR
"${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}${TAG_VERSION}/")
--elseif(NOT WANT_VERSIONING)
-- set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}/")
--else()
-- set(DOCDIR
"${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}-${VERSION}/")
-+if(NOT DOCDIR)
-+ if(WIN32 OR OS2)
-+ set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/")
-+ elseif(TAG_VERSION OR BUILD_OSX_BUNDLE)
-+ set(DOCDIR
"${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}${TAG_VERSION}/")
-+ elseif(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()
-
- if(IS_ABSOLUTE ${DOCDIR} AND WANT_RELOCATABLE)
diff --git a/app-office/scribus/files/scribus-1.5.6-findhyphen.patch
b/app-office/scribus/files/scribus-1.5.6-findhyphen.patch
deleted file mode 100644
index d8e2400ea1f4..
--- a/app-office/scribus/files/scribus-1.5.6-findhyphen.patch
+++ /dev/null
@@ -1,19 +0,0 @@
a/CMakeLists_Dependencies.cmake
-+++ b/CMakeLists_Dependencies.cmake
-@@ -954,6 +954,16 @@
- endif()
- #>>HUNSPELL for Speelling support
-
-+#<>HYPHEN for Hyphenation support
-+
- #<
-
- #include "scribusapi.h"
--#include "third_party/hyphen/hyphen.h"
-+#include
-
- class ScribusDoc;
- class ScribusMainWindow;
diff --git a/app-office/scribus/files/scribus-1.5.8-python-3.12.patch
b/app-office/scribus/files/scribus-1.5.8-python-3.12.patch
deleted file mode 100644
index 0e13892c7e26..
--- a/app-office/scribus/files/scribus-1.5.8-python-3.12.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Backport of
https://github.com/scribusproject/scribus/commit/065459990d1fe097d4339653c7ba600cc3547523
to fix
-https://bugzilla.redhat.com/2155514: Fails to build with Python 3.12: error:
'PyUnicode_AS_UNICODE'
-was not declared in this scope.
-
scribus-1.5.8/scribus/plugins/scriptplugin/cmdgetsetprop.cpp
-+++ scribus-1.5.8/scribus/plugins/scriptplugin/cmdgetsetprop.cpp.python-3.12
-@@ -409,10 +409,8 @
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/, app-office/scribus/files/
commit: 0be4808553bc65293d2cfcd9c4c9f121865f3e5f
Author: Miroslav Šulc gentoo org>
AuthorDate: Sun Jan 14 09:29:56 2024 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Sun Jan 14 09:30:35 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0be48085
app-office/scribus: added live ebuild with qt6 support
Signed-off-by: Miroslav Šulc gentoo.org>
...bus-1.7.0-dont-install-thirdparty-license.patch | 15 ++
.../scribus/files/scribus-1.7.0-findhyphen.patch | 70 ++
.../files/scribus-1.7.0-fix-icon-version.patch | 11 ++
.../scribus-1.7.0-fix-install-prefix-path.patch| 11 ++
.../scribus-1.7.0-remove-hello-world-test.patch| 10 ++
app-office/scribus/scribus-.ebuild | 154 +
6 files changed, 271 insertions(+)
diff --git
a/app-office/scribus/files/scribus-1.7.0-dont-install-thirdparty-license.patch
b/app-office/scribus/files/scribus-1.7.0-dont-install-thirdparty-license.patch
new file mode 100644
index ..d660b8dca008
--- /dev/null
+++
b/app-office/scribus/files/scribus-1.7.0-dont-install-thirdparty-license.patch
@@ -0,0 +1,15 @@
+--- a/scribus/third_party/Qt-Advanced-Docking-System/src/CMakeLists.txt
b/scribus/third_party/Qt-Advanced-Docking-System/src/CMakeLists.txt
+@@ -123,12 +123,6 @@ install(FILES ${ads_HEADERS}
+ DESTINATION include/${library_name}
+ COMPONENT headers
+ )
+-install(FILES
+-"${CMAKE_CURRENT_SOURCE_DIR}/../LICENSE"
+-"${CMAKE_CURRENT_SOURCE_DIR}/../gnu-lgpl-v2.1.md"
+-DESTINATION license/ads
+-COMPONENT license
+-)
+ install(TARGETS ${library_name}
+ EXPORT adsTargets
+ RUNTIME DESTINATION bin
diff --git a/app-office/scribus/files/scribus-1.7.0-findhyphen.patch
b/app-office/scribus/files/scribus-1.7.0-findhyphen.patch
new file mode 100644
index ..1fb7151c096d
--- /dev/null
+++ b/app-office/scribus/files/scribus-1.7.0-findhyphen.patch
@@ -0,0 +1,70 @@
+--- a/CMakeLists_Dependencies.cmake
b/CMakeLists_Dependencies.cmake
+@@ -1,6 +1,16 @@
+
##
+ ## Find Dependencies
##
+
++#<>HYPHEN for Hyphenation support
++
+ #<
+
+ #include "scribusapi.h"
+-#include "third_party/hyphen/hyphen.h"
++#include
+
+ class ScribusDoc;
+ class ScribusMainWindow;
diff --git a/app-office/scribus/files/scribus-1.7.0-fix-icon-version.patch
b/app-office/scribus/files/scribus-1.7.0-fix-icon-version.patch
new file mode 100644
index ..56c42602d20b
--- /dev/null
+++ b/app-office/scribus/files/scribus-1.7.0-fix-icon-version.patch
@@ -0,0 +1,11 @@
+--- a/resources/iconsets/artwork/CMakeLists.txt
b/resources/iconsets/artwork/CMakeLists.txt
+@@ -20,7 +20,7 @@ if(NOT WIN32 AND NOT APPLE)
+ FOREACH(res 16x16 32x32 64x64 128x128 256x256)
+ INSTALL(FILES
+ application-vnd.scribus_${res}.png
+- RENAME application-vnd.scribus.png
++ RENAME application-vnd.scribus${TAG_VERSION}.png
+ DESTINATION ${SYSICONDIR}/${res}/mimetypes/
+ )
+ ENDFOREACH(res)
diff --git
a/app-office/scribus/files/scribus-1.7.0-fix-install-prefix-path.patch
b/app-office/scribus/files/scribus-1.7.0-fix-install-prefix-path.patch
new file mode 100644
index ..33cad2b9c7fc
--- /dev/null
+++ b/app-office/scribus/files/scribus-1.7.0-fix-install-prefix-path.patch
@@ -0,0 +1,11 @@
+--- a/resources/templates/CMakeLists.txt
b/resources/templates/CMakeLists.txt
+@@ -5,7 +5,7 @@ ${CMAKE_SOURCE_DIR}/scribus
+
+ # Gentoo has an option for no templates. Let's make the ebuild simpler and
open up the option to others, but leave as a default for us. Make the directory
in any case as our source will look for it.
+ if (WANT_NOTEMPLATES)
+- install(CODE "file(MAKE_DIRECTORY
${ENV}${CMAKE_INSTALL_PREFIX}/${TEMPLATEDIR})")
++ install(CODE "file(MAKE_DIRECTORY
${ENV}./${CMAKE_INSTALL_PREFIX}/${TEMPLATEDIR})")
+ else (WANT_NOTEMPLATES)
+
+ install(FILES
diff --git
a/app-office/scribus/files/scribus-1.7.0-remove-hello-world-test.patch
b/app-office/scribus/files/scribus-1.7.0-remove-hello-world-test.patch
new file mode 100644
index ..cf9018fe1924
--- /dev/null
+++ b/app-office/scribus/files/scribus-1.7.0-remove-hello-world-test.patch
@@ -0,0 +1,10 @@
+--- a/scribus/CMakeLists.txt
b/scribus/CMakeLists.txt
+@@ -40,7 +40,6 @@ include(styles/CMakeLists.txt)
+ include(text/CMakeLists.txt)
+
+ add_subdirectory(dtd)
+-add_subdirectory(ui/qml)
+ if(WITH_TESTS)
+ add_subdirectory(tests)
+ endif()
diff --git a/app-office/scribus/scribus-.ebuild
b/app-office/scribus/scribus-.ebuild
new file mode 100644
index ..c1af6fc67077
--- /dev/null
+++ b/app-office/scribus/scribus-.ebuild
@@ -0,0 +1,154 @@
+# Copyright
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/, app-office/scribus/files/
commit: 8cad1d78982a56aa4f57a009fb52c93282c085b4
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Sep 23 19:56:16 2023 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Sun Sep 24 08:02:36 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8cad1d78
app-office/scribus: Fix build with >=app-text/podofo-0.10, python3_12
Closes: https://bugs.gentoo.org/914493
Signed-off-by: Andreas Sturmlechner gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/33015
Signed-off-by: Miroslav Šulc gentoo.org>
app-office/scribus/Manifest| 1 +
.../scribus/files/scribus-1.5.8-python-3.12.patch | 32
app-office/scribus/scribus-1.5.8-r6.ebuild | 171 +
3 files changed, 204 insertions(+)
diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index 77fcc903a9bf..5bb7b3812a2a 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -1,2 +1,3 @@
DIST scribus-1.5.8-patchset-1.tar.xz 7396 BLAKE2B
f8c7b6eb83bfdca715a46c09f4168db332d52b4d4bdc12946bd3ca88bd9b6c67a22c034b58ca62149cbe483ca75efa646589d367245db68136b0bdbcf91dae20
SHA512
ee9bc984b0593fb2f0e727e45dac12b6d1fd1117d0e42d531ab7a49b55b0d72b5c36fc40709750571eb8c70e19f5b59e69faefa40c5706d82f1b6db18baff28d
+DIST scribus-1.5.8-podofo-0.10.tar.xz 19116 BLAKE2B
3aa6ecc6726fece8c3b1645096493615eafc67daf45bb5e5ff56a01e75a08418aaad9cfd67e1de3114b4e1e8dd7478c2be3da63ea29560948ddd5295f586e00e
SHA512
7d03cedbdae5147c6f2b662ae8c9bd009d5eb9efcb3087bd841e785b4a4a1942a2811f29d433590022d9dc68f716b8b20c30b818d5c91197cbe79fe3260d0db7
DIST scribus-1.5.8.tar.xz 74543476 BLAKE2B
6eacf3089db88b673bd146a9727af4faa4e64901b332dbe08e6c62c912212bfd0e9e2003796df51621ee7d66262388ecfc3bed057a22d1d7fb1740e77fe50686
SHA512
eb46be0165eeb0d8974aa744fc8ffac321b206ca0015da39bb2f50d9fd4a5e28300a49ada0f963b4e0cf9a3301dc746ffba74f359f5e76d308d80b71ee669c2d
diff --git a/app-office/scribus/files/scribus-1.5.8-python-3.12.patch
b/app-office/scribus/files/scribus-1.5.8-python-3.12.patch
new file mode 100644
index ..ba30cb3eb467
--- /dev/null
+++ b/app-office/scribus/files/scribus-1.5.8-python-3.12.patch
@@ -0,0 +1,32 @@
+Backport of
https://github.com/scribusproject/scribus/commit/065459990d1fe097d4339653c7ba600cc3547523
to fix
+https://bugzilla.redhat.com/show_bug.cgi?id=2155514: Fails to build with
Python 3.12: error: 'PyUnicode_AS_UNICODE'
+was not declared in this scope.
+
+--- scribus-1.5.8/scribus/plugins/scriptplugin/cmdgetsetprop.cpp
2022-01-23 17:16:04.0 +0100
scribus-1.5.8/scribus/plugins/scriptplugin/cmdgetsetprop.cpp.python-3.12
2023-06-17 23:59:35.497937156 +0200
+@@ -409,10 +409,8 @@
+ success = obj->setProperty(propertyName,
QString::fromUtf8(PyBytes_AsString(objValue)));
+ else if (PyUnicode_Check(objValue))
+ {
+- // Get a pointer to the internal buffer of the
Py_Unicode object, which is UCS2 formatted
+- const unsigned short * ucs2Data = (const unsigned short
*) PyUnicode_AS_UNICODE(objValue);
+- // and make a new QString from it (the string is copied)
+- success = obj->setProperty(propertyName,
QString::fromUtf16(ucs2Data));
++ QString qStrValue = PyUnicode_asQString(objValue);
++ success = obj->setProperty(propertyName, qStrValue);
+ }
+ else
+ matched = false;
+@@ -429,10 +427,8 @@
+ }
+ else if (PyUnicode_Check(objValue))
+ {
+- // Get a pointer to the internal buffer of the
Py_Unicode object, which is UCS2 formatted
+- const unsigned short * utf16Data = (const unsigned
short *)PyUnicode_AS_UNICODE(objValue);
+- // and make a new QString from it (the string is copied)
+- success = obj->setProperty(propertyName,
QString::fromUtf16(utf16Data).toLatin1());
++ QString qStrValue = PyUnicode_asQString(objValue);
++ success = obj->setProperty(propertyName,
qStrValue.toLatin1());
+ }
+ else
+ matched = false;
diff --git a/app-office/scribus/scribus-1.5.8-r6.ebuild
b/app-office/scribus/scribus-1.5.8-r6.ebuild
new file mode 100644
index ..d5391b38535f
--- /dev/null
+++ b/app-office/scribus/scribus-1.5.8-r6.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PATCHSET=${P}-patchset-1
+PYTHON_COMPAT=( python3_{9..12} )
+PYTHON_REQ_USE="tk?"
+inherit cmake desktop flag-o-matic optfeature python-single-r1 xdg
+
+DESCRIPTION="Desktop publishing (DTP) and layout program"
+HOMEPAGE="https://www.scribus.net/";
+SRC_URI="mirror://sourceforge/project/${PN}/${PN}-
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/, app-office/scribus/files/
commit: 5908d48769d80baedb730c61b2605a983d97bb0f
Author: Sam James gentoo org>
AuthorDate: Fri Sep 2 04:37:21 2022 +
Commit: Sam James gentoo org>
CommitDate: Fri Sep 2 04:37:27 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5908d487
app-office/scribus: fix build with Poppler 22.09.0
Signed-off-by: Sam James gentoo.org>
.../files/scribus-1.5.8-poppler-22.09.0.patch| 20
app-office/scribus/scribus-1.5.8-r1.ebuild | 1 +
2 files changed, 21 insertions(+)
diff --git a/app-office/scribus/files/scribus-1.5.8-poppler-22.09.0.patch
b/app-office/scribus/files/scribus-1.5.8-poppler-22.09.0.patch
new file mode 100644
index ..106a6f5162b6
--- /dev/null
+++ b/app-office/scribus/files/scribus-1.5.8-poppler-22.09.0.patch
@@ -0,0 +1,20 @@
+--- a/scribus/plugins/import/pdf/slaoutput.cpp
b/scribus/plugins/import/pdf/slaoutput.cpp
+@@ -3741,9 +3741,16 @@ void SlaOutputDev::getPenState(GfxState *state)
+ break;
+ }
+ double lw = state->getLineWidth();
+- double *dashPattern;
+ int dashLength;
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 9, 0)
++ const double *dashPattern;
++ const std::vector &dash = state->getLineDash(&DashOffset);
++ dashPattern = dash.data();
++ dashLength = dash.size();
++#else
++ double *dashPattern;
+ state->getLineDash(&dashPattern, &dashLength, &DashOffset);
++#endif
+ QVector pattern(dashLength);
+ for (int i = 0; i < dashLength; ++i)
+ {
diff --git a/app-office/scribus/scribus-1.5.8-r1.ebuild
b/app-office/scribus/scribus-1.5.8-r1.ebuild
index 5457bc6ee17f..175ae6cd558b 100644
--- a/app-office/scribus/scribus-1.5.8-r1.ebuild
+++ b/app-office/scribus/scribus-1.5.8-r1.ebuild
@@ -80,6 +80,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.5.8-poppler-22.2.0-2.patch
"${FILESDIR}"/${PN}-1.5.8-poppler-22.03.0.patch # bug 834537
"${FILESDIR}"/${PN}-1.5.8-poppler-22.04.0.patch # bug 843287
+ "${FILESDIR}"/${PN}-1.5.8-poppler-22.09.0.patch
)
CMAKE_BUILD_TYPE="Release"
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/, app-office/scribus/files/
commit: 65615103763c15420ea24f0781626384dcbc83d7
Author: Sam James gentoo org>
AuthorDate: Sun May 8 17:58:53 2022 +
Commit: Sam James gentoo org>
CommitDate: Sun May 8 18:00:12 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65615103
app-office/scribus: fix build with Poppler 22.04.0
Closes: https://bugs.gentoo.org/843287
Signed-off-by: Sam James gentoo.org>
.../files/scribus-1.5.8-poppler-22.04.0.patch | 291 +
...scribus-.ebuild => scribus-1.5.8-r1.ebuild} | 18 +-
app-office/scribus/scribus-.ebuild | 2 +-
3 files changed, 303 insertions(+), 8 deletions(-)
diff --git a/app-office/scribus/files/scribus-1.5.8-poppler-22.04.0.patch
b/app-office/scribus/files/scribus-1.5.8-poppler-22.04.0.patch
new file mode 100644
index ..290484e7e872
--- /dev/null
+++ b/app-office/scribus/files/scribus-1.5.8-poppler-22.04.0.patch
@@ -0,0 +1,291 @@
+https://bugs.gentoo.org/843287
+https://github.com/scribusproject/scribus/commit/f2237b8f0b5cf7690e864a22ef7a63a6d769fa36.patch
+
+From f2237b8f0b5cf7690e864a22ef7a63a6d769fa36 Mon Sep 17 00:00:00 2001
+From: Jean Ghali
+Date: Fri, 1 Apr 2022 23:52:32 +
+Subject: [PATCH] Fix build with poppler 22.04.0
+
+git-svn-id: svn://scribus.net/trunk/Scribus@25074
11d20701-8431-0410-a711-e3c959e3b870
+---
+ scribus/plugins/import/pdf/slaoutput.cpp | 123 ++-
+ 1 file changed, 78 insertions(+), 45 deletions(-)
+
+diff --git a/scribus/plugins/import/pdf/slaoutput.cpp
b/scribus/plugins/import/pdf/slaoutput.cpp
+index e20a81f99e..5626fe3477 100644
+--- a/scribus/plugins/import/pdf/slaoutput.cpp
b/scribus/plugins/import/pdf/slaoutput.cpp
+@@ -174,8 +174,13 @@ void AnoOutputDev::drawString(GfxState *state,
POPPLER_CONST GooString *s)
+ int shade = 100;
+ currColorText = getColor(state->getFillColorSpace(),
state->getFillColor(), &shade);
+ fontSize = state->getFontSize();
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 4, 0)
++ if (state->getFont() && state->getFont()->getName())
++ fontName = new GooString(state->getFont()->getName().value());
++#else
+ if (state->getFont())
+ fontName = state->getFont()->getName()->copy();
++#endif
+ itemText = s->copy();
+ }
+
+@@ -357,7 +362,12 @@ std::unique_ptr
SlaOutputDev::SC_getAdditionalAction(const char *key
+ GBool SlaOutputDev::annotations_callback(Annot *annota, void *user_data)
+ {
+ SlaOutputDev *dev = (SlaOutputDev*)user_data;
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 4, 0)
++ const PDFRectangle& annotRect = annota->getRect();;
++ const PDFRectangle* box = &annotRect;
++#else
+ PDFRectangle *box = annota->getRect();
++#endif
+ double xCoor = dev->m_doc->currentPage()->xOffset() + box->x1 -
dev->cropOffsetX;
+ double yCoor = dev->m_doc->currentPage()->yOffset() +
dev->m_doc->currentPage()->height() - box->y2 + dev->cropOffsetY;
+ double width = box->x2 - box->x1;
+@@ -684,7 +694,12 @@ bool SlaOutputDev::handleWidgetAnnot(Annot* annota,
double xCoor, double yCoor,
+ if (apa || !achar)
+ {
+ AnoOutputDev *annotOutDev = new
AnoOutputDev(m_doc, m_importedColors);
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 4, 0)
++ const PDFRectangle& annotaRect =
annota->getRect();
++ Gfx* gfx = new Gfx(pdfDoc, annotOutDev,
pdfDoc->getPage(m_actPage)->getResourceDict(), &annotaRect, nullptr);
++#else
+ Gfx *gfx = new Gfx(pdfDoc, annotOutDev,
pdfDoc->getPage(m_actPage)->getResourceDict(), annota->getRect(), nullptr);
++#endif
+ ano->draw(gfx, false);
+ if (!bgFound)
+ m_currColorFill =
annotOutDev->currColorFill;
+@@ -2916,22 +2931,27 @@ void SlaOutputDev::markPoint(POPPLER_CONST char *name,
Dict *properties)
+
+ void SlaOutputDev::updateFont(GfxState *state)
+ {
+- GfxFont *gfxFont;
+-#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 2, 0)
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 4, 0)
++ std::optional fontLoc;
++ std::string fileName;
++ std::unique_ptr ff;
++ std::optional> tmpBuf;
++#elif POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 2, 0)
+ std::optional fontLoc;
+ const GooString * fileName = nullptr;
+ std::unique_ptr ff;
++ char* tmpBuf = nullptr;
+ #else
+ GfxFontLoc * fontLoc = nullptr;
+ GooString * fileName = nullptr;
+ FoFiTrueType * ff = nullptr;
++ char* tmpBuf = nullptr;
+ #endif
+ GfxFontType fontType;
+ SlaOutFontFileID *id;
+ SplashFontFile *fontFile;
+ SplashFontSrc *fontsrc = nullptr;
+ Object refObj, strObj;
+- char *tmpBuf = nullptr;
+ int
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/, app-office/scribus/files/
commit: cad26fcc1480486168769f7838611a15c83b29bc
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Mon Mar 7 16:40:35 2022 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Mar 12 15:52:46 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cad26fcc
app-office/scribus: Fix build with >=app-text/poppler-22.03.0
Closes: https://bugs.gentoo.org/834537
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../files/scribus-1.5.8-poppler-22.03.0.patch | 52 ++
app-office/scribus/scribus-1.5.8.ebuild| 1 +
2 files changed, 53 insertions(+)
diff --git a/app-office/scribus/files/scribus-1.5.8-poppler-22.03.0.patch
b/app-office/scribus/files/scribus-1.5.8-poppler-22.03.0.patch
new file mode 100644
index ..f7a0c03fdd96
--- /dev/null
+++ b/app-office/scribus/files/scribus-1.5.8-poppler-22.03.0.patch
@@ -0,0 +1,52 @@
+From f19410ac3b27e33dd62105746784e61e85b90a1d Mon Sep 17 00:00:00 2001
+From: Jean Ghali
+Date: Wed, 2 Mar 2022 22:22:53 +
+Subject: [PATCH] #16764: Build break with poppler 22.03.0
+
+git-svn-id: svn://scribus.net/trunk/Scribus@24982
11d20701-8431-0410-a711-e3c959e3b870
+---
+ scribus/plugins/import/pdf/importpdf.cpp | 13 +
+ 1 file changed, 13 insertions(+)
+
+diff --git a/scribus/plugins/import/pdf/importpdf.cpp
b/scribus/plugins/import/pdf/importpdf.cpp
+index 154e58a3f0..392dcd9e64 100644
+--- a/scribus/plugins/import/pdf/importpdf.cpp
b/scribus/plugins/import/pdf/importpdf.cpp
+@@ -89,7 +89,11 @@ QImage PdfPlug::readThumbnail(const QString& fName)
+ #endif
+ globalParams->setErrQuiet(gTrue);
+
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 3, 0)
++ PDFDoc pdfDoc{ std::make_unique(fname) };
++#else
+ PDFDoc pdfDoc{fname, nullptr, nullptr, nullptr};
++#endif
+ if (!pdfDoc.isOk() || pdfDoc.getErrorCode() == errEncrypted)
+ return QImage();
+
+@@ -342,7 +346,11 @@ bool PdfPlug::convert(const QString& fn)
+ globalParams->setErrQuiet(gTrue);
+ //globalParams->setPrintCommands(gTrue);
+ QList ocgGroups;
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 3, 0)
++ auto pdfDoc =
std::make_unique(std::make_unique(fname));
++#else
+ auto pdfDoc = std::unique_ptr(new PDFDoc(fname, nullptr,
nullptr, nullptr));
++#endif
+ if (pdfDoc)
+ {
+ if (pdfDoc->getErrorCode() == errEncrypted)
+@@ -361,8 +369,13 @@ bool PdfPlug::convert(const QString& fn)
+ #else
+ auto fname = new
GooString(QFile::encodeName(fn).data());
+ #endif
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 3, 0)
++ std::optional userPW(std::in_place,
text.toLocal8Bit().data());
++ pdfDoc.reset(new
PDFDoc(std::make_unique(fname), userPW, userPW, nullptr));
++#else
+ auto userPW = new
GooString(text.toLocal8Bit().data());
+ pdfDoc.reset(new PDFDoc(fname, userPW, userPW,
nullptr));
++#endif
+
qApp->changeOverrideCursor(QCursor(Qt::WaitCursor));
+ }
+ if ((!pdfDoc) || (pdfDoc->getErrorCode() != errNone))
diff --git a/app-office/scribus/scribus-1.5.8.ebuild
b/app-office/scribus/scribus-1.5.8.ebuild
index 506619d80133..228401b0e914 100644
--- a/app-office/scribus/scribus-1.5.8.ebuild
+++ b/app-office/scribus/scribus-1.5.8.ebuild
@@ -78,6 +78,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.5.6-findhyphen.patch
"${FILESDIR}"/${PN}-1.5.8-poppler-22.2.0-1.patch
"${FILESDIR}"/${PN}-1.5.8-poppler-22.2.0-2.patch
+ "${FILESDIR}"/${PN}-1.5.8-poppler-22.03.0.patch # bug 834537
)
CMAKE_BUILD_TYPE="Release"
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/, app-office/scribus/files/
commit: 5bdb78c3f0f4d0513b9aa448b0466d347ef39ef0
Author: Ionen Wolkens gentoo org>
AuthorDate: Fri Jan 14 04:40:42 2022 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Fri Jan 14 04:47:53 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5bdb78c3
app-office/scribus: backport upstream fix for USE=osg with CPP17
Fixes: 40fd326c118a7eb8ed87a62559dfa9b1266aba97
Closes: https://bugs.gentoo.org/831161
Signed-off-by: Ionen Wolkens gentoo.org>
.../scribus/files/scribus-1.5.7-osg-cpp17.patch| 219 +
app-office/scribus/scribus-1.5.7.ebuild| 1 +
2 files changed, 220 insertions(+)
diff --git a/app-office/scribus/files/scribus-1.5.7-osg-cpp17.patch
b/app-office/scribus/files/scribus-1.5.7-osg-cpp17.patch
new file mode 100644
index ..21f0c00554d2
--- /dev/null
+++ b/app-office/scribus/files/scribus-1.5.7-osg-cpp17.patch
@@ -0,0 +1,219 @@
+https://bugs.gentoo.org/831161
+Backport of https://github.com/scribusproject/scribus/commit/80405ce
+
+From: Jean Ghali
+Date: Mon, 10 Jan 2022 20:38:51 +
+Subject: [PATCH] Rename byte() to to_byte() in order to avoid potential
+ conflict with std::byte in c++17 mode
+--- a/scribus/third_party/prc/oPRCFile.cc
b/scribus/third_party/prc/oPRCFile.cc
+@@ -76,3 +76,3 @@
+ // Map [0,1] to [0,255]
+-inline uint8_t byte(double r)
++inline uint8_t to_byte(double r)
+ {
+@@ -451,5 +451,5 @@
+ {
+-tess->rgba_vertices.push_back(byte(lit->color.red));
+-tess->rgba_vertices.push_back(byte(lit->color.green));
+-tess->rgba_vertices.push_back(byte(lit->color.blue));
++tess->rgba_vertices.push_back(to_byte(lit->color.red));
++tess->rgba_vertices.push_back(to_byte(lit->color.green));
++tess->rgba_vertices.push_back(to_byte(lit->color.blue));
+ }
+@@ -595,19 +595,19 @@
+ {
+-tessFace->rgba_vertices.push_back(byte(C[1].R));
+-tessFace->rgba_vertices.push_back(byte(C[1].G));
+-tessFace->rgba_vertices.push_back(byte(C[1].B));
++tessFace->rgba_vertices.push_back(to_byte(C[1].R));
++tessFace->rgba_vertices.push_back(to_byte(C[1].G));
++tessFace->rgba_vertices.push_back(to_byte(C[1].B));
+ if(tessFace->is_rgba)
+- tessFace->rgba_vertices.push_back(byte(C[1].A));
++ tessFace->rgba_vertices.push_back(to_byte(C[1].A));
+
+-tessFace->rgba_vertices.push_back(byte(C[2].R));
+-tessFace->rgba_vertices.push_back(byte(C[2].G));
+-tessFace->rgba_vertices.push_back(byte(C[2].B));
++tessFace->rgba_vertices.push_back(to_byte(C[2].R));
++tessFace->rgba_vertices.push_back(to_byte(C[2].G));
++tessFace->rgba_vertices.push_back(to_byte(C[2].B));
+ if(tessFace->is_rgba)
+- tessFace->rgba_vertices.push_back(byte(C[2].A));
++ tessFace->rgba_vertices.push_back(to_byte(C[2].A));
+
+-tessFace->rgba_vertices.push_back(byte(C[3].R));
+-tessFace->rgba_vertices.push_back(byte(C[3].G));
+-tessFace->rgba_vertices.push_back(byte(C[3].B));
++tessFace->rgba_vertices.push_back(to_byte(C[3].R));
++tessFace->rgba_vertices.push_back(to_byte(C[3].G));
++tessFace->rgba_vertices.push_back(to_byte(C[3].B));
+ if(tessFace->is_rgba)
+- tessFace->rgba_vertices.push_back(byte(C[3].A));
++ tessFace->rgba_vertices.push_back(to_byte(C[3].A));
+ }
+@@ -622,19 +622,19 @@
+ {
+-tessFace->rgba_vertices.push_back(byte(C[0].R));
+-tessFace->rgba_vertices.push_back(byte(C[0].G));
+-tessFace->rgba_vertices.push_back(byte(C[0].B));
++tessFace->rgba_vertices.push_back(to_byte(C[0].R));
++tessFace->rgba_vertices.push_back(to_byte(C[0].G));
++tessFace->rgba_vertices.push_back(to_byte(C[0].B));
+ if(tessFace->is_rgba)
+- tessFace->rgba_vertices.push_back(byte(C[0].A));
++ tessFace->rgba_vertices.push_back(to_byte(C[0].A));
+
+-tessFace->rgba_vertices.push_back(byte(C[2].R));
+-tessFace->rgba_vertices.push_back(byte(C[2].G));
+-tessFace->rgba_vertices.push_back(byte(C[2].B));
++tessFace->rgba_vertices.push_back(to_byte(C[2].R));
++tessFace->rgba_vertices.push_back(to_byte(C[2].G));
++tessFace->rgba_vertices.push_back(to_byte(C[2].B));
+ if(tessFace->is_rgba)
+- tessFace->rgba_vertices.push_back(byte(C[2].A));
++ tessFace->rgba_vertices.push_back(to_byte(C[2].A));
+
+-tessFace->rgba_vertices.push_back(byte(C[3].R));
+-tessFace->rgba_vertices.push_back(byte(C[3].G));
+-tessFace->rgba
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/, app-office/scribus/files/
commit: 1550f728b6232a6698a4a63eed49070ee3a2ec4a
Author: Miroslav Šulc gentoo org>
AuthorDate: Wed Aug 25 10:54:06 2021 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Wed Aug 25 10:54:23 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1550f728
app-office/scribus: updated a patch for live
Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Miroslav Šulc gentoo.org>
.../scribus/files/scribus-1.5.8-findhyphen-1.patch | 54 ++
app-office/scribus/scribus-.ebuild | 2 +-
2 files changed, 55 insertions(+), 1 deletion(-)
diff --git a/app-office/scribus/files/scribus-1.5.8-findhyphen-1.patch
b/app-office/scribus/files/scribus-1.5.8-findhyphen-1.patch
new file mode 100644
index 000..39a11b0ee4a
--- /dev/null
+++ b/app-office/scribus/files/scribus-1.5.8-findhyphen-1.patch
@@ -0,0 +1,54 @@
+diff --git a/scribus/CMakeLists.txt b/scribus/CMakeLists.txt
+index aec69d3..9451404 100644
+--- a/scribus/CMakeLists.txt
b/scribus/CMakeLists.txt
+@@ -587,7 +587,9 @@ set(SCRIBUS_SOURCES
+ ${SCRIBUS_GMAGICK_SRC}
+ )
+
+-if(NOT HAVE_HYPHEN)
++if(HAVE_HYPHEN)
++ include_directories(${HYPHEN_INCLUDE_DIR})
++else()
+ include_directories(third_party/hyphen)
+ set(SCRIBUS_SOURCES
+ ${SCRIBUS_SOURCES}
+@@ -678,12 +680,6 @@ if(HAVE_PODOFO)
+
+ endif()
+
+-if(HAVE_HYPHEN)
+- target_link_libraries(${EXE_NAME} PRIVATE
+- ${HYPHEN_LIBRARY}
+- )
+-endif()
+-
+
+ if(GESTURE_FRAME_PREVIEW)
+message(STATUS "Enable gesture frame preview [experimental]")
+@@ -743,6 +739,12 @@ if(WANT_PCH)
+ target_precompile_headers(${EXE_NAME} PRIVATE scribus_pch.h)
+ endif()
+
++if(HAVE_HYPHEN)
++ target_link_libraries(${EXE_NAME} PRIVATE
++ ${HYPHEN_LIBRARY}
++ )
++endif()
++
+ if(WIN32)
+ set_target_properties(${EXE_NAME}
+ PROPERTIES
+diff --git a/scribus/hyphenator.h b/scribus/hyphenator.h
+index 7fa4abd..2863c70 100644
+--- a/scribus/hyphenator.h
b/scribus/hyphenator.h
+@@ -13,7 +13,7 @@ for which a new license (GPL+exception) is in place.
+ #include
+
+ #include "scribusapi.h"
+-#include "third_party/hyphen/hyphen.h"
++#include
+
+ class ScribusDoc;
+ class ScribusMainWindow;
diff --git a/app-office/scribus/scribus-.ebuild
b/app-office/scribus/scribus-.ebuild
index d3fee462bba..9ee1a1dcf52 100644
--- a/app-office/scribus/scribus-.ebuild
+++ b/app-office/scribus/scribus-.ebuild
@@ -76,7 +76,7 @@ PATCHES=(
# non(?)-upstreamable
"${FILESDIR}"/${PN}-1.5.3-fpic.patch
"${FILESDIR}"/${PN}-1.5.6-docdir.patch
- "${FILESDIR}"/${PN}-1.5.5-findhyphen-1.patch
+ "${FILESDIR}"/${PN}-1.5.8-findhyphen-1.patch
"${FILESDIR}"/${PN}-1.5.6-findhyphen.patch
)
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/, app-office/scribus/files/
commit: 23771baa6ca237a3d7a00f75d8521621ed2e00f8
Author: Christophe Lermytte lermytte be>
AuthorDate: Mon Apr 5 12:13:05 2021 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Tue Apr 6 12:29:52 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23771baa
app-office/scribus: add upstream patch for poppler-21.04.0 compatibility
Patch source:
https://github.com/scribusproject/scribus/commit/c62844064cd6d85802d21e188b0f479463e22095
Signed-off-by: Christophe Lermytte lermytte.be>
Closes: https://bugs.gentoo.org/780363
Closes: https://github.com/gentoo/gentoo/pull/20265
Signed-off-by: Miroslav Šulc gentoo.org>
.../files/scribus-1.5.6.1-poppler-21.04.0.patch| 27 ++
app-office/scribus/scribus-1.5.6.1.ebuild | 1 +
2 files changed, 28 insertions(+)
diff --git a/app-office/scribus/files/scribus-1.5.6.1-poppler-21.04.0.patch
b/app-office/scribus/files/scribus-1.5.6.1-poppler-21.04.0.patch
new file mode 100644
index 000..bb821ea5c9a
--- /dev/null
+++ b/app-office/scribus/files/scribus-1.5.6.1-poppler-21.04.0.patch
@@ -0,0 +1,27 @@
+From c62844064cd6d85802d21e188b0f479463e22095 Mon Sep 17 00:00:00 2001
+From: Jean Ghali
+Date: Sun, 4 Apr 2021 21:37:04 +
+Subject: [PATCH] #16536: Page::getFormWidgets() returns unique_ptr in poppler
+ 21.04.0
+
+git-svn-id: svn://scribus.net/trunk/Scribus@24599
11d20701-8431-0410-a711-e3c959e3b870
+---
+ scribus/plugins/import/pdf/slaoutput.h | 4
+ 1 file changed, 4 insertions(+)
+
+diff --git a/scribus/plugins/import/pdf/slaoutput.h
b/scribus/plugins/import/pdf/slaoutput.h
+index 66c34203ae..cb191b1023 100644
+--- a/scribus/plugins/import/pdf/slaoutput.h
b/scribus/plugins/import/pdf/slaoutput.h
+@@ -379,7 +379,11 @@ class SlaOutputDev : public OutputDev
+ Catalog *catalog {nullptr};
+ SplashFontEngine *m_fontEngine {nullptr};
+ SplashFont *m_font {nullptr};
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(21, 4, 0)
++ std::unique_ptr m_formWidgets;
++#else
+ FormPageWidgets *m_formWidgets {nullptr};
++#endif
+ QHash > m_radioMap;
+ QHash m_radioButtons;
+ int m_actPage;
diff --git a/app-office/scribus/scribus-1.5.6.1.ebuild
b/app-office/scribus/scribus-1.5.6.1.ebuild
index 5d0d78d897a..5e803e2024d 100644
--- a/app-office/scribus/scribus-1.5.6.1.ebuild
+++ b/app-office/scribus/scribus-1.5.6.1.ebuild
@@ -73,6 +73,7 @@ RDEPEND="${DEPEND}
PATCHES=(
"${FILESDIR}"/${P}-poppler-21.03.0-{1,2}.patch
+ "${FILESDIR}"/${P}-poppler-21.04.0.patch
# non(?)-upstreamable
"${FILESDIR}"/${PN}-1.5.3-fpic.patch
"${FILESDIR}"/${PN}-1.5.6-docdir.patch
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/, app-office/scribus/files/
commit: 4ffdbba60050b08a2f1546481e699b65c69e1529
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu Jan 2 20:00:57 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Jan 2 20:26:42 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ffdbba6
app-office/scribus: Fix build with app-text/poppler-0.84.0
Reported-by: Erik Zeek gmail.com>
Thanks-to: Julien Papasian gmail.com>
Closes: https://bugs.gentoo.org/704482
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../scribus/files/scribus-1.5.5-poppler-0.84.patch | 34 ++
app-office/scribus/scribus-1.5.5.ebuild| 3 +-
2 files changed, 36 insertions(+), 1 deletion(-)
diff --git a/app-office/scribus/files/scribus-1.5.5-poppler-0.84.patch
b/app-office/scribus/files/scribus-1.5.5-poppler-0.84.patch
new file mode 100644
index 000..de1f39411e8
--- /dev/null
+++ b/app-office/scribus/files/scribus-1.5.5-poppler-0.84.patch
@@ -0,0 +1,34 @@
+From 3742559924136c2471ab15081c5b600dd5feaeb0 Mon Sep 17 00:00:00 2001
+From: Jean Ghali
+Date: Sat, 28 Dec 2019 21:32:29 +
+Subject: [PATCH] Fix failure to build with poppler 0.84.0
+
+git-svn-id: svn://scribus.net/trunk/Scribus@23429
11d20701-8431-0410-a711-e3c959e3b870
+---
+ scribus/plugins/import/pdf/slaoutput.cpp | 6 ++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/scribus/plugins/import/pdf/slaoutput.cpp
b/scribus/plugins/import/pdf/slaoutput.cpp
+index ffcfa8450b..d788f9f06c 100644
+--- a/scribus/plugins/import/pdf/slaoutput.cpp
b/scribus/plugins/import/pdf/slaoutput.cpp
+@@ -1189,6 +1189,11 @@ void SlaOutputDev::startDoc(PDFDoc *doc, XRef *xrefA,
Catalog *catA)
+ catalog = catA;
+ pdfDoc = doc;
+ updateGUICounter = 0;
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 84, 0)
++ m_fontEngine = new SplashFontEngine(true, true, true, true);
++#elif POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 61, 0)
++ m_fontEngine = new SplashFontEngine(globalParams->getEnableFreeType(),
true, true, true);
++#else
+ m_fontEngine = new SplashFontEngine(
+ #if HAVE_T1LIB_H
+ globalParams->getEnableT1lib(),
+@@ -1199,6 +1204,7 @@ void SlaOutputDev::startDoc(PDFDoc *doc, XRef *xrefA,
Catalog *catA)
+ true,
+ #endif
+ true);
++#endif
+ }
+
+ void SlaOutputDev::startPage(int pageNum, GfxState *, XRef *)
diff --git a/app-office/scribus/scribus-1.5.5.ebuild
b/app-office/scribus/scribus-1.5.5.ebuild
index cd725acf6b8..88bcd5cc441 100644
--- a/app-office/scribus/scribus-1.5.5.ebuild
+++ b/app-office/scribus/scribus-1.5.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -70,6 +70,7 @@ PATCHES=(
# upstream svn trunk
"${FILESDIR}"/${P}-poppler-0.82.patch
"${FILESDIR}"/${P}-poppler-0.83.patch
+ "${FILESDIR}"/${P}-poppler-0.84.patch
# non(?)-upstreamable
"${FILESDIR}"/${PN}-1.5.3-fpic.patch
"${FILESDIR}"/${P}-docdir.patch
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/, app-office/scribus/files/
commit: 3a4906fa477b18df55a7671d825265e337c0ca6d
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Dec 7 09:37:41 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Dec 7 09:37:41 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a4906fa
app-office/scribus: Drop 1.5.5_pre20190429
Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner gentoo.org>
app-office/scribus/Manifest| 1 -
.../scribus-1.5.5_pre20190429-poppler-0.76.patch | 59 --
.../scribus/scribus-1.5.5_pre20190429.ebuild | 230 -
3 files changed, 290 deletions(-)
diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index bc1bb961c1a..e8d12ffa74f 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -1,2 +1 @@
DIST scribus-1.5.5.tar.xz 73861836 BLAKE2B
1a10878eaba67116d72c20d8ecd8952764c709ad14d575e4eb921b4f8a7c4525b73e6722f610b1cce57c08540f619d6ebd3d32e04b653b310e475026c185561b
SHA512
2d62424ad609296df33ced550940fceb4e15133a595a740cc4f4b4ffbc92aa31737336ac7716c2eed20d2866e37f5a9b780a44d86128daa6bbad3ccb58168b50
-DIST scribus-1.5.5_pre20190429.tar.gz 85838093 BLAKE2B
4ffdc6356b5a2c7372bf6395847f348e7c56276d39114fa5691b6c7f8345aa89a0efe221adbbf1d431d89208fae53ae211c5298d9406487d46ddf98dd69d8c1a
SHA512
1aa76491560848dccbeb17f03ba4ac24d6045881f6f92f31b921cf1a91c051176b835d86e0c46046e73573bf60b330e07945c279c077a7619bf2ee9331ca9324
diff --git
a/app-office/scribus/files/scribus-1.5.5_pre20190429-poppler-0.76.patch
b/app-office/scribus/files/scribus-1.5.5_pre20190429-poppler-0.76.patch
deleted file mode 100644
index d62db93663e..000
--- a/app-office/scribus/files/scribus-1.5.5_pre20190429-poppler-0.76.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From aeea6a2ed4cb15ce8c35bb83066ef03e4e04b29b Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner
-Date: Thu, 2 May 2019 00:08:12 +0200
-Subject: [PATCH] Fix build with poppler-0.76
-
-findPage(int num, int gen) -> findPage(const Ref ref)
-
-https://gitlab.freedesktop.org/poppler/poppler/commit/244c7d6926463b079b1f96e34d9e4451d352942e
- scribus/plugins/import/pdf/slaoutput.cpp | 12
- 1 file changed, 4 insertions(+), 8 deletions(-)
-
-diff --git a/scribus/plugins/import/pdf/slaoutput.cpp
b/scribus/plugins/import/pdf/slaoutput.cpp
-index fe9794a65..b25082de6 100644
a/scribus/plugins/import/pdf/slaoutput.cpp
-+++ b/scribus/plugins/import/pdf/slaoutput.cpp
-@@ -429,8 +429,7 @@ bool SlaOutputDev::handleLinkAnnot(Annot* annota, double
xCoor, double yCoor, do
- {
- if (dst->isPageRef())
- {
-- Ref dstr = dst->getPageRef();
-- pagNum = pdfDoc->findPage(dstr.num,
dstr.gen);
-+ pagNum =
pdfDoc->findPage(dst->getPageRef());
- }
- else
- pagNum = dst->getPageNum();
-@@ -451,8 +450,7 @@ bool SlaOutputDev::handleLinkAnnot(Annot* annota, double
xCoor, double yCoor, do
- {
- if (dstn->isPageRef())
- {
-- Ref dstr =
dstn->getPageRef();
-- pagNum =
pdfDoc->findPage(dstr.num, dstr.gen);
-+ pagNum =
pdfDoc->findPage(dstn->getPageRef());
- }
- else
- pagNum =
dstn->getPageNum();
-@@ -931,8 +929,7 @@ void SlaOutputDev::handleActions(PageItem* ite,
AnnotWidget *ano)
- {
- if (dst->isPageRef())
- {
-- Ref dstr = dst->getPageRef();
-- pagNum =
pdfDoc->findPage(dstr.num, dstr.gen);
-+ pagNum =
pdfDoc->findPage(dst->getPageRef());
- }
- else
- pagNum = dst->getPageNum();
-@@ -955,8 +952,7 @@ void SlaOutputDev::handleActions(PageItem* ite,
AnnotWidget *ano)
- {
- if (dstn->isPageRef())
- {
-- Ref dstr =
dstn->getPageRef();
-- pagNum =
pdfDoc->findPage(
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/, app-office/scribus/files/
commit: 5883a4d0b2e598d4b4543d68f650e9503ccbebbc
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Fri Nov 1 15:52:41 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Fri Nov 1 18:39:18 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5883a4d0
app-office/scribus: Fix build with poppler-0.82.0
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../scribus/files/scribus-1.5.5-poppler-0.82.patch | 89 ++
app-office/scribus/scribus-1.5.5.ebuild| 3 +
2 files changed, 92 insertions(+)
diff --git a/app-office/scribus/files/scribus-1.5.5-poppler-0.82.patch
b/app-office/scribus/files/scribus-1.5.5-poppler-0.82.patch
new file mode 100644
index 000..f1eb1e887da
--- /dev/null
+++ b/app-office/scribus/files/scribus-1.5.5-poppler-0.82.patch
@@ -0,0 +1,89 @@
+From 615b6185c70c70928cab1aab6e1340ba5f80c174 Mon Sep 17 00:00:00 2001
+From: Craig Bradney
+Date: Mon, 28 Oct 2019 22:11:56 +
+Subject: [PATCH] Work around poppler 0.82 signature changes
+
+git-svn-id: svn://scribus.net/trunk/Scribus@23287
11d20701-8431-0410-a711-e3c959e3b870
+
+Use same mechanism as with previous poppler versions to support change of
constness in function signatures
+
+git-svn-id: svn://scribus.net/trunk/Scribus@23289
11d20701-8431-0410-a711-e3c959e3b870
+---
+ scribus/plugins/import/pdf/importpdfconfig.h | 6 ++
+ scribus/plugins/import/pdf/slaoutput.cpp | 6 +++---
+ scribus/plugins/import/pdf/slaoutput.h | 6 +++---
+ 3 files changed, 12 insertions(+), 6 deletions(-)
+
+diff --git a/scribus/plugins/import/pdf/importpdfconfig.h
b/scribus/plugins/import/pdf/importpdfconfig.h
+index 2a13b0d10..9913ee382 100644
+--- a/scribus/plugins/import/pdf/importpdfconfig.h
b/scribus/plugins/import/pdf/importpdfconfig.h
+@@ -52,4 +52,10 @@ for which a new license (GPL+exception) is in place.
+ #define POPPLER_REF
+ #endif
+
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 82, 0)
++#define POPPLER_CONST_082 const
++#else
++#define POPPLER_CONST_082
++#endif
++
+ #endif
+diff --git a/scribus/plugins/import/pdf/slaoutput.cpp
b/scribus/plugins/import/pdf/slaoutput.cpp
+index 6094f3d9e..520474f65 100644
+--- a/scribus/plugins/import/pdf/slaoutput.cpp
b/scribus/plugins/import/pdf/slaoutput.cpp
+@@ -2784,7 +2784,7 @@ void SlaOutputDev::drawMaskedImage(GfxState *state,
Object *ref, Stream *str, i
+ delete[] mbuffer;
+ }
+
+-void SlaOutputDev::drawImage(GfxState *state, Object *ref, Stream *str, int
width, int height, GfxImageColorMap *colorMap, GBool interpolate, int
*maskColors, GBool inlineImg)
++void SlaOutputDev::drawImage(GfxState *state, Object *ref, Stream *str, int
width, int height, GfxImageColorMap *colorMap, GBool interpolate,
POPPLER_CONST_082 int* maskColors, GBool inlineImg)
+ {
+ ImageStream * imgStr = new ImageStream(str, width,
colorMap->getNumPixelComps(), colorMap->getBits());
+ //qDebug() << "Image Components" << colorMap->getNumPixelComps() <<
"Mask" << maskColors;
+@@ -3365,7 +3365,7 @@ err1:
+ fontsrc->unref();
+ }
+
+-void SlaOutputDev::drawChar(GfxState *state, double x, double y, double dx,
double dy, double originX, double originY, CharCode code, int nBytes, Unicode
*u, int uLen)
++void SlaOutputDev::drawChar(GfxState *state, double x, double y, double dx,
double dy, double originX, double originY, CharCode code, int nBytes,
POPPLER_CONST_082 Unicode *u, int uLen)
+ {
+ double x1, y1, x2, y2;
+ int render;
+@@ -3452,7 +3452,7 @@ void SlaOutputDev::drawChar(GfxState *state, double x,
double y, double dx, doub
+ }
+ }
+
+-GBool SlaOutputDev::beginType3Char(GfxState *state, double x, double y,
double dx, double dy, CharCode code, Unicode *u, int uLen)
++GBool SlaOutputDev::beginType3Char(GfxState *state, double x, double y,
double dx, double dy, CharCode code, POPPLER_CONST_082 Unicode *u, int uLen)
+ {
+ //qDebug() << "beginType3Char";
+ GfxFont *gfxFont;
+diff --git a/scribus/plugins/import/pdf/slaoutput.h
b/scribus/plugins/import/pdf/slaoutput.h
+index bc4350a03..14a590d55 100644
+--- a/scribus/plugins/import/pdf/slaoutput.h
b/scribus/plugins/import/pdf/slaoutput.h
+@@ -229,7 +229,7 @@ public:
+
+ //- image drawing
+ void drawImageMask(GfxState *state, Object *ref, Stream *str, int
width, int height, GBool invert, GBool interpolate, GBool inlineImg) override;
+- void drawImage(GfxState *state, Object *ref, Stream *str, int width,
int height, GfxImageColorMap *colorMap, GBool interpolate, int *maskColors,
GBool inlineImg) override;
++ void drawImage(GfxState *state, Object *ref, Stream *str, int width,
int height, GfxImageColorMap *colorMap, GBool interpolate, POPPLER_CONST_082
int *maskColors, GBool inlineImg) override;
+ void drawSoftMaskedImage(GfxState *state, Object *ref, Stream *str,
+ int w
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/, app-office/scribus/files/
commit: 6170ef8b13ba83f6c3d399514ce580ba46c00be8
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu Jan 24 23:56:17 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Jan 24 23:59:54 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6170ef8b
app-office/scribus: Drop 1.5.5_pre20190113 snapshot
Package-Manager: Portage-2.3.58, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner gentoo.org>
app-office/scribus/Manifest| 1 -
.../scribus-1.5.5_pre20190113-poppler-0.73.patch | 24 --
.../scribus/scribus-1.5.5_pre20190113.ebuild | 241 -
3 files changed, 266 deletions(-)
diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index aa18cb539d7..a4eef7c9181 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -1,4 +1,3 @@
DIST scribus-1.5.4-poppler-0.64.0.patch.tar.xz 3020 BLAKE2B
3388efe6498545ffef6604a41b9e697a0cb6cd053c4893f9d64349bb2251400aca7a4f7dd193eb94cf69ca3f4ae1a3ba3ed106127c4fa680f396940d8056e669
SHA512
4577b4b737948a2b41dc0cec90ec95ba260959343e4953929696ceab518a2723a28a891b189caf79435e7fc8f8fc0a1012e7079e890d10549cb2ba426d15b568
DIST scribus-1.5.4.tar.xz 72832248 BLAKE2B
64797e865ce44fb01f1e29823e3cb46b2b8f1501e8d07e8b265e93a37961582ec4118d0f32d460bc044e32cf7fa6069732f6b9ce60e4dc4b0b42f914b280e637
SHA512
7875ea5f3db5fb116856cf4cf56b4cce2d0b00d9c4820969f52b89e9bf2b36f96eb9e15b368d392be74d4c6d32e971fc28f6ecbf6661fce5e3b9cb61c4d02403
-DIST scribus-1.5.5_pre20190113.tar.gz 84927002 BLAKE2B
ff515bbd66267493e4558fa2cbdca57fb3e9514940c3c7cc48e435e5d78349674f57bdbeeeb0574c7e7e2d1a2d2482a5b16ccc48c62281f2d11c28a5cc38f915
SHA512
1ed9bd3add1a62234b8e26f10a31a015f3a224da588b7b72c854209a45faae61ee949d2986980700132f9d573a426c1283f4e375c25d7ea63ce6b04260a863bb
DIST scribus-1.5.5_pre20190124.tar.gz 85713996 BLAKE2B
c4bb181012c5b2d15076239cb06d5b2d88fb24ef67d5e258142a4acb7979a304d5fdbd9163a24aaa47a1c8f354b0b70af7115430173ade9a8e77c1cb489fc849
SHA512
e9bd63c37a4818a5dda151b7bb6b7fa9cf7918949bd5612009646335d630b4b4188c2346c7567a3dc5f857849a2d49967f825320720c12e38a6038c7a0d3c34a
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
deleted file mode 100644
index f63f4c6d1ee..000
--- a/app-office/scribus/files/scribus-1.5.5_pre20190113-poppler-0.73.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From d34e59bfe495250ba023ba0f99e672ee32300a27 Mon Sep 17 00:00:00 2001
-From: Jean Ghali
-Date: Wed, 16 Jan 2019 00:30:35 +
-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 | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/scribus/plugins/import/pdf/slaoutput.h
b/scribus/plugins/import/pdf/slaoutput.h
-index c46448b80a..4dac7c3983 100644
a/scribus/plugins/import/pdf/slaoutput.h
-+++ b/scribus/plugins/import/pdf/slaoutput.h
-@@ -28,7 +28,9 @@ for which a new license (GPL+exception) is in place.
- #include "selection.h"
- #include "vgradient.h"
-
-+#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(0, 73, 0)
- #include
-+#endif
- #include
- #include
- #include
diff --git a/app-office/scribus/scribus-1.5.5_pre20190113.ebuild
b/app-office/scribus/scribus-1.5.5_pre20190113.ebuild
deleted file mode 100644
index 77540ffb19b..000
--- a/app-office/scribus/scribus-1.5.5_pre20190113.ebuild
+++ /dev/null
@@ -1,241 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="tk?"
-CMAKE_MAKEFILE_GENERATOR=ninja
-COMMIT=6326f2af85935842fa7a93eb8f86bd2ae698245e
-inherit cmake-utils desktop flag-o-matic gnome2-utils python-single-r1
xdg-utils
-
-DESCRIPTION="Desktop publishing (DTP) and layout program"
-HOMEPAGE="https://www.scribus.net/";
-SRC_URI="https://github.com/${PN}project/${PN}/archive/${COMMIT}.tar.gz ->
${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts
templates tk"
-
-#a=$((ls resources/translations/scribus.*ts | sed -e 's:\.: :g' | awk '{print
$2}'; ls resources/loremipsum/*xml | sed -e 's:\.: :g' -e 's:loremipsum\/: :g'|
awk '{print $2}'; ls resources/dicts/hyph*dic | sed -e 's:\.: :g' -e 's:hyph_:
:g' | awk '{print $2}'; ls resources/dicts/README_*txt | sed -e 's:_hyph::g' -e
's:\.: :g' -e 's:README_: :g' | awk '{print $2}') | sort | uniq); echo $a
-# Keep this sorted, otherwise eliminating of duplicates below won't work
-IUSE_L10N=" af ar bg br ca ca_ES cs cs_CZ cy cy_GB da da_DK de de_1901 de_CH
de_DE el en_AU en_GB en_US eo es es_ES et eu fa_IR fi fi_FI fr gl he he_IL hr
hu hu_HU ia id id_ID is is_IS it ja kab kn_IN ko ku la lt lt_LT nb_NO nl nn_NO
pl pl_PL pt
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/, app-office/scribus/files/
commit: 635e0dd7cf4a58a29f6fb44b1e0e39371e3e60bb
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Mon Jan 14 22:26:53 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Mon Jan 14 23:34:25 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=635e0dd7
app-office/scribus: 1.5.5_pre20190113 snapshot, build w/ poppler-0.73
Bug: https://bugs.gentoo.org/674804
Package-Manager: Portage-2.3.55, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner gentoo.org>
app-office/scribus/Manifest| 2 +-
.../scribus-1.5.5_pre20190113-poppler-0.73.patch | 24 ++
...227.ebuild => scribus-1.5.5_pre20190113.ebuild} | 3 ++-
3 files changed, 27 insertions(+), 2 deletions(-)
diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index ee5658be540..4e57dbe3b39 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -1,3 +1,3 @@
DIST scribus-1.5.4-poppler-0.64.0.patch.tar.xz 3020 BLAKE2B
3388efe6498545ffef6604a41b9e697a0cb6cd053c4893f9d64349bb2251400aca7a4f7dd193eb94cf69ca3f4ae1a3ba3ed106127c4fa680f396940d8056e669
SHA512
4577b4b737948a2b41dc0cec90ec95ba260959343e4953929696ceab518a2723a28a891b189caf79435e7fc8f8fc0a1012e7079e890d10549cb2ba426d15b568
DIST scribus-1.5.4.tar.xz 72832248 BLAKE2B
64797e865ce44fb01f1e29823e3cb46b2b8f1501e8d07e8b265e93a37961582ec4118d0f32d460bc044e32cf7fa6069732f6b9ce60e4dc4b0b42f914b280e637
SHA512
7875ea5f3db5fb116856cf4cf56b4cce2d0b00d9c4820969f52b89e9bf2b36f96eb9e15b368d392be74d4c6d32e971fc28f6ecbf6661fce5e3b9cb61c4d02403
-DIST scribus-1.5.5_pre20181227.tar.gz 84926534 BLAKE2B
1fa392a8a196aac028ad4f1b913f31c5655a191d5ff3db26f16b4b181885bb1035ca95d11b100ad1b6cc7aea0ea21677a211c83dbd94bfe730a94ed4feaaf6bc
SHA512
53a9494dca4520ec89b4b4487c09683da00876088ed2750fd80bca6cbc96536c0bcfb8c96d671d9ca0ed0b74cbd8f75382298e3d20285d52cec52951807f4797
+DIST scribus-1.5.5_pre20190113.tar.gz 84927002 BLAKE2B
ff515bbd66267493e4558fa2cbdca57fb3e9514940c3c7cc48e435e5d78349674f57bdbeeeb0574c7e7e2d1a2d2482a5b16ccc48c62281f2d11c28a5cc38f915
SHA512
1ed9bd3add1a62234b8e26f10a31a015f3a224da588b7b72c854209a45faae61ee949d2986980700132f9d573a426c1283f4e375c25d7ea63ce6b04260a863bb
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
new file mode 100644
index 000..af98da7050c
--- /dev/null
+++ b/app-office/scribus/files/scribus-1.5.5_pre20190113-poppler-0.73.patch
@@ -0,0 +1,24 @@
+From 5a3255ac6dd1f19fb5fb5ab17452083bfe573f42 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner
+Date: Mon, 14 Jan 2019 23:58:59 +0100
+Subject: [PATCH] Drop obsolete header, does not exist in poppler-0.73
+
+---
+ scribus/plugins/import/pdf/slaoutput.h | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/scribus/plugins/import/pdf/slaoutput.h
b/scribus/plugins/import/pdf/slaoutput.h
+index c46448b..83e010c 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.
+ #include "selection.h"
+ #include "vgradient.h"
+
+-#include
+ #include
+ #include
+ #include
+--
+2.20.1
+
diff --git a/app-office/scribus/scribus-1.5.5_pre20181227.ebuild
b/app-office/scribus/scribus-1.5.5_pre20190113.ebuild
similarity index 98%
rename from app-office/scribus/scribus-1.5.5_pre20181227.ebuild
rename to app-office/scribus/scribus-1.5.5_pre20190113.ebuild
index b92edd436ae..77540ffb19b 100644
--- a/app-office/scribus/scribus-1.5.5_pre20181227.ebuild
+++ b/app-office/scribus/scribus-1.5.5_pre20190113.ebuild
@@ -6,7 +6,7 @@ EAPI=6
PYTHON_COMPAT=( python2_7 )
PYTHON_REQ_USE="tk?"
CMAKE_MAKEFILE_GENERATOR=ninja
-COMMIT=d857c1a3430acf207cdde2512db6822c45e98732
+COMMIT=6326f2af85935842fa7a93eb8f86bd2ae698245e
inherit cmake-utils desktop flag-o-matic gnome2-utils python-single-r1
xdg-utils
DESCRIPTION="Desktop publishing (DTP) and layout program"
@@ -94,6 +94,7 @@ DEPEND="${COMMON_DEPEND}
PATCHES=(
"${FILESDIR}"/${PN}-1.5.3-docdir.patch
"${FILESDIR}"/${PN}-1.5.3-fpic.patch
+ "${FILESDIR}"/${P}-poppler-0.73.patch
)
S="${WORKDIR}"/${PN}-${COMMIT}
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/, app-office/scribus/files/
commit: 41e75c83ad5a6f8298b3029a2ff751393435c5a3
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Mon Mar 19 23:55:29 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Mon Mar 19 23:56:00 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41e75c83
app-office/scribus: Fix build with Qt 5.11
Package-Manager: Portage-2.3.24, Repoman-2.3.6
.../scribus/files/scribus-1.5.3-qt-5.11.patch | 59 ++
app-office/scribus/scribus-1.5.3-r1.ebuild | 1 +
2 files changed, 60 insertions(+)
diff --git a/app-office/scribus/files/scribus-1.5.3-qt-5.11.patch
b/app-office/scribus/files/scribus-1.5.3-qt-5.11.patch
new file mode 100644
index 000..d46a9cfcf60
--- /dev/null
+++ b/app-office/scribus/files/scribus-1.5.3-qt-5.11.patch
@@ -0,0 +1,59 @@
+From ed5bb7e205e10a2855b2f55d6de9d5702f81633f Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner
+Date: Mon, 19 Mar 2018 23:52:49 +0100
+Subject: [PATCH] Fix build with Qt 5.11 (missing headers)
+
+---
+ .../plugins/tools/2geomtools/meshdistortion/meshdistortiondialog.cpp | 3 ++-
+ scribus/plugins/tools/lenseffects/lensdialog.cpp | 1 +
+ scribus/sclistboxpixmap.h | 2 ++
+ 3 files changed, 5 insertions(+), 1 deletion(-)
+
+diff --git
a/scribus/plugins/tools/2geomtools/meshdistortion/meshdistortiondialog.cpp
b/scribus/plugins/tools/2geomtools/meshdistortion/meshdistortiondialog.cpp
+index 3f0d916b7..645aec8d1 100644
+--- a/scribus/plugins/tools/2geomtools/meshdistortion/meshdistortiondialog.cpp
b/scribus/plugins/tools/2geomtools/meshdistortion/meshdistortiondialog.cpp
+@@ -26,8 +26,9 @@ for which a new license (GPL+exception) is in place.
+
+ #include "meshdistortiondialog.h"
+
+-#include
+ #include
++#include
++#include
+
+ #include "commonstrings.h"
+ #include "fpointarray.h"
+diff --git a/scribus/plugins/tools/lenseffects/lensdialog.cpp
b/scribus/plugins/tools/lenseffects/lensdialog.cpp
+index cfabc4091..bed8305dc 100644
+--- a/scribus/plugins/tools/lenseffects/lensdialog.cpp
b/scribus/plugins/tools/lenseffects/lensdialog.cpp
+@@ -27,6 +27,7 @@ for which a new license (GPL+exception) is in place.
+ #include "lensdialog.h"
+ #include
+ #include
++#include
+ #include "iconmanager.h"
+ #include "selection.h"
+ #include "sccolorengine.h"
+diff --git a/scribus/sclistboxpixmap.h b/scribus/sclistboxpixmap.h
+index a067b7912..ebdae272c 100644
+--- a/scribus/sclistboxpixmap.h
b/scribus/sclistboxpixmap.h
+@@ -9,11 +9,13 @@ for which a new license (GPL+exception) is in place.
+
+ #include
+
++#include
+ #include
+ #include
+ #include
+ #include
+ #include
++#include
+ #include
+
+ #include "scguardedptr.h"
+--
+2.16.2
+
diff --git a/app-office/scribus/scribus-1.5.3-r1.ebuild
b/app-office/scribus/scribus-1.5.3-r1.ebuild
index b65910862d8..12d67402592 100644
--- a/app-office/scribus/scribus-1.5.3-r1.ebuild
+++ b/app-office/scribus/scribus-1.5.3-r1.ebuild
@@ -97,6 +97,7 @@ PATCHES=(
"${FILESDIR}"/${P}-cmake-openssl.patch
"${FILESDIR}"/${P}-poppler-0.58.patch
"${FILESDIR}"/${P}-x86-fpic.patch
+ "${FILESDIR}"/${P}-qt-5.11.patch
)
src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/, app-office/scribus/files/
commit: 82b08626d628bfe6e95ab0927ba9985243cdcdeb
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue Dec 26 00:32:44 2017 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue Dec 26 01:02:04 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82b08626
app-office/scribus: Fix build with >=app-text/popper-0.58
Closes: https://bugs.gentoo.org/629752
Package-Manager: Portage-2.3.19, Repoman-2.3.6
.../scribus/files/scribus-1.5.3-poppler-0.58.patch | 534 +
app-office/scribus/scribus-1.5.3-r1.ebuild | 1 +
2 files changed, 535 insertions(+)
diff --git a/app-office/scribus/files/scribus-1.5.3-poppler-0.58.patch
b/app-office/scribus/files/scribus-1.5.3-poppler-0.58.patch
new file mode 100644
index 000..61f5552f959
--- /dev/null
+++ b/app-office/scribus/files/scribus-1.5.3-poppler-0.58.patch
@@ -0,0 +1,534 @@
+From 61186c7ef083046b7e0c908952e8a773e2787d82 Mon Sep 17 00:00:00 2001
+From: Jean Ghali
+Date: Fri, 8 Sep 2017 16:52:10 +
+Subject: [PATCH] #14979: poppler-0.58 breaks build
+
+git-svn-id: svn://scribus.net/trunk/Scribus@22154
11d20701-8431-0410-a711-e3c959e3b870
+---
+ scribus/plugins/import/pdf/importpdf.cpp | 95 +++--
+ scribus/plugins/import/pdf/slaoutput.cpp | 174 ++-
+ 2 files changed, 258 insertions(+), 11 deletions(-)
+
+diff --git a/scribus/plugins/import/pdf/importpdf.cpp
b/scribus/plugins/import/pdf/importpdf.cpp
+index 4c462beadd..1c0bd8a888 100644
+--- a/scribus/plugins/import/pdf/importpdf.cpp
b/scribus/plugins/import/pdf/importpdf.cpp
+@@ -22,6 +22,7 @@ for which a new license (GPL+exception) is in place.
+ #include
+ #include
+ #include
++#include
+ #include
+ #include
+
+@@ -59,6 +60,12 @@ for which a new license (GPL+exception) is in place.
+ #include "ui/multiprogressdialog.h"
+ #include "ui/propertiespalette.h"
+
++#define POPPLER_VERSION_ENCODE(major, minor, micro) ( \
++((major) * 1) \
++ + ((minor) * 100) \
++ + ((micro) * 1))
++#define POPPLER_ENCODED_VERSION POPPLER_VERSION_ENCODE(POPPLER_VERSION_MAJOR,
POPPLER_VERSION_MINOR, POPPLER_VERSION_MICRO)
++
+ PdfPlug::PdfPlug(ScribusDoc* doc, int flags)
+ {
+ tmpSele = new Selection(this, false);
+@@ -507,12 +514,20 @@ bool PdfPlug::convert(const QString& fn)
+ {
+ for (int i = 0;
i < order->getLength (); ++i)
+ {
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 58, 0)
++ Object
orderItem = order->get(i);
++#else
+ Object
orderItem;
+
order->get(i, &orderItem);
++#endif
+ if
(orderItem.isDict())
+ {
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 58, 0)
++
Object ref = order->getNF(i);
++#else
+
Object ref;
+
order->getNF(i, &ref);
++#endif
+
if (ref.isRef())
+
{
+
OptionalContentGroup *oc = ocg->findOcgByRef(ref.getRef());
+@@ -523,7 +538,9 @@ bool PdfPlug::convert(const QString& fn)
+
ocgNames.append(ocgName);
+
}
+
}
++#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(0, 58, 0)
+
ref.free();
++#endif
+ }
+ else
+ {
+@@ -597,39 +614,71 @@ bool PdfPlug::convert(const QString& fn)
+ dev->layersSetByOCG =
true;
+ }
+ #endif
++
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 58, 0)
++
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/, app-office/scribus/files/
commit: 9f25508e22d9fcb7bbdc2114fbc9057ced285686
Author: Justin Lecher gentoo org>
AuthorDate: Sun Jun 4 11:54:00 2017 +
Commit: Justin Lecher gentoo org>
CommitDate: Sun Jun 4 11:54:42 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f25508e
app-office/scribus: Import latest changes into live ebuild
Package-Manager: Portage-2.3.6, Repoman-2.3.2
Signed-off-by: Justin Lecher gentoo.org>
app-office/scribus/files/scribus--docdir.patch | 31 +++
app-office/scribus/files/scribus--fpic.patch | 16 ++
app-office/scribus/scribus-.ebuild | 64 ++
3 files changed, 77 insertions(+), 34 deletions(-)
diff --git a/app-office/scribus/files/scribus--docdir.patch
b/app-office/scribus/files/scribus--docdir.patch
index 442829d3bda..d866922fa18 100644
--- a/app-office/scribus/files/scribus--docdir.patch
+++ b/app-office/scribus/files/scribus--docdir.patch
@@ -1,8 +1,11 @@
+ CMakeLists.txt | 28 +++-
+ 1 file changed, 15 insertions(+), 13 deletions(-)
+
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 79b1feb..259d474 100644
+index 29d66f3..1c08cdd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -284,16 +284,18 @@ else()
+@@ -244,19 +244,21 @@ else()
endif()
#SHARE - use the default on Apple as TAG_VERSION is empty
@@ -11,21 +14,29 @@ index 79b1feb..259d474 100644
-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(NOT WANT_VERSIONING)
-- set(DOCDIR
"${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}/")
++ else()
+ if(TAG_VERSION OR BUILD_OSX_BUNDLE)
+ set(DOCDIR
"${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}${TAG_VERSION}/")
- else()
-- set(DOCDIR
"${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}-${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()
++ endif()
++ endif()
++endif()
+ if(NOT IS_ABSOLUTE ${DOCDIR})
+ add_definitions("-DDOCDIR=\\\"${CMAKE_INSTALL_PREFIX}/${DOCDIR}\\\"")
+ else()
diff --git a/app-office/scribus/files/scribus--fpic.patch
b/app-office/scribus/files/scribus--fpic.patch
new file mode 100644
index 000..ba0721955ef
--- /dev/null
+++ b/app-office/scribus/files/scribus--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/scribus-.ebuild
b/app-office/scribus/scribus-.ebuild
index 330982a019c..3c14d44fe7b 100644
--- a/app-office/scribus/scribus-.ebuild
+++ b/app-office/scribus/scribus-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -6,8 +6,9 @@ EAPI=6
PYTHON_COMPAT=( python2_7 )
PYTHON_REQ_USE="tk?"
CMAKE_MAKEFILE_GENERATOR=ninja
+CMAKE_MIN_VERSION=3.2.0
-inherit cmake-utils fdo-mime flag-o-matic multilib python-single-r1 subversion
+inherit cmake-utils eutils fdo-mime flag-o-matic gnome2 multilib
python-single-r1
DESCRIPTION="Desktop publishing (DTP) and layout program"
HOMEPAGE="http://www.scribus.net/";
@@ -21,7 +22,7 @@ KEYWORDS=""
IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts
templates tk"
#a=$((ls resources/translations/scribus.*ts | sed -e 's:\.: :g' | awk '{print
$2}'; ls resources/loremipsum/*xml | sed -e 's:\.: :g' -e 's:loremipsum\/: :g'|
awk '{print $2}'; ls resources/dicts/hyph*dic | sed -e 's:\.: :g' -e 's:hyph_:
:g' | awk '{print $2}'; ls resources/dicts/README_*txt | se
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/, app-office/scribus/files/
commit: 74152808104b50e3559e86ed2745c5601ef597c6
Author: Justin Lecher gentoo org>
AuthorDate: Sun Jun 4 11:49:36 2017 +
Commit: Justin Lecher gentoo org>
CommitDate: Sun Jun 4 11:49:50 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74152808
app-office/scribus: Version Bump
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=620172
Package-Manager: Portage-2.3.6, Repoman-2.3.2
Signed-off-by: Justin Lecher gentoo.org>
app-office/scribus/Manifest| 1 +
.../scribus/files/scribus-1.5.3-docdir.patch | 42
app-office/scribus/files/scribus-1.5.3-fpic.patch | 16 ++
app-office/scribus/scribus-1.5.3.ebuild| 231 +
4 files changed, 290 insertions(+)
diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index 1f887c4cb9d..c3bf0b2d0e3 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -1,3 +1,4 @@
DIST scribus-1.4.6.tar.xz 73601104 SHA256
21e336500d9edc9c90ccf73087e5ef3df59ec3e4a3cbfec15367bcd8d078a19a SHA512
74d8a89eb767535bcd8fe5e3c55d03709d59ff8fc5280005bcc2ad36cae1d37c8442ab85abaea86fdee9f351a901c86947231001324e2d8df00cbd8e5c18d1e3
WHIRLPOOL
5c2ee366cb53720b35ffec2f7e2db244105a95ed7b14c27cf4fab7636cbdf10c6a370c0a14f65f630cd8252b22a4a3ec4b5e592c71308f78269205a89ae56fb7
DIST scribus-1.5.0.tar.xz 75867348 SHA256
a3dbe66d12719355d41ae7f2cac7a8c9d5599b12aeb5c038d939636f054e8e68 SHA512
3d3f311543019cf985e12d25d0a9bd2ea470679aee0f40d0aed4d2f1532ea3cdbd4d2e215e59b559b4301613fb71f738a348c56d09d3c6e32da0047d9e212065
WHIRLPOOL
feae71d139724b4927c81cab5d13168a9e00383f9a7890484cf5ab62f001b266b4af954440bc7edc51eedb65c3ace4541a7fc0836b0f6237061d6d38371ac6ca
DIST scribus-1.5.2.tar.xz 74456064 SHA256
ec5eec23aeda655d3a761cffb85853dcd2ede3973b9e62a1b3c28bd1093c74f5 SHA512
c3531bc5ef97e1f7d026ec7cff872ff7a6ea36472c794b632bee1a84fdeea87deaa56e8b9c467fe8e6db694266efc9ec84d822e5feefd2f99b4469d08826cea4
WHIRLPOOL
cc1cd41c725aaa240a064149c011cee31f04e738ea386285b75f31aeb200b9351e6e434ed517a2d600c1de694f2f3584012e9213b0fdf094a6497d04c14e3fb7
+DIST scribus-1.5.3.tar.xz 74222084 SHA256
73a30b4727e19f5d301a936d23a84275cc4f5613a92416cbd843f5167721d74f SHA512
487cea685869397bc52acc7be8e8e9f4bad3f594c1f95740207e4d9e26b07461a7fd2a95d5337b38f1b0fa6504a9f6059cca6740c78cc165eab0b779ffdfe980
WHIRLPOOL
0e4c36089e00f7bfc582f2138f4b402f26ca22ea6c7ecd1adce066e1b8741b839d34e769c2a7c4806e79279627d678223332cf36609d68716d32515f3389a48a
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 000..d866922fa18
--- /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 000..ba0721955ef
--- /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
+@
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/, app-office/scribus/files/
commit: aec91a89bd09d87037e3d64c9d924faa644d71ed
Author: Miroslav Šulc gentoo org>
AuthorDate: Tue Dec 6 09:31:37 2016 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Tue Dec 6 09:32:05 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aec91a89
app-office/scribus-: fixed patching the sources (ajdusted docdir patch and
not using fpic patch as it is already applied)
Package-Manager: portage-2.3.3
app-office/scribus/files/scribus--docdir.patch | 31 ++
app-office/scribus/scribus-.ebuild | 3 +--
2 files changed, 32 insertions(+), 2 deletions(-)
diff --git a/app-office/scribus/files/scribus--docdir.patch
b/app-office/scribus/files/scribus--docdir.patch
new file mode 100644
index ..442829d
--- /dev/null
+++ b/app-office/scribus/files/scribus--docdir.patch
@@ -0,0 +1,31 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 79b1feb..259d474 100644
+--- a/CMakeLists.txt
b/CMakeLists.txt
+@@ -284,16 +284,18 @@ 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}/")
++if(NOT DOCDIR)
++ if(WIN32 OR OS2)
++ set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/")
+ else()
+- if(NOT WANT_VERSIONING)
+- set(DOCDIR
"${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}/")
++ if(TAG_VERSION OR BUILD_OSX_BUNDLE)
++ set(DOCDIR
"${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}${TAG_VERSION}/")
+ else()
+- set(DOCDIR
"${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}-${VERSION}/")
++ 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()
diff --git a/app-office/scribus/scribus-.ebuild
b/app-office/scribus/scribus-.ebuild
index e96e3f6..ec8570c 100644
--- a/app-office/scribus/scribus-.ebuild
+++ b/app-office/scribus/scribus-.ebuild
@@ -74,8 +74,7 @@ DEPEND="${COMMON_DEPEND}
virtual/pkgconfig"
PATCHES=(
- "${FILESDIR}"/${PN}-1.5.0-docdir.patch
- "${FILESDIR}"/${PN}-1.5.2-fpic.patch
+ "${FILESDIR}"/${P}-docdir.patch
)
src_prepare() {
