From owner-svn-ports-all@freebsd.org Fri Jun 5 10:21:18 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 1576A346D78; Fri, 5 Jun 2020 10:21:18 +0000 (UTC) (envelope-from adridg@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 49ddwF6x4nz4ffT; Fri, 5 Jun 2020 10:21:17 +0000 (UTC) (envelope-from adridg@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 E941DF61C; Fri, 5 Jun 2020 10:21:17 +0000 (UTC) (envelope-from adridg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 055ALHEv086153; Fri, 5 Jun 2020 10:21:17 GMT (envelope-from adridg@FreeBSD.org) Received: (from adridg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 055ALHrk086148; Fri, 5 Jun 2020 10:21:17 GMT (envelope-from adridg@FreeBSD.org) Message-Id: <202006051021.055ALHrk086148@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adridg set sender to adridg@FreeBSD.org using -f From: Adriaan de Groot Date: Fri, 5 Jun 2020 10:21:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r538003 - in head/devel/liteide: . files X-SVN-Group: ports-head X-SVN-Commit-Author: adridg X-SVN-Commit-Paths: in head/devel/liteide: . files X-SVN-Commit-Revision: 538003 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, 05 Jun 2020 10:21:18 -0000 Author: adridg Date: Fri Jun 5 10:21:16 2020 New Revision: 538003 URL: https://svnweb.freebsd.org/changeset/ports/538003 Log: devel/liteide: Qt 5.15 housekeeping - add includes because Qt 5.15 drops some implicitly included ones - remove bundled copy of old QJson library -- use the system one PR: 246992 Approved by: dmgk Added: head/devel/liteide/files/patch-src_plugins_liteeditor_liteeditorwidgetbase.cpp (contents, props changed) head/devel/liteide/files/patch-src_utils_dlvclient_dlvclient.cpp (contents, props changed) head/devel/liteide/files/patch-src_utils_dlvclient_dlvtypes.h (contents, props changed) Deleted: head/devel/liteide/files/patch-src_3rdparty_qjsonrpc_src_json_json.pri Modified: head/devel/liteide/Makefile Modified: head/devel/liteide/Makefile ============================================================================== --- head/devel/liteide/Makefile Fri Jun 5 09:43:11 2020 (r538002) +++ head/devel/liteide/Makefile Fri Jun 5 10:21:16 2020 (r538003) @@ -3,6 +3,7 @@ PORTNAME= liteide DISTVERSIONPREFIX= x DISTVERSION= 37.1 +PORTREVISION= 1 CATEGORIES= devel editors MAINTAINER= dmgk@FreeBSD.org @@ -11,7 +12,7 @@ COMMENT= Simple, open source, cross-platform Go IDE LICENSE= LGPL21+ LICENSE_FILE= ${WRKSRC}/LICENSE.LGPL -USES= gl go:modules,no_targets,run qmake qt:5 +USES= dos2unix gl go:modules,no_targets,run qmake qt:5 USE_GITHUB= yes GH_ACCOUNT= visualfc @@ -34,6 +35,13 @@ OPTIONS_SUB= yes DEBUG_CONFIGURE_ENABLE= debug ICON_SIZES= 16 24 32 48 64 128 + +DOS2UNIX_FILES= src/utils/dlvclient/dlvclient.cpp \ + src/utils/dlvclient/dlvtypes.h + +post-extract: + # Bundled, horribly outdated copy of QJsonDocument + rm -r ${WRKSRC}/src/3rdparty/qjsonrpc/src/json/ post-build: cd ${WRKSRC_visualfc_gocode} && \ Added: head/devel/liteide/files/patch-src_plugins_liteeditor_liteeditorwidgetbase.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/liteide/files/patch-src_plugins_liteeditor_liteeditorwidgetbase.cpp Fri Jun 5 10:21:16 2020 (r538003) @@ -0,0 +1,10 @@ +--- src/plugins/liteeditor/liteeditorwidgetbase.cpp.orig 2020-06-04 12:34:09 UTC ++++ src/plugins/liteeditor/liteeditorwidgetbase.cpp +@@ -28,6 +28,7 @@ + #include + #include + #include ++#include + #include + #include + #include Added: head/devel/liteide/files/patch-src_utils_dlvclient_dlvclient.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/liteide/files/patch-src_utils_dlvclient_dlvclient.cpp Fri Jun 5 10:21:16 2020 (r538003) @@ -0,0 +1,12 @@ +--- src/utils/dlvclient/dlvclient.cpp.orig 2020-06-04 12:27:44 UTC ++++ src/utils/dlvclient/dlvclient.cpp +@@ -26,8 +26,7 @@ + #include + #include + #include +-#include "qjsonrpc/src/json/qjson_export.h" +-#include "qjsonrpc/src/json/qjsondocument.h" ++#include + #include "qjsonrpc/src/qjsonrpcservicereply.h" + //lite_memory_check_begin + #if defined(WIN32) && defined(_MSC_VER) && defined(_DEBUG) Added: head/devel/liteide/files/patch-src_utils_dlvclient_dlvtypes.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/liteide/files/patch-src_utils_dlvclient_dlvtypes.h Fri Jun 5 10:21:16 2020 (r538003) @@ -0,0 +1,11 @@ +--- src/utils/dlvclient/dlvtypes.h.orig 2020-06-04 12:27:35 UTC ++++ src/utils/dlvclient/dlvtypes.h +@@ -28,7 +28,7 @@ + #include + #include + #include "varianthelper.h" +-#include "qjsonrpc/src/json/qjsonobject.h" ++#include + + #include +