Date: Fri, 5 Jun 2020 10:21:17 +0000 (UTC) From: Adriaan de Groot <adridg@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r538003 - in head/devel/liteide: . files Message-ID: <202006051021.055ALHrk086148@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <QApplication> + #include <QTextBlock> + #include <QPainter> ++#include <QPainterPath> + #include <QStyle> + #include <QDebug> + #include <QMessageBox> 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 <QHostAddress> + #include <QUrl> + #include <QDebug> +-#include "qjsonrpc/src/json/qjson_export.h" +-#include "qjsonrpc/src/json/qjsondocument.h" ++#include <qjsondocument.h> + #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 <QDateTime> + #include <QSharedPointer> + #include "varianthelper.h" +-#include "qjsonrpc/src/json/qjsonobject.h" ++#include <qjsonobject.h> + + #include <QDebug> +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202006051021.055ALHrk086148>