From owner-svn-ports-all@freebsd.org Sun Jul 19 17:38:44 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 0A4DD364A00; Sun, 19 Jul 2020 17:38:44 +0000 (UTC) (envelope-from pkubaj@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4B8sXg6Kgvz3YhZ; Sun, 19 Jul 2020 17:38:43 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B96EB1F606; Sun, 19 Jul 2020 17:38:43 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 06JHchDW043481; Sun, 19 Jul 2020 17:38:43 GMT (envelope-from pkubaj@FreeBSD.org) Received: (from pkubaj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 06JHchBq043480; Sun, 19 Jul 2020 17:38:43 GMT (envelope-from pkubaj@FreeBSD.org) Message-Id: <202007191738.06JHchBq043480@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pkubaj set sender to pkubaj@FreeBSD.org using -f From: Piotr Kubaj Date: Sun, 19 Jul 2020 17:38:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r542589 - head/graphics/dspdfviewer X-SVN-Group: ports-head X-SVN-Commit-Author: pkubaj X-SVN-Commit-Paths: head/graphics/dspdfviewer X-SVN-Commit-Revision: 542589 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 19 Jul 2020 17:38:44 -0000 Author: pkubaj Date: Sun Jul 19 17:38:43 2020 New Revision: 542589 URL: https://svnweb.freebsd.org/changeset/ports/542589 Log: graphics/dspdfviewer: fix build on GCC architectures To build with Qt5, use C++11 compiler. Hide Clang-only flags behind .if and add one for GCC. MFH: 2020Q3 (fix build blanket) Modified: head/graphics/dspdfviewer/Makefile Modified: head/graphics/dspdfviewer/Makefile ============================================================================== --- head/graphics/dspdfviewer/Makefile Sun Jul 19 16:15:35 2020 (r542588) +++ head/graphics/dspdfviewer/Makefile Sun Jul 19 17:38:43 2020 (r542589) @@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libboost_program_options.so:devel/boost-libs \ libpoppler-qt5.so:graphics/poppler-qt5 -USES= cmake:insource pkgconfig qt:5 +USES= cmake:insource compiler:c++11-lang pkgconfig qt:5 USE_QT= core gui linguisttools widgets xml buildtools_build qmake_build USE_LDCONFIG= yes @@ -35,22 +35,28 @@ PLIST_FILES= bin/dspdfviewer \ .include +.if ${CHOSEN_COMPILER_TYPE} == clang # Build fails with LLVM 4.0. Reported upstream as #191: # https://github.com/dannyedel/dspdfviewer/issues/191 CFLAGS+= -Wno-error=undefined-func-template +.endif -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200039 +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200039 && ${CHOSEN_COMPILER_TYPE} == clang CFLAGS+= -Wno-error=zero-as-null-pointer-constant .endif # Fixes build failure for Clang 8.0.0 -.if ${OPSYS} == FreeBSD && (${OSVERSION} >= 1300014 || (${OSVERSION} >= 1103000 && ${OSVERSION} < 1200000) || ${OSVERSION} >= 1201000) +.if ${OPSYS} == FreeBSD && (${OSVERSION} >= 1300014 || (${OSVERSION} >= 1103000 && ${OSVERSION} < 1200000) || ${OSVERSION} >= 1201000) && ${CHOSEN_COMPILER_TYPE} == clang CFLAGS+= -Wno-error=extra-semi-stmt .endif # Prepare for Qt5-5.15 CFLAGS+= -Wno-deprecated +.if ${CHOSEN_COMPILER_TYPE} == clang CFLAGS+= -Wno-error=redundant-parens +.else +CFLAGS+= -Wno-error=deprecated-declarations +.endif .include