[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/files/, app-office/scribus/
commit: 5f19629e0a9fc0e2ae03382664e72eea71526311
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Mon Mar 4 22:15:58 2024 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Mon Mar 4 22:18:11 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f19629e
app-office/scribus: Fix build with >=app-text/poppler-24.03
Fix is pending upstream:
https://github.com/scribusproject/scribus/pull/177
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../files/scribus-1.6.1-poppler-24.03.patch| 70 ++
app-office/scribus/scribus-1.6.1-r1.ebuild | 1 +
2 files changed, 71 insertions(+)
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
new file mode 100644
index ..076e48e14fd9
--- /dev/null
+++ b/app-office/scribus/files/scribus-1.6.1-poppler-24.03.patch
@@ -0,0 +1,70 @@
+From dc2470990ab73c87fdd60068c99518ced01a3edd Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner
+Date: Mon, 4 Mar 2024 17:35:11 +0100
+Subject: [PATCH] Fix build with >=poppler-24.03.0
+
+Fixes build errors caused by:
+
+"Use an enum for Function getType"
+Upstream commit 6e3824d45d42cb806a28a2df84e4ab6bb3587083
+
+Signed-off-by: Andreas Sturmlechner
+---
+ scribus/plugins/import/pdf/slaoutput.cpp | 16
+ 1 file changed, 16 insertions(+)
+
+diff --git a/scribus/plugins/import/pdf/slaoutput.cpp
b/scribus/plugins/import/pdf/slaoutput.cpp
+index 4e31e4b6c..3e4a768ec 100644
+--- a/scribus/plugins/import/pdf/slaoutput.cpp
b/scribus/plugins/import/pdf/slaoutput.cpp
+@@ -1731,7 +1731,11 @@ bool SlaOutputDev::axialShadedFill(GfxState *state,
GfxAxialShading *shading, do
+ VGradient FillGradient = VGradient(VGradient::linear);
+ FillGradient.clearStops();
+ GfxColorSpace *color_space = shading->getColorSpace();
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 3, 0)
++ if (func->getType() == Function::Type::Stitching)
++#else
+ if (func->getType() == 3)
++#endif
+ {
+ StitchingFunction *stitchingFunc = (StitchingFunction*)func;
+ const double *bounds = stitchingFunc->getBounds();
+@@ -1753,7 +1757,11 @@ bool SlaOutputDev::axialShadedFill(GfxState *state,
GfxAxialShading *shading, do
+ FillGradient.addStop(
ScColorEngine::getShadeColor(m_doc->PageColors[stopColor], m_doc, shade),
stopPoint, 0.5, 1.0, stopColor, shade );
+ }
+ }
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 3, 0)
++ else if ((func->getType() == Function::Type::Exponential) ||
(func->getType() == Function::Type::Sampled))
++#else
+ else if ((func->getType() == 2) || (func->getType() == 0))
++#endif
+ {
+ GfxColor stop1;
+ shading->getColor(0.0, );
+@@ -1865,7 +1873,11 @@ bool SlaOutputDev::radialShadedFill(GfxState *state,
GfxRadialShading *shading,
+ VGradient FillGradient = VGradient(VGradient::linear);
+ FillGradient.clearStops();
+ GfxColorSpace *color_space = shading->getColorSpace();
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 3, 0)
++ if (func->getType() == Function::Type::Stitching)
++#else
+ if (func->getType() == 3)
++#endif
+ {
+ StitchingFunction *stitchingFunc = (StitchingFunction*)func;
+ const double *bounds = stitchingFunc->getBounds();
+@@ -1887,7 +1899,11 @@ bool SlaOutputDev::radialShadedFill(GfxState *state,
GfxRadialShading *shading,
+ FillGradient.addStop(
ScColorEngine::getShadeColor(m_doc->PageColors[stopColor], m_doc, shade),
stopPoint, 0.5, 1.0, stopColor, shade );
+ }
+ }
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 3, 0)
++ else if ((func->getType() == Function::Type::Exponential) ||
(func->getType() == Function::Type::Sampled))
++#else
+ else if ((func->getType() == 2) || (func->getType() == 0))
++#endif
+ {
+ GfxColor stop1;
+ shading->getColor(0.0, );
+--
+2.44.0
+
diff --git a/app-office/scribus/scribus-1.6.1-r1.ebuild
b/app-office/scribus/scribus-1.6.1-r1.ebuild
index 3b9230eb12a6..21e17e6ae260 100644
--- a/app-office/scribus/scribus-1.6.1-r1.ebuild
+++ b/app-office/scribus/scribus-1.6.1-r1.ebuild
@@ -77,6 +77,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.6.1-findhyphen.patch
"${FILESDIR}"/${PN}-1.7.0-remove-hello-world-test.patch
"${FILESDIR}"/${PN}-1.7.0-fix-icon-version.patch
+ "${FILESDIR}"/${PN}-1.6.1-poppler-24.03.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/
commit: e1138dda822481a6625631b2c8b0b6b01893ef99
Author: Arthur Zamarin gentoo org>
AuthorDate: Sat Mar 2 13:08:34 2024 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Sat Mar 2 13:08:34 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1138dda
app-office/scribus: Stabilize 1.6.1-r1 ppc, #924481
Signed-off-by: Arthur Zamarin gentoo.org>
app-office/scribus/scribus-1.6.1-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/scribus/scribus-1.6.1-r1.ebuild
b/app-office/scribus/scribus-1.6.1-r1.ebuild
index e91a3601b7ec..3b9230eb12a6 100644
--- a/app-office/scribus/scribus-1.6.1-r1.ebuild
+++ b/app-office/scribus/scribus-1.6.1-r1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${P}"
LICENSE="GPL-2"
SLOT="$(ver_cut 1-2)"
-KEYWORDS="amd64 ~ppc ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 x86"
IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts
+templates tk"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
commit: f3bbc4a3cba0f69a9691aad63caee6e761e7daa6
Author: Sam James gentoo org>
AuthorDate: Sat Feb 17 14:47:24 2024 +
Commit: Sam James gentoo org>
CommitDate: Sat Feb 17 14:47:24 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3bbc4a3
app-office/scribus: Stabilize 1.6.1-r1 ppc64, #924481
Signed-off-by: Sam James gentoo.org>
app-office/scribus/scribus-1.6.1-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/scribus/scribus-1.6.1-r1.ebuild
b/app-office/scribus/scribus-1.6.1-r1.ebuild
index dcaf6b17a10b..e91a3601b7ec 100644
--- a/app-office/scribus/scribus-1.6.1-r1.ebuild
+++ b/app-office/scribus/scribus-1.6.1-r1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${P}"
LICENSE="GPL-2"
SLOT="$(ver_cut 1-2)"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~ppc ppc64 x86"
IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts
+templates tk"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
commit: d05ad58787c33a73805c624f89961a90412167fc
Author: Jakov Smolić gentoo org>
AuthorDate: Thu Feb 15 10:05:38 2024 +
Commit: Jakov Smolić gentoo org>
CommitDate: Thu Feb 15 10:05:38 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d05ad587
app-office/scribus: Stabilize 1.6.1-r1 x86, #924481
Signed-off-by: Jakov Smolić gentoo.org>
app-office/scribus/scribus-1.6.1-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/scribus/scribus-1.6.1-r1.ebuild
b/app-office/scribus/scribus-1.6.1-r1.ebuild
index 7cad31d8601b..dcaf6b17a10b 100644
--- a/app-office/scribus/scribus-1.6.1-r1.ebuild
+++ b/app-office/scribus/scribus-1.6.1-r1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${P}"
LICENSE="GPL-2"
SLOT="$(ver_cut 1-2)"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts
+templates tk"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
commit: 65bba2a3b1fe987b01688b2f8b61533957aa4e94
Author: Sam James gentoo org>
AuthorDate: Wed Feb 14 16:42:55 2024 +
Commit: Sam James gentoo org>
CommitDate: Wed Feb 14 16:42:55 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65bba2a3
app-office/scribus: Stabilize 1.6.1-r1 amd64, #924481
Signed-off-by: Sam James gentoo.org>
app-office/scribus/scribus-1.6.1-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/scribus/scribus-1.6.1-r1.ebuild
b/app-office/scribus/scribus-1.6.1-r1.ebuild
index 6a80b0653e02..7cad31d8601b 100644
--- a/app-office/scribus/scribus-1.6.1-r1.ebuild
+++ b/app-office/scribus/scribus-1.6.1-r1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${P}"
LICENSE="GPL-2"
SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts
+templates tk"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
commit: aad534985ef2dc061a07ae2a0145da6d802fc06e
Author: Miroslav Šulc gentoo org>
AuthorDate: Sun Jan 14 10:29:15 2024 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Sun Jan 14 10:29:15 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aad53498
app-office/scribus: minor update in live
Signed-off-by: Miroslav Šulc gentoo.org>
app-office/scribus/scribus-.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/scribus/scribus-.ebuild
b/app-office/scribus/scribus-.ebuild
index 3b5f179d8564..0225ed3b28db 100644
--- a/app-office/scribus/scribus-.ebuild
+++ b/app-office/scribus/scribus-.ebuild
@@ -38,7 +38,7 @@ DEPEND="${PYTHON_DEPS}
dev-libs/librevenge
dev-libs/libxml2
dev-qt/qt5compat:6
- dev-qt/qtbase:6[gui,network,opengl,xml,widgets]
+ dev-qt/qtbase:6[cups,gui,network,opengl,xml,widgets]
dev-qt/qtsvg:6
media-libs/fontconfig
media-libs/freetype:2
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/files/, app-office/scribus/
commit: 73525eaa3d3b87962d64d606a883fc84569b6f8e
Author: Miroslav Šulc gentoo org>
AuthorDate: Sun Jan 14 10:22:34 2024 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Sun Jan 14 10:24:08 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73525eaa
app-office/scribus: in 1.6.1 squashed findhyphen patches and backported some
patches from live
Signed-off-by: Miroslav Šulc gentoo.org>
.../scribus/files/scribus-1.6.1-findhyphen.patch | 69 ++
...cribus-1.6.1.ebuild => scribus-1.6.1-r1.ebuild} | 21 ++-
2 files changed, 73 insertions(+), 17 deletions(-)
diff --git a/app-office/scribus/files/scribus-1.6.1-findhyphen.patch
b/app-office/scribus/files/scribus-1.6.1-findhyphen.patch
new file mode 100644
index ..cc6e5db58a24
--- /dev/null
+++ b/app-office/scribus/files/scribus-1.6.1-findhyphen.patch
@@ -0,0 +1,69 @@
+--- 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/scribus-1.6.1.ebuild
b/app-office/scribus/scribus-1.6.1-r1.ebuild
similarity index 88%
rename from app-office/scribus/scribus-1.6.1.ebuild
rename to app-office/scribus/scribus-1.6.1-r1.ebuild
index 23dca9517e2f..6a80b0653e02 100644
--- a/app-office/scribus/scribus-1.6.1.ebuild
+++ b/app-office/scribus/scribus-1.6.1-r1.ebuild
@@ -72,31 +72,18 @@ BDEPEND="
"
PATCHES=(
- # non(?)-upstreamable
"${FILESDIR}"/${PN}-1.5.8-cmake.patch # bug 886251
"${FILESDIR}"/${PN}-1.5.3-fpic.patch
- "${FILESDIR}"/${PN}-1.5.8-findhyphen-1.patch
- "${FILESDIR}"/${PN}-1.5.6-findhyphen.patch
+ "${FILESDIR}"/${PN}-1.6.1-findhyphen.patch
+ "${FILESDIR}"/${PN}-1.7.0-remove-hello-world-test.patch
+ "${FILESDIR}"/${PN}-1.7.0-fix-icon-version.patch
)
src_prepare() {
cmake_src_prepare
+ # for safety remove files that we patched out
rm -r scribus/third_party/hyphen || die
-
- sed \
- -e "/^\s*unzip\.[ch]/d" \
- -e "/^\s*ioapi\.[ch]/d" \
- -i scribus/CMakeLists.txt Scribus.pro || die
- rm scribus/ioapi.[ch] || die
-
- sed \
- -e 's:\(${CMAKE_INSTALL_PREFIX}\):./\1:g' \
- -i resources/templates/CMakeLists.txt || die
-
- sed \
- -e "/^add_subdirectory(ui\/qml)/s/^/#DONT/" \
- -i scribus/CMakeLists.txt || die # nothing but a bogus Hello
World test
}
src_configure() {
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
commit: c748eb3971c2a9e9f23fc5ae4e0842cc1b311819
Author: Miroslav Šulc gentoo org>
AuthorDate: Sun Jan 14 10:06:42 2024 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Sun Jan 14 10:06:42 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c748eb39
app-office/scribus: switched to svg icon in live
Signed-off-by: Miroslav Šulc gentoo.org>
app-office/scribus/scribus-.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/scribus/scribus-.ebuild
b/app-office/scribus/scribus-.ebuild
index 4e7611020d9c..3b5f179d8564 100644
--- a/app-office/scribus/scribus-.ebuild
+++ b/app-office/scribus/scribus-.ebuild
@@ -142,7 +142,7 @@ src_install() {
newicon -s $size
resources/iconsets/artwork/icon_${size}x${size}.png scribus-${SLOT}.png
done
newicon -s 64 resources/iconsets/artwork/icon_32...@2x.png
scribus-${SLOT}.png
- newicon resources/iconsets/1_5_1/scribus.png scribus-${SLOT}.png
+ newicon resources/iconsets/1_7_0/scribus-icon.svg scribus-${SLOT}.png
newmenu scribus.desktop scribus-${SLOT}.desktop
}
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/files/, app-office/scribus/
commit: 8aa06bee94ae1f0b31f9f91d31fb40a553602c02
Author: Miroslav Šulc gentoo org>
AuthorDate: Sun Jan 14 09:38:03 2024 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Sun Jan 14 09:38:12 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8aa06bee
app-office/scribus: removed obsolete patch from live
Signed-off-by: Miroslav Šulc gentoo.org>
.../scribus/files/scribus-1.7.0-fix-install-prefix-path.patch | 11 ---
app-office/scribus/scribus-.ebuild| 1 -
2 files changed, 12 deletions(-)
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
deleted file mode 100644
index 33cad2b9c7fc..
--- a/app-office/scribus/files/scribus-1.7.0-fix-install-prefix-path.patch
+++ /dev/null
@@ -1,11 +0,0 @@
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/scribus-.ebuild
b/app-office/scribus/scribus-.ebuild
index c1af6fc67077..4e7611020d9c 100644
--- a/app-office/scribus/scribus-.ebuild
+++ b/app-office/scribus/scribus-.ebuild
@@ -79,7 +79,6 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.5.3-fpic.patch
"${FILESDIR}"/${PN}-1.7.0-findhyphen.patch
"${FILESDIR}"/${PN}-1.7.0-remove-hello-world-test.patch
- "${FILESDIR}"/${PN}-1.7.0-fix-install-prefix-path.patch
"${FILESDIR}"/${PN}-1.7.0-dont-install-thirdparty-license.patch
"${FILESDIR}"/${PN}-1.7.0-fix-icon-version.patch
)
[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 @@
+#
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/files/
commit: e6ac94fc102dc2e801cad6e3661f6c4981529c3c Author: Michael Mair-Keimberger levelnine at> AuthorDate: Sat Jan 13 14:46:08 2024 + Commit: Michał Górny gentoo org> CommitDate: Sat Jan 13 18:50:50 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6ac94fc app-office/scribus: remove unused patch Signed-off-by: Michael Mair-Keimberger levelnine.at> Signed-off-by: Michał Górny 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.. --- 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]=اسکریباس
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
commit: cd811d45e6545d47e392e465155b6207f9c67c1e
Author: Miroslav Šulc gentoo org>
AuthorDate: Wed Jan 10 10:06:38 2024 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Wed Jan 10 10:06:48 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd811d45
app-office/scribus: bump to 1.6.1, dropped 1.6.0
Signed-off-by: Miroslav Šulc gentoo.org>
app-office/scribus/Manifest | 2 +-
app-office/scribus/{scribus-1.6.0.ebuild => scribus-1.6.1.ebuild} | 2 --
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index a5618a8e6015..8980478a95bb 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -1,4 +1,4 @@
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.0.tar.xz 73267436 BLAKE2B
a855820c7c4b63339fb8a1e15764425b95655e20fe26857ebbc730d816d229441a639ca46f5be803e8599131495e698f1ff7d61b3b08dd42a303653dcdbdfc9d
SHA512
bb64b628dda07acdd29b7bbcb765b4f22abbfa175df68f1f046041f840800549be04ada6cf3f24ea4bf0c61b38a1ad503c482d4d47b1f2a3a6885f7c963adef8
+DIST scribus-1.6.1.tar.xz 73266900 BLAKE2B
b8120823cf98201ed197748cffe3f12019acfbd4831b497585ad7d04fa6d6e470bf4bc85dac15700483dfc977c56136cb49bcee20106f482cd9b0022d75d28d5
SHA512
ffde5628ea314dab8f212f78e7dd96cd258ceaebccc5b8de2c21e338a433f82d7fbbb047d05882abb07b4dceac031141b77fef933c9a3ed0e26f29bb94377e7e
diff --git a/app-office/scribus/scribus-1.6.0.ebuild
b/app-office/scribus/scribus-1.6.1.ebuild
similarity index 98%
rename from app-office/scribus/scribus-1.6.0.ebuild
rename to app-office/scribus/scribus-1.6.1.ebuild
index 5b5fb9de4298..23dca9517e2f 100644
--- a/app-office/scribus/scribus-1.6.0.ebuild
+++ b/app-office/scribus/scribus-1.6.1.ebuild
@@ -75,10 +75,8 @@ PATCHES=(
# non(?)-upstreamable
"${FILESDIR}"/${PN}-1.5.8-cmake.patch # bug 886251
"${FILESDIR}"/${PN}-1.5.3-fpic.patch
- "${FILESDIR}"/${PN}-1.5.6-docdir.patch
"${FILESDIR}"/${PN}-1.5.8-findhyphen-1.patch
"${FILESDIR}"/${PN}-1.5.6-findhyphen.patch
- "${FILESDIR}"/${PN}-1.6.0-fix-desktop.patch
)
src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/files/, app-office/scribus/
commit: 568af5f6f6f200ae9539ceec7cdddaad3015723d
Author: Miroslav Šulc gentoo org>
AuthorDate: Mon Jan 1 09:30:31 2024 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Mon Jan 1 09:30:43 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=568af5f6
app-office/scribus: bump to 1.6.0 + introduced slotting + scrubbed patches
Signed-off-by: Miroslav Šulc gentoo.org>
app-office/scribus/Manifest| 1 +
app-office/scribus/files/scribus-1.5.3-fpic.patch | 2 -
.../scribus/files/scribus-1.5.6-docdir.patch | 2 -
.../scribus/files/scribus-1.5.6-findhyphen.patch | 4 +-
app-office/scribus/files/scribus-1.5.8-cmake.patch | 4 +-
.../scribus/files/scribus-1.5.8-findhyphen-1.patch | 4 -
.../scribus/files/scribus-1.5.8-python-3.12.patch | 6 +-
.../scribus/files/scribus-1.6.0-fix-desktop.patch | 20 +++
app-office/scribus/scribus-1.6.0.ebuild| 165 +
9 files changed, 193 insertions(+), 15 deletions(-)
diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index 5bb7b3812a2a..a5618a8e6015 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -1,3 +1,4 @@
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.0.tar.xz 73267436 BLAKE2B
a855820c7c4b63339fb8a1e15764425b95655e20fe26857ebbc730d816d229441a639ca46f5be803e8599131495e698f1ff7d61b3b08dd42a303653dcdbdfc9d
SHA512
bb64b628dda07acdd29b7bbcb765b4f22abbfa175df68f1f046041f840800549be04ada6cf3f24ea4bf0c61b38a1ad503c482d4d47b1f2a3a6885f7c963adef8
diff --git a/app-office/scribus/files/scribus-1.5.3-fpic.patch
b/app-office/scribus/files/scribus-1.5.3-fpic.patch
index ba0721955ef8..bb4378e5effa 100644
--- a/app-office/scribus/files/scribus-1.5.3-fpic.patch
+++ b/app-office/scribus/files/scribus-1.5.3-fpic.patch
@@ -1,8 +1,6 @@
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}
diff --git a/app-office/scribus/files/scribus-1.5.6-docdir.patch
b/app-office/scribus/files/scribus-1.5.6-docdir.patch
index 957991c2acc4..06d878af55fd 100644
--- a/app-office/scribus/files/scribus-1.5.6-docdir.patch
+++ b/app-office/scribus/files/scribus-1.5.6-docdir.patch
@@ -1,5 +1,3 @@
-diff --git a/CMakeLists_Directories.cmake b/CMakeLists_Directories.cmake
-index db6133f..faf85ce 100644
--- a/CMakeLists_Directories.cmake
+++ b/CMakeLists_Directories.cmake
@@ -36,14 +36,16 @@ else()
diff --git a/app-office/scribus/files/scribus-1.5.6-findhyphen.patch
b/app-office/scribus/files/scribus-1.5.6-findhyphen.patch
index 3123ce4477c9..d8e2400ea1f4 100644
--- a/app-office/scribus/files/scribus-1.5.6-findhyphen.patch
+++ b/app-office/scribus/files/scribus-1.5.6-findhyphen.patch
@@ -1,5 +1,5 @@
a/CMakeLists_Dependencies.cmake2019-07-31 00:34:43.0 +0200
-+++ b/CMakeLists_Dependencies.cmake2019-10-02 00:17:34.968355656 +0200
+--- a/CMakeLists_Dependencies.cmake
b/CMakeLists_Dependencies.cmake
@@ -954,6 +954,16 @@
endif()
#>>HUNSPELL for Speelling support
diff --git a/app-office/scribus/files/scribus-1.5.8-cmake.patch
b/app-office/scribus/files/scribus-1.5.8-cmake.patch
index a461ee20c281..6ddd76912dbe 100644
--- a/app-office/scribus/files/scribus-1.5.8-cmake.patch
+++ b/app-office/scribus/files/scribus-1.5.8-cmake.patch
@@ -1,5 +1,5 @@
a/CMakeLists.txt 2022-01-23 17:14:43.0 +0100
-+++ b/CMakeLists.txt 2023-02-05 15:59:57.828047452 +0100
+--- a/CMakeLists.txt
b/CMakeLists.txt
@@ -362,25 +362,6 @@
if(APPLE)
### Include our Apple configure commands
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
index 39a11b0ee4a9..e199c488c020 100644
--- a/app-office/scribus/files/scribus-1.5.8-findhyphen-1.patch
+++
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
commit: 7d14d7fa89a5e1427e696ea53f517b72e345b95b
Author: Miroslav Šulc gentoo org>
AuthorDate: Mon Oct 30 08:13:06 2023 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Mon Oct 30 08:13:06 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d14d7fa
app-office/scribus: dropped obsolete 1.5.8-r5
Bug: https://bugs.gentoo.org/916227
Signed-off-by: Miroslav Šulc gentoo.org>
app-office/scribus/scribus-1.5.8-r5.ebuild | 168 -
1 file changed, 168 deletions(-)
diff --git a/app-office/scribus/scribus-1.5.8-r5.ebuild
b/app-office/scribus/scribus-1.5.8-r5.ebuild
deleted file mode 100644
index 0261a742c7f3..
--- a/app-office/scribus/scribus-1.5.8-r5.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# 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..11} )
-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}-devel/${PV}/${P}.tar.xz
-https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}.tar.xz;
-S="${WORKDIR}/${P}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts
+templates tk"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- tk? ( scripts )"
-
-# osg
-# couple of third_party libs bundled
-DEPEND="${PYTHON_DEPS}
- app-text/libmspub
- app-text/libqxp
- app-text/poppler:=
- dev-libs/hyphen
- dev-libs/icu:0=
- dev-libs/librevenge
- dev-libs/libxml2
- dev-qt/qtcore:5
- dev-qt/qtgui:5[-gles2-only]
- dev-qt/qtnetwork:5
- dev-qt/qtopengl:5
- dev-qt/qtprintsupport:5
- dev-qt/qtwidgets:5
- dev-qt/qtxml:5
- media-libs/fontconfig
- media-libs/freetype:2
- media-libs/harfbuzz:0=[icu]
- media-libs/lcms:2
- media-libs/libcdr
- media-libs/libfreehand
- media-libs/libjpeg-turbo:=
- media-libs/libpagemaker
- media-libs/libpng:0=
- media-libs/libvisio
- media-libs/libzmf
- media-libs/tiff:=
- net-print/cups
- sys-libs/zlib[minizip]
- x11-libs/cairo[X,svg(+)]
- boost? ( dev-libs/boost:= )
- graphicsmagick? ( media-gfx/graphicsmagick:= )
- hunspell? ( app-text/hunspell:= )
- osg? ( dev-games/openscenegraph:= )
- pdf? ( app-text/podofo:0= )
- scripts? (
- $(python_gen_cond_dep '
- dev-python/pillow[tk?,${PYTHON_USEDEP}]
- ')
- )
-"
-RDEPEND="${DEPEND}
- app-text/ghostscript-gpl
-"
-BDEPEND="
- dev-qt/linguist-tools:5
- virtual/pkgconfig
-"
-
-PATCHES=(
- # non(?)-upstreamable
- "${FILESDIR}"/${PN}-1.5.8-cmake.patch # bug 886251
- "${FILESDIR}"/${PN}-1.5.3-fpic.patch
- "${FILESDIR}"/${PN}-1.5.6-docdir.patch
- "${FILESDIR}"/${PN}-1.5.8-findhyphen-1.patch
- "${FILESDIR}"/${PN}-1.5.6-findhyphen.patch
-
- # git master; # bug 834537, 843287, 893158
- "${WORKDIR}"/${PATCHSET}
-)
-
-src_prepare() {
- cmake_src_prepare
-
- rm -r codegen/cheetah scribus/third_party/hyphen || die
-
- sed \
- -e "/^\s*unzip\.[ch]/d" \
- -e "/^\s*ioapi\.[ch]/d" \
- -i scribus/CMakeLists.txt Scribus.pro || die
- rm scribus/ioapi.[ch] || die
-
- sed \
- -e 's:\(${CMAKE_INSTALL_PREFIX}\):./\1:g' \
- -i resources/templates/CMakeLists.txt || die
-
- sed \
- -e "/^add_subdirectory(ui\/qml)/s/^/#DONT/" \
- -i scribus/CMakeLists.txt || die # nothing but a bogus Hello
World test
-}
-
-src_configure() {
- # bug #550818
- append-cppflags -DHAVE_MEMRCHR
-
- local mycmakeargs=(
- -DHAVE_PYTHON=ON
- -DWANT_DISTROBUILD=ON
- -DWANT_CPP17=ON
- -DDOCDIR="${EPREFIX}"/usr/share/doc/${PF}/
- -DPython3_EXECUTABLE="${PYTHON}"
- -DWITH_BOOST=$(usex boost)
- -DWANT_DEBUG=$(usex debug)
- -DWANT_NOEXAMPLES=$(usex !examples)
- -DWANT_GRAPHICSMAGICK=$(usex graphicsmagick)
- -DWANT_HUNSPELL=$(usex hunspell)
- -DWANT_HEADERINSTALL=$(usex !minimal)
- -DWANT_NOOSG=$(usex !osg)
- -DWITH_PODOFO=$(usex pdf)
- -DWANT_NOTEMPLATES=$(usex !templates)
- )
- cmake_src_configure
-}
-
-src_install() {
- cmake_src_install
-
- if ! use tk; then
- rm
"${ED}"/usr/share/scribus/scripts/{FontSample,CalendarWizard}.py || die
- fi
- if use scripts; then
- python_fix_shebang "${ED}"/usr/share/scribus/scripts
-
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
commit: 8c8d8869c6c50857ae481b505c5d9dadd3df70ec
Author: Sam James gentoo org>
AuthorDate: Fri Oct 27 12:14:39 2023 +
Commit: Sam James gentoo org>
CommitDate: Fri Oct 27 12:14:39 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c8d8869
app-office/scribus: Stabilize 1.5.8-r6 ppc64, #916227
Signed-off-by: Sam James gentoo.org>
app-office/scribus/scribus-1.5.8-r6.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/scribus/scribus-1.5.8-r6.ebuild
b/app-office/scribus/scribus-1.5.8-r6.ebuild
index 5a09b3a672bc..9dd9b956b095 100644
--- a/app-office/scribus/scribus-1.5.8-r6.ebuild
+++ b/app-office/scribus/scribus-1.5.8-r6.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${P}"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 x86"
IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts
+templates tk"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
commit: dd68e2d67bc9bbb0558716ba68162720f2636263
Author: Arthur Zamarin gentoo org>
AuthorDate: Tue Oct 24 19:11:23 2023 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Tue Oct 24 19:11:23 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd68e2d6
app-office/scribus: Stabilize 1.5.8-r6 ppc, #916227
Signed-off-by: Arthur Zamarin gentoo.org>
app-office/scribus/scribus-1.5.8-r6.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/scribus/scribus-1.5.8-r6.ebuild
b/app-office/scribus/scribus-1.5.8-r6.ebuild
index 56549f4efc56..5a09b3a672bc 100644
--- a/app-office/scribus/scribus-1.5.8-r6.ebuild
+++ b/app-office/scribus/scribus-1.5.8-r6.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${P}"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ppc ~ppc64 x86"
IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts
+templates tk"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
commit: 9f77a99164a00147cadf205462f82511090fcac1
Author: Arthur Zamarin gentoo org>
AuthorDate: Tue Oct 24 17:18:36 2023 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Tue Oct 24 17:18:36 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f77a991
app-office/scribus: Stabilize 1.5.8-r6 amd64, #916227
Signed-off-by: Arthur Zamarin gentoo.org>
app-office/scribus/scribus-1.5.8-r6.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/scribus/scribus-1.5.8-r6.ebuild
b/app-office/scribus/scribus-1.5.8-r6.ebuild
index a84e978a292d..56549f4efc56 100644
--- a/app-office/scribus/scribus-1.5.8-r6.ebuild
+++ b/app-office/scribus/scribus-1.5.8-r6.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${P}"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts
+templates tk"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
commit: 5a1fa483c85a06e49c8c1cc8fe611671e018ab56
Author: Arthur Zamarin gentoo org>
AuthorDate: Tue Oct 24 16:51:05 2023 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Tue Oct 24 16:51:05 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a1fa483
app-office/scribus: Stabilize 1.5.8-r6 x86, #916227
Signed-off-by: Arthur Zamarin gentoo.org>
app-office/scribus/scribus-1.5.8-r6.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/scribus/scribus-1.5.8-r6.ebuild
b/app-office/scribus/scribus-1.5.8-r6.ebuild
index d5391b38535f..a84e978a292d 100644
--- a/app-office/scribus/scribus-1.5.8-r6.ebuild
+++ b/app-office/scribus/scribus-1.5.8-r6.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${P}"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 x86"
IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts
+templates tk"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
[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/;
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/files/, app-office/scribus/
commit: cc0e1590aeba91a990174b7da4553c0524dd1e0f
Author: Miroslav Šulc gentoo org>
AuthorDate: Fri Mar 17 06:52:26 2023 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Fri Mar 17 06:52:40 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc0e1590
app-office/scribus: dropped obsolete 1.5.8-r4
Bug: https://bugs.gentoo.org/893488
Signed-off-by: Miroslav Šulc gentoo.org>
.../files/scribus-1.5.8-poppler-22.03.0.patch | 52
.../files/scribus-1.5.8-poppler-22.04.0.patch | 291 -
.../files/scribus-1.5.8-poppler-22.09.0.patch | 20 --
.../files/scribus-1.5.8-poppler-22.2.0-1.patch | 129 -
.../files/scribus-1.5.8-poppler-22.2.0-2.patch | 28 --
app-office/scribus/scribus-1.5.8-r4.ebuild | 170
6 files changed, 690 deletions(-)
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
deleted file mode 100644
index f7a0c03fdd96..
--- a/app-office/scribus/files/scribus-1.5.8-poppler-22.03.0.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-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/files/scribus-1.5.8-poppler-22.04.0.patch
b/app-office/scribus/files/scribus-1.5.8-poppler-22.04.0.patch
deleted file mode 100644
index 290484e7e872..
--- a/app-office/scribus/files/scribus-1.5.8-poppler-22.04.0.patch
+++ /dev/null
@@ -1,291 +0,0 @@
-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(), );
- fontSize = state->getFontSize();
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 4, 0)
-+ if (state->getFont() && state->getFont()->getName())
-+ fontName = new
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
commit: aa43e42830b43971cde887f8f29cb3d7237dcd31
Author: Arthur Zamarin gentoo org>
AuthorDate: Thu Mar 16 14:04:13 2023 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Thu Mar 16 14:04:13 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa43e428
app-office/scribus: Stabilize 1.5.8-r5 ppc64, #893488
Signed-off-by: Arthur Zamarin gentoo.org>
app-office/scribus/scribus-1.5.8-r5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/scribus/scribus-1.5.8-r5.ebuild
b/app-office/scribus/scribus-1.5.8-r5.ebuild
index 8331c66a59fd..0261a742c7f3 100644
--- a/app-office/scribus/scribus-1.5.8-r5.ebuild
+++ b/app-office/scribus/scribus-1.5.8-r5.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${P}"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 x86"
IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts
+templates tk"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
commit: 27a8bf4b22a7ed54f915899b6f030e19939aea30
Author: Sam James gentoo org>
AuthorDate: Mon Feb 20 14:29:47 2023 +
Commit: Sam James gentoo org>
CommitDate: Mon Feb 20 14:29:47 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27a8bf4b
app-office/scribus: Stabilize 1.5.8-r5 amd64, #893488
Signed-off-by: Sam James gentoo.org>
app-office/scribus/scribus-1.5.8-r5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/scribus/scribus-1.5.8-r5.ebuild
b/app-office/scribus/scribus-1.5.8-r5.ebuild
index e23d623e80a7..8331c66a59fd 100644
--- a/app-office/scribus/scribus-1.5.8-r5.ebuild
+++ b/app-office/scribus/scribus-1.5.8-r5.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${P}"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ppc ~ppc64 x86"
+KEYWORDS="amd64 ppc ~ppc64 x86"
IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts
+templates tk"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
commit: 099936712cf134f8304d5151fd1ef31a9bc09eeb
Author: Sam James gentoo org>
AuthorDate: Mon Feb 20 14:29:44 2023 +
Commit: Sam James gentoo org>
CommitDate: Mon Feb 20 14:29:44 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09993671
app-office/scribus: Stabilize 1.5.8-r5 x86, #893488
Signed-off-by: Sam James gentoo.org>
app-office/scribus/scribus-1.5.8-r5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/scribus/scribus-1.5.8-r5.ebuild
b/app-office/scribus/scribus-1.5.8-r5.ebuild
index 1175bafb55e2..e23d623e80a7 100644
--- a/app-office/scribus/scribus-1.5.8-r5.ebuild
+++ b/app-office/scribus/scribus-1.5.8-r5.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${P}"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ppc ~ppc64 x86"
IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts
+templates tk"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
commit: 3740c45c2801717dbec434027d9daac2dfc87d01
Author: Sam James gentoo org>
AuthorDate: Mon Feb 20 13:49:46 2023 +
Commit: Sam James gentoo org>
CommitDate: Mon Feb 20 13:49:46 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3740c45c
app-office/scribus: Stabilize 1.5.8-r5 ppc, #893488
Signed-off-by: Sam James gentoo.org>
app-office/scribus/scribus-1.5.8-r5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/scribus/scribus-1.5.8-r5.ebuild
b/app-office/scribus/scribus-1.5.8-r5.ebuild
index 6f8c9ec7de09..1175bafb55e2 100644
--- a/app-office/scribus/scribus-1.5.8-r5.ebuild
+++ b/app-office/scribus/scribus-1.5.8-r5.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${P}"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ppc ~ppc64 ~x86"
IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts
+templates tk"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/files/, app-office/scribus/
commit: eb70711765546964429e8734e71a17d26ce6cd56
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Feb 5 15:33:43 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Mon Feb 6 10:35:21 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb707117
app-office/scribus: Add python3_11, fix memleak, fix dashed lines
Use upstream poppler-22.09 support patch, amended by Debian
for dashed lines fix.
Drop CMAKE_BUILD_TYPE="Release"
Hopefully stop cmake overwriting user optimisations
Bug: https://bugs.gentoo.org/691684
Closes: https://bugs.gentoo.org/886251
Closes: https://bugs.gentoo.org/893158
Signed-off-by: Andreas Sturmlechner gentoo.org>
app-office/scribus/Manifest| 1 +
app-office/scribus/files/scribus-1.5.8-cmake.patch | 28
app-office/scribus/scribus-1.5.8-r5.ebuild | 168 +
3 files changed, 197 insertions(+)
diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index b68a6cf5f28c..77fcc903a9bf 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -1 +1,2 @@
+DIST scribus-1.5.8-patchset-1.tar.xz 7396 BLAKE2B
f8c7b6eb83bfdca715a46c09f4168db332d52b4d4bdc12946bd3ca88bd9b6c67a22c034b58ca62149cbe483ca75efa646589d367245db68136b0bdbcf91dae20
SHA512
ee9bc984b0593fb2f0e727e45dac12b6d1fd1117d0e42d531ab7a49b55b0d72b5c36fc40709750571eb8c70e19f5b59e69faefa40c5706d82f1b6db18baff28d
DIST scribus-1.5.8.tar.xz 74543476 BLAKE2B
6eacf3089db88b673bd146a9727af4faa4e64901b332dbe08e6c62c912212bfd0e9e2003796df51621ee7d66262388ecfc3bed057a22d1d7fb1740e77fe50686
SHA512
eb46be0165eeb0d8974aa744fc8ffac321b206ca0015da39bb2f50d9fd4a5e28300a49ada0f963b4e0cf9a3301dc746ffba74f359f5e76d308d80b71ee669c2d
diff --git a/app-office/scribus/files/scribus-1.5.8-cmake.patch
b/app-office/scribus/files/scribus-1.5.8-cmake.patch
new file mode 100644
index ..a461ee20c281
--- /dev/null
+++ b/app-office/scribus/files/scribus-1.5.8-cmake.patch
@@ -0,0 +1,28 @@
+--- a/CMakeLists.txt 2022-01-23 17:14:43.0 +0100
b/CMakeLists.txt 2023-02-05 15:59:57.828047452 +0100
+@@ -362,25 +362,6 @@
+ if(APPLE)
+ ### Include our Apple configure commands
+ include(CMakeLists_Apple.cmake)
+-else()
+- if(${CMAKE_GENERATOR} MATCHES "^(Visual Studio|NMake).*")
+- # Windows build with Visual Studio
+- # Surely there's a better way to identify the compiler?
+- set(CMAKE_CXX_FLAGS_DEBUG)
+- set(CMAKE_C_FLAGS_DEBUG)
+- else()
+- # vanilla gcc
+- set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0 -g
-Wall -fstrict-aliasing")
+- set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0 -g -Wall
-fstrict-aliasing")
+- endif()
+- if(${CMAKE_GENERATOR} MATCHES "^(Visual Studio|NMake).*")
+- set(CMAKE_CXX_FLAGS_RELEASE)
+- set(CMAKE_C_FLAGS_RELEASE)
+- else()
+- set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O2
-Wall")
+- set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O2 -Wall")
+- # add_definitions(-DNDEBUG)
+- endif()
+ endif()
+ if(WIN32)
+ add_definitions(-DWIN32_LEAN_AND_MEAN
diff --git a/app-office/scribus/scribus-1.5.8-r5.ebuild
b/app-office/scribus/scribus-1.5.8-r5.ebuild
new file mode 100644
index ..6f8c9ec7de09
--- /dev/null
+++ b/app-office/scribus/scribus-1.5.8-r5.ebuild
@@ -0,0 +1,168 @@
+# 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..11} )
+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}-devel/${PV}/${P}.tar.xz
+https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}.tar.xz;
+S="${WORKDIR}/${P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts
+templates tk"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ tk? ( scripts )"
+
+# osg
+# couple of third_party libs bundled
+DEPEND="${PYTHON_DEPS}
+ app-text/libmspub
+ app-text/libqxp
+ app-text/poppler:=
+ dev-libs/hyphen
+ dev-libs/icu:0=
+ dev-libs/librevenge
+ dev-libs/libxml2
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5[-gles2-only]
+ dev-qt/qtnetwork:5
+ dev-qt/qtopengl:5
+ dev-qt/qtprintsupport:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtxml:5
+ media-libs/fontconfig
+ media-libs/freetype:2
+ media-libs/harfbuzz:0=[icu]
+ media-libs/lcms:2
+ media-libs/libcdr
+ media-libs/libfreehand
+ media-libs/libjpeg-turbo:=
+ media-libs/libpagemaker
+ media-libs/libpng:0=
+
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
commit: 6bf7f944ee8fc778bb46244b20bd5fd4a787583c
Author: Jeffery Gazso gmail com>
AuthorDate: Tue Oct 18 00:05:50 2022 +
Commit: Sam James gentoo org>
CommitDate: Thu Dec 29 21:34:04 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6bf7f944
app-office/scribus: antiword support optfeature
Signed-off-by: Jeffery Gazso gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/27826
Signed-off-by: Sam James gentoo.org>
app-office/scribus/scribus-1.5.8-r4.ebuild | 8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/app-office/scribus/scribus-1.5.8-r4.ebuild
b/app-office/scribus/scribus-1.5.8-r4.ebuild
index b3a6630f39be..452fd4085ad9 100644
--- a/app-office/scribus/scribus-1.5.8-r4.ebuild
+++ b/app-office/scribus/scribus-1.5.8-r4.ebuild
@@ -5,7 +5,7 @@ EAPI=8
PYTHON_COMPAT=( python3_{8..10} )
PYTHON_REQ_USE="tk?"
-inherit cmake desktop flag-o-matic python-single-r1 xdg
+inherit cmake desktop flag-o-matic optfeature python-single-r1 xdg
DESCRIPTION="Desktop publishing (DTP) and layout program"
HOMEPAGE="https://www.scribus.net/;
@@ -162,3 +162,9 @@ src_install() {
doicon resources/iconsets/*/scribus.png
domenu scribus.desktop
}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+
+ optfeature "MS Word .doc file import filter support" app-text/antiword
+}
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
commit: b1a2ca73b34ffd2ee67fba3aeb6c338ed540e87b
Author: Sam James gentoo org>
AuthorDate: Sat Oct 8 18:17:19 2022 +
Commit: Sam James gentoo org>
CommitDate: Sat Oct 8 18:25:03 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1a2ca73
app-office/scribus: fix MissingUseDepDefault on cairo
Closes: https://bugs.gentoo.org/875899
Signed-off-by: Sam James gentoo.org>
app-office/scribus/{scribus-1.5.8-r1.ebuild => scribus-1.5.8-r2.ebuild} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/scribus/scribus-1.5.8-r1.ebuild
b/app-office/scribus/scribus-1.5.8-r2.ebuild
similarity index 99%
rename from app-office/scribus/scribus-1.5.8-r1.ebuild
rename to app-office/scribus/scribus-1.5.8-r2.ebuild
index 175ae6cd558b..edff91bca961 100644
--- a/app-office/scribus/scribus-1.5.8-r1.ebuild
+++ b/app-office/scribus/scribus-1.5.8-r2.ebuild
@@ -50,7 +50,7 @@ DEPEND="${PYTHON_DEPS}
media-libs/tiff:0
net-print/cups
sys-libs/zlib[minizip]
- x11-libs/cairo[X,svg]
+ x11-libs/cairo[X,svg(+)]
boost? ( dev-libs/boost:= )
graphicsmagick? ( media-gfx/graphicsmagick:= )
hunspell? ( app-text/hunspell:= )
[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 = state->getLineDash();
++ dashPattern = dash.data();
++ dashLength = dash.size();
++#else
++ double *dashPattern;
+ state->getLineDash(, , );
++#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/
commit: 59a7f9c82b983d5f6dfa41b313742616d07e7713
Author: Miroslav Šulc gentoo org>
AuthorDate: Tue May 17 09:39:09 2022 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Tue May 17 09:39:09 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59a7f9c8
app-office/scribus: dropped obsolete 1.5.8
Bug: https://bugs.gentoo.org/843356
Signed-off-by: Miroslav Šulc gentoo.org>
app-office/scribus/scribus-1.5.8.ebuild | 162
1 file changed, 162 deletions(-)
diff --git a/app-office/scribus/scribus-1.5.8.ebuild
b/app-office/scribus/scribus-1.5.8.ebuild
deleted file mode 100644
index 20e8e9c6d5a0..
--- a/app-office/scribus/scribus-1.5.8.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="tk?"
-inherit cmake desktop flag-o-matic python-single-r1 xdg
-
-DESCRIPTION="Desktop publishing (DTP) and layout program"
-HOMEPAGE="https://www.scribus.net/;
-SRC_URI="mirror://sourceforge/project/${PN}/${PN}-devel/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts
+templates tk"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- tk? ( scripts )"
-
-# osg
-# couple of third_party libs bundled
-DEPEND="${PYTHON_DEPS}
- app-text/libmspub
- app-text/libqxp
- app-text/poppler:=
- dev-libs/hyphen
- dev-libs/icu:0=
- dev-libs/librevenge
- dev-libs/libxml2
- dev-qt/qtcore:5
- dev-qt/qtgui:5[-gles2-only]
- dev-qt/qtnetwork:5
- dev-qt/qtopengl:5
- dev-qt/qtprintsupport:5
- dev-qt/qtwidgets:5
- dev-qt/qtxml:5
- media-libs/fontconfig
- media-libs/freetype:2
- media-libs/harfbuzz:0=[icu]
- media-libs/lcms:2
- media-libs/libcdr
- media-libs/libfreehand
- media-libs/libpagemaker
- media-libs/libpng:0=
- media-libs/libvisio
- media-libs/libzmf
- media-libs/tiff:0
- net-print/cups
- sys-libs/zlib[minizip]
- virtual/jpeg:0=
- x11-libs/cairo[X,svg]
- boost? ( dev-libs/boost:= )
- graphicsmagick? ( media-gfx/graphicsmagick:= )
- hunspell? ( app-text/hunspell:= )
- osg? ( dev-games/openscenegraph:= )
- pdf? ( app-text/podofo:0= )
- scripts? (
- $(python_gen_cond_dep '
- dev-python/pillow[tk?,${PYTHON_USEDEP}]
- ')
- )
-"
-RDEPEND="${DEPEND}
- app-text/ghostscript-gpl
-"
-BDEPEND="
- dev-qt/linguist-tools:5
- virtual/pkgconfig
-"
-
-PATCHES=(
- # non(?)-upstreamable
- "${FILESDIR}"/${PN}-1.5.3-fpic.patch
- "${FILESDIR}"/${PN}-1.5.6-docdir.patch
- "${FILESDIR}"/${PN}-1.5.8-findhyphen-1.patch
- "${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"
-
-S="${WORKDIR}/${P}"
-
-src_prepare() {
- cmake_src_prepare
-
- rm -r codegen/cheetah scribus/third_party/hyphen || die
-
- sed \
- -e "/^\s*unzip\.[ch]/d" \
- -e "/^\s*ioapi\.[ch]/d" \
- -i scribus/CMakeLists.txt Scribus.pro || die
- rm scribus/ioapi.[ch] || die
-
- sed \
- -e 's:\(${CMAKE_INSTALL_PREFIX}\):./\1:g' \
- -i resources/templates/CMakeLists.txt || die
-
- sed \
- -e "/^add_subdirectory(ui\/qml)/s/^/#DONT/" \
- -i scribus/CMakeLists.txt || die # nothing but a bogus Hello
World test
-}
-
-src_configure() {
- # bug #550818
- append-cppflags -DHAVE_MEMRCHR
-
- local mycmakeargs=(
- -DHAVE_PYTHON=ON
- -DWANT_DISTROBUILD=ON
- -DWANT_CPP17=ON
- -DDOCDIR="${EPREFIX}"/usr/share/doc/${PF}/
- -DPython3_EXECUTABLE="${PYTHON}"
- -DWITH_BOOST=$(usex boost)
- -DWANT_DEBUG=$(usex debug)
- -DWANT_NOEXAMPLES=$(usex !examples)
- -DWANT_GRAPHICSMAGICK=$(usex graphicsmagick)
- -DWANT_HUNSPELL=$(usex hunspell)
- -DWANT_HEADERINSTALL=$(usex !minimal)
- -DWANT_NOOSG=$(usex !osg)
- -DWITH_PODOFO=$(usex pdf)
- -DWANT_NOTEMPLATES=$(usex !templates)
- )
- cmake_src_configure
-}
-
-src_install() {
- cmake_src_install
-
- if ! use tk; then
- rm
"${ED}"/usr/share/scribus/scripts/{FontSample,CalendarWizard}.py || die
- fi
- if use scripts; then
- python_fix_shebang "${ED}"/usr/share/scribus/scripts
- python_optimize "${ED}"/usr/share/scribus/scripts
-
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
commit: 804d8a804d4c3886871d70d62151c34ad11facb7
Author: Agostino Sarubbo gentoo org>
AuthorDate: Tue May 17 09:23:26 2022 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Tue May 17 09:23:26 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=804d8a80
app-office/scribus: x86 stable wrt bug #843356
Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo gentoo.org>
app-office/scribus/scribus-1.5.8-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/scribus/scribus-1.5.8-r1.ebuild
b/app-office/scribus/scribus-1.5.8-r1.ebuild
index 38016ddcd6ab..5457bc6ee17f 100644
--- a/app-office/scribus/scribus-1.5.8-r1.ebuild
+++ b/app-office/scribus/scribus-1.5.8-r1.ebuild
@@ -13,7 +13,7 @@
SRC_URI="mirror://sourceforge/project/${PN}/${PN}-devel/${PV}/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ppc ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts
+templates tk"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
commit: af51b09e1c6b4ad9a583164d309bf8acb230d1fa
Author: Jakov Smolić gentoo org>
AuthorDate: Mon May 16 12:22:03 2022 +
Commit: Jakov Smolić gentoo org>
CommitDate: Mon May 16 12:22:03 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af51b09e
app-office/scribus: Stabilize 1.5.8-r1 amd64, #843356
Signed-off-by: Jakov Smolić gentoo.org>
app-office/scribus/scribus-1.5.8-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/scribus/scribus-1.5.8-r1.ebuild
b/app-office/scribus/scribus-1.5.8-r1.ebuild
index a9851f372d1b..38016ddcd6ab 100644
--- a/app-office/scribus/scribus-1.5.8-r1.ebuild
+++ b/app-office/scribus/scribus-1.5.8-r1.ebuild
@@ -13,7 +13,7 @@
SRC_URI="mirror://sourceforge/project/${PN}/${PN}-devel/${PV}/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ppc ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 ~x86"
IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts
+templates tk"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
commit: 5ab2a2de47b464797b1aa3011eeae96e8bf62226
Author: Jakov Smolić gentoo org>
AuthorDate: Mon May 16 12:21:07 2022 +
Commit: Jakov Smolić gentoo org>
CommitDate: Mon May 16 12:21:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ab2a2de
app-office/scribus: Stabilize 1.5.8-r1 ppc64, #843356
Signed-off-by: Jakov Smolić gentoo.org>
app-office/scribus/scribus-1.5.8-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/scribus/scribus-1.5.8-r1.ebuild
b/app-office/scribus/scribus-1.5.8-r1.ebuild
index 9c9dfbd6604c..a9851f372d1b 100644
--- a/app-office/scribus/scribus-1.5.8-r1.ebuild
+++ b/app-office/scribus/scribus-1.5.8-r1.ebuild
@@ -13,7 +13,7 @@
SRC_URI="mirror://sourceforge/project/${PN}/${PN}-devel/${PV}/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ppc ppc64 ~x86"
IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts
+templates tk"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
commit: 6f3f15babb0ed6afd65b65dc9537f182c2866bc3
Author: Jakov Smolić gentoo org>
AuthorDate: Mon May 16 12:21:05 2022 +
Commit: Jakov Smolić gentoo org>
CommitDate: Mon May 16 12:21:05 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f3f15ba
app-office/scribus: Stabilize 1.5.8-r1 ppc, #843356
Signed-off-by: Jakov Smolić gentoo.org>
app-office/scribus/scribus-1.5.8-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/scribus/scribus-1.5.8-r1.ebuild
b/app-office/scribus/scribus-1.5.8-r1.ebuild
index d54fc9affaaa..9c9dfbd6604c 100644
--- a/app-office/scribus/scribus-1.5.8-r1.ebuild
+++ b/app-office/scribus/scribus-1.5.8-r1.ebuild
@@ -13,7 +13,7 @@
SRC_URI="mirror://sourceforge/project/${PN}/${PN}-devel/${PV}/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ppc ~ppc64 ~x86"
IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts
+templates tk"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
commit: fbdbeee6ca80d6257e186676723c6ffcba6b
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Mon May 9 06:54:12 2022 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Mon May 9 06:54:32 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fbdbeee6
app-office/scribus: Drop broken ebuild
Bug: https://bugs.gentoo.org/832444
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner gentoo.org>
app-office/scribus/scribus-.ebuild | 159 -
1 file changed, 159 deletions(-)
diff --git a/app-office/scribus/scribus-.ebuild
b/app-office/scribus/scribus-.ebuild
deleted file mode 100644
index dc6748192f39..
--- a/app-office/scribus/scribus-.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="tk?"
-inherit cmake desktop flag-o-matic python-single-r1 subversion xdg
-
-DESCRIPTION="Desktop publishing (DTP) and layout program"
-HOMEPAGE="https://www.scribus.net/;
-SRC_URI=""
-ESVN_REPO_URI="svn://scribus.net/trunk/Scribus"
-ESVN_PROJECT=Scribus-1.5
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts
+templates tk"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- tk? ( scripts )"
-
-# osg
-# couple of third_party libs bundled
-DEPEND="${PYTHON_DEPS}
- app-text/libmspub
- app-text/libqxp
- app-text/poppler:=
- dev-libs/hyphen
- dev-libs/icu:0=
- dev-libs/librevenge
- dev-libs/libxml2
- dev-qt/qtcore:5
- dev-qt/qtgui:5[-gles2-only]
- dev-qt/qtnetwork:5
- dev-qt/qtopengl:5
- dev-qt/qtprintsupport:5
- dev-qt/qtwidgets:5
- dev-qt/qtxml:5
- media-libs/fontconfig
- media-libs/freetype:2
- media-libs/harfbuzz:0=[icu]
- media-libs/lcms:2
- media-libs/libcdr
- media-libs/libfreehand
- media-libs/libjpeg-turbo:=
- media-libs/libpagemaker
- media-libs/libpng:0=
- media-libs/libvisio
- media-libs/libzmf
- media-libs/tiff:0
- net-print/cups
- sys-libs/zlib[minizip]
- x11-libs/cairo[X,svg]
- boost? ( dev-libs/boost:= )
- graphicsmagick? ( media-gfx/graphicsmagick:= )
- hunspell? ( app-text/hunspell:= )
- osg? ( dev-games/openscenegraph:= )
- pdf? ( app-text/podofo:0= )
- scripts? (
- $(python_gen_cond_dep '
- dev-python/pillow[tk?,${PYTHON_USEDEP}]
- ')
- )
-"
-RDEPEND="${DEPEND}
- app-text/ghostscript-gpl
-"
-BDEPEND="
- dev-qt/linguist-tools:5
- virtual/pkgconfig
-"
-
-PATCHES=(
- # non(?)-upstreamable
- "${FILESDIR}"/${PN}-1.5.3-fpic.patch
- "${FILESDIR}"/${PN}-1.5.6-docdir.patch
- "${FILESDIR}"/${PN}-1.5.8-findhyphen-1.patch
- "${FILESDIR}"/${PN}-1.5.6-findhyphen.patch
-)
-
-CMAKE_BUILD_TYPE="Release"
-
-src_prepare() {
- cmake_src_prepare
-
- rm -r codegen/cheetah scribus/third_party/hyphen || die
-
- sed \
- -e "/^\s*unzip\.[ch]/d" \
- -e "/^\s*ioapi\.[ch]/d" \
- -i scribus/CMakeLists.txt Scribus.pro || die
- rm scribus/ioapi.[ch] || die
-
- sed \
- -e 's:\(${CMAKE_INSTALL_PREFIX}\):./\1:g' \
- -i resources/templates/CMakeLists.txt || die
-
- sed \
- -e "/^add_subdirectory(ui\/qml)/s/^/#DONT/" \
- -i scribus/CMakeLists.txt || die # nothing but a bogus Hello
World test
-}
-
-src_configure() {
- # bug #550818
- append-cppflags -DHAVE_MEMRCHR
-
- local mycmakeargs=(
- -DHAVE_PYTHON=ON
- -DWANT_DISTROBUILD=ON
- -DWANT_CPP17=ON
- -DDOCDIR="${EPREFIX}"/usr/share/doc/${PF}/
- -DPython3_EXECUTABLE="${PYTHON}"
- -DWITH_BOOST=$(usex boost)
- -DWANT_DEBUG=$(usex debug)
- -DWANT_NOEXAMPLES=$(usex !examples)
- -DWANT_GRAPHICSMAGICK=$(usex graphicsmagick)
- -DWANT_HUNSPELL=$(usex hunspell)
- -DWANT_HEADERINSTALL=$(usex !minimal)
- -DWANT_NOOSG=$(usex !osg)
- -DWITH_PODOFO=$(usex pdf)
- -DWANT_NOTEMPLATES=$(usex !templates)
- )
- cmake_src_configure
-}
-
-src_install() {
- cmake_src_install
-
- if ! use tk; then
- rm
"${ED}"/usr/share/scribus/scripts/{FontSample,CalendarWizard}.py || die
- fi
- if use scripts; then
- python_fix_shebang "${ED}"/usr/share/scribus/scripts
- python_optimize "${ED}"/usr/share/scribus/scripts
- else
- rm "${ED}"/usr/share/scribus/scripts/*.py || die
- fi
-
- mv
[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(), );
+ 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 =
++#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(), , 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 tmpBufLen = 0;
+ int
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/files/, app-office/scribus/
commit: a353ebd90d6cf08b5f2923315e1104d4a9bc3629
Author: Miroslav Šulc gentoo org>
AuthorDate: Sun Mar 27 06:04:55 2022 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Sun Mar 27 06:05:14 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a353ebd9
app-office/scribus: removed obsolete 1.5.7
Bug: https://bugs.gentoo.org/show_bug.cgi?id=835425
Signed-off-by: Miroslav Šulc gentoo.org>
app-office/scribus/Manifest| 1 -
.../scribus/files/scribus-1.5.5-findhyphen-1.patch | 51 -
.../scribus/files/scribus-1.5.7-osg-cpp17.patch| 219 -
.../scribus/files/scribus-1.5.8-harfbuzz-3.patch | 68 ---
app-office/scribus/scribus-1.5.7.ebuild| 162 ---
5 files changed, 501 deletions(-)
diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index 0844d8a46097..b68a6cf5f28c 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -1,2 +1 @@
-DIST scribus-1.5.7.tar.xz 74490040 BLAKE2B
80ecc25f506ad3bdd3b03362b6616f1f7394b7f2794349cdf60089a7e5d39e861883a7e1b3a949667b2eb41b0b383bd8536de8a0feff4980305ef52f85eb0d05
SHA512
0c8cd42b9d3d26e24d4e0f6638b6c72bab2c2c3aa7e7195efb222391a0c0e671633e32afb08ec35b6ab5123793983de5d413aa7607b51adac3725dc8a83bfb01
DIST scribus-1.5.8.tar.xz 74543476 BLAKE2B
6eacf3089db88b673bd146a9727af4faa4e64901b332dbe08e6c62c912212bfd0e9e2003796df51621ee7d66262388ecfc3bed057a22d1d7fb1740e77fe50686
SHA512
eb46be0165eeb0d8974aa744fc8ffac321b206ca0015da39bb2f50d9fd4a5e28300a49ada0f963b4e0cf9a3301dc746ffba74f359f5e76d308d80b71ee669c2d
diff --git a/app-office/scribus/files/scribus-1.5.5-findhyphen-1.patch
b/app-office/scribus/files/scribus-1.5.5-findhyphen-1.patch
deleted file mode 100644
index 98682d60f700..
--- a/app-office/scribus/files/scribus-1.5.5-findhyphen-1.patch
+++ /dev/null
@@ -1,51 +0,0 @@
a/scribus/CMakeLists.txt 2019-10-02 00:25:01.194386515 +0200
-+++ b/scribus/CMakeLists.txt 2019-10-02 00:26:23.584392213 +0200
-@@ -1069,7 +1069,9 @@
- ${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}
-@@ -1180,13 +1182,6 @@
-
- endif()
-
--if(HAVE_HYPHEN)
-- target_link_libraries(${EXE_NAME}
-- ${HYPHEN_LIBRARY}
-- )
--endif()
--
--
- if(GESTURE_FRAME_PREVIEW)
-message(STATUS "Enable gesture frame preview [experimental]")
-set(GESTURE_FRAME_PREVIEW_SOURCES pageitempreview.cpp)
-@@ -1234,6 +1229,12 @@
- )
- endif ()
-
-+if(HAVE_HYPHEN)
-+ target_link_libraries(${EXE_NAME}
-+ ${HYPHEN_LIBRARY}
-+ )
-+endif()
-+
- if(WIN32)
- set_target_properties(${EXE_NAME}
- PROPERTIES
a/scribus/hyphenator.h 2019-07-31 00:35:05.0 +0200
-+++ b/scribus/hyphenator.h 2019-10-02 00:00:42.497285638 +0200
-@@ -13,7 +13,7 @@
- #include
-
- #include "scribusapi.h"
--#include "third_party/hyphen/hyphen.h"
-+#include
-
- class ScribusDoc;
- class ScribusMainWindow;
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
deleted file mode 100644
index 21f0c00554d2..
--- a/app-office/scribus/files/scribus-1.5.7-osg-cpp17.patch
+++ /dev/null
@@ -1,219 +0,0 @@
-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));
-+
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
commit: 09de8a1bf162ce6fcbf1ee771e98b85ef1885484
Author: Sam James gentoo org>
AuthorDate: Sun Mar 27 02:34:00 2022 +
Commit: Sam James gentoo org>
CommitDate: Sun Mar 27 02:34:00 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09de8a1b
app-office/scribus: Stabilize 1.5.8 ppc64, #835425
Signed-off-by: Sam James gentoo.org>
app-office/scribus/scribus-1.5.8.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/scribus/scribus-1.5.8.ebuild
b/app-office/scribus/scribus-1.5.8.ebuild
index c344d68a2691..20e8e9c6d5a0 100644
--- a/app-office/scribus/scribus-1.5.8.ebuild
+++ b/app-office/scribus/scribus-1.5.8.ebuild
@@ -13,7 +13,7 @@
SRC_URI="mirror://sourceforge/project/${PN}/${PN}-devel/${PV}/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 x86"
IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts
+templates tk"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
commit: 093dd79c85faf25f252cd1b422d4cb9951943d51
Author: Agostino Sarubbo gentoo org>
AuthorDate: Sat Mar 19 19:21:14 2022 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Sat Mar 19 19:21:14 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=093dd79c
app-office/scribus: x86 stable wrt bug #835425
Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo gentoo.org>
app-office/scribus/scribus-1.5.8.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/scribus/scribus-1.5.8.ebuild
b/app-office/scribus/scribus-1.5.8.ebuild
index e8fdac49b665..c344d68a2691 100644
--- a/app-office/scribus/scribus-1.5.8.ebuild
+++ b/app-office/scribus/scribus-1.5.8.ebuild
@@ -13,7 +13,7 @@
SRC_URI="mirror://sourceforge/project/${PN}/${PN}-devel/${PV}/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ~ppc64 x86"
IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts
+templates tk"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
commit: 2dc9e5e7580bc0aec5151d48872d4fab5e492876
Author: Arthur Zamarin gentoo org>
AuthorDate: Fri Mar 18 08:15:00 2022 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Fri Mar 18 08:15:00 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2dc9e5e7
app-office/scribus: Stabilize 1.5.8 ppc, #835425
Signed-off-by: Arthur Zamarin gentoo.org>
app-office/scribus/scribus-1.5.8.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/scribus/scribus-1.5.8.ebuild
b/app-office/scribus/scribus-1.5.8.ebuild
index 8e4217d415ca..e8fdac49b665 100644
--- a/app-office/scribus/scribus-1.5.8.ebuild
+++ b/app-office/scribus/scribus-1.5.8.ebuild
@@ -13,7 +13,7 @@
SRC_URI="mirror://sourceforge/project/${PN}/${PN}-devel/${PV}/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ~ppc64 ~x86"
IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts
+templates tk"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
commit: 25d7811532830c37acd11e89843d4ec751f36028
Author: Jakov Smolić gentoo org>
AuthorDate: Wed Mar 16 19:20:22 2022 +
Commit: Jakov Smolić gentoo org>
CommitDate: Wed Mar 16 19:20:49 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25d78115
app-office/scribus: Stabilize 1.5.8 amd64, #835425
Signed-off-by: Jakov Smolić gentoo.org>
app-office/scribus/scribus-1.5.8.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/scribus/scribus-1.5.8.ebuild
b/app-office/scribus/scribus-1.5.8.ebuild
index 95598f864d10..8e4217d415ca 100644
--- a/app-office/scribus/scribus-1.5.8.ebuild
+++ b/app-office/scribus/scribus-1.5.8.ebuild
@@ -13,7 +13,7 @@
SRC_URI="mirror://sourceforge/project/${PN}/${PN}-devel/${PV}/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts
+templates tk"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
commit: 001ab457c403760b8dd43ce513c7ce3cc444c0fa
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed Mar 16 15:16:45 2022 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed Mar 16 15:17:14 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=001ab457
app-office/scribus: Fix SRC_URI by switching to SF mirror://
Closes: https://bugs.gentoo.org/835425
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner gentoo.org>
app-office/scribus/scribus-1.5.8.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/scribus/scribus-1.5.8.ebuild
b/app-office/scribus/scribus-1.5.8.ebuild
index 228401b0e914..95598f864d10 100644
--- a/app-office/scribus/scribus-1.5.8.ebuild
+++ b/app-office/scribus/scribus-1.5.8.ebuild
@@ -9,7 +9,7 @@ inherit cmake desktop flag-o-matic python-single-r1 xdg
DESCRIPTION="Desktop publishing (DTP) and layout program"
HOMEPAGE="https://www.scribus.net/;
-SRC_URI="https://pilotfiber.dl.sourceforge.net/project/${PN}/${PN}-devel/${PV}/${P}.tar.xz;
+SRC_URI="mirror://sourceforge/project/${PN}/${PN}-devel/${PV}/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
[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/files/, app-office/scribus/
commit: a7e4e34c72ef8b2df011b995ba3c85fac10a5394
Author: Miroslav Šulc gentoo org>
AuthorDate: Thu Feb 10 19:37:43 2022 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Thu Feb 10 19:37:43 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7e4e34c
app-office/scribus: added patches for poppler 2.22.0
Bug: https://bugs.gentoo.org/833086
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Miroslav Šulc gentoo.org>
.../files/scribus-1.5.8-poppler-22.2.0-1.patch | 129 +
.../files/scribus-1.5.8-poppler-22.2.0-2.patch | 28 +
app-office/scribus/scribus-1.5.8.ebuild| 2 +
3 files changed, 159 insertions(+)
diff --git a/app-office/scribus/files/scribus-1.5.8-poppler-22.2.0-1.patch
b/app-office/scribus/files/scribus-1.5.8-poppler-22.2.0-1.patch
new file mode 100644
index ..4e0f607c6a07
--- /dev/null
+++ b/app-office/scribus/files/scribus-1.5.8-poppler-22.2.0-1.patch
@@ -0,0 +1,129 @@
+From 85c0dff3422fa3c26fbc2e8d8561f597ec24bd92 Mon Sep 17 00:00:00 2001
+From: Jean Ghali
+Date: Wed, 2 Feb 2022 23:12:52 +
+Subject: [PATCH] #16734: Build break with poppler 22.2.0
+
+git-svn-id: svn://scribus.net/trunk/Scribus@24884
11d20701-8431-0410-a711-e3c959e3b870
+---
+ scribus/plugins/import/pdf/slaoutput.cpp | 47 +++-
+ 1 file changed, 37 insertions(+), 10 deletions(-)
+
+diff --git a/scribus/plugins/import/pdf/slaoutput.cpp
b/scribus/plugins/import/pdf/slaoutput.cpp
+index 5894bf2ad6..3650c96f52 100644
+--- a/scribus/plugins/import/pdf/slaoutput.cpp
b/scribus/plugins/import/pdf/slaoutput.cpp
+@@ -7,6 +7,11 @@ for which a new license (GPL+exception) is in place.
+
+ #include "slaoutput.h"
+
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 2, 0)
++#include
++#include
++#endif
++
+ #include
+ #include
+ #include
+@@ -3027,18 +3032,24 @@ void SlaOutputDev::markPoint(POPPLER_CONST char *name,
Dict *properties)
+ void SlaOutputDev::updateFont(GfxState *state)
+ {
+ GfxFont *gfxFont;
+- GfxFontLoc *fontLoc;
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 2, 0)
++ std::optional fontLoc;
++ const GooString * fileName = nullptr;
++ std::unique_ptr ff;
++#else
++ GfxFontLoc * fontLoc = nullptr;
++ GooString * fileName = nullptr;
++ FoFiTrueType * ff = nullptr;
++#endif
+ GfxFontType fontType;
+ SlaOutFontFileID *id;
+ SplashFontFile *fontFile;
+ SplashFontSrc *fontsrc = nullptr;
+- FoFiTrueType *ff;
+ Object refObj, strObj;
+- GooString *fileName;
+- char *tmpBuf;
++ char *tmpBuf = nullptr;
+ int tmpBufLen = 0;
+- int *codeToGID;
+- const double *textMat;
++ int *codeToGID = nullptr;
++ const double *textMat = nullptr;
+ double m11, m12, m21, m22, fontSize;
+ SplashCoord mat[4];
+ int n = 0;
+@@ -3046,9 +3057,6 @@ void SlaOutputDev::updateFont(GfxState *state)
+ SplashCoord matrix[6];
+
+ m_font = nullptr;
+- fileName = nullptr;
+- tmpBuf = nullptr;
+- fontLoc = nullptr;
+
+ gfxFont = state->getFont();
+ if (!gfxFont)
+@@ -3083,7 +3091,11 @@ void SlaOutputDev::updateFont(GfxState *state)
+ }
+ else
+ { // gfxFontLocExternal
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 2, 0)
++ fileName = fontLoc->pathAsGooString();
++#else
+ fileName = fontLoc->path;
++#endif
+ fontType = fontLoc->fontType;
+ }
+
+@@ -3136,9 +3148,14 @@ void SlaOutputDev::updateFont(GfxState *state)
+ ff = FoFiTrueType::make(tmpBuf, tmpBufLen);
+ if (ff)
+ {
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 2, 0)
++ codeToGID = ((Gfx8BitFont*)
gfxFont)->getCodeToGIDMap(ff.get());
++ ff.reset();
++#else
+ codeToGID = ((Gfx8BitFont
*)gfxFont)->getCodeToGIDMap(ff);
+- n = 256;
+ delete ff;
++#endif
++ n = 256;
+ }
+ else
+ {
+@@ -3209,8 +3226,13 @@ void SlaOutputDev::updateFont(GfxState *state)
+ ff = FoFiTrueType::make(tmpBuf,
tmpBufLen);
+ if (! ff)
+ goto err2;
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 2, 0)
++ codeToGID = ((GfxCIDFont*)
gfxFont)->getCodeToGIDMap(ff.get(), );
++ ff.reset();
++#else
+ codeToGID = ((GfxCIDFont
*)gfxFont)->getCodeToGIDMap(ff, );
+ delete ff;
++#endif
+ }
+
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
commit: 513b45f5b4bbe01dcf27331e5634161be1c90771
Author: Miroslav Šulc gentoo org>
AuthorDate: Mon Jan 24 10:31:27 2022 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Mon Jan 24 10:31:38 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=513b45f5
app-office/scribus: bump to 1.5.8
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Miroslav Šulc gentoo.org>
app-office/scribus/Manifest | 1 +
app-office/scribus/scribus-1.5.8.ebuild | 159
2 files changed, 160 insertions(+)
diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index 1ef4d5a62e03..0844d8a46097 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -1 +1,2 @@
DIST scribus-1.5.7.tar.xz 74490040 BLAKE2B
80ecc25f506ad3bdd3b03362b6616f1f7394b7f2794349cdf60089a7e5d39e861883a7e1b3a949667b2eb41b0b383bd8536de8a0feff4980305ef52f85eb0d05
SHA512
0c8cd42b9d3d26e24d4e0f6638b6c72bab2c2c3aa7e7195efb222391a0c0e671633e32afb08ec35b6ab5123793983de5d413aa7607b51adac3725dc8a83bfb01
+DIST scribus-1.5.8.tar.xz 74543476 BLAKE2B
6eacf3089db88b673bd146a9727af4faa4e64901b332dbe08e6c62c912212bfd0e9e2003796df51621ee7d66262388ecfc3bed057a22d1d7fb1740e77fe50686
SHA512
eb46be0165eeb0d8974aa744fc8ffac321b206ca0015da39bb2f50d9fd4a5e28300a49ada0f963b4e0cf9a3301dc746ffba74f359f5e76d308d80b71ee669c2d
diff --git a/app-office/scribus/scribus-1.5.8.ebuild
b/app-office/scribus/scribus-1.5.8.ebuild
new file mode 100644
index ..472e6c130552
--- /dev/null
+++ b/app-office/scribus/scribus-1.5.8.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="tk?"
+inherit cmake desktop flag-o-matic python-single-r1 xdg
+
+DESCRIPTION="Desktop publishing (DTP) and layout program"
+HOMEPAGE="https://www.scribus.net/;
+SRC_URI="https://pilotfiber.dl.sourceforge.net/project/${PN}/${PN}-devel/${PV}/${P}.tar.xz;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts
+templates tk"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ tk? ( scripts )"
+
+# osg
+# couple of third_party libs bundled
+DEPEND="${PYTHON_DEPS}
+ app-text/libmspub
+ app-text/libqxp
+ app-text/poppler:=
+ dev-libs/hyphen
+ dev-libs/icu:0=
+ dev-libs/librevenge
+ dev-libs/libxml2
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5[-gles2-only]
+ dev-qt/qtnetwork:5
+ dev-qt/qtopengl:5
+ dev-qt/qtprintsupport:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtxml:5
+ media-libs/fontconfig
+ media-libs/freetype:2
+ media-libs/harfbuzz:0=[icu]
+ media-libs/lcms:2
+ media-libs/libcdr
+ media-libs/libfreehand
+ media-libs/libpagemaker
+ media-libs/libpng:0=
+ media-libs/libvisio
+ media-libs/libzmf
+ media-libs/tiff:0
+ net-print/cups
+ sys-libs/zlib[minizip]
+ virtual/jpeg:0=
+ x11-libs/cairo[X,svg]
+ boost? ( dev-libs/boost:= )
+ graphicsmagick? ( media-gfx/graphicsmagick:= )
+ hunspell? ( app-text/hunspell:= )
+ osg? ( dev-games/openscenegraph:= )
+ pdf? ( app-text/podofo:0= )
+ scripts? (
+ $(python_gen_cond_dep '
+ dev-python/pillow[tk?,${PYTHON_USEDEP}]
+ ')
+ )
+"
+RDEPEND="${DEPEND}
+ app-text/ghostscript-gpl
+"
+BDEPEND="
+ dev-qt/linguist-tools:5
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ # non(?)-upstreamable
+ "${FILESDIR}"/${PN}-1.5.3-fpic.patch
+ "${FILESDIR}"/${PN}-1.5.6-docdir.patch
+ "${FILESDIR}"/${PN}-1.5.8-findhyphen-1.patch
+ "${FILESDIR}"/${PN}-1.5.6-findhyphen.patch
+)
+
+CMAKE_BUILD_TYPE="Release"
+
+S="${WORKDIR}/${P}"
+
+src_prepare() {
+ cmake_src_prepare
+
+ rm -r codegen/cheetah scribus/third_party/hyphen || die
+
+ sed \
+ -e "/^\s*unzip\.[ch]/d" \
+ -e "/^\s*ioapi\.[ch]/d" \
+ -i scribus/CMakeLists.txt Scribus.pro || die
+ rm scribus/ioapi.[ch] || die
+
+ sed \
+ -e 's:\(${CMAKE_INSTALL_PREFIX}\):./\1:g' \
+ -i resources/templates/CMakeLists.txt || die
+
+ sed \
+ -e "/^add_subdirectory(ui\/qml)/s/^/#DONT/" \
+ -i scribus/CMakeLists.txt || die # nothing but a bogus Hello
World test
+}
+
+src_configure() {
+ # bug #550818
+ append-cppflags -DHAVE_MEMRCHR
+
+ local mycmakeargs=(
+ -DHAVE_PYTHON=ON
+ -DWANT_DISTROBUILD=ON
+ -DWANT_CPP17=ON
+ -DDOCDIR="${EPREFIX}"/usr/share/doc/${PF}/
+ -DPython3_EXECUTABLE="${PYTHON}"
+ -DWITH_BOOST=$(usex boost)
+ -DWANT_DEBUG=$(usex debug)
+
[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));
+-
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
commit: c2b90af788833c9eb69b7e2ccd867cfc5bdfe354
Author: t0b3 gmail com>
AuthorDate: Tue Dec 14 20:23:23 2021 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Wed Dec 15 08:08:44 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2b90af7
app-office/scribus: add python 3.10
Closes: https://bugs.gentoo.org/829206
Signed-off-by: t0b3 gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/23304
Signed-off-by: Miroslav Šulc gentoo.org>
app-office/scribus/scribus-1.5.7.ebuild | 2 +-
app-office/scribus/scribus-.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-office/scribus/scribus-1.5.7.ebuild
b/app-office/scribus/scribus-1.5.7.ebuild
index 806085da0d11..6a826be1e707 100644
--- a/app-office/scribus/scribus-1.5.7.ebuild
+++ b/app-office/scribus/scribus-1.5.7.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
PYTHON_REQ_USE="tk?"
inherit cmake desktop flag-o-matic python-single-r1 xdg
diff --git a/app-office/scribus/scribus-.ebuild
b/app-office/scribus/scribus-.ebuild
index 9ee1a1dcf524..a926b40a 100644
--- a/app-office/scribus/scribus-.ebuild
+++ b/app-office/scribus/scribus-.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
PYTHON_REQ_USE="tk?"
inherit cmake desktop flag-o-matic python-single-r1 subversion xdg
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/files/
commit: 7b8c6af798cc7d82e65be5e6699558016dd3
Author: Sam James gentoo org>
AuthorDate: Sun Oct 10 00:54:34 2021 +
Commit: Sam James gentoo org>
CommitDate: Sun Oct 10 00:54:34 2021 +
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 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
+Date: Sat, 21 Aug 2021 20:05:43 +
+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
hbSubsetFace(hb_subset(hbFullFace.get(), hbSubsetInput.get()));
+
From 68ec41169eaceea4a6e1d6f359762a191c7e61d5 Mon Sep 17 00:00:00 2001
From: Jean Ghali
Date: Sun, 19 Sep 2021 11:59:50 +
@@ -26,4 +65,4 @@ git-svn-id: svn://scribus.net/trunk/Scribus@24707
11d20701-8431-0410-a711-e3c959
+#endif
QScopedPointer
hbSubsetBlob(hb_face_reference_blob(hbSubsetFace.get()));
- if (hbSubsetBlob.isNull())
+ if (hbSubsetBlob.isNull())
\ No newline at end of file
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/files/, app-office/scribus/
commit: bd3a0a60eb96a95e025ba101430b3ee12c46dc97
Author: Sam James gentoo org>
AuthorDate: Sat Oct 9 19:37:43 2021 +
Commit: Sam James gentoo org>
CommitDate: Sat Oct 9 19:38:11 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd3a0a60
app-office/scribus: fix build with Harfbuzz 3
Closes: https://bugs.gentoo.org/813711
Signed-off-by: Sam James gentoo.org>
.../scribus/files/scribus-1.5.8-harfbuzz-3.patch | 29 ++
app-office/scribus/scribus-1.5.7.ebuild| 2 ++
2 files changed, 31 insertions(+)
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
new file mode 100644
index 000..11e251866f0
--- /dev/null
+++ b/app-office/scribus/files/scribus-1.5.8-harfbuzz-3.patch
@@ -0,0 +1,29 @@
+https://github.com/scribusproject/scribus/commit/68ec41169eaceea4a6e1d6f359762a191c7e61d5.patch
+https://bugs.scribus.net/view.php?id=16635
+https://bugs.gentoo.org/813711
+
+From 68ec41169eaceea4a6e1d6f359762a191c7e61d5 Mon Sep 17 00:00:00 2001
+From: Jean Ghali
+Date: Sun, 19 Sep 2021 11:59:50 +
+Subject: [PATCH] #16635: Replace hb_subset, removed in harfbuzz 3.0, by
+ hb_subset_or_fail
+
+git-svn-id: svn://scribus.net/trunk/Scribus@24707
11d20701-8431-0410-a711-e3c959e3b870
+--- a/scribus/fonts/sfnt.cpp
b/scribus/fonts/sfnt.cpp
+@@ -1271,9 +1271,15 @@ namespace sfnt {
+ #endif
+ #endif
+
++#if HB_VERSION_ATLEAST(2, 9, 0)
++ QScopedPointer
hbSubsetFace(hb_subset_or_fail(hbFullFace.get(), hbSubsetInput.get()));
++ if (hbSubsetFace.isNull())
++ return QByteArray();
++#else
+ QScopedPointer
hbSubsetFace(hb_subset(hbFullFace.get(), hbSubsetInput.get()));
+ if (hbSubsetFace.isNull())
+ return QByteArray();
++#endif
+
+ QScopedPointer
hbSubsetBlob(hb_face_reference_blob(hbSubsetFace.get()));
+ if (hbSubsetBlob.isNull())
diff --git a/app-office/scribus/scribus-1.5.7.ebuild
b/app-office/scribus/scribus-1.5.7.ebuild
index 67c6ac3aa05..806085da0d1 100644
--- a/app-office/scribus/scribus-1.5.7.ebuild
+++ b/app-office/scribus/scribus-1.5.7.ebuild
@@ -76,6 +76,8 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.5.6-docdir.patch
"${FILESDIR}"/${PN}-1.5.5-findhyphen-1.patch
"${FILESDIR}"/${PN}-1.5.6-findhyphen.patch
+ # upstream
+ "${FILESDIR}"/${PN}-1.5.8-harfbuzz-3.patch
)
CMAKE_BUILD_TYPE="Release"
[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/files/, app-office/scribus/
commit: 419db5bfcc58960fb15f8a108014995d8a207d67
Author: Miroslav Šulc gentoo org>
AuthorDate: Sun May 30 10:45:14 2021 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Sun May 30 10:45:14 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=419db5bf
app-office/scribus: removed obsolete 1.5.6.1
Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Miroslav Šulc gentoo.org>
app-office/scribus/Manifest| 1 -
.../files/scribus-1.5.6.1-poppler-21.03.0-1.patch | 53 ---
.../files/scribus-1.5.6.1-poppler-21.03.0-2.patch | 27
.../files/scribus-1.5.6.1-poppler-21.04.0.patch| 27
app-office/scribus/scribus-1.5.6.1.ebuild | 161 -
5 files changed, 269 deletions(-)
diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index 0d731f62af6..1ef4d5a62e0 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -1,2 +1 @@
-DIST scribus-1.5.6.1.tar.gz 87557791 BLAKE2B
183b035901f5a19ffbf5890acc6037eb5483a0b5837b244b39838ca03d13bd4afc76c3c41345123aec402c602177c5fff7183deba10f8e33e980659c4ef7881e
SHA512
ff6cf0d86c874b7f03c8be9675f92c6cc7797e3a344326824e4f01f0b02ec02d6fdf5b52924e51b3436d9a6d78eda47a5e9987507721d18985768cc5a3c77245
DIST scribus-1.5.7.tar.xz 74490040 BLAKE2B
80ecc25f506ad3bdd3b03362b6616f1f7394b7f2794349cdf60089a7e5d39e861883a7e1b3a949667b2eb41b0b383bd8536de8a0feff4980305ef52f85eb0d05
SHA512
0c8cd42b9d3d26e24d4e0f6638b6c72bab2c2c3aa7e7195efb222391a0c0e671633e32afb08ec35b6ab5123793983de5d413aa7607b51adac3725dc8a83bfb01
diff --git a/app-office/scribus/files/scribus-1.5.6.1-poppler-21.03.0-1.patch
b/app-office/scribus/files/scribus-1.5.6.1-poppler-21.03.0-1.patch
deleted file mode 100644
index 18c1edcaaa9..000
--- a/app-office/scribus/files/scribus-1.5.6.1-poppler-21.03.0-1.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 7ce0ac16fd42d61ef9082b27822c7d9d79c7fef7 Mon Sep 17 00:00:00 2001
-From: Jean Ghali
-Date: Mon, 1 Mar 2021 21:52:54 +
-Subject: [PATCH] Attempt to fix build of pdf import plugin with poppler
- 21.03.0
-
-git-svn-id: svn://scribus.net/trunk/Scribus@24537
11d20701-8431-0410-a711-e3c959e3b870
- scribus/plugins/import/pdf/slaoutput.cpp | 12 +++-
- scribus/plugins/import/pdf/slaoutput.h | 4
- 2 files changed, 15 insertions(+), 1 deletion(-)
-
-diff --git a/scribus/plugins/import/pdf/slaoutput.cpp
b/scribus/plugins/import/pdf/slaoutput.cpp
-index 7cbc73e8d4..d1b37a0c21 100644
a/scribus/plugins/import/pdf/slaoutput.cpp
-+++ b/scribus/plugins/import/pdf/slaoutput.cpp
-@@ -2292,9 +2292,19 @@ GBool SlaOutputDev::patchMeshShadedFill(GfxState
*state, GfxPatchMeshShading *sh
- return gTrue;
- }
-
--GBool SlaOutputDev::tilingPatternFill(GfxState *state, Gfx * /*gfx*/, Catalog
*cat, Object *str, POPPLER_CONST_070 double *pmat, int paintType, int
tilingType, Dict *resDict, POPPLER_CONST_070 double *mat, POPPLER_CONST_070
double *bbox, int x0, int y0, int x1, int y1, double xStep, double yStep)
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(21, 3, 0)
-+bool SlaOutputDev::tilingPatternFill(GfxState *state, Gfx * /*gfx*/, Catalog
*cat, GfxTilingPattern *tPat, const double *mat, int x0, int y0, int x1, int
y1, double xStep, double yStep)
-+#else
-+GBool SlaOutputDev::tilingPatternFill(GfxState *state, Gfx * /*gfx*/, Catalog
*cat, Object *str, POPPLER_CONST_070 double *pmat, int /*paintType*/, int
/*tilingType*/, Dict *resDict, POPPLER_CONST_070 double *mat, POPPLER_CONST_070
double *bbox, int x0, int y0, int x1, int y1, double xStep, double yStep)
-+#endif
- {
- //qDebug() << "SlaOutputDev::tilingPatternFill";
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(21, 3, 0)
-+ const double *bbox = tPat->getBBox();
-+ const double *pmat = tPat->getMatrix();
-+ Dict *resDict = tPat->getResDict();
-+#endif
-+
- PDFRectangle box;
- Gfx *gfx;
- QString id;
-diff --git a/scribus/plugins/import/pdf/slaoutput.h
b/scribus/plugins/import/pdf/slaoutput.h
-index 5149f19e31..66c34203ae 100644
a/scribus/plugins/import/pdf/slaoutput.h
-+++ b/scribus/plugins/import/pdf/slaoutput.h
-@@ -197,7 +197,11 @@ class SlaOutputDev : public OutputDev
- void stroke(GfxState *state) override;
- void fill(GfxState *state) override;
- void eoFill(GfxState *state) override;
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(21, 3, 0)
-+ bool tilingPatternFill(GfxState *state, Gfx *gfx, Catalog *cat,
GfxTilingPattern *tPat, const double *mat, int x0, int y0, int x1, int y1,
double xStep, double yStep) override;
-+#else
- GBool tilingPatternFill(GfxState *state, Gfx *gfx, Catalog *cat, Object
*str, POPPLER_CONST_070 double *pmat, int paintType, int tilingType, Dict
*resDict, POPPLER_CONST_070 double *mat, POPPLER_CONST_070 double *bbox, int
x0, int y0, int x1, int y1, double xStep, double yStep) override;
-+#endif
- GBool
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
commit: dfd416475704441d2a7acfec61db00de940b6dbc
Author: Agostino Sarubbo gentoo org>
AuthorDate: Sun May 30 09:50:40 2021 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Sun May 30 09:50:40 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dfd41647
app-office/scribus: ppc64 stable wrt bug #792786
Package-Manager: Portage-3.0.13, Repoman-3.0.2
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo gentoo.org>
app-office/scribus/scribus-1.5.7.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/scribus/scribus-1.5.7.ebuild
b/app-office/scribus/scribus-1.5.7.ebuild
index 1c7309a2ea5..eebeed0651f 100644
--- a/app-office/scribus/scribus-1.5.7.ebuild
+++ b/app-office/scribus/scribus-1.5.7.ebuild
@@ -13,7 +13,7 @@
SRC_URI="https://pilotfiber.dl.sourceforge.net/project/${PN}/${PN}-devel/${PV}/$
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 x86"
IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts
+templates tk"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
commit: 8f923f0a1b37f0b2329459ecf6038469353bccdd
Author: Sam James gentoo org>
AuthorDate: Sat May 29 15:21:09 2021 +
Commit: Sam James gentoo org>
CommitDate: Sat May 29 15:21:09 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f923f0a
app-office/scribus: Stabilize 1.5.7 amd64, #792786
Signed-off-by: Sam James gentoo.org>
app-office/scribus/scribus-1.5.7.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/scribus/scribus-1.5.7.ebuild
b/app-office/scribus/scribus-1.5.7.ebuild
index 0168d180c48..1c7309a2ea5 100644
--- a/app-office/scribus/scribus-1.5.7.ebuild
+++ b/app-office/scribus/scribus-1.5.7.ebuild
@@ -13,7 +13,7 @@
SRC_URI="https://pilotfiber.dl.sourceforge.net/project/${PN}/${PN}-devel/${PV}/$
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ppc ~ppc64 x86"
+KEYWORDS="amd64 ppc ~ppc64 x86"
IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts
+templates tk"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
commit: c95b2eafeddc27f67f2e5a25c5f3dd1d8e6093fc
Author: Sam James gentoo org>
AuthorDate: Sat May 29 10:20:17 2021 +
Commit: Sam James gentoo org>
CommitDate: Sat May 29 10:21:32 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c95b2eaf
app-office/scribus: Stabilize 1.5.7 ppc, #792786
Signed-off-by: Sam James gentoo.org>
app-office/scribus/scribus-1.5.7.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/scribus/scribus-1.5.7.ebuild
b/app-office/scribus/scribus-1.5.7.ebuild
index 89541682d7e..0168d180c48 100644
--- a/app-office/scribus/scribus-1.5.7.ebuild
+++ b/app-office/scribus/scribus-1.5.7.ebuild
@@ -13,7 +13,7 @@
SRC_URI="https://pilotfiber.dl.sourceforge.net/project/${PN}/${PN}-devel/${PV}/$
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 x86"
+KEYWORDS="~amd64 ppc ~ppc64 x86"
IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts
+templates tk"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
commit: 85d49ddc2edeac9a3ebc30ba5affdbfb8c78ac69
Author: Sam James gentoo org>
AuthorDate: Sat May 29 10:18:21 2021 +
Commit: Sam James gentoo org>
CommitDate: Sat May 29 10:21:29 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85d49ddc
app-office/scribus: Stabilize 1.5.7 x86, #792786
Signed-off-by: Sam James gentoo.org>
app-office/scribus/scribus-1.5.7.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/scribus/scribus-1.5.7.ebuild
b/app-office/scribus/scribus-1.5.7.ebuild
index 0793c811fb9..89541682d7e 100644
--- a/app-office/scribus/scribus-1.5.7.ebuild
+++ b/app-office/scribus/scribus-1.5.7.ebuild
@@ -13,7 +13,7 @@
SRC_URI="https://pilotfiber.dl.sourceforge.net/project/${PN}/${PN}-devel/${PV}/$
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 x86"
IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts
+templates tk"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
commit: 1a1e8722269fd9c58017293c40cc685ecfbc8421
Author: Miroslav Šulc gentoo org>
AuthorDate: Tue Apr 27 09:33:39 2021 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Tue Apr 27 09:33:55 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a1e8722
app-office/scribus: bump to 1.5.7
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Miroslav Šulc gentoo.org>
app-office/scribus/Manifest | 1 +
app-office/scribus/scribus-1.5.7.ebuild | 158
2 files changed, 159 insertions(+)
diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index be709ff7499..0d731f62af6 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -1 +1,2 @@
DIST scribus-1.5.6.1.tar.gz 87557791 BLAKE2B
183b035901f5a19ffbf5890acc6037eb5483a0b5837b244b39838ca03d13bd4afc76c3c41345123aec402c602177c5fff7183deba10f8e33e980659c4ef7881e
SHA512
ff6cf0d86c874b7f03c8be9675f92c6cc7797e3a344326824e4f01f0b02ec02d6fdf5b52924e51b3436d9a6d78eda47a5e9987507721d18985768cc5a3c77245
+DIST scribus-1.5.7.tar.xz 74490040 BLAKE2B
80ecc25f506ad3bdd3b03362b6616f1f7394b7f2794349cdf60089a7e5d39e861883a7e1b3a949667b2eb41b0b383bd8536de8a0feff4980305ef52f85eb0d05
SHA512
0c8cd42b9d3d26e24d4e0f6638b6c72bab2c2c3aa7e7195efb222391a0c0e671633e32afb08ec35b6ab5123793983de5d413aa7607b51adac3725dc8a83bfb01
diff --git a/app-office/scribus/scribus-1.5.7.ebuild
b/app-office/scribus/scribus-1.5.7.ebuild
new file mode 100644
index 000..0793c811fb9
--- /dev/null
+++ b/app-office/scribus/scribus-1.5.7.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_REQ_USE="tk?"
+inherit cmake desktop flag-o-matic python-single-r1 xdg
+
+DESCRIPTION="Desktop publishing (DTP) and layout program"
+HOMEPAGE="https://www.scribus.net/;
+SRC_URI="https://pilotfiber.dl.sourceforge.net/project/${PN}/${PN}-devel/${PV}/${P}.tar.xz;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts
+templates tk"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ tk? ( scripts )"
+
+# osg
+# couple of third_party libs bundled
+BDEPEND="
+ dev-qt/linguist-tools:5
+ virtual/pkgconfig
+"
+DEPEND="${PYTHON_DEPS}
+ app-text/libmspub
+ app-text/libqxp
+ app-text/poppler:=
+ dev-libs/hyphen
+ dev-libs/icu:0=
+ dev-libs/librevenge
+ dev-libs/libxml2
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5[-gles2-only]
+ dev-qt/qtnetwork:5
+ dev-qt/qtopengl:5
+ dev-qt/qtprintsupport:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtxml:5
+ media-libs/fontconfig
+ media-libs/freetype:2
+ media-libs/harfbuzz:0=[icu]
+ media-libs/lcms:2
+ media-libs/libcdr
+ media-libs/libfreehand
+ media-libs/libpagemaker
+ media-libs/libpng:0=
+ media-libs/libvisio
+ media-libs/libzmf
+ media-libs/tiff:0
+ net-print/cups
+ sys-libs/zlib[minizip]
+ virtual/jpeg:0=
+ x11-libs/cairo[X,svg]
+ boost? ( dev-libs/boost:= )
+ graphicsmagick? ( media-gfx/graphicsmagick:= )
+ hunspell? ( app-text/hunspell:= )
+ osg? ( dev-games/openscenegraph:= )
+ pdf? ( app-text/podofo:0= )
+ scripts? (
+ $(python_gen_cond_dep '
+ dev-python/pillow[tk?,${PYTHON_MULTI_USEDEP}]
+ ')
+ )
+"
+RDEPEND="${DEPEND}
+ app-text/ghostscript-gpl
+"
+
+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.6-findhyphen.patch
+)
+
+CMAKE_BUILD_TYPE="Release"
+
+S="${WORKDIR}/${P}"
+
+src_prepare() {
+ cmake_src_prepare
+
+ rm -r codegen/cheetah scribus/third_party/hyphen || die
+
+ sed \
+ -e "/^\s*unzip\.[ch]/d" \
+ -e "/^\s*ioapi\.[ch]/d" \
+ -i scribus/CMakeLists.txt Scribus.pro || die
+ rm scribus/ioapi.[ch] || die
+
+ sed \
+ -e 's:\(${CMAKE_INSTALL_PREFIX}\):./\1:g' \
+ -i resources/templates/CMakeLists.txt || die
+
+ sed \
+ -e "/^add_subdirectory(ui\/qml)/s/^/#DONT/" \
+ -i scribus/CMakeLists.txt || die # nothing but a bogus Hello
World test
+}
+
+src_configure() {
+ # bug #550818
+ append-cppflags -DHAVE_MEMRCHR
+
+ local mycmakeargs=(
+ -DHAVE_PYTHON=ON
+ -DWANT_DISTROBUILD=ON
+ -DDOCDIR="${EPREFIX}"/usr/share/doc/${PF}/
+ -DPython3_EXECUTABLE="${PYTHON}"
+ -DWITH_BOOST=$(usex boost)
+ -DWANT_DEBUG=$(usex debug)
+ -DWANT_NOEXAMPLES=$(usex !examples)
+
[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/files/, app-office/scribus/
commit: 6dbd3c2927d356ed242b437be3b807fc1ea94ed5
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Mar 7 01:04:09 2021 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Mar 7 01:04:09 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6dbd3c29
app-office/scribus: Fix build with app-text/poppler-21.03.0
Package-Manager: Portage-3.0.16, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../files/scribus-1.5.6.1-poppler-21.03.0-1.patch | 53 ++
.../files/scribus-1.5.6.1-poppler-21.03.0-2.patch | 27 +++
app-office/scribus/scribus-1.5.6.1.ebuild | 3 +-
3 files changed, 82 insertions(+), 1 deletion(-)
diff --git a/app-office/scribus/files/scribus-1.5.6.1-poppler-21.03.0-1.patch
b/app-office/scribus/files/scribus-1.5.6.1-poppler-21.03.0-1.patch
new file mode 100644
index 000..18c1edcaaa9
--- /dev/null
+++ b/app-office/scribus/files/scribus-1.5.6.1-poppler-21.03.0-1.patch
@@ -0,0 +1,53 @@
+From 7ce0ac16fd42d61ef9082b27822c7d9d79c7fef7 Mon Sep 17 00:00:00 2001
+From: Jean Ghali
+Date: Mon, 1 Mar 2021 21:52:54 +
+Subject: [PATCH] Attempt to fix build of pdf import plugin with poppler
+ 21.03.0
+
+git-svn-id: svn://scribus.net/trunk/Scribus@24537
11d20701-8431-0410-a711-e3c959e3b870
+---
+ scribus/plugins/import/pdf/slaoutput.cpp | 12 +++-
+ scribus/plugins/import/pdf/slaoutput.h | 4
+ 2 files changed, 15 insertions(+), 1 deletion(-)
+
+diff --git a/scribus/plugins/import/pdf/slaoutput.cpp
b/scribus/plugins/import/pdf/slaoutput.cpp
+index 7cbc73e8d4..d1b37a0c21 100644
+--- a/scribus/plugins/import/pdf/slaoutput.cpp
b/scribus/plugins/import/pdf/slaoutput.cpp
+@@ -2292,9 +2292,19 @@ GBool SlaOutputDev::patchMeshShadedFill(GfxState
*state, GfxPatchMeshShading *sh
+ return gTrue;
+ }
+
+-GBool SlaOutputDev::tilingPatternFill(GfxState *state, Gfx * /*gfx*/, Catalog
*cat, Object *str, POPPLER_CONST_070 double *pmat, int paintType, int
tilingType, Dict *resDict, POPPLER_CONST_070 double *mat, POPPLER_CONST_070
double *bbox, int x0, int y0, int x1, int y1, double xStep, double yStep)
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(21, 3, 0)
++bool SlaOutputDev::tilingPatternFill(GfxState *state, Gfx * /*gfx*/, Catalog
*cat, GfxTilingPattern *tPat, const double *mat, int x0, int y0, int x1, int
y1, double xStep, double yStep)
++#else
++GBool SlaOutputDev::tilingPatternFill(GfxState *state, Gfx * /*gfx*/, Catalog
*cat, Object *str, POPPLER_CONST_070 double *pmat, int /*paintType*/, int
/*tilingType*/, Dict *resDict, POPPLER_CONST_070 double *mat, POPPLER_CONST_070
double *bbox, int x0, int y0, int x1, int y1, double xStep, double yStep)
++#endif
+ {
+ //qDebug() << "SlaOutputDev::tilingPatternFill";
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(21, 3, 0)
++ const double *bbox = tPat->getBBox();
++ const double *pmat = tPat->getMatrix();
++ Dict *resDict = tPat->getResDict();
++#endif
++
+ PDFRectangle box;
+ Gfx *gfx;
+ QString id;
+diff --git a/scribus/plugins/import/pdf/slaoutput.h
b/scribus/plugins/import/pdf/slaoutput.h
+index 5149f19e31..66c34203ae 100644
+--- a/scribus/plugins/import/pdf/slaoutput.h
b/scribus/plugins/import/pdf/slaoutput.h
+@@ -197,7 +197,11 @@ class SlaOutputDev : public OutputDev
+ void stroke(GfxState *state) override;
+ void fill(GfxState *state) override;
+ void eoFill(GfxState *state) override;
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(21, 3, 0)
++ bool tilingPatternFill(GfxState *state, Gfx *gfx, Catalog *cat,
GfxTilingPattern *tPat, const double *mat, int x0, int y0, int x1, int y1,
double xStep, double yStep) override;
++#else
+ GBool tilingPatternFill(GfxState *state, Gfx *gfx, Catalog *cat, Object
*str, POPPLER_CONST_070 double *pmat, int paintType, int tilingType, Dict
*resDict, POPPLER_CONST_070 double *mat, POPPLER_CONST_070 double *bbox, int
x0, int y0, int x1, int y1, double xStep, double yStep) override;
++#endif
+ GBool functionShadedFill(GfxState * /*state*/, GfxFunctionShading *
/*shading*/) override { qDebug() << "Function Shaded Fill"; return gFalse; }
+ GBool axialShadedFill(GfxState *state, GfxAxialShading *shading, double
tMin, double tMax) override;
+ GBool axialShadedSupportExtend(GfxState *state, GfxAxialShading
*shading) override { return (shading->getExtend0() == shading->getExtend1()); }
diff --git a/app-office/scribus/files/scribus-1.5.6.1-poppler-21.03.0-2.patch
b/app-office/scribus/files/scribus-1.5.6.1-poppler-21.03.0-2.patch
new file mode 100644
index 000..bff1c08b39a
--- /dev/null
+++ b/app-office/scribus/files/scribus-1.5.6.1-poppler-21.03.0-2.patch
@@ -0,0 +1,27 @@
+From 6b9ff916959bcb941866f0bd86da639a421337f8 Mon Sep 17 00:00:00 2001
+From: Jean Ghali
+Date: Mon, 1 Mar 2021 22:00:02 +
+Subject: [PATCH] Attempt to fix build of pdf import plugin
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
commit: 5eec1ae6ab42f0328ab69922ec287a6d3d0494e1
Author: Miroslav Šulc gentoo org>
AuthorDate: Tue Dec 22 13:25:18 2020 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Tue Dec 22 13:25:18 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5eec1ae6
app-office/scribus: removed obsolete 1.5.5_p20200626
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Miroslav Šulc gentoo.org>
app-office/scribus/Manifest | 1 -
app-office/scribus/scribus-1.5.5_p20200626.ebuild | 159 --
2 files changed, 160 deletions(-)
diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index d253eedb7a6..be709ff7499 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -1,2 +1 @@
-DIST scribus-1.5.5_p20200626.tar.gz 87557791 BLAKE2B
183b035901f5a19ffbf5890acc6037eb5483a0b5837b244b39838ca03d13bd4afc76c3c41345123aec402c602177c5fff7183deba10f8e33e980659c4ef7881e
SHA512
ff6cf0d86c874b7f03c8be9675f92c6cc7797e3a344326824e4f01f0b02ec02d6fdf5b52924e51b3436d9a6d78eda47a5e9987507721d18985768cc5a3c77245
DIST scribus-1.5.6.1.tar.gz 87557791 BLAKE2B
183b035901f5a19ffbf5890acc6037eb5483a0b5837b244b39838ca03d13bd4afc76c3c41345123aec402c602177c5fff7183deba10f8e33e980659c4ef7881e
SHA512
ff6cf0d86c874b7f03c8be9675f92c6cc7797e3a344326824e4f01f0b02ec02d6fdf5b52924e51b3436d9a6d78eda47a5e9987507721d18985768cc5a3c77245
diff --git a/app-office/scribus/scribus-1.5.5_p20200626.ebuild
b/app-office/scribus/scribus-1.5.5_p20200626.ebuild
deleted file mode 100644
index 2b4f3fb49c3..000
--- a/app-office/scribus/scribus-1.5.5_p20200626.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9} )
-PYTHON_REQ_USE="tk?"
-COMMIT=aa84120d97003a03d883db33ea9a6ad28550e59a
-inherit cmake desktop flag-o-matic python-single-r1 xdg
-
-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="amd64 ppc ppc64 x86"
-IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts
+templates tk"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- tk? ( scripts )"
-
-# osg
-# couple of third_party libs bundled
-BDEPEND="
- dev-qt/linguist-tools:5
- virtual/pkgconfig
-"
-DEPEND="${PYTHON_DEPS}
- app-text/libmspub
- app-text/libqxp
- app-text/poppler:=
- dev-libs/hyphen
- >=dev-libs/icu-58.2:0=
- dev-libs/librevenge
- dev-libs/libxml2
- dev-qt/qtcore:5
- dev-qt/qtgui:5[-gles2-only]
- dev-qt/qtnetwork:5
- dev-qt/qtopengl:5
- dev-qt/qtprintsupport:5
- dev-qt/qtwidgets:5
- dev-qt/qtxml:5
- media-libs/fontconfig
- media-libs/freetype:2
- >=media-libs/harfbuzz-0.9.42:0=[icu]
- media-libs/lcms:2
- media-libs/libcdr
- media-libs/libfreehand
- media-libs/libpagemaker
- media-libs/libpng:0=
- media-libs/libvisio
- media-libs/libzmf
- media-libs/tiff:0
- net-print/cups
- sys-libs/zlib[minizip]
- virtual/jpeg:0=
- >=x11-libs/cairo-1.10.0[X,svg]
- boost? ( >=dev-libs/boost-1.67:= )
- graphicsmagick? ( media-gfx/graphicsmagick:= )
- hunspell? ( app-text/hunspell:= )
- osg? ( dev-games/openscenegraph:= )
- pdf? ( app-text/podofo:0= )
- scripts? (
- $(python_gen_cond_dep '
- dev-python/pillow[tk?,${PYTHON_MULTI_USEDEP}]
- ')
- )
-"
-RDEPEND="${DEPEND}
- app-text/ghostscript-gpl
-"
-
-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.6-findhyphen.patch
-)
-
-CMAKE_BUILD_TYPE="Release"
-
-S="${WORKDIR}"/${PN}-${COMMIT}
-
-src_prepare() {
- cmake_src_prepare
-
- rm -r codegen/cheetah scribus/third_party/hyphen || die
-
- sed \
- -e "/^\s*unzip\.[ch]/d" \
- -e "/^\s*ioapi\.[ch]/d" \
- -i scribus/CMakeLists.txt Scribus.pro || die
- rm scribus/ioapi.[ch] || die
-
- sed \
- -e 's:\(${CMAKE_INSTALL_PREFIX}\):./\1:g' \
- -i resources/templates/CMakeLists.txt || die
-
- sed \
- -e "/^add_subdirectory(ui\/qml)/s/^/#DONT/" \
- -i scribus/CMakeLists.txt || die # nothing but a bogus Hello
World test
-}
-
-src_configure() {
- # bug #550818
- append-cppflags -DHAVE_MEMRCHR
-
- local mycmakeargs=(
- -DHAVE_PYTHON=ON
- -DWANT_DISTROBUILD=ON
- -DDOCDIR="${EPREFIX}"/usr/share/doc/${PF}/
-
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
commit: 8b9685070ef73fe2fb0c63c0cef58c975597b244
Author: Sam James gentoo org>
AuthorDate: Tue Dec 22 05:20:49 2020 +
Commit: Sam James gentoo org>
CommitDate: Tue Dec 22 05:20:49 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b968507
app-office/scribus: Stabilize 1.5.6.1 ppc64, #760147
Signed-off-by: Sam James gentoo.org>
app-office/scribus/scribus-1.5.6.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/scribus/scribus-1.5.6.1.ebuild
b/app-office/scribus/scribus-1.5.6.1.ebuild
index d68ada3ac04..659599ae1ef 100644
--- a/app-office/scribus/scribus-1.5.6.1.ebuild
+++ b/app-office/scribus/scribus-1.5.6.1.ebuild
@@ -14,7 +14,7 @@
SRC_URI="https://github.com/${PN}project/${PN}/archive/${COMMIT}.tar.gz -> ${P}.
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 x86"
IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts
+templates tk"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
commit: 6575b18a1b0e50e2f015053cc2b26cfed7f14025
Author: Thomas Deutschmann gentoo org>
AuthorDate: Sun Dec 20 18:55:55 2020 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Sun Dec 20 19:06:50 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6575b18a
app-office/scribus: x86 stable (bug #760147)
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Thomas Deutschmann gentoo.org>
app-office/scribus/scribus-1.5.6.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/scribus/scribus-1.5.6.1.ebuild
b/app-office/scribus/scribus-1.5.6.1.ebuild
index f001fe5574c..d68ada3ac04 100644
--- a/app-office/scribus/scribus-1.5.6.1.ebuild
+++ b/app-office/scribus/scribus-1.5.6.1.ebuild
@@ -14,7 +14,7 @@
SRC_URI="https://github.com/${PN}project/${PN}/archive/${COMMIT}.tar.gz -> ${P}.
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ~ppc64 x86"
IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts
+templates tk"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
commit: ae0d0dbfb581d26bcfabb18e9dc09c8af76f600b
Author: Sam James gentoo org>
AuthorDate: Wed Dec 16 17:57:32 2020 +
Commit: Sam James gentoo org>
CommitDate: Wed Dec 16 17:57:48 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae0d0dbf
app-office/scribus: Stabilize 1.5.6.1 ppc, #760147
Signed-off-by: Sam James gentoo.org>
app-office/scribus/scribus-1.5.6.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/scribus/scribus-1.5.6.1.ebuild
b/app-office/scribus/scribus-1.5.6.1.ebuild
index a535eb5a50b..82470486f2b 100644
--- a/app-office/scribus/scribus-1.5.6.1.ebuild
+++ b/app-office/scribus/scribus-1.5.6.1.ebuild
@@ -14,7 +14,7 @@
SRC_URI="https://github.com/${PN}project/${PN}/archive/${COMMIT}.tar.gz -> ${P}.
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ppc ~ppc64 ~x86"
IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts
+templates tk"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
commit: 6e2781d43a16e3994bddfeeedc7400bc72218dd9
Author: Miroslav Šulc gentoo org>
AuthorDate: Mon Nov 16 09:08:17 2020 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Mon Nov 16 09:08:30 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e2781d4
app-office/scribus: bump to 1.5.6.1
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Miroslav Šulc gentoo.org>
app-office/scribus/Manifest | 1 +
.../{scribus-.ebuild => scribus-1.5.6.1.ebuild} | 19 ++-
app-office/scribus/scribus-.ebuild| 8
3 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index 968c3cbf84b..d253eedb7a6 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -1 +1,2 @@
DIST scribus-1.5.5_p20200626.tar.gz 87557791 BLAKE2B
183b035901f5a19ffbf5890acc6037eb5483a0b5837b244b39838ca03d13bd4afc76c3c41345123aec402c602177c5fff7183deba10f8e33e980659c4ef7881e
SHA512
ff6cf0d86c874b7f03c8be9675f92c6cc7797e3a344326824e4f01f0b02ec02d6fdf5b52924e51b3436d9a6d78eda47a5e9987507721d18985768cc5a3c77245
+DIST scribus-1.5.6.1.tar.gz 87557791 BLAKE2B
183b035901f5a19ffbf5890acc6037eb5483a0b5837b244b39838ca03d13bd4afc76c3c41345123aec402c602177c5fff7183deba10f8e33e980659c4ef7881e
SHA512
ff6cf0d86c874b7f03c8be9675f92c6cc7797e3a344326824e4f01f0b02ec02d6fdf5b52924e51b3436d9a6d78eda47a5e9987507721d18985768cc5a3c77245
diff --git a/app-office/scribus/scribus-.ebuild
b/app-office/scribus/scribus-1.5.6.1.ebuild
similarity index 91%
copy from app-office/scribus/scribus-.ebuild
copy to app-office/scribus/scribus-1.5.6.1.ebuild
index 944a609bb5c..a535eb5a50b 100644
--- a/app-office/scribus/scribus-.ebuild
+++ b/app-office/scribus/scribus-1.5.6.1.ebuild
@@ -5,17 +5,16 @@ EAPI=7
PYTHON_COMPAT=( python3_{6,7,8,9} )
PYTHON_REQ_USE="tk?"
-inherit cmake desktop flag-o-matic python-single-r1 subversion xdg
+COMMIT=aa84120d97003a03d883db33ea9a6ad28550e59a
+inherit cmake desktop flag-o-matic python-single-r1 xdg
DESCRIPTION="Desktop publishing (DTP) and layout program"
HOMEPAGE="https://www.scribus.net/;
-SRC_URI=""
-ESVN_REPO_URI="svn://scribus.net/trunk/Scribus"
-ESVN_PROJECT=Scribus-1.5
+SRC_URI="https://github.com/${PN}project/${PN}/archive/${COMMIT}.tar.gz ->
${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts
+templates tk"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
@@ -32,7 +31,7 @@ DEPEND="${PYTHON_DEPS}
app-text/libqxp
app-text/poppler:=
dev-libs/hyphen
- >=dev-libs/icu-58.2:0=
+ dev-libs/icu:0=
dev-libs/librevenge
dev-libs/libxml2
dev-qt/qtcore:5
@@ -44,7 +43,7 @@ DEPEND="${PYTHON_DEPS}
dev-qt/qtxml:5
media-libs/fontconfig
media-libs/freetype:2
- >=media-libs/harfbuzz-0.9.42:0=[icu]
+ media-libs/harfbuzz:0=[icu]
media-libs/lcms:2
media-libs/libcdr
media-libs/libfreehand
@@ -56,8 +55,8 @@ DEPEND="${PYTHON_DEPS}
net-print/cups
sys-libs/zlib[minizip]
virtual/jpeg:0=
- >=x11-libs/cairo-1.10.0[X,svg]
- boost? ( >=dev-libs/boost-1.67:= )
+ x11-libs/cairo[X,svg]
+ boost? ( dev-libs/boost:= )
graphicsmagick? ( media-gfx/graphicsmagick:= )
hunspell? ( app-text/hunspell:= )
osg? ( dev-games/openscenegraph:= )
@@ -82,6 +81,8 @@ PATCHES=(
CMAKE_BUILD_TYPE="Release"
+S="${WORKDIR}"/${PN}-${COMMIT}
+
src_prepare() {
cmake_src_prepare
diff --git a/app-office/scribus/scribus-.ebuild
b/app-office/scribus/scribus-.ebuild
index 944a609bb5c..3fbcb491ffe 100644
--- a/app-office/scribus/scribus-.ebuild
+++ b/app-office/scribus/scribus-.ebuild
@@ -32,7 +32,7 @@ DEPEND="${PYTHON_DEPS}
app-text/libqxp
app-text/poppler:=
dev-libs/hyphen
- >=dev-libs/icu-58.2:0=
+ dev-libs/icu:0=
dev-libs/librevenge
dev-libs/libxml2
dev-qt/qtcore:5
@@ -44,7 +44,7 @@ DEPEND="${PYTHON_DEPS}
dev-qt/qtxml:5
media-libs/fontconfig
media-libs/freetype:2
- >=media-libs/harfbuzz-0.9.42:0=[icu]
+ media-libs/harfbuzz:0=[icu]
media-libs/lcms:2
media-libs/libcdr
media-libs/libfreehand
@@ -56,8 +56,8 @@ DEPEND="${PYTHON_DEPS}
net-print/cups
sys-libs/zlib[minizip]
virtual/jpeg:0=
- >=x11-libs/cairo-1.10.0[X,svg]
- boost? ( >=dev-libs/boost-1.67:= )
+ x11-libs/cairo[X,svg]
+ boost? ( dev-libs/boost:= )
graphicsmagick? ( media-gfx/graphicsmagick:= )
hunspell? ( app-text/hunspell:= )
osg? ( dev-games/openscenegraph:= )
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
commit: b0eb1fc8412545fb98b62f9f427bac6602614de4 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Sep 28 20:47:25 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Sep 28 21:28:23 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0eb1fc8 app-office/scribus: Fix various typos in metadata.xml Package-Manager: Portage-3.0.8, Repoman-3.0.1 Signed-off-by: Andreas Sturmlechner gentoo.org> app-office/scribus/metadata.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app-office/scribus/metadata.xml b/app-office/scribus/metadata.xml index ab1b2fa6c13..de419b7e9f3 100644 --- a/app-office/scribus/metadata.xml +++ b/app-office/scribus/metadata.xml @@ -9,9 +9,9 @@ Enable support for Boost based enhancement Enable support for spell checking with app-text/hunspell Don't install headers (only required for e.g. plug-in developers) -3D redering via dev-games/openscenegraph +3D rendering via dev-games/openscenegraph Install the scripts -Document tamplates +Document templates Install tk based scripts e.g. FontSample.py
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
commit: 2ef48ef5a61a589eba1c657dd5e97f56b6560ce2 Author: Miroslav Šulc gentoo org> AuthorDate: Thu Aug 6 17:10:33 2020 + Commit: Miroslav Šulc gentoo org> CommitDate: Thu Aug 6 17:10:53 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ef48ef5 app-office/scribus: fixed typo in metadata.xml Package-Manager: Portage-3.0.1, Repoman-2.3.23 Signed-off-by: Miroslav Šulc gentoo.org> app-office/scribus/metadata.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-office/scribus/metadata.xml b/app-office/scribus/metadata.xml index 4e2f58a9429..ab1b2fa6c13 100644 --- a/app-office/scribus/metadata.xml +++ b/app-office/scribus/metadata.xml @@ -3,7 +3,7 @@ fordf...@gentoo.org -Miroslav šulc +Miroslav Šulc Enable support for Boost based enhancement
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
commit: 493ea248942bc3d32f995d8d9424509e3db60f9b Author: Miroslav Šulc gentoo org> AuthorDate: Thu Aug 6 10:03:47 2020 + Commit: Miroslav Šulc gentoo org> CommitDate: Thu Aug 6 13:28:34 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=493ea248 app-office/scribus: taking the package Package-Manager: Portage-3.0.1, Repoman-2.3.23 Signed-off-by: Miroslav Šulc gentoo.org> app-office/scribus/metadata.xml | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app-office/scribus/metadata.xml b/app-office/scribus/metadata.xml index 22b568ff29b..4e2f58a9429 100644 --- a/app-office/scribus/metadata.xml +++ b/app-office/scribus/metadata.xml @@ -1,7 +1,10 @@ http://www.gentoo.org/dtd/metadata.dtd;> - + +fordf...@gentoo.org +Miroslav šulc + Enable support for Boost based enhancement Enable support for spell checking with app-text/hunspell
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/, sys-fs/aufs-headers/, net-vpn/vpncwatch/, ...
commit: 9451bd4aa7de2603c1451c40a6e9fc4a668cfd43
Author: Michał Górny gentoo org>
AuthorDate: Wed Aug 5 07:25:11 2020 +
Commit: Michał Górny gentoo org>
CommitDate: Wed Aug 5 07:50:49 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9451bd4a
*/*: reassign jlec's packages
Signed-off-by: Michał Górny gentoo.org>
app-backup/cachedir/metadata.xml | 5 +
app-benchmarks/bootchart2/metadata.xml | 4 +---
app-benchmarks/ioping/metadata.xml | 3 ---
app-benchmarks/ramspeed/metadata.xml | 5 +
app-office/scribus/metadata.xml| 4 +---
app-text/pdfgrep/metadata.xml | 3 ---
dev-lua/luaposix/metadata.xml | 7 ++-
dev-util/shellcheck/metadata.xml | 4
eclass/cuda.eclass | 4 ++--
eclass/emboss-r2.eclass| 3 +--
eclass/fortran-2.eclass| 1 -
net-analyzer/zmap/metadata.xml | 4 +---
net-libs/czmq/metadata.xml | 5 +
net-misc/axel/metadata.xml | 5 +
net-vpn/vpncwatch/metadata.xml | 4 +---
sys-block/blocks/metadata.xml | 4 +---
sys-boot/makebootfat/metadata.xml | 4 +---
sys-cluster/pmix/metadata.xml | 4
sys-cluster/singularity/metadata.xml | 4
sys-cluster/ucx/metadata.xml | 4
sys-fs/aufs-headers/metadata.xml | 4 +---
sys-fs/aufs-util/metadata.xml | 4 +---
sys-fs/bcache-tools/metadata.xml | 4 +---
sys-kernel/aufs-sources/metadata.xml | 4 +---
sys-kernel/kergen/metadata.xml | 5 +
25 files changed, 20 insertions(+), 82 deletions(-)
diff --git a/app-backup/cachedir/metadata.xml b/app-backup/cachedir/metadata.xml
index b7595a302f2..7a38bb90096 100644
--- a/app-backup/cachedir/metadata.xml
+++ b/app-backup/cachedir/metadata.xml
@@ -1,8 +1,5 @@
http://www.gentoo.org/dtd/metadata.dtd;>
-
- j...@gentoo.org
- Justin Lecher
-
+
diff --git a/app-benchmarks/bootchart2/metadata.xml
b/app-benchmarks/bootchart2/metadata.xml
index 59b22aee67c..b714966c25d 100644
--- a/app-benchmarks/bootchart2/metadata.xml
+++ b/app-benchmarks/bootchart2/metadata.xml
@@ -1,9 +1,7 @@
http://www.gentoo.org/dtd/metadata.dtd;>
-
-j...@gentoo.org
-
+
mmeeks/bootchart
diff --git a/app-benchmarks/ioping/metadata.xml
b/app-benchmarks/ioping/metadata.xml
index f1fd644784b..55ad5be23a2 100644
--- a/app-benchmarks/ioping/metadata.xml
+++ b/app-benchmarks/ioping/metadata.xml
@@ -1,9 +1,6 @@
http://www.gentoo.org/dtd/metadata.dtd;>
-
-j...@gentoo.org
-
shell-to...@gentoo.org
Gentoo Shell Tools Project
diff --git a/app-benchmarks/ramspeed/metadata.xml
b/app-benchmarks/ramspeed/metadata.xml
index d84a11e0804..d03ea47e8ab 100644
--- a/app-benchmarks/ramspeed/metadata.xml
+++ b/app-benchmarks/ramspeed/metadata.xml
@@ -1,10 +1,7 @@
http://www.gentoo.org/dtd/metadata.dtd;>
-
-j...@gentoo.org
-Justin Lecher
-
+
Force shared libraries to be built as PIC (this is
slower)
diff --git a/app-office/scribus/metadata.xml b/app-office/scribus/metadata.xml
index 02d7f56a4fe..22b568ff29b 100644
--- a/app-office/scribus/metadata.xml
+++ b/app-office/scribus/metadata.xml
@@ -1,9 +1,7 @@
http://www.gentoo.org/dtd/metadata.dtd;>
-
-j...@gentoo.org
-
+
Enable support for Boost based enhancement
Enable support for spell checking with
app-text/hunspell
diff --git a/app-text/pdfgrep/metadata.xml b/app-text/pdfgrep/metadata.xml
index 1a839140fb6..3b89b4ece53 100644
--- a/app-text/pdfgrep/metadata.xml
+++ b/app-text/pdfgrep/metadata.xml
@@ -1,9 +1,6 @@
http://www.gentoo.org/dtd/metadata.dtd;>
-
- j...@gentoo.org
-
f...@geekplace.eu
diff --git a/dev-lua/luaposix/metadata.xml b/dev-lua/luaposix/metadata.xml
index 686aaf5c3d7..55f9ea8cfb0 100644
--- a/dev-lua/luaposix/metadata.xml
+++ b/dev-lua/luaposix/metadata.xml
@@ -1,10 +1,7 @@
-
+
http://www.gentoo.org/dtd/metadata.dtd;>
-
- j...@gentoo.org
- Justin Lecher
-
+
luaposix/luaposix
diff --git a/dev-util/shellcheck/metadata.xml b/dev-util/shellcheck/metadata.xml
index c120a64c1f9..b7878815d80 100644
--- a/dev-util/shellcheck/metadata.xml
+++ b/dev-util/shellcheck/metadata.xml
@@ -1,10 +1,6 @@
http://www.gentoo.org/dtd/metadata.dtd;>
-
- j...@gentoo.org
- Justin Lecher
-
hask...@gentoo.org
Gentoo Haskell
diff --git a/eclass/cuda.eclass b/eclass/cuda.eclass
index f1c09ca2e45..3d16570e862 100644
--- a/eclass/cuda.eclass
+++ b/eclass/cuda.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
case "${EAPI:-0}"
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/files/, app-office/scribus/
commit: feb8be0ac2f9df871ee473e68222e59d80581275
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Jul 18 00:55:29 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Jul 18 08:31:57 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=feb8be0a
app-office/scribus: Drop 1.5.5-r1
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner gentoo.org>
app-office/scribus/Manifest| 1 -
.../scribus/files/scribus-1.5.5-docdir.patch | 29 --
.../scribus/files/scribus-1.5.5-findhyphen-2.patch | 19 -
.../scribus/files/scribus-1.5.5-poppler-0.82.patch | 89
.../scribus/files/scribus-1.5.5-poppler-0.83.patch | 153 ---
.../scribus/files/scribus-1.5.5-poppler-0.84.patch | 34 --
.../scribus/files/scribus-1.5.5-poppler-0.86.patch | 459 -
.../scribus/files/scribus-1.5.5-qt-5.15.patch | 22 -
app-office/scribus/scribus-1.5.5-r1.ebuild | 167
9 files changed, 973 deletions(-)
diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index 823daf4f2db..968c3cbf84b 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_p20200626.tar.gz 87557791 BLAKE2B
183b035901f5a19ffbf5890acc6037eb5483a0b5837b244b39838ca03d13bd4afc76c3c41345123aec402c602177c5fff7183deba10f8e33e980659c4ef7881e
SHA512
ff6cf0d86c874b7f03c8be9675f92c6cc7797e3a344326824e4f01f0b02ec02d6fdf5b52924e51b3436d9a6d78eda47a5e9987507721d18985768cc5a3c77245
diff --git a/app-office/scribus/files/scribus-1.5.5-docdir.patch
b/app-office/scribus/files/scribus-1.5.5-docdir.patch
deleted file mode 100644
index 897a8a75ae9..000
--- a/app-office/scribus/files/scribus-1.5.5-docdir.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f5b3e77..4c5fd3f 100644
a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -313,14 +313,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.5-findhyphen-2.patch
b/app-office/scribus/files/scribus-1.5.5-findhyphen-2.patch
deleted file mode 100644
index a8993ca6387..000
--- a/app-office/scribus/files/scribus-1.5.5-findhyphen-2.patch
+++ /dev/null
@@ -1,19 +0,0 @@
a/CMakeLists.txt 2019-07-31 00:34:43.0 +0200
-+++ b/CMakeLists.txt 2019-10-02 00:17:34.968355656 +0200
-@@ -954,6 +954,16 @@
- endif()
- #>>HUNSPELL for Speelling support
-
-+#<>HYPHEN for Hyphenation support
-+
- #<
-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
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
commit: 2f7fb219da54ab342b2dce83542c03ebd3457689
Author: Agostino Sarubbo gentoo org>
AuthorDate: Fri Jul 17 18:38:41 2020 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Fri Jul 17 18:38:41 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f7fb219
app-office/scribus: x86 stable wrt bug #732396
Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo gentoo.org>
app-office/scribus/scribus-1.5.5_p20200626.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/scribus/scribus-1.5.5_p20200626.ebuild
b/app-office/scribus/scribus-1.5.5_p20200626.ebuild
index bf3f85e57b4..2b4f3fb49c3 100644
--- a/app-office/scribus/scribus-1.5.5_p20200626.ebuild
+++ b/app-office/scribus/scribus-1.5.5_p20200626.ebuild
@@ -14,7 +14,7 @@
SRC_URI="https://github.com/${PN}project/${PN}/archive/${COMMIT}.tar.gz -> ${P}.
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ppc ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts
+templates tk"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
commit: f3d3d1fd542d2d9daca7379d37c6caf8503de01c
Author: Sam James gentoo org>
AuthorDate: Mon Jul 13 19:22:50 2020 +
Commit: Sam James gentoo org>
CommitDate: Mon Jul 13 19:22:50 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3d3d1fd
app-office/scribus: ppc64 stable (bug #732396)
Package-Manager: Portage-2.3.99, Repoman-2.3.23
Signed-off-by: Sam James gentoo.org>
app-office/scribus/scribus-1.5.5_p20200626.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/scribus/scribus-1.5.5_p20200626.ebuild
b/app-office/scribus/scribus-1.5.5_p20200626.ebuild
index 76072b68d44..bf3f85e57b4 100644
--- a/app-office/scribus/scribus-1.5.5_p20200626.ebuild
+++ b/app-office/scribus/scribus-1.5.5_p20200626.ebuild
@@ -14,7 +14,7 @@
SRC_URI="https://github.com/${PN}project/${PN}/archive/${COMMIT}.tar.gz -> ${P}.
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 ~x86"
IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts
+templates tk"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
commit: 2d4abc3ca31c4c32e7cb6d8ff6cb87de951f9710
Author: Sam James gentoo org>
AuthorDate: Mon Jul 13 18:56:17 2020 +
Commit: Sam James gentoo org>
CommitDate: Mon Jul 13 18:56:17 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d4abc3c
app-office/scribus: ppc stable (bug #732396)
Package-Manager: Portage-2.3.99, Repoman-2.3.23
Signed-off-by: Sam James gentoo.org>
app-office/scribus/scribus-1.5.5_p20200626.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/scribus/scribus-1.5.5_p20200626.ebuild
b/app-office/scribus/scribus-1.5.5_p20200626.ebuild
index 24284862d6a..76072b68d44 100644
--- a/app-office/scribus/scribus-1.5.5_p20200626.ebuild
+++ b/app-office/scribus/scribus-1.5.5_p20200626.ebuild
@@ -14,7 +14,7 @@
SRC_URI="https://github.com/${PN}project/${PN}/archive/${COMMIT}.tar.gz -> ${P}.
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ~ppc64 ~x86"
IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts
+templates tk"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
commit: b95bf99c7928cf3b42d73bc9940cbe52134286be
Author: Michał Górny gentoo org>
AuthorDate: Mon Jul 13 11:19:47 2020 +
Commit: Michał Górny gentoo org>
CommitDate: Mon Jul 13 11:28:41 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b95bf99c
app-office/scribus: Stabilize 1.5.5_p20200626 amd64, #732396
Signed-off-by: Michał Górny gentoo.org>
app-office/scribus/scribus-1.5.5_p20200626.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/scribus/scribus-1.5.5_p20200626.ebuild
b/app-office/scribus/scribus-1.5.5_p20200626.ebuild
index a017d67eb01..24284862d6a 100644
--- a/app-office/scribus/scribus-1.5.5_p20200626.ebuild
+++ b/app-office/scribus/scribus-1.5.5_p20200626.ebuild
@@ -14,7 +14,7 @@
SRC_URI="https://github.com/${PN}project/${PN}/archive/${COMMIT}.tar.gz -> ${P}.
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts
+templates tk"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
commit: d6eec871cd9da061cd912294d47ba1de231b514c
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed Jul 1 13:43:52 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed Jul 1 14:16:27 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6eec871
app-office/scribus: 1.5.5_p20200626 snapshot bump w/ python3 support
Bug: https://bugs.gentoo.org/719938
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner gentoo.org>
app-office/scribus/Manifest | 1 +
...scribus-.ebuild => scribus-1.5.5_p20200626.ebuild} | 15 ---
app-office/scribus/scribus-.ebuild| 4 ++--
3 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index e8d12ffa74f..823daf4f2db 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -1 +1,2 @@
DIST scribus-1.5.5.tar.xz 73861836 BLAKE2B
1a10878eaba67116d72c20d8ecd8952764c709ad14d575e4eb921b4f8a7c4525b73e6722f610b1cce57c08540f619d6ebd3d32e04b653b310e475026c185561b
SHA512
2d62424ad609296df33ced550940fceb4e15133a595a740cc4f4b4ffbc92aa31737336ac7716c2eed20d2866e37f5a9b780a44d86128daa6bbad3ccb58168b50
+DIST scribus-1.5.5_p20200626.tar.gz 87557791 BLAKE2B
183b035901f5a19ffbf5890acc6037eb5483a0b5837b244b39838ca03d13bd4afc76c3c41345123aec402c602177c5fff7183deba10f8e33e980659c4ef7881e
SHA512
ff6cf0d86c874b7f03c8be9675f92c6cc7797e3a344326824e4f01f0b02ec02d6fdf5b52924e51b3436d9a6d78eda47a5e9987507721d18985768cc5a3c77245
diff --git a/app-office/scribus/scribus-.ebuild
b/app-office/scribus/scribus-1.5.5_p20200626.ebuild
similarity index 92%
copy from app-office/scribus/scribus-.ebuild
copy to app-office/scribus/scribus-1.5.5_p20200626.ebuild
index d532762422e..a017d67eb01 100644
--- a/app-office/scribus/scribus-.ebuild
+++ b/app-office/scribus/scribus-1.5.5_p20200626.ebuild
@@ -3,19 +3,18 @@
EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
PYTHON_REQ_USE="tk?"
-inherit cmake desktop flag-o-matic python-single-r1 subversion xdg
+COMMIT=aa84120d97003a03d883db33ea9a6ad28550e59a
+inherit cmake desktop flag-o-matic python-single-r1 xdg
DESCRIPTION="Desktop publishing (DTP) and layout program"
HOMEPAGE="https://www.scribus.net/;
-SRC_URI=""
-ESVN_REPO_URI="svn://scribus.net/trunk/Scribus"
-ESVN_PROJECT=Scribus-1.5
+SRC_URI="https://github.com/${PN}project/${PN}/archive/${COMMIT}.tar.gz ->
${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts
+templates tk"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
@@ -58,8 +57,8 @@ DEPEND="${PYTHON_DEPS}
virtual/jpeg:0=
>=x11-libs/cairo-1.10.0[X,svg]
boost? ( >=dev-libs/boost-1.67:= )
- hunspell? ( app-text/hunspell:= )
graphicsmagick? ( media-gfx/graphicsmagick:= )
+ hunspell? ( app-text/hunspell:= )
osg? ( dev-games/openscenegraph:= )
pdf? ( app-text/podofo:0= )
scripts? (
@@ -82,6 +81,8 @@ PATCHES=(
CMAKE_BUILD_TYPE="Release"
+S="${WORKDIR}"/${PN}-${COMMIT}
+
src_prepare() {
cmake_src_prepare
diff --git a/app-office/scribus/scribus-.ebuild
b/app-office/scribus/scribus-.ebuild
index d532762422e..944a609bb5c 100644
--- a/app-office/scribus/scribus-.ebuild
+++ b/app-office/scribus/scribus-.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
PYTHON_REQ_USE="tk?"
inherit cmake desktop flag-o-matic python-single-r1 subversion xdg
@@ -58,8 +58,8 @@ DEPEND="${PYTHON_DEPS}
virtual/jpeg:0=
>=x11-libs/cairo-1.10.0[X,svg]
boost? ( >=dev-libs/boost-1.67:= )
- hunspell? ( app-text/hunspell:= )
graphicsmagick? ( media-gfx/graphicsmagick:= )
+ hunspell? ( app-text/hunspell:= )
osg? ( dev-games/openscenegraph:= )
pdf? ( app-text/podofo:0= )
scripts? (
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/files/, app-office/scribus/
commit: a97286f1925b40327ab2e35aa468ed3c0902285b
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat May 30 09:20:39 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat May 30 09:31:06 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a97286f1
app-office/scribus: Fix build with Qt 5.15
Reported-by: Kobboi lermytte.be>
Thanks-to: Dennis Schridde gmx.net>
Closes: https://bugs.gentoo.org/726046
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../scribus/files/scribus-1.5.5-qt-5.15.patch | 22 ++
app-office/scribus/scribus-1.5.5-r1.ebuild | 1 +
2 files changed, 23 insertions(+)
diff --git a/app-office/scribus/files/scribus-1.5.5-qt-5.15.patch
b/app-office/scribus/files/scribus-1.5.5-qt-5.15.patch
new file mode 100644
index 000..4ece0feb8e4
--- /dev/null
+++ b/app-office/scribus/files/scribus-1.5.5-qt-5.15.patch
@@ -0,0 +1,22 @@
+From 17d6a9833488163d7c33c3f2233916b18550e253 Mon Sep 17 00:00:00 2001
+From: Jean Ghali
+Date: Sun, 29 Mar 2020 10:55:06 +
+Subject: [PATCH] #16076: Fix build with Qt 5.15
+
+git-svn-id: svn://scribus.net/trunk/Scribus@23541
11d20701-8431-0410-a711-e3c959e3b870
+---
+ scribus/ui/scresizecursor.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/scribus/ui/scresizecursor.cpp b/scribus/ui/scresizecursor.cpp
+index f2c78e5ae7..85271ed861 100644
+--- a/scribus/ui/scresizecursor.cpp
b/scribus/ui/scresizecursor.cpp
+@@ -12,6 +12,7 @@
+
+ #include
+ #include
++#include
+ #include
+ #include
+ #include
diff --git a/app-office/scribus/scribus-1.5.5-r1.ebuild
b/app-office/scribus/scribus-1.5.5-r1.ebuild
index 48d5cb285e7..9ba57749729 100644
--- a/app-office/scribus/scribus-1.5.5-r1.ebuild
+++ b/app-office/scribus/scribus-1.5.5-r1.ebuild
@@ -76,6 +76,7 @@ PATCHES=(
"${FILESDIR}"/${P}-poppler-0.83.patch
"${FILESDIR}"/${P}-poppler-0.84.patch
"${FILESDIR}"/${P}-poppler-0.86.patch
+ "${FILESDIR}"/${P}-qt-5.15.patch # bug 726046
# non(?)-upstreamable
"${FILESDIR}"/${PN}-1.5.3-fpic.patch
"${FILESDIR}"/${P}-docdir.patch
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/files/, app-office/scribus/
commit: 9478d521df295284f5892c9f2790d31351c0eca0
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Mon Apr 6 23:36:18 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue Apr 7 07:49:42 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9478d521
app-office/scribus: Fix build with app-text/poppler-0.86.0
Package-Manager: Portage-2.3.96, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../scribus/files/scribus-1.5.5-poppler-0.86.patch | 459 +
app-office/scribus/scribus-1.5.5-r1.ebuild | 1 +
2 files changed, 460 insertions(+)
diff --git a/app-office/scribus/files/scribus-1.5.5-poppler-0.86.patch
b/app-office/scribus/files/scribus-1.5.5-poppler-0.86.patch
new file mode 100644
index 000..e91bb3afdb6
--- /dev/null
+++ b/app-office/scribus/files/scribus-1.5.5-poppler-0.86.patch
@@ -0,0 +1,459 @@
+From 67f8771aaff2f55d61b8246f420e762f4b526944 Mon Sep 17 00:00:00 2001
+From: Jean Ghali
+Date: Mon, 2 Mar 2020 14:45:59 +
+Subject: [PATCH] PDF import plugin: support poppler 0.86.x
+
+git-svn-id: svn://scribus.net/trunk/Scribus@23478
11d20701-8431-0410-a711-e3c959e3b870
+---
+ scribus/plugins/import/pdf/importpdf.cpp | 51 +++-
+ scribus/plugins/import/pdf/importpdf.h | 19 +--
+ scribus/plugins/import/pdf/slaoutput.cpp | 154 +--
+ scribus/plugins/import/pdf/slaoutput.h | 13 +-
+ 4 files changed, 215 insertions(+), 22 deletions(-)
+
+diff --git a/scribus/plugins/import/pdf/importpdf.cpp
b/scribus/plugins/import/pdf/importpdf.cpp
+index 427cd66ef2..4679674a4d 100644
+--- a/scribus/plugins/import/pdf/importpdf.cpp
b/scribus/plugins/import/pdf/importpdf.cpp
+@@ -791,11 +791,20 @@ bool PdfPlug::convert(const QString& fn)
+ names =
catDict.dictLookup("OpenAction");
+ if
(names.isDict())
+ {
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0)
++
std::unique_ptr linkAction;
++
linkAction = LinkAction::parseAction(,
pdfDoc->getCatalog()->getBaseURI());
++#else
+
LinkAction *linkAction = nullptr;
+
linkAction = LinkAction::parseAction(,
pdfDoc->getCatalog()->getBaseURI());
++#endif
+ if
(linkAction)
+ {
+-
LinkJavaScript *jsa = (LinkJavaScript*)linkAction;
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0)
++
LinkJavaScript *jsa = (LinkJavaScript*) linkAction.get();
++#else
++
LinkJavaScript *jsa = (LinkJavaScript*) linkAction;
++#endif
+
if (jsa->isOk())
+
{
+
QString script = UnicodeParsedString(jsa->getScript());
+@@ -1003,3 +1012,43 @@ QString PdfPlug::UnicodeParsedString(POPPLER_CONST
GooString *s1)
+ }
+ return result;
+ }
++
++QString PdfPlug::UnicodeParsedString(const std::string& s1)
++{
++ if (s1.length() == 0)
++ return QString();
++ GBool isUnicode;
++ int i;
++ Unicode u;
++ QString result;
++ if ((s1.at(0) & 0xff) == 0xfe && (s1.length() > 1 && (s1.at(1) & 0xff)
== 0xff))
++ {
++ isUnicode = gTrue;
++ i = 2;
++ result.reserve((s1.length() - 2) / 2);
++ }
++ else
++ {
++ isUnicode = gFalse;
++ i = 0;
++ result.reserve(s1.length());
++ }
++ while (i < s1.length())
++ {
++ if (isUnicode)
++ {
++ u = ((s1.at(i) & 0xff) << 8) | (s1.at(i+1) & 0xff);
++ i += 2;
++ }
++ else
++ {
++ u = s1.at(i) & 0xff;
++ ++i;
++ }
++ // #15616: imagemagick may write unicode strings incorrectly in
PDF
++ if (u == 0)
++ continue;
++ result += QChar( u );
++ }
++ return result;
++}
+diff --git a/scribus/plugins/import/pdf/importpdf.h
b/scribus/plugins/import/pdf/importpdf.h
+index
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
commit: eaf3ca8747edaf0fb1623927fd095110adb79c13
Author: Haelwenn (lanodan) Monnier hacktivis me>
AuthorDate: Fri Mar 27 03:09:31 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Fri Apr 3 20:06:03 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eaf3ca87
app-office/scribus: dev-qt/qtgui[-gles2 => -gles2-only]
Signed-off-by: Haelwenn (lanodan) Monnier hacktivis.me>
Signed-off-by: Andreas Sturmlechner gentoo.org>
app-office/scribus/{scribus-1.5.5.ebuild => scribus-1.5.5-r1.ebuild} | 2 +-
app-office/scribus/scribus-.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-office/scribus/scribus-1.5.5.ebuild
b/app-office/scribus/scribus-1.5.5-r1.ebuild
similarity index 99%
rename from app-office/scribus/scribus-1.5.5.ebuild
rename to app-office/scribus/scribus-1.5.5-r1.ebuild
index b9350d63eef..d17a4aee818 100644
--- a/app-office/scribus/scribus-1.5.5.ebuild
+++ b/app-office/scribus/scribus-1.5.5-r1.ebuild
@@ -34,7 +34,7 @@ DEPEND="${PYTHON_DEPS}
dev-libs/librevenge
dev-libs/libxml2
dev-qt/qtcore:5
- dev-qt/qtgui:5[-gles2]
+ dev-qt/qtgui:5[-gles2-only]
dev-qt/qtnetwork:5
dev-qt/qtopengl:5
dev-qt/qtprintsupport:5
diff --git a/app-office/scribus/scribus-.ebuild
b/app-office/scribus/scribus-.ebuild
index 9d0977e8bd7..d532762422e 100644
--- a/app-office/scribus/scribus-.ebuild
+++ b/app-office/scribus/scribus-.ebuild
@@ -36,7 +36,7 @@ DEPEND="${PYTHON_DEPS}
dev-libs/librevenge
dev-libs/libxml2
dev-qt/qtcore:5
- dev-qt/qtgui:5[-gles2]
+ dev-qt/qtgui:5[-gles2-only]
dev-qt/qtnetwork:5
dev-qt/qtopengl:5
dev-qt/qtprintsupport:5
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
commit: 624ba2504e489972a8d5c511628352bcc8748803
Author: Bernd Waibel gmail com>
AuthorDate: Tue Mar 24 18:53:16 2020 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Fri Mar 27 10:08:04 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=624ba250
app-office/scribus: fix startup crash
The patch fixes the crash on startup, as well as a zlib package
finding related issue in src_configure. It also solves an issue
whith selecting the correct python implementation.
Bug: https://bugs.gentoo.rog/691684
Package-Manager: Portage-2.3.95, Repoman-2.3.21
Signed-off-by: Bernd Waibel gmail.com>
Closes: https://bugs.gentoo.org/691684
Signed-off-by: Miroslav Šulc gentoo.org>
app-office/scribus/scribus-.ebuild | 10 +++---
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/app-office/scribus/scribus-.ebuild
b/app-office/scribus/scribus-.ebuild
index 97d62f8d370..9d0977e8bd7 100644
--- a/app-office/scribus/scribus-.ebuild
+++ b/app-office/scribus/scribus-.ebuild
@@ -80,18 +80,13 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.5.6-findhyphen.patch
)
+CMAKE_BUILD_TYPE="Release"
+
src_prepare() {
cmake_src_prepare
rm -r codegen/cheetah scribus/third_party/hyphen || die
- cat > cmake/modules/FindZLIB.cmake <<- EOF || die
- find_package(PkgConfig)
- pkg_check_modules(ZLIB minizip zlib)
- SET( ZLIB_LIBRARY \${ZLIB_LIBRARIES} )
- SET( ZLIB_INCLUDE_DIR \${ZLIB_INCLUDE_DIRS} )
- MARK_AS_ADVANCED( ZLIB_LIBRARY ZLIB_INCLUDE_DIR )
- EOF
sed \
-e "/^\s*unzip\.[ch]/d" \
-e "/^\s*ioapi\.[ch]/d" \
@@ -115,6 +110,7 @@ src_configure() {
-DHAVE_PYTHON=ON
-DWANT_DISTROBUILD=ON
-DDOCDIR="${EPREFIX}"/usr/share/doc/${PF}/
+ -DPython3_EXECUTABLE="${PYTHON}"
-DWITH_BOOST=$(usex boost)
-DWANT_DEBUG=$(usex debug)
-DWANT_NOEXAMPLES=$(usex !examples)
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
commit: 8f6a0da14c2a98cedd6ae510d7a63e755a770074
Author: Matt Turner gentoo org>
AuthorDate: Fri Mar 20 21:47:00 2020 +
Commit: Matt Turner gentoo org>
CommitDate: Fri Mar 20 21:52:45 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f6a0da1
app-office/scribus: drop hppa keywords
Signed-off-by: Matt Turner gentoo.org>
app-office/scribus/scribus-1.5.5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/scribus/scribus-1.5.5.ebuild
b/app-office/scribus/scribus-1.5.5.ebuild
index ca708fa897b..b9350d63eef 100644
--- a/app-office/scribus/scribus-1.5.5.ebuild
+++ b/app-office/scribus/scribus-1.5.5.ebuild
@@ -13,7 +13,7 @@
SRC_URI="mirror://sourceforge/project/${PN}/${PN}-devel/${PV}/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 x86"
IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts
+templates tk"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
commit: f459fb452fc7f96b02f60e4a5c90469c1ec0f749
Author: Michał Górny gentoo org>
AuthorDate: Fri Feb 7 11:30:06 2020 +
Commit: Michał Górny gentoo org>
CommitDate: Sun Feb 9 16:11:00 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f459fb45
app-office/scribus: Switch to PYTHON_MULTI_USEDEP API
Signed-off-by: Michał Górny gentoo.org>
app-office/scribus/scribus-1.5.5.ebuild | 6 +-
app-office/scribus/scribus-.ebuild | 6 +-
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/app-office/scribus/scribus-1.5.5.ebuild
b/app-office/scribus/scribus-1.5.5.ebuild
index fa0caa4e246..ca708fa897b 100644
--- a/app-office/scribus/scribus-1.5.5.ebuild
+++ b/app-office/scribus/scribus-1.5.5.ebuild
@@ -60,7 +60,11 @@ DEPEND="${PYTHON_DEPS}
graphicsmagick? ( media-gfx/graphicsmagick:= )
osg? ( dev-games/openscenegraph:= )
pdf? ( app-text/podofo:0= )
- scripts? ( dev-python/pillow[tk?,${PYTHON_USEDEP}] )
+ scripts? (
+ $(python_gen_cond_dep '
+ dev-python/pillow[tk?,${PYTHON_MULTI_USEDEP}]
+ ')
+ )
"
RDEPEND="${DEPEND}
app-text/ghostscript-gpl
diff --git a/app-office/scribus/scribus-.ebuild
b/app-office/scribus/scribus-.ebuild
index 2fc0d191008..97d62f8d370 100644
--- a/app-office/scribus/scribus-.ebuild
+++ b/app-office/scribus/scribus-.ebuild
@@ -62,7 +62,11 @@ DEPEND="${PYTHON_DEPS}
graphicsmagick? ( media-gfx/graphicsmagick:= )
osg? ( dev-games/openscenegraph:= )
pdf? ( app-text/podofo:0= )
- scripts? ( dev-python/pillow[tk?,${PYTHON_USEDEP}] )
+ scripts? (
+ $(python_gen_cond_dep '
+ dev-python/pillow[tk?,${PYTHON_MULTI_USEDEP}]
+ ')
+ )
"
RDEPEND="${DEPEND}
app-text/ghostscript-gpl
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
commit: 7e2afb61ddae9852e6a0834d00aabe6e8b1c8ded
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Fri Jan 3 20:06:58 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Fri Jan 3 20:07:24 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e2afb61
app-office/scribus: Switch to cmake.eclass and fix
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner gentoo.org>
app-office/scribus/scribus-1.5.5.ebuild | 8
app-office/scribus/scribus-.ebuild | 3 +--
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/app-office/scribus/scribus-1.5.5.ebuild
b/app-office/scribus/scribus-1.5.5.ebuild
index 88bcd5cc441..fa0caa4e246 100644
--- a/app-office/scribus/scribus-1.5.5.ebuild
+++ b/app-office/scribus/scribus-1.5.5.ebuild
@@ -5,7 +5,7 @@ EAPI=7
PYTHON_COMPAT=( python2_7 )
PYTHON_REQ_USE="tk?"
-inherit cmake-utils desktop flag-o-matic python-single-r1 xdg
+inherit cmake desktop flag-o-matic python-single-r1 xdg
DESCRIPTION="Desktop publishing (DTP) and layout program"
HOMEPAGE="https://www.scribus.net/;
@@ -78,7 +78,7 @@ PATCHES=(
)
src_prepare() {
- cmake-utils_src_prepare
+ cmake_src_prepare
rm -r codegen/cheetah scribus/third_party/hyphen || die
@@ -124,11 +124,11 @@ src_configure() {
-DWITH_PODOFO=$(usex pdf)
-DWANT_NOTEMPLATES=$(usex !templates)
)
- cmake-utils_src_configure
+ cmake_src_configure
}
src_install() {
- cmake-utils_src_install
+ cmake_src_install
if ! use tk; then
rm
"${ED}"/usr/share/scribus/scripts/{FontSample,CalendarWizard}.py || die
diff --git a/app-office/scribus/scribus-.ebuild
b/app-office/scribus/scribus-.ebuild
index da3a47d2520..2fc0d191008 100644
--- a/app-office/scribus/scribus-.ebuild
+++ b/app-office/scribus/scribus-.ebuild
@@ -77,8 +77,7 @@ PATCHES=(
)
src_prepare() {
- default
- _CMAKE_SRC_PREPARE_HAS_RUN=1
+ cmake_src_prepare
rm -r codegen/cheetah scribus/third_party/hyphen || die
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
commit: 91e7091096936ef82d8ea76edc8b595a4d4f7d92
Author: Miroslav Šulc gentoo org>
AuthorDate: Fri Jan 3 07:23:37 2020 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Fri Jan 3 07:24:00 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91e70910
app-office/scribus: fixed
1) added python3_8
2) switched from cmake-utils to cmake
3) removed unused config args
Bug: https://bugs.gentoo.org/691684
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Miroslav Šulc gentoo.org>
app-office/scribus/scribus-.ebuild | 15 +++
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/app-office/scribus/scribus-.ebuild
b/app-office/scribus/scribus-.ebuild
index ac7b913c7f8..da3a47d2520 100644
--- a/app-office/scribus/scribus-.ebuild
+++ b/app-office/scribus/scribus-.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
PYTHON_REQ_USE="tk?"
-inherit cmake-utils desktop flag-o-matic python-single-r1 subversion xdg
+inherit cmake desktop flag-o-matic python-single-r1 subversion xdg
DESCRIPTION="Desktop publishing (DTP) and layout program"
HOMEPAGE="https://www.scribus.net/;
@@ -77,7 +77,8 @@ PATCHES=(
)
src_prepare() {
- cmake-utils_src_prepare
+ default
+ _CMAKE_SRC_PREPARE_HAS_RUN=1
rm -r codegen/cheetah scribus/third_party/hyphen || die
@@ -109,8 +110,6 @@ src_configure() {
local mycmakeargs=(
-DHAVE_PYTHON=ON
- -DPYTHON_INCLUDE_PATH=$(python_get_includedir)
- -DPYTHON_LIBRARY=$(python_get_library_path)
-DWANT_DISTROBUILD=ON
-DDOCDIR="${EPREFIX}"/usr/share/doc/${PF}/
-DWITH_BOOST=$(usex boost)
@@ -123,11 +122,11 @@ src_configure() {
-DWITH_PODOFO=$(usex pdf)
-DWANT_NOTEMPLATES=$(usex !templates)
)
- cmake-utils_src_configure
+ cmake_src_configure
}
src_install() {
- cmake-utils_src_install
+ cmake_src_install
if ! use tk; then
rm
"${ED}"/usr/share/scribus/scripts/{FontSample,CalendarWizard}.py || die
[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/files/
commit: 534c58cdbefddb55d4fd9689b1a59c9b8768765b
Author: Michael Mair-Keimberger gmail com>
AuthorDate: Wed Jan 1 21:12:22 2020 +
Commit: Aaron Bauman gentoo org>
CommitDate: Wed Jan 1 23:08:11 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=534c58cd
app-office/scribus: remove unused patch
Signed-off-by: Michael Mair-Keimberger gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/14205
Signed-off-by: Aaron Bauman 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..000
--- 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()
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/files/, app-office/scribus/
commit: ffabc71c416a88c0b4a588b6a480c4206245d4d6
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Dec 29 11:51:36 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Dec 29 11:54:30 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffabc71c
app-office/scribus: Fix build with app-text/poppler-0.83.0
Closes: https://bugs.gentoo.org/704162
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.83.patch | 153 +
app-office/scribus/scribus-1.5.5.ebuild| 1 +
2 files changed, 154 insertions(+)
diff --git a/app-office/scribus/files/scribus-1.5.5-poppler-0.83.patch
b/app-office/scribus/files/scribus-1.5.5-poppler-0.83.patch
new file mode 100644
index 000..0d52486da92
--- /dev/null
+++ b/app-office/scribus/files/scribus-1.5.5-poppler-0.83.patch
@@ -0,0 +1,153 @@
+Source/Upstream: Yes fixed in svn
+Reason: Fix build with poppler 0.83.0
+
+From b51c2bab4d57d685f96d427d6816bdd4ecfb4674 Mon Sep 17 00:00:00 2001
+From: Jean Ghali
+Date: Wed, 4 Dec 2019 05:51:19 +
+Subject: [PATCH] #15985: Fix failure to build against poppler 0.83.0
+
+git-svn-id: svn://scribus.net/trunk/Scribus@23395
11d20701-8431-0410-a711-e3c959e3b870
+---
+ scribus/plugins/import/pdf/importpdf.cpp | 22
+ scribus/plugins/import/pdf/importpdfconfig.h | 6 ++
+ scribus/plugins/import/pdf/slaoutput.cpp | 4 ++--
+ scribus/plugins/import/pdf/slaoutput.h | 2 +-
+ 4 files changed, 31 insertions(+), 3 deletions(-)
+
+diff --git a/scribus/plugins/import/pdf/importpdf.cpp
b/scribus/plugins/import/pdf/importpdf.cpp
+index 2ab38ac758..427cd66ef2 100644
+--- a/scribus/plugins/import/pdf/importpdf.cpp
b/scribus/plugins/import/pdf/importpdf.cpp
+@@ -74,7 +74,11 @@ PdfPlug::PdfPlug(ScribusDoc* doc, int flags)
+ QImage PdfPlug::readThumbnail(const QString& fName)
+ {
+ QString pdfFile = QDir::toNativeSeparators(fName);
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 83, 0)
++ globalParams.reset(new GlobalParams());
++#else
+ globalParams = new GlobalParams();
++#endif
+ if (globalParams)
+ {
+ #if defined(Q_OS_WIN32) && POPPLER_ENCODED_VERSION >=
POPPLER_VERSION_ENCODE(0, 62, 0)
+@@ -89,7 +93,9 @@ QImage PdfPlug::readThumbnail(const QString& fName)
+ if (pdfDoc->getErrorCode() == errEncrypted)
+ {
+ delete pdfDoc;
++#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(0, 83, 0)
+ delete globalParams;
++#endif
+ return QImage();
+ }
+ if (pdfDoc->isOk())
+@@ -133,11 +139,15 @@ QImage PdfPlug::readThumbnail(const QString& fName)
+ image.setText("YSize", QString("%1").arg(h));
+ delete dev;
+ delete pdfDoc;
++#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(0, 83, 0)
+ delete globalParams;
++#endif
+ return image;
+ }
+ delete pdfDoc;
++#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(0, 83, 0)
+ delete globalParams;
++#endif
+ }
+ }
+ return QImage();
+@@ -343,7 +353,11 @@ bool PdfPlug::convert(const QString& fn)
+ qApp->processEvents();
+ }
+
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 83, 0)
++ globalParams.reset(new GlobalParams());
++#else
+ globalParams = new GlobalParams();
++#endif
+ GooString *userPW = nullptr;
+ if (globalParams)
+ {
+@@ -385,7 +399,9 @@ bool PdfPlug::convert(const QString& fn)
+ if (progressDialog)
+ progressDialog->close();
+ delete pdfDoc;
++#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(0, 83, 0)
+ delete globalParams;
++#endif
+ return false;
+ }
+ if (progressDialog)
+@@ -430,7 +446,9 @@ bool PdfPlug::convert(const QString& fn)
+ progressDialog->close();
+ delete optImp;
+ delete pdfDoc;
++#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(0, 83, 0)
+ delete globalParams;
++#endif
+ return false;
+ }
+ pageString = optImp->getPagesString();
+@@ -843,8 +861,12 @@ bool PdfPlug::convert(const QString&
[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 =
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
commit: 7c55288d6a64d8fad1f4e98bea1febfdc008cff4
Author: Agostino Sarubbo gentoo org>
AuthorDate: Tue Dec 3 11:57:34 2019 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Tue Dec 3 11:57:34 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c55288d
app-office/scribus: ppc64 stable wrt bug #696206
Package-Manager: Portage-2.3.79, Repoman-2.3.16
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo gentoo.org>
app-office/scribus/scribus-1.5.5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/scribus/scribus-1.5.5.ebuild
b/app-office/scribus/scribus-1.5.5.ebuild
index 3df0ede4938..c00d61006ab 100644
--- a/app-office/scribus/scribus-1.5.5.ebuild
+++ b/app-office/scribus/scribus-1.5.5.ebuild
@@ -13,7 +13,7 @@
SRC_URI="mirror://sourceforge/project/${PN}/${PN}-devel/${PV}/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ~ppc64 x86"
+KEYWORDS="amd64 ~hppa ppc ppc64 x86"
IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts
+templates tk"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
commit: 418d6d90cc39c927ef63fa3f412e96a5e1bc4f64
Author: Sergei Trofimovich gentoo org>
AuthorDate: Sun Dec 1 13:56:17 2019 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Sun Dec 1 13:56:17 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=418d6d90
app-office/scribus: stable 1.5.5 for ppc, bug #696206
Package-Manager: Portage-2.3.80, Repoman-2.3.19
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Sergei Trofimovich gentoo.org>
app-office/scribus/scribus-1.5.5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/scribus/scribus-1.5.5.ebuild
b/app-office/scribus/scribus-1.5.5.ebuild
index 65a2d33765b..3df0ede4938 100644
--- a/app-office/scribus/scribus-1.5.5.ebuild
+++ b/app-office/scribus/scribus-1.5.5.ebuild
@@ -13,7 +13,7 @@
SRC_URI="mirror://sourceforge/project/${PN}/${PN}-devel/${PV}/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~hppa ppc ~ppc64 x86"
IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts
+templates tk"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/files/, app-office/scribus/
commit: f720773f7aa3c2da8bf8b28b5080e84857c7525f
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Fri Nov 8 20:11:10 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Fri Nov 8 20:13:10 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f720773f
app-office/scribus: Sync with most recent 1.5.5 changes
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner gentoo.org>
...phen.patch => scribus-1.5.5-findhyphen-1.patch} | 19 ---
.../scribus/files/scribus-1.5.5-findhyphen-2.patch | 19 +++
.../scribus/files/scribus-1.5.6-findhyphen.patch | 19 +++
app-office/scribus/scribus-1.5.5.ebuild| 2 +-
app-office/scribus/scribus-.ebuild | 144 ++---
5 files changed, 77 insertions(+), 126 deletions(-)
diff --git a/app-office/scribus/files/scribus-1.5.5-findhyphen.patch
b/app-office/scribus/files/scribus-1.5.5-findhyphen-1.patch
similarity index 66%
rename from app-office/scribus/files/scribus-1.5.5-findhyphen.patch
rename to app-office/scribus/files/scribus-1.5.5-findhyphen-1.patch
index 13c168c51f5..98682d60f70 100644
--- a/app-office/scribus/files/scribus-1.5.5-findhyphen.patch
+++ b/app-office/scribus/files/scribus-1.5.5-findhyphen-1.patch
@@ -1,22 +1,3 @@
a/CMakeLists.txt 2019-07-31 00:34:43.0 +0200
-+++ b/CMakeLists.txt 2019-10-02 00:17:34.968355656 +0200
-@@ -954,6 +954,16 @@
- endif()
- #>>HUNSPELL for Speelling support
-
-+#<>HYPHEN for Hyphenation support
-+
- #<>HUNSPELL for Speelling support
+
++#<>HYPHEN for Hyphenation support
++
+ #<>HUNSPELL for Speelling support
+
++#<>HYPHEN for Hyphenation support
++
+ #<=x11-libs/cairo-1.10.0[X,svg]
- boost? ( >=dev-libs/boost-1.62:= )
+ boost? ( >=dev-libs/boost-1.67:= )
hunspell? ( app-text/hunspell:= )
graphicsmagick? ( media-gfx/graphicsmagick:= )
osg? ( dev-games/openscenegraph:= )
pdf? ( app-text/podofo:0= )
scripts? ( dev-python/pillow[tk?,${PYTHON_USEDEP}] )
"
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="${DEPEND}
app-text/ghostscript-gpl
"
-DEPEND="${COMMON_DEPEND}
- dev-qt/linguist-tools:5
- virtual/pkgconfig
-"
PATCHES=(
- "${FILESDIR}"/${PN}-1.5.6-docdir.patch
+ # 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.6-findhyphen.patch
)
src_prepare() {
- rm -r codegen/cheetah || die
+ cmake-utils_src_prepare
+
+ rm -r codegen/cheetah scribus/third_party/hyphen || die
+
cat > cmake/modules/FindZLIB.cmake <<- EOF || die
find_package(PkgConfig)
pkg_check_modules(ZLIB minizip zlib)
@@ -107,7 +88,6 @@ src_prepare() {
SET( ZLIB_INCLUDE_DIR \${ZLIB_INCLUDE_DIRS} )
MARK_AS_ADVANCED( ZLIB_LIBRARY ZLIB_INCLUDE_DIR )
EOF
-
sed \
-e "/^\s*unzip\.[ch]/d" \
-e "/^\s*ioapi\.[ch]/d" \
@@ -121,54 +101,27 @@ src_prepare() {
sed \
-e "/^add_subdirectory(ui\/qml)/s/^/#DONT/" \
-i scribus/CMakeLists.txt || die # nothing but a bogus Hello
World test
-
- cmake-utils_src_prepare
}
src_configure() {
# bug #550818
append-cppflags -DHAVE_MEMRCHR
- local _lang lang langs
- for _lang in ${IUSE_L10N}; do
- lang=$(map_lang ${_lang})
- if use l10n_${lang}; then
- # From the CMakeLists.txt
- # "#Bit of a hack, preprocess all the filenames to
generate our language string, needed for -DWANT_GUI_LANG=en_GB;de_DE , etc"
- langs+=";${_lang}"
- else
- # Don't install localized documentation
- sed -e "/${_lang}/d" -i doc/CMakeLists.txt || die
- safe_delete \
- ./resources/dicts/README_${_lang}.txt \
- ./resources/dicts/README_hyph_${_lang}.txt \
- ./resources/dicts/hyph_${_lang}.dic \
- ./resources/loremipsum/${_lang}.xml
- fi
- sed -e "/en_EN/d" -i doc/CMakeLists.txt || die
- safe_delete \
- ./resources/dicts/README_en_EN.txt \
- ./resources/dicts/README_hyph_en_EN.txt \
- ./resources/dicts/hyph_en_EN.dic \
- ./resources/loremipsum/en_EN.xml
- done
-
local mycmakeargs=(
-DHAVE_PYTHON=ON
- -DPYTHON_INCLUDE_PATH="$(python_get_includedir)"
- -DPYTHON_LIBRARY="$(python_get_library_path)"
+ -DPYTHON_INCLUDE_PATH=$(python_get_includedir)
+ -DPYTHON_LIBRARY=$(python_get_library_path)
-DWANT_DISTROBUILD=ON
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
commit: ac12431b14cf9d13db74559d7a82136cf1e50464
Author: Miroslav Šulc gentoo org>
AuthorDate: Fri Nov 8 10:41:53 2019 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Fri Nov 8 10:42:26 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac12431b
app-office/scribus-: python-3, eapi7, qa fixes
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Miroslav Šulc gentoo.org>
app-office/scribus/scribus-.ebuild | 18 +-
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/app-office/scribus/scribus-.ebuild
b/app-office/scribus/scribus-.ebuild
index 06ff411dee8..27fa3c1b8ce 100644
--- a/app-office/scribus/scribus-.ebuild
+++ b/app-office/scribus/scribus-.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{6,7} )
PYTHON_REQ_USE="tk?"
CMAKE_MAKEFILE_GENERATOR=ninja
@@ -181,22 +181,22 @@ src_install() {
for _lang in ${IUSE_L10N}; do
lang=$(map_lang ${_lang})
if ! use l10n_${lang}; then
- safe_delete "${ED%/}"/usr/share/man/${_lang}
+ safe_delete "${ED}"/usr/share/man/${_lang}
fi
done
if ! use scripts; then
- rm "${ED%/}"/usr/share/scribus/scripts/*.py || die
+ rm "${ED}"/usr/share/scribus/scripts/*.py || die
elif ! use tk; then
- rm
"${ED%/}"/usr/share/scribus/scripts/{FontSample,CalendarWizard}.py || die
+ rm
"${ED}"/usr/share/scribus/scripts/{FontSample,CalendarWizard}.py || die
fi
use scripts && \
- python_fix_shebang "${ED%/}"/usr/share/scribus/scripts && \
- python_optimize "${ED%/}"/usr/share/scribus/scripts
+ python_fix_shebang "${ED}"/usr/share/scribus/scripts && \
+ python_optimize "${ED}"/usr/share/scribus/scripts
- mv "${ED%/}"/usr/share/doc/${PF}/{en,html} || die
- ln -sf html "${ED%/}"/usr/share/doc/${PF}/en || die
+ mv "${ED}"/usr/share/doc/${PF}/{en,html} || die
+ ln -sf html "${ED}"/usr/share/doc/${PF}/en || die
cat >> "${T}"/COPYING <<- EOF || die
${PN} is licensed under the "${LICENSE}".
Please visit https://www.gnu.org/licenses/gpl-2.0.html for the complete
license text.
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
commit: 4e4f1c704ade77d4d86ce44dc0894500cddc2d92
Author: Agostino Sarubbo gentoo org>
AuthorDate: Sat Nov 2 08:40:46 2019 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Sat Nov 2 08:40:46 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e4f1c70
app-office/scribus: amd64 stable wrt bug #696206
Package-Manager: Portage-2.3.76, Repoman-2.3.16
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo gentoo.org>
app-office/scribus/scribus-1.5.5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/scribus/scribus-1.5.5.ebuild
b/app-office/scribus/scribus-1.5.5.ebuild
index 011cbdfc82a..3cfe057c2ad 100644
--- a/app-office/scribus/scribus-1.5.5.ebuild
+++ b/app-office/scribus/scribus-1.5.5.ebuild
@@ -13,7 +13,7 @@
SRC_URI="mirror://sourceforge/project/${PN}/${PN}-devel/${PV}/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~hppa ~ppc ~ppc64 x86"
IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts
+templates tk"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
[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
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
commit: 40ab47d15ab396004744a4817cda7b01afd671ff
Author: Thomas Deutschmann gentoo org>
AuthorDate: Thu Oct 31 23:38:48 2019 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Thu Oct 31 23:38:48 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40ab47d1
app-office/scribus: x86 stable (bug #696206)
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Thomas Deutschmann gentoo.org>
app-office/scribus/scribus-1.5.5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/scribus/scribus-1.5.5.ebuild
b/app-office/scribus/scribus-1.5.5.ebuild
index 576abf23fb5..a2c649ca819 100644
--- a/app-office/scribus/scribus-1.5.5.ebuild
+++ b/app-office/scribus/scribus-1.5.5.ebuild
@@ -13,7 +13,7 @@
SRC_URI="mirror://sourceforge/project/${PN}/${PN}-devel/${PV}/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 x86"
IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts
+templates tk"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/files/, app-office/scribus/
commit: 1c9a7b1068756fc7ae6b52febaaf850a481b8ad3
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue Oct 1 20:13:17 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue Oct 1 23:43:03 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c9a7b10
app-office/scribus: 1.5.5 version bump, EAPI-7 bump
Drop L10N hacks
Fix build against system dev-libs/hyphen, drop bundled
Install bigger icon
Set USE +templates by default
Closes: https://bugs.gentoo.org/692280
Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner gentoo.org>
app-office/scribus/Manifest| 1 +
.../scribus/files/scribus-1.5.5-findhyphen.patch | 70 +
app-office/scribus/scribus-1.5.5.ebuild| 156 +
3 files changed, 227 insertions(+)
diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index 3734ddc121f..bc1bb961c1a 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -1 +1,2 @@
+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-findhyphen.patch
b/app-office/scribus/files/scribus-1.5.5-findhyphen.patch
new file mode 100644
index 000..13c168c51f5
--- /dev/null
+++ b/app-office/scribus/files/scribus-1.5.5-findhyphen.patch
@@ -0,0 +1,70 @@
+--- a/CMakeLists.txt 2019-07-31 00:34:43.0 +0200
b/CMakeLists.txt 2019-10-02 00:17:34.968355656 +0200
+@@ -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/scribus-1.5.5.ebuild
b/app-office/scribus/scribus-1.5.5.ebuild
new file mode 100644
index 000..576abf23fb5
--- /dev/null
+++ b/app-office/scribus/scribus-1.5.5.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="tk?"
+inherit cmake-utils desktop flag-o-matic python-single-r1 xdg
+
+DESCRIPTION="Desktop publishing (DTP) and layout program"
+HOMEPAGE="https://www.scribus.net/;
+SRC_URI="mirror://sourceforge/project/${PN}/${PN}-devel/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts
+templates tk"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ tk? ( scripts )"
+
+# osg
+# couple of third_party libs bundled
+BDEPEND="
+ dev-qt/linguist-tools:5
+ virtual/pkgconfig
+"
+DEPEND="${PYTHON_DEPS}
+ app-text/libmspub
+ app-text/libqxp
+ app-text/poppler:=
+ dev-libs/hyphen
+ >=dev-libs/icu-58.2:0=
+ dev-libs/librevenge
+ dev-libs/libxml2
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5[-gles2]
+ dev-qt/qtnetwork:5
+ dev-qt/qtopengl:5
+ dev-qt/qtprintsupport:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtxml:5
+ media-libs/fontconfig
+ media-libs/freetype:2
+ >=media-libs/harfbuzz-0.9.42:0=[icu]
+ media-libs/lcms:2
+ media-libs/libcdr
+ media-libs/libfreehand
+ media-libs/libpagemaker
+ media-libs/libpng:0=
+ media-libs/libvisio
+ media-libs/libzmf
+ media-libs/tiff:0
+ net-print/cups
+ sys-libs/zlib[minizip]
+ virtual/jpeg:0=
+ >=x11-libs/cairo-1.10.0[X,svg]
+ boost? ( >=dev-libs/boost-1.67:= )
+ hunspell? ( app-text/hunspell:= )
+ graphicsmagick? ( media-gfx/graphicsmagick:= )
+ osg? ( dev-games/openscenegraph:= )
+ pdf? ( app-text/podofo:0= )
+ scripts? ( dev-python/pillow[tk?,${PYTHON_USEDEP}] )
+"
+RDEPEND="${DEPEND}
+ app-text/ghostscript-gpl
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.5.3-fpic.patch
+ "${FILESDIR}"/${P}-docdir.patch
+ "${FILESDIR}"/${P}-findhyphen.patch
+)
+
+src_prepare() {
+ cmake-utils_src_prepare
+
+ rm -r codegen/cheetah scribus/third_party/hyphen || die
+
+ cat > cmake/modules/FindZLIB.cmake <<- EOF || die
+ find_package(PkgConfig)
+ pkg_check_modules(ZLIB minizip zlib)
+ SET( ZLIB_LIBRARY \${ZLIB_LIBRARIES} )
+ SET( ZLIB_INCLUDE_DIR \${ZLIB_INCLUDE_DIRS}
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
commit: 649117fa760f34e0603864b5640eae1b9d735b43
Author: Matt Turner gentoo org>
AuthorDate: Fri Sep 13 23:17:59 2019 +
Commit: Matt Turner gentoo org>
CommitDate: Fri Sep 13 23:51:46 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=649117fa
app-office/scribus-1.5.5_pre20190429: drop sparc keywords
Signed-off-by: Matt Turner gentoo.org>
app-office/scribus/scribus-1.5.5_pre20190429.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/scribus/scribus-1.5.5_pre20190429.ebuild
b/app-office/scribus/scribus-1.5.5_pre20190429.ebuild
index 56615d2265b..1926b62bb62 100644
--- a/app-office/scribus/scribus-1.5.5_pre20190429.ebuild
+++ b/app-office/scribus/scribus-1.5.5_pre20190429.ebuild
@@ -15,7 +15,7 @@
SRC_URI="https://github.com/${PN}project/${PN}/archive/${COMMIT}.tar.gz -> ${P}.
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 ~hppa ppc ppc64 x86"
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
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/files/, app-office/scribus/
commit: ac6f121dce90c63353c16afc77a73cb9ed10146e
Author: Miroslav Šulc gentoo org>
AuthorDate: Fri Aug 16 08:51:45 2019 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Fri Aug 16 08:52:15 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac6f121d
app-office/scribus-: updated docdir patch
keeping files/scribus-1.5.5-docdir.patch for scribus-1.5.5 bump
Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Miroslav Šulc gentoo.org>
.../scribus/files/scribus-1.5.6-docdir.patch | 29 ++
app-office/scribus/scribus-.ebuild | 2 +-
2 files changed, 30 insertions(+), 1 deletion(-)
diff --git a/app-office/scribus/files/scribus-1.5.6-docdir.patch
b/app-office/scribus/files/scribus-1.5.6-docdir.patch
new file mode 100644
index 000..957991c2acc
--- /dev/null
+++ b/app-office/scribus/files/scribus-1.5.6-docdir.patch
@@ -0,0 +1,29 @@
+diff --git a/CMakeLists_Directories.cmake b/CMakeLists_Directories.cmake
+index db6133f..faf85ce 100644
+--- 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/scribus-.ebuild
b/app-office/scribus/scribus-.ebuild
index 98c9fa5d082..06ff411dee8 100644
--- a/app-office/scribus/scribus-.ebuild
+++ b/app-office/scribus/scribus-.ebuild
@@ -94,7 +94,7 @@ DEPEND="${COMMON_DEPEND}
"
PATCHES=(
- "${FILESDIR}"/${PN}-1.5.5-docdir.patch
+ "${FILESDIR}"/${PN}-1.5.6-docdir.patch
"${FILESDIR}"/${PN}-1.5.3-fpic.patch
)
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/files/, app-office/scribus/
commit: b8163a1828bcf65ede1b6e55f99d926147575f2f
Author: Miroslav Šulc gentoo org>
AuthorDate: Sun Jun 23 16:43:20 2019 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Sun Jun 23 16:44:41 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8163a18
app-office/scribus-: updated docdir patch
Package-Manager: Portage-2.3.67, Repoman-2.3.15
Signed-off-by: Miroslav Šulc gentoo.org>
.../scribus/files/scribus-1.5.5-docdir.patch | 29 ++
app-office/scribus/scribus-.ebuild | 2 +-
2 files changed, 30 insertions(+), 1 deletion(-)
diff --git a/app-office/scribus/files/scribus-1.5.5-docdir.patch
b/app-office/scribus/files/scribus-1.5.5-docdir.patch
new file mode 100644
index 000..897a8a75ae9
--- /dev/null
+++ b/app-office/scribus/files/scribus-1.5.5-docdir.patch
@@ -0,0 +1,29 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f5b3e77..4c5fd3f 100644
+--- a/CMakeLists.txt
b/CMakeLists.txt
+@@ -313,14 +313,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/scribus-.ebuild
b/app-office/scribus/scribus-.ebuild
index 89fb20f8034..98c9fa5d082 100644
--- a/app-office/scribus/scribus-.ebuild
+++ b/app-office/scribus/scribus-.ebuild
@@ -94,7 +94,7 @@ DEPEND="${COMMON_DEPEND}
"
PATCHES=(
- "${FILESDIR}"/${PN}-1.5.3-docdir.patch
+ "${FILESDIR}"/${PN}-1.5.5-docdir.patch
"${FILESDIR}"/${PN}-1.5.3-fpic.patch
)
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
commit: b8996055c1fbc92ff79b144f9f0f276baa0fc315
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed Jun 12 09:57:45 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed Jun 12 10:02:13 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8996055
app-office/scribus: Drop 1.5.5_pre20190124
Package-Manager: Portage-2.3.67, Repoman-2.3.14
Signed-off-by: Andreas Sturmlechner gentoo.org>
app-office/scribus/Manifest| 1 -
.../scribus/scribus-1.5.5_pre20190124.ebuild | 228 -
2 files changed, 229 deletions(-)
diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index 7b2d1642c55..3734ddc121f 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -1,2 +1 @@
-DIST scribus-1.5.5_pre20190124.tar.gz 85713996 BLAKE2B
c4bb181012c5b2d15076239cb06d5b2d88fb24ef67d5e258142a4acb7979a304d5fdbd9163a24aaa47a1c8f354b0b70af7115430173ade9a8e77c1cb489fc849
SHA512
e9bd63c37a4818a5dda151b7bb6b7fa9cf7918949bd5612009646335d630b4b4188c2346c7567a3dc5f857849a2d49967f825320720c12e38a6038c7a0d3c34a
DIST scribus-1.5.5_pre20190429.tar.gz 85838093 BLAKE2B
4ffdc6356b5a2c7372bf6395847f348e7c56276d39114fa5691b6c7f8345aa89a0efe221adbbf1d431d89208fae53ae211c5298d9406487d46ddf98dd69d8c1a
SHA512
1aa76491560848dccbeb17f03ba4ac24d6045881f6f92f31b921cf1a91c051176b835d86e0c46046e73573bf60b330e07945c279c077a7619bf2ee9331ca9324
diff --git a/app-office/scribus/scribus-1.5.5_pre20190124.ebuild
b/app-office/scribus/scribus-1.5.5_pre20190124.ebuild
deleted file mode 100644
index 76be599564d..000
--- a/app-office/scribus/scribus-1.5.5_pre20190124.ebuild
+++ /dev/null
@@ -1,228 +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=1ed85778dd55bcbcfad2bbc276fd4c97f43ad965
-inherit cmake-utils desktop flag-o-matic python-single-r1 xdg
-
-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="amd64 ~hppa ppc ppc64 ~sparc x86"
-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 pt_BR pt_PT ro ro_RO ru ru_RU_0 sa sk sk_SK sl sl_SI so sq sr sv
sv_SE te th_TH tr uk uk_UA zh_CN zh_TW"
-
-map_lang() {
- local lang=${1/_/-}
- case $1 in
- # Retain the following, which have a specific subtag
- de_*|en_*|pt_*|zh_*) ;;
- # Consider all other xx_XX as duplicates of the generic xx tag
- *_*) lang=${1%%_*} ;;
- esac
- echo ${lang}
-}
-
-prev_l=
-for l in ${IUSE_L10N}; do
- l=$(map_lang ${l})
- [[ ${l} != "${prev_l}" ]] && IUSE+=" l10n_${l}"
- prev_l=${l}
-done
-unset l prev_l
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- tk? ( scripts )"
-
-# osg
-# couple of third_party libs bundled
-COMMON_DEPEND="${PYTHON_DEPS}
- app-text/libmspub
- app-text/libqxp
- app-text/poppler:=
- dev-libs/hyphen
- >=dev-libs/icu-58.2:0=
- dev-libs/librevenge
- dev-libs/libxml2
- dev-qt/qtcore:5
- dev-qt/qtgui:5[-gles2]
- dev-qt/qtnetwork:5
- dev-qt/qtopengl:5
- dev-qt/qtprintsupport:5
- dev-qt/qtwidgets:5
- dev-qt/qtxml:5
- media-libs/fontconfig
- media-libs/freetype:2
- >=media-libs/harfbuzz-0.9.42:0=[icu]
- media-libs/lcms:2
- media-libs/libcdr
- media-libs/libfreehand
- media-libs/libpagemaker
- media-libs/libpng:0=
- media-libs/libvisio
- media-libs/libzmf
- media-libs/tiff:0
- net-print/cups
- sys-libs/zlib[minizip]
- virtual/jpeg:0=
- >=x11-libs/cairo-1.10.0[X,svg]
- boost? ( >=dev-libs/boost-1.62:= )
- hunspell? ( app-text/hunspell:= )
- graphicsmagick? ( media-gfx/graphicsmagick:= )
- osg? ( dev-games/openscenegraph:= )
- pdf? ( app-text/podofo:0= )
- scripts? ( dev-python/pillow[tk?,${PYTHON_USEDEP}] )
-"
-RDEPEND="${COMMON_DEPEND}
-
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
commit: 80f0c0753652a996d88c45ad70c48b4102c11bda
Author: Mikle Kolyada gentoo org>
AuthorDate: Mon May 20 11:32:25 2019 +
Commit: Mikle Kolyada gentoo org>
CommitDate: Mon May 20 11:32:25 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80f0c075
app-office/scribus: amd64 stable wrt bug #685492
Signed-off-by: Mikle Kolyada gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
RepoMan-Options: --include-arches="amd64"
app-office/scribus/scribus-1.5.5_pre20190429.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/scribus/scribus-1.5.5_pre20190429.ebuild
b/app-office/scribus/scribus-1.5.5_pre20190429.ebuild
index 5e9cd6b4e4a..6402cd3d0d5 100644
--- a/app-office/scribus/scribus-1.5.5_pre20190429.ebuild
+++ b/app-office/scribus/scribus-1.5.5_pre20190429.ebuild
@@ -15,7 +15,7 @@
SRC_URI="https://github.com/${PN}project/${PN}/archive/${COMMIT}.tar.gz -> ${P}.
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~sparc x86"
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
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
commit: 0071bcb762fd8af93c9f561e2325842dcb27cbd8
Author: Thomas Deutschmann gentoo org>
AuthorDate: Sun May 19 13:08:54 2019 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Sun May 19 13:08:54 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0071bcb7
app-office/scribus: x86 stable (bug #685492)
Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Thomas Deutschmann gentoo.org>
app-office/scribus/scribus-1.5.5_pre20190429.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/scribus/scribus-1.5.5_pre20190429.ebuild
b/app-office/scribus/scribus-1.5.5_pre20190429.ebuild
index d279c081265..5e9cd6b4e4a 100644
--- a/app-office/scribus/scribus-1.5.5_pre20190429.ebuild
+++ b/app-office/scribus/scribus-1.5.5_pre20190429.ebuild
@@ -15,7 +15,7 @@
SRC_URI="https://github.com/${PN}project/${PN}/archive/${COMMIT}.tar.gz -> ${P}.
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc x86"
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
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
commit: dad0e16ab9fc0d5b6c9ca8b5c4647ececcf1608b
Author: Zac Medico gentoo org>
AuthorDate: Wed May 8 17:19:48 2019 +
Commit: Zac Medico gentoo org>
CommitDate: Wed May 8 17:19:48 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dad0e16a
app-office/scribus: fix has_version syntax
Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Zac Medico gentoo.org>
app-office/scribus/scribus-1.5.5_pre20190429.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/scribus/scribus-1.5.5_pre20190429.ebuild
b/app-office/scribus/scribus-1.5.5_pre20190429.ebuild
index a889616acc0..d279c081265 100644
--- a/app-office/scribus/scribus-1.5.5_pre20190429.ebuild
+++ b/app-office/scribus/scribus-1.5.5_pre20190429.ebuild
@@ -122,7 +122,7 @@ src_prepare() {
-e "/^add_subdirectory(ui\/qml)/s/^/#DONT/" \
-i scribus/CMakeLists.txt || die # nothing but a bogus Hello
World test
- has_version ">=app-text/poppler-0.76.0" PATCHES+=(
"${FILESDIR}"/${P}-poppler-0.76.patch )
+ has_version ">=app-text/poppler-0.76.0" && PATCHES+=(
"${FILESDIR}"/${P}-poppler-0.76.patch )
cmake-utils_src_prepare
}
