diff options
author | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2024-05-23 20:24:01 +0700 |
---|---|---|
committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2024-05-23 20:24:40 +0700 |
commit | dbc608c925bc98cfbca34b3ebb838e21488f3d48 (patch) | |
tree | 3eb0ccf0170d4f419156c6ec422ede2c357e56d2 | |
parent | 03f081b7e5de536b1b6e90b264e97724defa154d (diff) | |
download | slackbuilds-scribus.tar.gz slackbuilds-scribus.tar.xz |
office/scribus: Updated for version 1.6.1.scribus
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-rw-r--r-- | office/scribus/harfbuzz-3.0.0.patch | 68 | ||||
-rw-r--r-- | office/scribus/poppler-24.03.patch.gz | bin | 0 -> 916 bytes | |||
-rw-r--r-- | office/scribus/poppler-24.05.patch.gz | bin | 0 -> 826 bytes | |||
-rw-r--r-- | office/scribus/scribus.SlackBuild | 17 | ||||
-rw-r--r-- | office/scribus/scribus.info | 6 |
5 files changed, 14 insertions, 77 deletions
diff --git a/office/scribus/harfbuzz-3.0.0.patch b/office/scribus/harfbuzz-3.0.0.patch deleted file mode 100644 index 4dc4f0db4a..0000000000 --- a/office/scribus/harfbuzz-3.0.0.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 1b546978bc4ea0b2a73fbe4d7cf947887e865162 Mon Sep 17 00:00:00 2001 -From: Jean Ghali <jghali@libertysurf.fr> -Date: Sat, 21 Aug 2021 20:05:43 +0000 -Subject: [PATCH] Use new hb-subset api with harfbuzz >= 2.9.0 in order to - prepeare for removal of legacy API in 3.0 - -git-svn-id: svn://scribus.net/trunk/Scribus@24696 11d20701-8431-0410-a711-e3c959e3b870 ---- - scribus/fonts/sfnt.cpp | 10 +++++++++- - 1 file changed, 9 insertions(+), 1 deletion(-) - -diff --git a/scribus/fonts/sfnt.cpp b/scribus/fonts/sfnt.cpp -index 50777f66e3..fca8b39158 100644 ---- a/scribus/fonts/sfnt.cpp -+++ b/scribus/fonts/sfnt.cpp -@@ -1256,11 +1256,19 @@ namespace sfnt { -
- for (int i = 0; i < cids.count(); ++i)
- hb_set_add(glyphSet, cids.at(i));
--
-+
-+#if HB_VERSION_ATLEAST(2, 9, 0)
-+ uint32_t subsetFlags = (uint32_t) hb_subset_input_get_flags(hbSubsetInput.get());
-+ subsetFlags |= HB_SUBSET_FLAGS_RETAIN_GIDS;
-+ subsetFlags &= ~HB_SUBSET_FLAGS_NO_HINTING;
-+ subsetFlags |= HB_SUBSET_FLAGS_NAME_LEGACY;
-+ hb_subset_input_set_flags(hbSubsetInput.get(), subsetFlags);
-+#else
- hb_subset_input_set_retain_gids(hbSubsetInput.get(), true);
- hb_subset_input_set_drop_hints(hbSubsetInput.get(), false);
- #if HB_VERSION_ATLEAST(2, 6, 5)
- hb_subset_input_set_name_legacy(hbSubsetInput.get(), true);
-+#endif
- #endif
-
- QScopedPointer<hb_face_t, HbFaceDeleter> hbSubsetFace(hb_subset(hbFullFace.get(), hbSubsetInput.get()));
- -From 68ec41169eaceea4a6e1d6f359762a191c7e61d5 Mon Sep 17 00:00:00 2001 -From: Jean Ghali <jghali@libertysurf.fr> -Date: Sun, 19 Sep 2021 11:59:50 +0000 -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 ---- - scribus/fonts/sfnt.cpp | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/scribus/fonts/sfnt.cpp b/scribus/fonts/sfnt.cpp -index fca8b39158..b3dfa50dc6 100644 ---- 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<hb_face_t, HbFaceDeleter> hbSubsetFace(hb_subset_or_fail(hbFullFace.get(), hbSubsetInput.get()));
-+ if (hbSubsetFace.isNull())
-+ return QByteArray();
-+#else
- QScopedPointer<hb_face_t, HbFaceDeleter> hbSubsetFace(hb_subset(hbFullFace.get(), hbSubsetInput.get()));
- if (hbSubsetFace.isNull())
- return QByteArray();
-+#endif
-
- QScopedPointer<hb_blob_t, HbBlobDeleter> hbSubsetBlob(hb_face_reference_blob(hbSubsetFace.get()));
- if (hbSubsetBlob.isNull())
diff --git a/office/scribus/poppler-24.03.patch.gz b/office/scribus/poppler-24.03.patch.gz Binary files differnew file mode 100644 index 0000000000..d58505e644 --- /dev/null +++ b/office/scribus/poppler-24.03.patch.gz diff --git a/office/scribus/poppler-24.05.patch.gz b/office/scribus/poppler-24.05.patch.gz Binary files differnew file mode 100644 index 0000000000..a11c4a4196 --- /dev/null +++ b/office/scribus/poppler-24.05.patch.gz diff --git a/office/scribus/scribus.SlackBuild b/office/scribus/scribus.SlackBuild index c7e17f62e8..40ee1e0e7a 100644 --- a/office/scribus/scribus.SlackBuild +++ b/office/scribus/scribus.SlackBuild @@ -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} @@ -42,9 +42,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -68,6 +65,8 @@ else LIBDIRSUFFIX="" fi +if pkg-config --exists libpodofo ; then PODOFO="On" ; else PODOFO="Off" ; fi + set -e rm -rf $PKG @@ -83,13 +82,19 @@ 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/c++20.patch +zcat $CWD/poppler-24.03.patch.gz | patch -p1 +zcat < $CWD/poppler-24.05.patch.gz | patch -p1 + +sed -e 's|WANT_CPP17|WANT_CPP20|g' -e 's|CMAKE_CXX_STANDARD 17|CMAKE_CXX_STANDARD 20|g' -i CMakeLists.txt cmake \ -DCMAKE_C_FLAGS="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX:PATH=/usr \ + -D WANT_CPP20=On \ + -DWANT_CCACHE=ON \ + -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="" |