From nobody Thu Jun 23 04:53:52 2022 X-Original-To: dev-commits-ports-branches@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 0B0B1860340; Thu, 23 Jun 2022 04:53: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 4LT7FD6xk4z3vLr; Thu, 23 Jun 2022 04:53:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655960033; 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=y8UlvIhpbtpKpz60alaOE4AeUx6RuUmNPdbmpZZLOYQ=; b=QFtQh1StgJegvEhOTe31QQJUGVvbXK79ARbRqG/dBdEWIHO51nX+lyH9s8zHAEHsIFTtcQ aQ0GogCkIFG+xucJ61Ay9lxZyI3SkkdAE9I+3rTarXkQ1CvDvlALR7Txp/5uZKFjs8hNrg 1ST+ylFJJpg95Zq3XdU+PuKSIgxv2KW3vY3aLjQRJ2tlQC+zNI6oyPXUr6a6yR869HdDdi xSVRw7wzE0F4Tzh65WSWgYRPWmiPfuCMl2xxFxArFK5szoCFi5FDbm4xXV7u4BQ4t071bO 7mwqwK4IPqdSa/xPOhhUoM57yz+Rg01GYqhyngtHDeeWMLJh7njf0Vrc4c4Asg== 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 CE44F1488F; Thu, 23 Jun 2022 04:53: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 25N4rq6N024814; Thu, 23 Jun 2022 04:53:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25N4rqVt024813; Thu, 23 Jun 2022 04:53:52 GMT (envelope-from git) Date: Thu, 23 Jun 2022 04:53:52 GMT Message-Id: <202206230453.25N4rqVt024813@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Yuri Victorovich Subject: git: bb202c55afc9 - 2022Q2 - graphics/engauge-digitizer: Fix build List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q2 X-Git-Reftype: branch X-Git-Commit: bb202c55afc9c2dc00e731623f879349468ce96f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655960033; 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=y8UlvIhpbtpKpz60alaOE4AeUx6RuUmNPdbmpZZLOYQ=; b=H7usjL7fF2FErz5PZtupRZ8vBg1DuGYjm9AjZ6XQEF2/X0ml0t+UR5cMMkwouiOslxS3Zj E5KS0t2Fmwp21Ez/o2YJckBGlZyE/Po3x7RatjRcViwL/tw9E8P6ouqH4Ub6qOc+GPrNvb 4oyd3pa7piQcFxBHEd8ucKGHxRPuCgJAxaMaz3UZBmxw+1WdbIgkrdDg3AjzbOq3i62JNv YHbhZQQX2ph+rL1dI8tn8YVB9F9TEujnTmajuxQI3qaD9f8TwrRba3oSPl9oX0335q7OIq 784z7ouzU7TfDRzx6t1S6AOuRVPFAD6J8mQkpIm7wAJgQqAammYVQto0X17OLg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655960033; a=rsa-sha256; cv=none; b=aAcO9z+vNlqJVSqH+a7701CYHMrz1Do90NoHFWPl3+mBloiwuFW94i0Yuebe+G0ju3lVdk Ox2JGZ8yYhjlpJGPp3k4BUXgaDkgOFOeFkkmrgGexhlVllHsGNx7wKL94I1xdcP09xYG9B T+Jz5H/peV+0OdAwfkWBHQGO3tOxYv9oN8vBUeS9PUnEDr0ZaSvYMGktEGtI9fFCC9ZKxA /DLGXC2gUfmDKX5aMjtpEoCkz2NrG1tM65mDsoJQW22hautYI/StEf4GRiv36MHOHvGukQ kJGbYQVRtO0cyddmtF4ytxuGd+aZ8Yc+ZTJedOaZDSyp+j+NUjQ8R1CXSMkISA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q2 has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=bb202c55afc9c2dc00e731623f879349468ce96f commit bb202c55afc9c2dc00e731623f879349468ce96f Author: Yuri Victorovich AuthorDate: 2022-06-22 21:11:37 +0000 Commit: Yuri Victorovich CommitDate: 2022-06-23 04:53:50 +0000 graphics/engauge-digitizer: Fix build openjpeg.h wasn't found. Reported by: fallout (cherry picked from commit 77dff5bd868790fb078f8d2a38a5ad783daadd8c) --- graphics/engauge-digitizer/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/graphics/engauge-digitizer/Makefile b/graphics/engauge-digitizer/Makefile index f91120b9c311..43cc75d640b4 100644 --- a/graphics/engauge-digitizer/Makefile +++ b/graphics/engauge-digitizer/Makefile @@ -15,7 +15,7 @@ LIB_DEPENDS= libfftw3.so:math/fftw3 \ libopenjp2.so:graphics/openjpeg \ libpoppler-qt5.so:graphics/poppler-qt5 -USES= compiler:c++11-lang desktop-file-utils gl qmake qt:5 +USES= compiler:c++11-lang desktop-file-utils gl pkgconfig qmake qt:5 # pkgconfig is for https://github.com/markummitchell/engauge-digitizer/issues/423 USE_GITHUB= yes GH_ACCOUNT= markummitchell USE_QT= core gui printsupport sql xml widgets buildtools_build @@ -24,6 +24,8 @@ CONFIGURE_ENV= OPENJPEG_INCLUDE=${PREFIX}/include/openjpeg-2.4 OPENJPEG_LIB=${PR POPPLER_INCLUDE=${PREFIX}/include/poppler/qt5 POPPLER_LIB=${PREFIX}/lib QMAKE_ARGS= "CONFIG+=jpeg2000 pdf" +CXXFLAGS+= `pkg-config --cflags libopenjp2` # workaround for https://github.com/markummitchell/engauge-digitizer/issues/423 + OPTIONS_DEFINE= NLS DOCS OPTIONS_SUB= yes