Date: Sun, 26 Mar 2023 21:35:24 GMT From: Adriaan de Groot <adridg@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 5c2907039b79 - main - graphics/dspdfviewer: repair build Message-ID: <202303262135.32QLZOIQ094094@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by adridg: URL: https://cgit.FreeBSD.org/ports/commit/?id=5c2907039b796003b856577a1821b08aae53ab6d commit 5c2907039b796003b856577a1821b08aae53ab6d Author: Adriaan de Groot <adridg@FreeBSD.org> AuthorDate: 2023-03-23 20:35:05 +0000 Commit: Adriaan de Groot <adridg@FreeBSD.org> CommitDate: 2023-03-26 21:31:32 +0000 graphics/dspdfviewer: repair build dspdfviewer.cpp:50:22: error: use of bitwise '|' with boolean operands [-Werror,-Wbitwise-instead-of-logical] secondaryWindow(0, (r.useFullPage() | r.duplicate())? PagePart::FullPage --- graphics/dspdfviewer/files/patch-dspdfviewer.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/graphics/dspdfviewer/files/patch-dspdfviewer.cpp b/graphics/dspdfviewer/files/patch-dspdfviewer.cpp index d9e8b04e8a54..d9ec3fdce981 100644 --- a/graphics/dspdfviewer/files/patch-dspdfviewer.cpp +++ b/graphics/dspdfviewer/files/patch-dspdfviewer.cpp @@ -6,6 +6,15 @@ Fix build with Clang 8: --- dspdfviewer.cpp.orig 2016-09-13 13:18:47 UTC +++ dspdfviewer.cpp +@@ -47,7 +47,7 @@ DSPDFViewer::DSPDFViewer(const RuntimeConfiguration& r + renderFactory(r), + m_pagenumber(0), + audienceWindow(1, r.useFullPage() ? PagePart::FullPage : PagePart::LeftHalf , false, r, WindowRole::AudienceWindow), +- secondaryWindow(0, (r.useFullPage() | r.duplicate())? PagePart::FullPage : PagePart::RightHalf, true , r, WindowRole::PresenterWindow, r.useSecondScreen()) ++ secondaryWindow(0, (r.useFullPage() || r.duplicate())? PagePart::FullPage : PagePart::RightHalf, true , r, WindowRole::PresenterWindow, r.useSecondScreen()) + { + DEBUGOUT << tr("Starting constructor") ; + @@ -292,10 +292,10 @@ void DSPDFViewer::sendAllClockSignals() const emit presentationClockUpdate(presentationClock()); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202303262135.32QLZOIQ094094>