Index: head/graphics/qvge/Makefile =================================================================== --- head/graphics/qvge/Makefile (revision 556479) +++ head/graphics/qvge/Makefile (revision 556480) @@ -1,45 +1,49 @@ # Created by: Alexey Dokuchaev # $FreeBSD$ PORTNAME= qvge -PORTVERSION= 0.5.5 +PORTVERSION= 0.6.1 +DISTVERSIONPREFIX= v CATEGORIES= graphics MAINTAINER= danfe@FreeBSD.org COMMENT= Qt Visual Graph Editor LICENSE= MIT LICENSE_FILE= ${WRKSRC}/../LICENSE -LIB_DEPENDS= libOGDF.so:math/ogdf - USE_GITHUB= yes GH_ACCOUNT= ArsMasiuk -USES= compiler:c++11-lang qt:5 xorg +USES= compiler:c++11-lang desktop-file-utils gl qt:5 \ + shared-mime-info xorg +USE_GL= gl USE_QT= buildtools_build qmake_build core gui network opengl \ - printsupport widgets x11extras xml + printsupport svg widgets x11extras xml USE_XORG= x11 MAKE_ARGS= INSTALL_ROOT=${STAGEDIR} WRKSRC_SUBDIR= src -PLIST_FILES= bin/qvgeapp +PLIST_FILES= bin/qvgeapp share/appdata/qvge.appdata.xml \ + share/applications/qvge.desktop \ + share/mime/packages/application-xgr.xml \ + share/pixmaps/qvge.png PORTDOCS= CHANGES README.md -OPTIONS_DEFINE= DOCS +OPTIONS_DEFINE= DOCS OGDF +OGDF_DESC= Use OGDF instead of GraphViz engine -post-patch: - @${RM} -r ${BUILD_WRKSRC}/3rdParty/ogdf - @${REINPLACE_CMD} -e '/CONFIG += c++/s,14,11,' ${WRKSRC}/config.pri - @${REINPLACE_CMD} -e '/^USE_OGDF{/,+4d' ${WRKSRC}/qvgeapp.pro - @${REINPLACE_CMD} -e '/#include/s,math\.h,cmath,' ${WRKSRC}/qvge/CUtils.cpp +OGDF_LIB_DEPENDS= libOGDF.so:math/ogdf +OGDF_QMAKE_ON= CONFIG+=USE_OGDF +OGDF_QMAKE_OFF= CONFIG+=USE_GVGRAPH +OGDF_RUN_DEPENDS_OFF= dot:graphics/graphviz do-configure: cd ${CONFIGURE_WRKSRC} && ${QMAKE_ENV} ${QMAKE} ${QMAKE_ARGS} post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/../,} ${STAGEDIR}${DOCSDIR} .include Index: head/graphics/qvge/distinfo =================================================================== --- head/graphics/qvge/distinfo (revision 556479) +++ head/graphics/qvge/distinfo (revision 556480) @@ -1,3 +1,3 @@ -TIMESTAMP = 1592825045 -SHA256 (ArsMasiuk-qvge-0.5.5_GH0.tar.gz) = f4a8155f03653bde37c8c83c1ff1b7325b1dec7e1d4b2589cb38558211bf1f5a -SIZE (ArsMasiuk-qvge-0.5.5_GH0.tar.gz) = 4225872 +TIMESTAMP = 1604900327 +SHA256 (ArsMasiuk-qvge-v0.6.1_GH0.tar.gz) = cc782e8fc609d2035d84099cf3545765731208f5ad55c466ce5fbe1afb8510fb +SIZE (ArsMasiuk-qvge-v0.6.1_GH0.tar.gz) = 448727 Index: head/graphics/qvge/files/patch-app.pri =================================================================== --- head/graphics/qvge/files/patch-app.pri (revision 556479) +++ head/graphics/qvge/files/patch-app.pri (nonexistent) @@ -1,21 +0,0 @@ ---- app.pri.orig 2020-06-22 11:24:05 UTC -+++ app.pri -@@ -15,7 +15,7 @@ else{ - LIBS += -lcommonui -lqvge -lqvgeio -lqtpropertybrowser -lqsint-widgets - - USE_OGDF{ -- LIBS += -logdf -+ LIBS += -lOGDF - } - - win32{ -@@ -24,7 +24,8 @@ win32{ - - unix{ - !haiku{ -- LIBS += -lQt5X11Extras -lX11 -+ QT += x11extras -+ LIBS += -lX11 - } - } - Property changes on: head/graphics/qvge/files/patch-app.pri ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/graphics/qvge/files/patch-commonui_ogdf_COGDFLayout.cpp =================================================================== --- head/graphics/qvge/files/patch-commonui_ogdf_COGDFLayout.cpp (revision 556479) +++ head/graphics/qvge/files/patch-commonui_ogdf_COGDFLayout.cpp (nonexistent) @@ -1,31 +0,0 @@ ---- commonui/ogdf/COGDFLayout.cpp.orig 2020-06-22 11:24:05 UTC -+++ commonui/ogdf/COGDFLayout.cpp -@@ -6,7 +6,7 @@ - - #include - #include --#include -+#include - #include - - #include -@@ -246,16 +246,17 @@ bool COGDFLayout::loadGraph(const QString &filename, C - { - ogdf::Graph G; - ogdf::GraphAttributes GA(G, 0xffffff); // all attrs -+ std::ifstream is(filename.toStdString()); - - QString format = QFileInfo(filename).suffix().toLower(); - - bool ok = false; - if (format == "gml") -- ok = ogdf::GraphIO::readGML(GA, G, filename.toStdString()); -+ ok = ogdf::GraphIO::readGML(GA, G, is); - else - if (format == "dot" || format == "gv") - { -- ok = ogdf::GraphIO::readDOT(GA, G, filename.toStdString()); -+ ok = ogdf::GraphIO::readDOT(GA, G, is); - - // normalize node positions - if (ok && GA.has(GA.nodeGraphics)) Property changes on: head/graphics/qvge/files/patch-commonui_ogdf_COGDFLayout.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/graphics/qvge/files/patch-config.pri =================================================================== --- head/graphics/qvge/files/patch-config.pri (nonexistent) +++ head/graphics/qvge/files/patch-config.pri (revision 556480) @@ -0,0 +1,31 @@ +--- config.pri.orig 2020-11-09 05:38:47 UTC ++++ config.pri +@@ -6,7 +6,7 @@ + # It can be used freely, maintaining the information above. + + #CONFIG += USE_OGDF +-CONFIG += USE_GVGRAPH ++#CONFIG += USE_GVGRAPH + #CONFIG += USE_BOOST + + +@@ -15,8 +15,8 @@ USE_OGDF{ + DEFINES += USE_OGDF + + # system-specific OGDF setup +- OGDF_LIB_NAME = ogdf +- OGDF_LIB_PATH = ++ OGDF_LIB_NAME = OGDF ++ OGDF_LIB_PATH = /usr/local/lib # must not be empty + OGDF_INCLUDE_PATH = /usr/share/ogdf/include + } + +@@ -49,7 +49,7 @@ gcc{ + + # common config + QT += core gui widgets xml opengl network printsupport svg +-CONFIG += c++14 ++CONFIG += c++11 + + + # output Property changes on: head/graphics/qvge/files/patch-config.pri ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/graphics/qvge/pkg-descr =================================================================== --- head/graphics/qvge/pkg-descr (revision 556479) +++ head/graphics/qvge/pkg-descr (revision 556480) @@ -1,5 +1,5 @@ -qvge is a multi-platform graph editor written in C++/Qt. Its main goal +QVGE is a multi-platform graph editor written in C++/Qt. Its main goal is to make possible visually edit two-dimensional graphs in a simple and intuitive way. WWW: https://github.com/ArsMasiuk/qvge