From nobody Fri Jan 21 21:41:52 2022 X-Original-To: dev-commits-ports-all@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 8EB5A1970196; Fri, 21 Jan 2022 21:41:53 +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 4JgXrx0cXDz3Pmg; Fri, 21 Jan 2022 21:41:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642801313; 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=lQb3bPUiUoOa/UAdd9LwWg1o6cEPZKpRmhuj6ENKEu0=; b=SJCQSdtlkA0/7+PVeMbGGC0zdkO4+vfI1TpgOPkJoojKuQ8LGU7LgRrfuebQc6VV3TuEqM Mq8Vlxh8ntTzFWv8kBIqqGXfAl8M00Oxb5ChLHANrWeu81Wo/tSIqAvig3h6fG7JI2EmTc Z1/RJ/tNgb1oXwxriW4jKbScPZUUVClNCgrR/5jvNJaOeAsErCNU3xXZt7S+uwz3NWiKhq HU7YiWHGctwQiOPkWk0H7GbHXiH7DMRe6BnTuy5rRGrw+9hiKcUFrSt1hxrc6uT4Yb35E3 cuxrYEDpzQlqAwz5MYC8SfK22y+H+DysR80Yz7jyGBranvT4B+YKcP0cMi9YLQ== 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 DF601233B8; Fri, 21 Jan 2022 21:41:52 +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 20LLfqOl049305; Fri, 21 Jan 2022 21:41:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20LLfqss049304; Fri, 21 Jan 2022 21:41:52 GMT (envelope-from git) Date: Fri, 21 Jan 2022 21:41:52 GMT Message-Id: <202201212141.20LLfqss049304@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: bb2ef4e129b0 - main - converters/pdf2djvu: switch to C++17 for upcoming poppler, -XMP option List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: bb2ef4e129b0adb327e14abbc012e1cd39cea56d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642801313; 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=lQb3bPUiUoOa/UAdd9LwWg1o6cEPZKpRmhuj6ENKEu0=; b=kCCWPQ5FwHfnL0xcAcVuzaioT4VIjmADnW+5hrSjkfIy3Gn1nts93IgXpgwaR/jTMPC2nT LEcRD2B2S20Qfeim2VhSwgFLuMmiAhqftn4AyxiT7u1TQpk5Evm4Xh8zT3f/dNYkQ/p3vO hcQFWNwMu5RFQNcz7oHpBptLYAawQkvsy5v4Aw8SwhGnLr6x/2ufIUVmgndsHCultl/g0/ Rc8eTFi1WJmOrRoBSxQ5Y/N2xz3lTWoXjlvY2VbTLVotnnKca0DVEWSU777r4MJvbq8lgc 89NuqQNagnTD5HAnihU4vHXdhaTtjHKqQ4Hl2su8CahXLxWsN6zGHOPQF6JufA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642801313; a=rsa-sha256; cv=none; b=nIbvQDgAPXd/QMsKWiXYYTJvmk/gv80uvDKxtAjx8iqJUIE4dtIUD4I18+HkGusYK6IHU9 Ed6HzATztO/ggG5/e9GlshzPRPiNvmsJ8A3Dp/dxXivYdR39lfC3l1UCiyf79DwjhCVTyz ONrgtBWVj5jQk+n7O+AOll7S1RaVh1kYrt9nIYoTESSLzNh6Es93tVp4lYU/ifCyVjbUkm gY8RKIFZ3R2T6+W2TAd7rJfri/+Uz0b5ioxSKNeHBt69pVjIBsnjS3t7M4m0VRWJGdwrz4 Zm5AyJ4pavWVylNN0Qn9H8NZ+nULOY569BVZOZR9RjoGmV90I8Dk2WFf5ItgKg== 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=bb2ef4e129b0adb327e14abbc012e1cd39cea56d commit bb2ef4e129b0adb327e14abbc012e1cd39cea56d Author: Adriaan de Groot AuthorDate: 2022-01-11 22:43:27 +0000 Commit: Adriaan de Groot CommitDate: 2022-01-21 21:41:05 +0000 converters/pdf2djvu: switch to C++17 for upcoming poppler, -XMP option This is a "fix-it-before-it-breaks" commit. The issue is the upcoming updating for graphics/poppler. It *requires* consumers to be C++17 or later. Previously it was ok with C++11 or later. However, graphics/exiv2 is incompatible with C++17 in many ways; there's work on a new release that is compatible, but that's not out yet and not really applicable to the exiv2 version found in ports. (As an example of things-that-change, "register" is a keyword in C, which informs the storage class of a variable; in C++ up to C++17 it was possibly-meaningful but deprecated while in C++17 it is a reserved keyword but not allowed for storage class; any `register int x` is now a syntax error and patching that up outside of upstream repos is no fun at all). Mark XMP option broken because it pulls in (for the option) graphics/exiv2, while graphics/poppler is always needed. PR: 260956 --- converters/pdf2djvu/Makefile | 15 ++++++--------- converters/pdf2djvu/distinfo | 6 +++--- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/converters/pdf2djvu/Makefile b/converters/pdf2djvu/Makefile index 194bb5cdb3cd..0eaa305e79b7 100644 --- a/converters/pdf2djvu/Makefile +++ b/converters/pdf2djvu/Makefile @@ -1,13 +1,9 @@ PORTNAME= pdf2djvu -DISTVERSION= 0.9.17.1 -PORTREVISION= 17 +DISTVERSION= 0.9.18.2 +PORTREVISION= 1 CATEGORIES= converters MASTER_SITES= https://github.com/jwilk/${PORTNAME}/releases/download/${PORTVERSION}/ -# Poppler 21.10 support -PATCH_SITES= https://github.com/jwilk/pdf2djvu/commit/ -PATCHFILES= e528d3ab88c582e8481c9014982263d9c9e992fe.patch:-p1 - MAINTAINER= samy.mahmoudi@gmail.com COMMENT= Creates DjVu files from PDF files @@ -18,14 +14,14 @@ BUILD_DEPENDS= ${LOCALBASE}/include/pstreams/pstream.h:devel/pstreams LIB_DEPENDS= libdjvulibre.so:graphics/djvulibre \ libpoppler.so:graphics/poppler -USES= autoreconf:build compiler:c++11-lang gettext-tools \ +USES= autoreconf:build compiler:c++17-lang gettext-tools \ gmake iconv localbase pkgconfig tar:xz -USE_CXXSTD= c++11 +USE_CXXSTD= c++17 GNU_CONFIGURE= yes OPTIONS_DEFINE= COLOR_QUANTIZATION DOCS NLS MULTITHREADING XMP -OPTIONS_DEFAULT=COLOR_QUANTIZATION MULTITHREADING XMP +OPTIONS_DEFAULT=COLOR_QUANTIZATION MULTITHREADING OPTIONS_SUB= yes COLOR_QUANTIZATION_DESC=Color quantization via GraphicsMagick++ @@ -49,6 +45,7 @@ MULTITHREADING_CONFIGURE_ENABLE=openmp XMP_CONFIGURE_ENABLE= xmp XMP_LIB_DEPENDS= libexiv2.so:graphics/exiv2 +XMP_BROKEN= graphics/exiv2 and graphics/poppler disagree about usable C++ standard pre-configure: @cd ${WRKSRC} && ${SH} ${FILESDIR}/bootstrap diff --git a/converters/pdf2djvu/distinfo b/converters/pdf2djvu/distinfo index 4d16a595e807..d4a6b4e18c85 100644 --- a/converters/pdf2djvu/distinfo +++ b/converters/pdf2djvu/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1633515656 -SHA256 (pdf2djvu-0.9.17.1.tar.xz) = 5bbbb7bdc7858a1eeac6ff270e5a323390f2abb6bd3b0b2ae08c1965272226a3 -SIZE (pdf2djvu-0.9.17.1.tar.xz) = 295540 +TIMESTAMP = 1641936020 +SHA256 (pdf2djvu-0.9.18.2.tar.xz) = 9ea03f21d841a336808d89d65015713c0785e7295a6559d77771dc795333a9fa +SIZE (pdf2djvu-0.9.18.2.tar.xz) = 305912 SHA256 (e528d3ab88c582e8481c9014982263d9c9e992fe.patch) = 39cd67224052205bcf65eddf30e71953b329e2775e917ebe0993bee4696590bb SIZE (e528d3ab88c582e8481c9014982263d9c9e992fe.patch) = 1149