From nobody Mon Jan 24 12:02:42 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id ADEB5198121D; Mon, 24 Jan 2022 12:02:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Jj7sG4JQPz3G0F; Mon, 24 Jan 2022 12:02:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643025762; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U26xw+IgB+g8nlsfCsDMguisdRfmfIHsGSteaZQWuaA=; b=eOhRCHicu5dhYXwFn/Z8qmolp1X5I8ZE50n1rW9/YOvD52UJPdIyNhFXmr2DaqeKgwDHom 3lh0G7eX8c3/47GxqYWBS2gIi1Z+mfWgl8EeDB63CW7Ql0L2V188T7bD6HEn5dgPPI21ZD LL7U3uOw7BlQRln4/24qJbJq6Zn7ZYgJ/PLXU6ajWSYEyxEpdLaRLM53Z7vsmMWJVHrAbv JU1MwZokj8okF1kou67rhHoRMIWOWAHVAe3yIlqHxxT7YanPDMiD8xEjcSdQRRNz+2YFqF Z05Lk1lsWMKAmbmcAUwAk1jYW4xCEEq3FIjs/fFOouoxFJMIHYVLMJLf/LPGJw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 73973159FC; Mon, 24 Jan 2022 12:02:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 20OC2gdJ059063; Mon, 24 Jan 2022 12:02:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20OC2gMV059062; Mon, 24 Jan 2022 12:02:42 GMT (envelope-from git) Date: Mon, 24 Jan 2022 12:02:42 GMT Message-Id: <202201241202.20OC2gMV059062@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Piotr Kubaj Subject: git: a13185d956b4 - main - print/scribus-devel: update to 1.5.8 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pkubaj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a13185d956b4aeae4919be7cbeb17bcc30c3a0e1 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643025762; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U26xw+IgB+g8nlsfCsDMguisdRfmfIHsGSteaZQWuaA=; b=JDPHHNYZzlGUK+DDJEhaNepXAyDzY/1g2EjDwPBwnLqK2wsvFsRDpDM98IRSkRGcZ475Rw PZ8VFazwsVP8NO5FrLwHS3dcGK8kVxupP89BaEC8dj9myFxhQ6ca4ooEUfxxqtQjNClVnB Sm82Fs5qj/GIx15x9yigXwkGjdTHRv8zuFgW1M3aaUwUcs0PUUe/tI9J7bBckdqpmn0pgk k1cbfqfvHOXA9NwHXkQvy/tGgg9dIq8mX74/B09E3NR7quh4dPNX9tQpcvpUbKNhJLEXbk Ha2OsqBN3kcScBYLF9cTj9PBeLPsrZfaiNqmP8XxsSLN1lkrKZKX/Z8nkZ+dZg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643025762; a=rsa-sha256; cv=none; b=sUkN7aqYWUb5WpZzIU1inf9QczmqFmb680VNIZ8q5uinXXCGl6U7jN6fabV2Npuyz1VeCS QQ6oPvOfMS7/j/aKy7v+EiTpW0gy3ryhx58ZYy40FJJiDGhh+gdq/YvKpzmsNpcc3mGWTH ndcPCPHO5LtPgZoxCVvNUfxF7a6tjogjaEz7fpFO2FDfpie7A9ZOif1AAYjDGDMmI6N+Vy YG5XHuT/LyBgGT+0Okam3mnPmF0LG6wHu83WnK/cW+oPhNbuA+9Gw68T6S7FzUnE5X/DFa HW0gKB8F2+M/lA0JT4TqKP90YtTMkP/DKrM8rb7MNLfqB5g3I5l/9hGgg5Z3jw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=a13185d956b4aeae4919be7cbeb17bcc30c3a0e1 commit a13185d956b4aeae4919be7cbeb17bcc30c3a0e1 Author: Piotr Kubaj AuthorDate: 2022-01-24 11:46:51 +0000 Commit: Piotr Kubaj CommitDate: 2022-01-24 11:46:51 +0000 print/scribus-devel: update to 1.5.8 Changelog: https://w.scribus.net/wiki/index.php/1.5.8_Release --- print/scribus-devel/Makefile | 5 +-- print/scribus-devel/distinfo | 6 ++-- ...h-34dee8142844a7ee70ddff95253d0299896bcc16.diff | 38 ---------------------- print/scribus-devel/files/patch-harfbuzz-3.0.0 | 30 ----------------- print/scribus-devel/pkg-plist | 1 + 5 files changed, 5 insertions(+), 75 deletions(-) diff --git a/print/scribus-devel/Makefile b/print/scribus-devel/Makefile index 11c55db1d726..24385f373290 100644 --- a/print/scribus-devel/Makefile +++ b/print/scribus-devel/Makefile @@ -1,8 +1,5 @@ -# Created by: Piotr Kubaj - PORTNAME= scribus -PORTVERSION= 1.5.7 -PORTREVISION= 11 +PORTVERSION= 1.5.8 CATEGORIES= print editors MASTER_SITES= SF/${PORTNAME}/${PORTNAME}${PKGNAMESUFFIX}/${PORTVERSION}/ \ http://www.scribus.net/downloads/${PORTVERSION}/ diff --git a/print/scribus-devel/distinfo b/print/scribus-devel/distinfo index 85253cc99725..90416483e307 100644 --- a/print/scribus-devel/distinfo +++ b/print/scribus-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1619438970 -SHA256 (scribus-1.5.7.tar.xz) = 318316b2cfc7a76191d3e0d3f8c2265147daea0570162028e243c292d826f8ce -SIZE (scribus-1.5.7.tar.xz) = 74490040 +TIMESTAMP = 1643023155 +SHA256 (scribus-1.5.8.tar.xz) = 47816e8fcf6d05788ff16aa4499f97ff22431c777a7789149b0a88b451e16b74 +SIZE (scribus-1.5.8.tar.xz) = 74543476 diff --git a/print/scribus-devel/files/patch-34dee8142844a7ee70ddff95253d0299896bcc16.diff b/print/scribus-devel/files/patch-34dee8142844a7ee70ddff95253d0299896bcc16.diff deleted file mode 100644 index 040f90b85bb6..000000000000 --- a/print/scribus-devel/files/patch-34dee8142844a7ee70ddff95253d0299896bcc16.diff +++ /dev/null @@ -1,38 +0,0 @@ -From 34dee8142844a7ee70ddff95253d0299896bcc16 Mon Sep 17 00:00:00 2001 -From: Jean Ghali -Date: Wed, 4 Aug 2021 21:18:11 +0000 -Subject: [PATCH] #16605: Compilation error in lib2geom/path.h - -git-svn-id: svn://scribus.net/trunk/Scribus@24687 11d20701-8431-0410-a711-e3c959e3b870 ---- - scribus/third_party/lib2geom/path.h | 17 +++++++++-------- - 1 file changed, 9 insertions(+), 8 deletions(-) - -diff --git a/scribus/third_party/lib2geom/path.h b/scribus/third_party/lib2geom/path.h -index fab674ed3b..e923b5de8b 100644 ---- scribus/third_party/lib2geom/path.h -+++ scribus/third_party/lib2geom/path.h -@@ -251,14 +251,15 @@ class BezierCurve : public Curve { - - D2 toSBasis() const {return inner.toSBasis(); } - --protected: -- BezierCurve(Point c[]) { -- Coord x[order+1], y[order+1]; -- for(unsigned i = 0; i <= order; i++) { -- x[i] = c[i][X]; y[i] = c[i][Y]; -- } -- inner = Bezier(x, y); -- } -+// #16605: does not seem used at triggers build error with clang 12.0.1 -+//protected: -+// BezierCurve(Point c[]) { -+// Coord x[order+1], y[order+1]; -+// for(unsigned i = 0; i <= order; i++) { -+// x[i] = c[i][X]; y[i] = c[i][Y]; -+// } -+// inner = Bezier(x, y); -+// } - }; - - // BezierCurve<0> is meaningless; specialize it out diff --git a/print/scribus-devel/files/patch-harfbuzz-3.0.0 b/print/scribus-devel/files/patch-harfbuzz-3.0.0 deleted file mode 100644 index 7045102fa0fd..000000000000 --- a/print/scribus-devel/files/patch-harfbuzz-3.0.0 +++ /dev/null @@ -1,30 +0,0 @@ -https://github.com/scribusproject/scribus/commit/1b546978bc4e -https://bugs.scribus.net/view.php?id=16635 - ---- scribus/fonts/sfnt.cpp.orig 2021-04-25 20:24:48 UTC -+++ scribus/fonts/sfnt.cpp -@@ -1256,14 +1256,22 @@ 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())); -+ QScopedPointer hbSubsetFace(hb_subset_or_fail(hbFullFace.get(), hbSubsetInput.get())); - if (hbSubsetFace.isNull()) - return QByteArray(); - diff --git a/print/scribus-devel/pkg-plist b/print/scribus-devel/pkg-plist index 626275a37c33..f887df664f93 100644 --- a/print/scribus-devel/pkg-plist +++ b/print/scribus-devel/pkg-plist @@ -1828,6 +1828,7 @@ share/pixmaps/scribus.png %%DATADIR%%/translations/scribus.ms_MY.qm %%DATADIR%%/translations/scribus.nb_NO.qm %%DATADIR%%/translations/scribus.nl.qm +%%DATADIR%%/translations/scribus.nn_NO.qm %%DATADIR%%/translations/scribus.oc.qm %%DATADIR%%/translations/scribus.pl_PL.qm %%DATADIR%%/translations/scribus.pms.qm