wxhexeditor: fix compilation
This commit is contained in:
parent
e450699225
commit
c4514dfbb7
@ -1,7 +1,7 @@
|
|||||||
{ stdenv, fetchFromGitHub, fetchpatch, wxGTK, autoconf, automake, libtool, python, gettext }:
|
{ stdenv, fetchFromGitHub, fetchpatch, wxGTK, autoconf, automake, libtool, python, gettext }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "wxHexEditor-${version}";
|
pname = "wxHexEditor";
|
||||||
version = "0.24";
|
version = "0.24";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
@ -26,11 +26,10 @@ stdenv.mkDerivation rec {
|
|||||||
url = https://github.com/EUA/wxHexEditor/commit/d0fa3ddc3e9dc9b05f90b650991ef134f74eed01.patch;
|
url = https://github.com/EUA/wxHexEditor/commit/d0fa3ddc3e9dc9b05f90b650991ef134f74eed01.patch;
|
||||||
sha256 = "1wcb70hrnhq72frj89prcqylpqs74xrfz3kdfdkq84p5qfz9svyj";
|
sha256 = "1wcb70hrnhq72frj89prcqylpqs74xrfz3kdfdkq84p5qfz9svyj";
|
||||||
})
|
})
|
||||||
|
./missing-semicolon.patch
|
||||||
];
|
];
|
||||||
|
|
||||||
buildPhase = ''
|
makeFlags = [ "OPTFLAGS=-fopenmp" ];
|
||||||
make OPTFLAGS="-fopenmp"
|
|
||||||
'';
|
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "Hex Editor / Disk Editor for Huge Files or Devices";
|
description = "Hex Editor / Disk Editor for Huge Files or Devices";
|
||||||
|
@ -0,0 +1,35 @@
|
|||||||
|
diff --git a/src/HexDialogs.cpp b/src/HexDialogs.cpp
|
||||||
|
index 091a6f9..12e6a78 100644
|
||||||
|
--- a/src/HexDialogs.cpp
|
||||||
|
+++ b/src/HexDialogs.cpp
|
||||||
|
@@ -420,7 +420,7 @@ void FindDialog::OnChar( wxKeyEvent& event ){
|
||||||
|
}
|
||||||
|
|
||||||
|
void FindDialog::EventHandler( wxCommandEvent& event ){
|
||||||
|
- WX_CLEAR_ARRAY(parent->HighlightArray )
|
||||||
|
+ WX_CLEAR_ARRAY(parent->HighlightArray );
|
||||||
|
parent->HighlightArray.Shrink();
|
||||||
|
|
||||||
|
if( event.GetId() == btnFind->GetId())
|
||||||
|
diff --git a/src/HexEditorCtrl/HexEditorCtrl.cpp b/src/HexEditorCtrl/HexEditorCtrl.cpp
|
||||||
|
index 7a3b0e2..f12097f 100644
|
||||||
|
--- a/src/HexEditorCtrl/HexEditorCtrl.cpp
|
||||||
|
+++ b/src/HexEditorCtrl/HexEditorCtrl.cpp
|
||||||
|
@@ -64,9 +64,9 @@ HexEditorCtrl::~HexEditorCtrl( void ){
|
||||||
|
Dynamic_Disconnector();
|
||||||
|
Clear();
|
||||||
|
|
||||||
|
- WX_CLEAR_ARRAY(MainTagArray)
|
||||||
|
- WX_CLEAR_ARRAY(HighlightArray)
|
||||||
|
- WX_CLEAR_ARRAY(CompareArray)
|
||||||
|
+ WX_CLEAR_ARRAY(MainTagArray);
|
||||||
|
+ WX_CLEAR_ARRAY(HighlightArray);
|
||||||
|
+ WX_CLEAR_ARRAY(CompareArray);
|
||||||
|
|
||||||
|
MainTagArray.Shrink();
|
||||||
|
HighlightArray.Shrink();
|
||||||
|
@@ -1224,4 +1224,3 @@ void wxHugeScrollBar::OnOffsetScroll( wxScrollEvent& event ){
|
||||||
|
#endif
|
||||||
|
event.Skip();
|
||||||
|
}
|
||||||
|
-
|
Loading…
x
Reference in New Issue
Block a user