diff options
| -rw-r--r-- | devel/redasm/Makefile | 15 | ||||
| -rw-r--r-- | devel/redasm/distinfo | 14 | ||||
| -rw-r--r-- | devel/redasm/files/patch-git-779ffd9 | 41 |
3 files changed, 12 insertions, 58 deletions
diff --git a/devel/redasm/Makefile b/devel/redasm/Makefile index 5719b457bf2c..18f273f86d56 100644 --- a/devel/redasm/Makefile +++ b/devel/redasm/Makefile @@ -2,9 +2,8 @@ # $FreeBSD$ PORTNAME= redasm -PORTVERSION= 2.0 +PORTVERSION= 2.1.1 DISTVERSIONPREFIX= v -PORTREVISION= 1 CATEGORIES= devel MAINTAINER= danfe@FreeBSD.org @@ -13,24 +12,20 @@ COMMENT= Interactive, multiarchitecture disassembler LICENSE= GPLv3 USES= cmake compiler:c++11-lang qt:5 -USE_QT= buildtools_build qmake_build core gui network webengine +USE_QT= buildtools_build qmake_build core gui widgets USE_GITHUB= yes GH_ACCOUNT= REDasmOrg GH_PROJECT= REDasm -GH_TUPLE= REDasmOrg:REDasm-Library:2059871:libra/LibREDasm \ - Dax89:QHexView:e96ea40:qhv/QHexView \ +GH_TUPLE= REDasmOrg:REDasm-Library:b59bdc3:libra/LibREDasm \ + Dax89:QHexView:4524ca3:qhv/QHexView \ aquynh:capstone:4948fd1:cs/LibREDasm/depends/capstone PLIST_FILES= bin/REDasm lib/LibREDasm.so bin/redasm post-patch: - @${REINPLACE_CMD} -e 's,formats\.size(),formatsCount,' \ - ${WRKSRC}/mainwindow.cpp @${REINPLACE_CMD} -e '/Git/s,find_package,#&, ; \ - /CMAKE_INSTALL_RPATH/s,\.,${PREFIX}/lib, ; \ - s| LibREDasm|& pthread| ; \ - s|unknown|b47ed30|' ${WRKSRC}/CMakeLists.txt + s|unknown|8848416|' ${WRKSRC}/CMakeLists.txt do-install: ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/REDasm ${STAGEDIR}${PREFIX}/bin diff --git a/devel/redasm/distinfo b/devel/redasm/distinfo index ffa6b0297d62..50e24fb3fc51 100644 --- a/devel/redasm/distinfo +++ b/devel/redasm/distinfo @@ -1,9 +1,9 @@ -TIMESTAMP = 1551691545 -SHA256 (REDasmOrg-REDasm-v2.0_GH0.tar.gz) = e942b475d236e0ff1486ec09d6367dff71849002ac9d8fd5b16514cfa9b975f9 -SIZE (REDasmOrg-REDasm-v2.0_GH0.tar.gz) = 12201231 -SHA256 (REDasmOrg-REDasm-Library-2059871_GH0.tar.gz) = 880587635ed70cdca932dd60db5839a60b9a31363385283489123072e6a883d7 -SIZE (REDasmOrg-REDasm-Library-2059871_GH0.tar.gz) = 344807 -SHA256 (Dax89-QHexView-e96ea40_GH0.tar.gz) = 83f7740a1948a91a5d023784b6acd404fee1cdd35038db2328415beb1f9e7a92 -SIZE (Dax89-QHexView-e96ea40_GH0.tar.gz) = 160204 +TIMESTAMP = 1558623521 +SHA256 (REDasmOrg-REDasm-v2.1.1_GH0.tar.gz) = 2fdd97822279791688b761af66564429727867523cfc31c7018da54d101f0ce3 +SIZE (REDasmOrg-REDasm-v2.1.1_GH0.tar.gz) = 4000712 +SHA256 (REDasmOrg-REDasm-Library-b59bdc3_GH0.tar.gz) = 53424b354dc1d179ea26b0e58c0e6f644ac1ad9bf2d15291ad41e866fb416695 +SIZE (REDasmOrg-REDasm-Library-b59bdc3_GH0.tar.gz) = 420985 +SHA256 (Dax89-QHexView-4524ca3_GH0.tar.gz) = e09e312ce5bd049e74fb1065161f1ae056552cb8e0b23373abfa2ef7f3550729 +SIZE (Dax89-QHexView-4524ca3_GH0.tar.gz) = 160332 SHA256 (aquynh-capstone-4948fd1_GH0.tar.gz) = 8b004faf0c6fa696fe49de13f01da8cebb735459a10c9b08e7d244a02a776f6b SIZE (aquynh-capstone-4948fd1_GH0.tar.gz) = 3408171 diff --git a/devel/redasm/files/patch-git-779ffd9 b/devel/redasm/files/patch-git-779ffd9 deleted file mode 100644 index 0fa11ad60db3..000000000000 --- a/devel/redasm/files/patch-git-779ffd9 +++ /dev/null @@ -1,41 +0,0 @@ -https://github.com/REDasmOrg/REDasm/commit/779ffd95fc331a1c879bab70b30f5e7bb781f69d - ---- themes/dark.json.orig -+++ themes/dark.json -@@ -43,6 +43,11 @@ - "instruction_jmp_c": "#e67e22", - - "graph_bg": "#262626", -+ "graph_edge": "#3498db", -+ "graph_edge_true": "#2ecc71", -+ "graph_edge_false": "#e74c3c", -+ "graph_edge_loop": "#1abc9c", -+ "graph_edge_loop_c": "#f47cc3", - - "address_list_fg": "#ef717a", - "segment_name_fg": "#2dcb71", ---- themes/light.json.orig -+++ themes/light.json -@@ -29,6 +29,11 @@ - "instruction_jmp_c": "#d95459", - - "graph_bg": "azure", -+ "graph_edge": "#297fb9", -+ "graph_edge_true": "#27ae60", -+ "graph_edge_false": "#c0392b", -+ "graph_edge_loop": "#2d5036", -+ "graph_edge_loop_c": "#8e44ad", - - "address_list_fg": "darkblue", - "segment_name_fg": "darkgreen", ---- widgets/disassemblergraphview/disassemblergraphview.cpp.orig -+++ widgets/disassemblergraphview/disassemblergraphview.cpp -@@ -115,7 +115,7 @@ QString DisassemblerGraphView::getNodeContent(const REDasm::Graphing::Node *n) c - QColor DisassemblerGraphView::getEdgeColor(const REDasm::Graphing::Node *from, const REDasm::Graphing::Node *to) const - { - const REDasm::Graphing::FunctionBlock* fb = static_cast<const REDasm::Graphing::FunctionBlock*>(from); -- return QColor(QString::fromStdString(fb->color(static_cast<const REDasm::Graphing::FunctionBlock*>(to)))); -+ return THEME_VALUE(QString::fromStdString(fb->style(static_cast<const REDasm::Graphing::FunctionBlock*>(to)))); - } - - void DisassemblerGraphView::initializePage() |