commit 62cd0246cf6bbac572d89a7e743802a11607c604
Author: Jan Rękorajski <[email protected]>
Date: Sun Apr 17 11:52:09 2022 +0200
- up to 1.5.8
harfbuzz.patch | 67 ----------------------------------------------------------
scribus.spec | 17 +++++++--------
2 files changed, 8 insertions(+), 76 deletions(-)
---
diff --git a/scribus.spec b/scribus.spec
index e609755..99b89dc 100644
--- a/scribus.spec
+++ b/scribus.spec
@@ -10,14 +10,13 @@
Summary: Scribus - Open Source Desktop Publishing
Summary(pl.UTF-8): Scribus - DTP dla Wolnego Oprogramowania
Name: scribus
-Version: 1.5.7
-Release: 4
+Version: 1.5.8
+Release: 1
License: GPL v2+
Group: X11/Applications/Publishing
Source0:
https://downloads.sourceforge.net/scribus/%{name}-%{version}.tar.xz
-# Source0-md5: 4d0c63cfdade8a9abf225a4415e43694
+# Source0-md5: ff9e966a2251a6c8800bb26fcb4b7c59
Patch0: %{name}-docs.patch
-Patch1: harfbuzz.patch
URL: https://www.scribus.net/
BuildRequires: GraphicsMagick-devel
BuildRequires: Qt5Core-devel >= %{qt_ver}
@@ -62,8 +61,8 @@ BuildRequires: pkgconfig
BuildRequires: podofo-devel
BuildRequires: poppler-cpp-devel >= 0.58.0
BuildRequires: poppler-devel >= 0.58.0
-BuildRequires: python-devel >= 2
-BuildRequires: python-modules >= 2
+BuildRequires: python3-devel
+BuildRequires: python3-modules
BuildRequires: qt5-build >= %{qt_ver}
BuildRequires: qt5-linguist >= %{qt_ver}
BuildRequires: qt5-qmake >= %{qt_ver}
@@ -84,8 +83,8 @@ Requires: Qt5Widgets >= %{qt_ver}
Requires: Qt5Xml >= %{qt_ver}
Requires: harfbuzz >= 0.9.42
Requires: hicolor-icon-theme
-Requires: python-PIL
-Requires: python-tkinter
+Requires: python3-PIL
+Requires: python3-tkinter
Requires: shared-mime-info
Obsoletes: scribus-scripting
Obsoletes: scribus-short-words
@@ -161,13 +160,13 @@ Domyślne szablony dokumentów dostarczane wraz ze
Scribusem.
%prep
%setup -q
%patch0 -p1
-%patch1 -p1
%build
mkdir -p build
cd build
%cmake .. \
+ -DWANT_CPP17=ON \
-DWANT_GRAPHICSMAGICK:BOOL=ON
%{__make}
diff --git a/harfbuzz.patch b/harfbuzz.patch
deleted file mode 100644
index 4a82485..0000000
--- a/harfbuzz.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 1b546978bc4ea0b2a73fbe4d7cf947887e865162 Mon Sep 17 00:00:00 2001
-From: Jean Ghali <[email protected]>
-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 <[email protected]>
-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())
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/scribus.git/commitdiff/62cd0246cf6bbac572d89a7e743802a11607c604
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
