- up to 0.24

diff --git a/wxHexEditor.spec b/wxHexEditor.spec
index e88ced16709e58bb2f67ddaaf6a366f569c90d3b..dbf898e7b9616c28e42eaaed97efa8ed7b2a0e5e 100644 (file)
--- a/wxHexEditor.spec
+++ b/wxHexEditor.spec
@@ -1,20 +1,20 @@
-# TODO: package and switch to system-wide udis86
+# TODO: switch to system-wide udis86
 #
 Summary:       Hex editor wxHeXEditor
 Summary(pl.UTF-8):     Hex edytor wxHexEditor
 Name:          wxHexEditor
-Version:       0.22
-Release:       4
+Version:       0.24
+Release:       1
 License:       GPL v2
 Group:         X11/Applications/Editors
-Source0:       http://downloads.sourceforge.net/wxhexeditor/wxHexEditor/v0.22%20Beta/%{name}-v%{version}-src.tar.bz2
-# Source0-md5: eb88cfcda0553e23a2a9490197e18552
+Source0:       http://downloads.sourceforge.net/wxhexeditor/wxHexEditor/v0.24%20Beta/%{name}-v%{version}-src.tar.xz
+# Source0-md5: 6e54b7e640bf5296137b765488ec78a6
 Patch0:                wxWidgets3.patch
-URL:           http://wxhexeditor.sourceforge.net/
+URL:           http://www.wxhexeditor.org/
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: mhash-devel
-BuildRequires: wxGTK2-unicode-devel >= 2.8
+BuildRequires: wxGTK3-unicode-devel >= 2.8
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -35,8 +35,10 @@ dostosowany do reverse engineringu plików binarnych.
 
 %build
 cd udis86
-%{__aclocal} -I m4
+mkdir -p build/m4
+%{__aclocal} -I build/m4
 %{__autoconf}
+%{__libtoolize}
 %{__autoheader}
 %{__automake}
 %configure
@@ -44,7 +46,7 @@ cd udis86
 cd ..
 
 %{__make} \
-       WXCONFIG=wx-gtk2-unicode-config \
+       WXCONFIG=wx-gtk3-unicode-config \
        LIBS='udis86/libudis86/.libs/libudis86.a -lmhash' \
        CXXFLAGS="%{rpmcxxflags}"
 

diff --git a/wxWidgets3.patch b/wxWidgets3.patch
index cd754cbd7284d3a0c4f85d1aa5c94ba0be186afb..6f1146cd8f206eb5159f1b76126052355c8625ee 100644 (file)
--- a/wxWidgets3.patch
+++ b/wxWidgets3.patch
@@ -1,11 +1,40 @@
---- wxHexEditor/Makefile~      2014-01-18 16:45:00.000000000 +0100
-+++ wxHexEditor/Makefile       2014-01-18 16:45:15.795451816 +0100
-@@ -4,7 +4,7 @@
- CFLAGS = -O2
- CXXFLAGS = -O2
- WXCXXFLAGS= `$(WXCONFIG) --cxxflags` -Iudis86 -Imhash/include -MMD -O2 -c ${OPTFLAGS}
--WXLDFLAGS = `$(WXCONFIG) --libs`
-+WXLDFLAGS = `$(WXCONFIG) --libs` -lwx_gtk2u_aui-3.0
- RC = `$(WXCONFIG) --rescomp`
- #RC = x86_64-w64-mingw32-windres --define WX_CPU_AMD64
- RCFLAGS = `$(WXCONFIG) --cxxflags | sed s/' '-m.*//g;`
+From ebe2449fac22089825d124935a215fd1c0739403 Mon Sep 17 00:00:00 2001
+From: GT <george@tsimperopoulos.com>
+Date: Tue, 10 Sep 2019 23:52:19 +0100
+Subject: [PATCH] Fix build for wxWidgets v3.1.2
+
+---
+ src/HexDialogs.cpp                  | 2 +-
+ src/HexEditorCtrl/HexEditorCtrl.cpp | 6 +++---
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/HexDialogs.cpp b/src/HexDialogs.cpp
+index 260571b4..9c312ba4 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 37a6e4b0..6f3a4a0e 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();