From owner-svn-ports-head@freebsd.org Sat Mar 9 17:11:33 2019 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4C370152E627; Sat, 9 Mar 2019 17:11:33 +0000 (UTC) (envelope-from tcberner@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) server-signature RSA-PSS (4096 bits) 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 E87D18FA37; Sat, 9 Mar 2019 17:11:32 +0000 (UTC) (envelope-from tcberner@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 DC6B0E4B5; Sat, 9 Mar 2019 17:11:32 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x29HBWE3068589; Sat, 9 Mar 2019 17:11:32 GMT (envelope-from tcberner@FreeBSD.org) Received: (from tcberner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x29HBWpV068587; Sat, 9 Mar 2019 17:11:32 GMT (envelope-from tcberner@FreeBSD.org) Message-Id: <201903091711.x29HBWpV068587@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tcberner set sender to tcberner@FreeBSD.org using -f From: "Tobias C. Berner" Date: Sat, 9 Mar 2019 17:11:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r495178 - in head/net/x2goclient: . files X-SVN-Group: ports-head X-SVN-Commit-Author: tcberner X-SVN-Commit-Paths: in head/net/x2goclient: . files X-SVN-Commit-Revision: 495178 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: E87D18FA37 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.96)[-0.956,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Mar 2019 17:11:33 -0000 Author: tcberner Date: Sat Mar 9 17:11:32 2019 New Revision: 495178 URL: https://svnweb.freebsd.org/changeset/ports/495178 Log: net/x2goclient: switch to using Qt5 Added: head/net/x2goclient/files/patch-src_printwidget.cpp (contents, props changed) Modified: head/net/x2goclient/Makefile Modified: head/net/x2goclient/Makefile ============================================================================== --- head/net/x2goclient/Makefile Sat Mar 9 16:41:54 2019 (r495177) +++ head/net/x2goclient/Makefile Sat Mar 9 17:11:32 2019 (r495178) @@ -3,6 +3,7 @@ PORTNAME= x2goclient PORTVERSION= 4.1.0.0 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= http://code.x2go.org/releases/source/x2goclient/ @@ -12,11 +13,6 @@ COMMENT= Qt client for the X2Go system LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -BROKEN= fails to build - -DEPRECATED= Qt4 has been EOL since december 2015 -EXPIRATION_DATE= 2019-03-15 - # Avoid clash with libssh from base BUILD_DEPENDS= ${LOCALBASE}/lib/libssh.so:security/libssh LIB_DEPENDS= libcups.so:print/cups \ @@ -24,10 +20,11 @@ LIB_DEPENDS= libcups.so:print/cups \ RUN_DEPENDS= nxproxy:net/nxproxy \ x2goclient-cli:net/x2goclient-cli -USES= qmake qt:4 +USES= gl qmake qt:5 +USE_GL= gl USE_XORG= x11 xpm -USE_QT= corelib gui network svg \ - linguisttools_build moc_build rcc_build uic_build +USE_QT= core gui network svg widgets x11extras \ + buildtools_build linguisttools_build qmake_build QMAKE_ARGS= QMAKE_LRELEASE="${LRELEASE}" OPTIONS_DEFINE= DOCS LDAP Added: head/net/x2goclient/files/patch-src_printwidget.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/x2goclient/files/patch-src_printwidget.cpp Sat Mar 9 17:11:32 2019 (r495178) @@ -0,0 +1,11 @@ +--- src/printwidget.cpp.orig 2019-03-09 16:48:28 UTC ++++ src/printwidget.cpp +@@ -26,6 +26,8 @@ + #ifdef Q_OS_WIN + #include "wapi.h" + #endif ++#include ++ + PrintWidget::PrintWidget ( QWidget* parent ) + : QWidget ( parent ) + {