mirror of
https://git.FreeBSD.org/ports.git
synced 2024-12-22 04:17:44 +00:00
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
This commit is contained in:
parent
00f02ee593
commit
77622bee72
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=538003
@ -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
|
||||
@ -35,6 +36,13 @@ 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} && \
|
||||
${SETENV} ${MAKE_ENV} ${GO_ENV} ${GO_CMD} install ${GO_BUILDFLAGS}
|
||||
|
@ -1,8 +0,0 @@
|
||||
--- src/3rdparty/qjsonrpc/src/json/json.pri.orig 2017-07-20 14:27:57 UTC
|
||||
+++ src/3rdparty/qjsonrpc/src/json/json.pri
|
||||
@@ -29,4 +29,4 @@ json.files = \
|
||||
$${PWD}/qjsonarray.h
|
||||
|
||||
json.path = $${PREFIX}/include/qjsonrpc/json
|
||||
-INSTALLS += json
|
||||
+# INSTALLS += json
|
@ -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>
|
12
devel/liteide/files/patch-src_utils_dlvclient_dlvclient.cpp
Normal file
12
devel/liteide/files/patch-src_utils_dlvclient_dlvclient.cpp
Normal file
@ -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)
|
11
devel/liteide/files/patch-src_utils_dlvclient_dlvtypes.h
Normal file
11
devel/liteide/files/patch-src_utils_dlvclient_dlvtypes.h
Normal file
@ -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>
|
||||
|
Loading…
Reference in New Issue
Block a user