diff options
Diffstat (limited to 'office')
-rw-r--r-- | office/abiword/abiword.SlackBuild | 4 | ||||
-rw-r--r-- | office/asymptote/asymptote.SlackBuild | 2 | ||||
-rw-r--r-- | office/gnucash-docs/gnucash-docs.SlackBuild | 8 | ||||
-rw-r--r-- | office/gnucash-docs/gnucash-docs.info | 6 | ||||
-rw-r--r-- | office/gnucash/gnucash.SlackBuild | 4 | ||||
-rw-r--r-- | office/gnucash/gnucash.info | 6 | ||||
-rw-r--r-- | office/neoleo/neoleo.SlackBuild | 2 | ||||
-rw-r--r-- | office/qpdfview/qpdfview.SlackBuild | 2 | ||||
-rw-r--r-- | office/scribus/scribus-1.6.1-poppler-24.03.patch | 70 | ||||
-rw-r--r-- | office/scribus/scribus.SlackBuild | 11 | ||||
-rw-r--r-- | office/scribus/scribus.info | 6 |
11 files changed, 101 insertions, 20 deletions
diff --git a/office/abiword/abiword.SlackBuild b/office/abiword/abiword.SlackBuild index 11707f4c3a..de522d319c 100644 --- a/office/abiword/abiword.SlackBuild +++ b/office/abiword/abiword.SlackBuild @@ -92,6 +92,10 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ +# https://www.linuxfromscratch.org/blfs/view/svn/xsoft/AbiWord.html +sed -e '/libxml/a #include <libxml/xmlmemory.h>' \ + -i src/af/util/xp/ut_stringbuf.cpp + patch -p1 < $CWD/enchant-2.1.patch # 20200622 bkw: don't let abiword create /root/.config/abiword/profile diff --git a/office/asymptote/asymptote.SlackBuild b/office/asymptote/asymptote.SlackBuild index 3c9d7da655..3a7ecea72e 100644 --- a/office/asymptote/asymptote.SlackBuild +++ b/office/asymptote/asymptote.SlackBuild @@ -89,7 +89,7 @@ CFLAGS="$SLKCFLAGS" \ --sysconfdir=/etc \ --localstatedir=/var \ --enable-gc=system \ - --enable-offscreen \ + --disable-offscreen \ --disable-lsp \ --disable-gc-debug \ --disable-gc-full-debug \ diff --git a/office/gnucash-docs/gnucash-docs.SlackBuild b/office/gnucash-docs/gnucash-docs.SlackBuild index cab82e5ef0..fad6a714af 100644 --- a/office/gnucash-docs/gnucash-docs.SlackBuild +++ b/office/gnucash-docs/gnucash-docs.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=gnucash-docs -VERSION=${VERSION:-4.11} +VERSION=${VERSION:-5.4} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -91,15 +91,15 @@ cd build make $DOCLANG-gnucash-help-pdf || make C-gnucash-help-pdf fi - make install DESTDIR=$PKG + make -j1 install DESTDIR=$PKG # Move the files to where they belong: mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION - cp -Rv share/doc/$DOCLANG/* $PKG/usr/doc/$PRGNAM-$VERSION + cp -Rv share/help/$DOCLANG/* $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild # There is no help system for Japanese, so: if [ "$DOCLANG" = "ja" ]; then - cp -Rv share/doc/C/gnucash-help* $PKG/usr/doc/$PRGNAM-$VERSION + cp -Rv share/help/C/gnucash-help* $PKG/usr/doc/$PRGNAM-$VERSION fi mv $PKG/usr/share/$PRGNAM/* $PKG/usr/doc/$PRGNAM-$VERSION # get rid of unused folders: diff --git a/office/gnucash-docs/gnucash-docs.info b/office/gnucash-docs/gnucash-docs.info index b4ca5038df..0f7b5ee92d 100644 --- a/office/gnucash-docs/gnucash-docs.info +++ b/office/gnucash-docs/gnucash-docs.info @@ -1,8 +1,8 @@ PRGNAM="gnucash-docs" -VERSION="4.11" +VERSION="5.4" HOMEPAGE="https://www.gnucash.org" -DOWNLOAD="https://downloads.sourceforge.net/gnucash/gnucash-docs-4.11.tar.gz" -MD5SUM="4fd7d4e6cb5ef18fb3e54dc623dd76f6" +DOWNLOAD="https://downloads.sourceforge.net/gnucash/gnucash-docs-5.4.tar.gz" +MD5SUM="62b1a9cd78d9d9fff889c9460716bd5c" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="gnucash rarian yelp" diff --git a/office/gnucash/gnucash.SlackBuild b/office/gnucash/gnucash.SlackBuild index f1f89a24ad..0f60d7df45 100644 --- a/office/gnucash/gnucash.SlackBuild +++ b/office/gnucash/gnucash.SlackBuild @@ -26,8 +26,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=gnucash -VERSION=${VERSION:-4.11} -BUILD=${BUILD:-2} +VERSION=${VERSION:-5.4} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/office/gnucash/gnucash.info b/office/gnucash/gnucash.info index 0f8546165a..d337fd780c 100644 --- a/office/gnucash/gnucash.info +++ b/office/gnucash/gnucash.info @@ -1,8 +1,8 @@ PRGNAM="gnucash" -VERSION="4.11" +VERSION="5.4" HOMEPAGE="https://www.gnucash.org/" -DOWNLOAD="https://downloads.sourceforge.net/gnucash/gnucash-4.11.tar.bz2" -MD5SUM="e6ea5e80ea27f09115439fab881a0ad5" +DOWNLOAD="https://downloads.sourceforge.net/gnucash/gnucash-5.4.tar.bz2" +MD5SUM="d0d850eefe8a54e28a57ac37984158c0" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="webkit2gtk gtest" diff --git a/office/neoleo/neoleo.SlackBuild b/office/neoleo/neoleo.SlackBuild index c8d46d20f8..e9fc6e8a77 100644 --- a/office/neoleo/neoleo.SlackBuild +++ b/office/neoleo/neoleo.SlackBuild @@ -80,6 +80,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +sed -i '6i #include <cstdint>' src/neotypes.h + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/office/qpdfview/qpdfview.SlackBuild b/office/qpdfview/qpdfview.SlackBuild index 4e16cd0dc8..ddf9c860da 100644 --- a/office/qpdfview/qpdfview.SlackBuild +++ b/office/qpdfview/qpdfview.SlackBuild @@ -63,6 +63,8 @@ chown -R root:root . find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} + -o \ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} + +sed -i 's|c++11|c++17|' qpdfview.pri + # Add localizations lrelease-qt5 qpdfview.pro diff --git a/office/scribus/scribus-1.6.1-poppler-24.03.patch b/office/scribus/scribus-1.6.1-poppler-24.03.patch new file mode 100644 index 0000000000..076e48e14f --- /dev/null +++ b/office/scribus/scribus-1.6.1-poppler-24.03.patch @@ -0,0 +1,70 @@ +From dc2470990ab73c87fdd60068c99518ced01a3edd Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +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 <asturm@gentoo.org> +--- + 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, &stop1);
+@@ -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, &stop1);
+-- +2.44.0 + diff --git a/office/scribus/scribus.SlackBuild b/office/scribus/scribus.SlackBuild index c7e17f62e8..c816bbf48f 100644 --- a/office/scribus/scribus.SlackBuild +++ b/office/scribus/scribus.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for scribus # Copyright 2006 Martin Lefebvre <dadexter@gmail.com> -# Copyright 2008-2021 Heinz Wiesinger, Amsterdam, The Netherlands +# Copyright 2008-2024 Heinz Wiesinger, Amsterdam, The Netherlands # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -29,7 +29,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=scribus -VERSION=${VERSION:-1.5.7} +VERSION=${VERSION:-1.6.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -68,6 +68,8 @@ else LIBDIRSUFFIX="" fi +if pkg-config --exists libpodofo ; then PODOFO="On" ; else PODOFO="Off" ; fi + set -e rm -rf $PKG @@ -83,13 +85,14 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -# thanks archlinux! -patch -p1 < $CWD/harfbuzz-3.0.0.patch +patch -p1 < $CWD/scribus-1.6.1-poppler-24.03.patch cmake \ -DCMAKE_C_FLAGS="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX:PATH=/usr \ + -DWANT_CPP17=1 \ + -DWITH_PODOFO=$PODOFO \ -DLIB_SUFFIX=${LIBDIRSUFFIX} make diff --git a/office/scribus/scribus.info b/office/scribus/scribus.info index f1b56cd8de..d076f887a5 100644 --- a/office/scribus/scribus.info +++ b/office/scribus/scribus.info @@ -1,8 +1,8 @@ PRGNAM="scribus" -VERSION="1.5.7" +VERSION="1.6.1" HOMEPAGE="https://www.scribus.net" -DOWNLOAD="https://downloads.sourceforge.net/scribus/scribus-1.5.7.tar.xz" -MD5SUM="4d0c63cfdade8a9abf225a4415e43694" +DOWNLOAD="https://downloads.sourceforge.net/scribus/scribus-1.6.1.tar.xz" +MD5SUM="3fa27801c225e5fdf6920af1d0a1a12d" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" |