From nobody Fri Jan 21 21:41:53 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 BCD75196FFD5; Fri, 21 Jan 2022 21:41:54 +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 4JgXry2dbFz3Q7Q; Fri, 21 Jan 2022 21:41:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642801314; 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=sBxvAub+x1jOtL75EYJMTsNqiWf5DWtV649+9gB9G9k=; b=iapcAnL6ueABUMpRZaadIrezOZ7RjS988C0QfIqn0HnQCv9PNDIEWPc8ijdPV+gmeNH5FN 22EWmEgl20S0bHs62aS6bpQXWMKw0cICOjD4n6csT+2ILNtYwWOM7KK4HvkrNssvKuC1D8 LzzkmJ3Ixy+B62zmCh2GkqqsenQx0ASiv66+mNepOKPSIgrh/XypO+E8oWZVw7s4szJswy oikhZUeisCWdhA23zLAHbf/cGbSaXy4Cw0dsCnY5AODQU3sFnjGnpdXYfFTsCDrIoo48CY qmWsuyqkvwSb0qPH1LPkn8dAFf5GoyevHcMp0gdOyF8Z1ZnatAKLVtGNNP7/QQ== 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 0814D23371; Fri, 21 Jan 2022 21:41:54 +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 20LLfrek049329; Fri, 21 Jan 2022 21:41:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20LLfrgJ049328; Fri, 21 Jan 2022 21:41:53 GMT (envelope-from git) Date: Fri, 21 Jan 2022 21:41:53 GMT Message-Id: <202201212141.20LLfrgJ049328@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Adriaan de Groot Subject: git: 9dc9eb71e509 - main - print/scribus-devel: switch to C++17 for upcoming poppler 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: adridg X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9dc9eb71e509c136098ed08eff0294eeb2a226e6 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642801314; 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=sBxvAub+x1jOtL75EYJMTsNqiWf5DWtV649+9gB9G9k=; b=JAIhFn3u22Dao6BgOyjwPaMKZTwEGuCFCUPUzGjLkXKViS1Z9uwxyh89nJrdrRiB3YvvJx mvEUbVtaflU5k8ziiRQSPE4dQAuHdMEDZQSbr6JB0Q2lETnvvqLTnoGCSJUFPi2Zogq5hL YwGo1Iqprllpxcf1ppdNSwqMA/N1KdLeEGe2xg/Gv+pMAcz8bThpHCpciUT3Ie5Y0NxYaU zhZhCntgtdr9vE9SXecm4ehJ9SAschew6Ts1ZGIye4oKv6aokXjVq4zsPHJCMR/DhSfiW6 7sAhBhiphGh1sXXfMkfis/3khPVtqeC11kqRy4rIlg9xTPMsEVSZUecksiZEdA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642801314; a=rsa-sha256; cv=none; b=jFlvMysDhMeC02CFAqXoxu7FM6P7Qz0/qZsk7F0Jeb51r7iGTBx5C5dMB9OKVt8cWgX3xQ 0RcXAXaOMFozLaQpdi+RMU+7XdphDyjkujd95kJSdLr0VSawEGigwNFepuESR6u9hpb2ml sK3xUpOR5GEEaDNkFd3XOXAmNYu1Q0t31aBhMoyEvJKode7EMAUftGwUE948pY22tPjyCe j1Fz29ck7XAcPLo8DzsakZiz471kvs+BdJF/VUoO3LOC7PtmUTyOBDSEEBlwkIuozeJsRa ni197WCuepRLvgC+rGLFikHPuuLVg2t6Ut2S0tjdeBjDODFiJMHhH3e2zrIV7g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by adridg: URL: https://cgit.FreeBSD.org/ports/commit/?id=9dc9eb71e509c136098ed08eff0294eeb2a226e6 commit 9dc9eb71e509c136098ed08eff0294eeb2a226e6 Author: Adriaan de Groot AuthorDate: 2022-01-17 18:31:25 +0000 Commit: Adriaan de Groot CommitDate: 2022-01-21 21:41:06 +0000 print/scribus-devel: switch to C++17 for upcoming poppler This is a fix-it-before-it-breaks commit. Upcoming poppler requires consumers to build as C++17. Switch to that, and pull in an upstream patch that fixes the Scribus build in C++17. PR: 260956 --- print/scribus-devel/Makefile | 8 +++-- ...h-34dee8142844a7ee70ddff95253d0299896bcc16.diff | 38 ++++++++++++++++++++++ 2 files changed, 43 insertions(+), 3 deletions(-) diff --git a/print/scribus-devel/Makefile b/print/scribus-devel/Makefile index a022ffd87a64..11c55db1d726 100644 --- a/print/scribus-devel/Makefile +++ b/print/scribus-devel/Makefile @@ -2,7 +2,7 @@ PORTNAME= scribus PORTVERSION= 1.5.7 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= print editors MASTER_SITES= SF/${PORTNAME}/${PORTNAME}${PKGNAMESUFFIX}/${PORTVERSION}/ \ http://www.scribus.net/downloads/${PORTVERSION}/ @@ -38,14 +38,16 @@ LIB_DEPENDS= liblcms2.so:graphics/lcms2 \ libqxp-0.0.so:textproc/libqxp \ libzmf-0.0.so:graphics/libzmf -USES= cmake compiler:gcc-c++11-lib desktop-file-utils dos2unix gnome \ +USES= cmake compiler:c++17-lang desktop-file-utils dos2unix gnome \ jpeg pkgconfig python:3.6+ qt:5 shared-mime-info tar:xz USE_QT= buildtools_build core declarative gui linguisttools_build \ network opengl printsupport qmake_build widgets xml DOS2UNIX_REGEX= .*\.(cpp|h|txt) USE_GNOME= libxml2 -CMAKE_ARGS+= -DWANT_HUNSPELL=YES -DCMAKE_COLOR_MAKEFILE:BOOL=ON +CMAKE_ARGS+= -DWANT_HUNSPELL=YES \ + -DWANT_CPP17=YES \ + -DCMAKE_COLOR_MAKEFILE:BOOL=ON OPTIONS_DEFINE= DOCS diff --git a/print/scribus-devel/files/patch-34dee8142844a7ee70ddff95253d0299896bcc16.diff b/print/scribus-devel/files/patch-34dee8142844a7ee70ddff95253d0299896bcc16.diff new file mode 100644 index 000000000000..040f90b85bb6 --- /dev/null +++ b/print/scribus-devel/files/patch-34dee8142844a7ee70ddff95253d0299896bcc16.diff @@ -0,0 +1,38 @@ +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