From owner-svn-ports-all@freebsd.org Fri Sep 4 15:57:34 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 5CA283C6B6B; Fri, 4 Sep 2020 15:57:34 +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 4Bjj4G1s7lz4DqT; Fri, 4 Sep 2020 15:57:34 +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 22E83EFE3; Fri, 4 Sep 2020 15:57:34 +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 084FvXV2008381; Fri, 4 Sep 2020 15:57:33 GMT (envelope-from pkubaj@FreeBSD.org) Received: (from pkubaj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 084FvXXh008380; Fri, 4 Sep 2020 15:57:33 GMT (envelope-from pkubaj@FreeBSD.org) Message-Id: <202009041557.084FvXXh008380@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pkubaj set sender to pkubaj@FreeBSD.org using -f From: Piotr Kubaj Date: Fri, 4 Sep 2020 15:57:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r547546 - head/deskutils/syncthingtray X-SVN-Group: ports-head X-SVN-Commit-Author: pkubaj X-SVN-Commit-Paths: head/deskutils/syncthingtray X-SVN-Commit-Revision: 547546 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: Fri, 04 Sep 2020 15:57:34 -0000 Author: pkubaj Date: Fri Sep 4 15:57:33 2020 New Revision: 547546 URL: https://svnweb.freebsd.org/changeset/ports/547546 Log: deskutils/syncthingtray: fix build on non-x86 Don't use webengine on non-x86, instead use webkit. Modified: head/deskutils/syncthingtray/Makefile Modified: head/deskutils/syncthingtray/Makefile ============================================================================== --- head/deskutils/syncthingtray/Makefile Fri Sep 4 15:25:01 2020 (r547545) +++ head/deskutils/syncthingtray/Makefile Fri Sep 4 15:57:33 2020 (r547546) @@ -26,7 +26,7 @@ GH_TUPLE= Martchus:${PORTNAME}:${DISTVERSIONPREFIX}${D USE_KDE= plasma-framework USE_QT= concurrent core dbus declarative gui location network \ - printsupport qdbus quickcontrols2 svg webchannel webengine \ + printsupport qdbus quickcontrols2 svg webchannel \ widgets x11extras buildtools_build doc_build linguist_build \ qmake_build @@ -37,6 +37,15 @@ BUILD_WRKSRC= ${WRKDIR} INSTALL_WRKSRC= ${WRKDIR} CMAKE_SOURCE_PATH= ${WRKDIR}/subdirs/syncthingtray +.include + +.if ${ARCH} == amd64 || ${ARCH} == i386 +USE_QT+= webengine +.else +CMAKE_ARGS+= -DWEBVIEW_PROVIDER=webkit +USE_QT+= webkit +.endif + post-install: ${RM} -r \ ${STAGEDIR}${PREFIX}/include/c++utilities \ @@ -66,4 +75,4 @@ post-install: ${STAGEDIR}${QT_PLUGINDIR} \ ${STAGEDIR}${QT_LIBDIR} -.include +.include