Package: wxhexeditor
Version: 0.24+repack-0.1
Severity: important
Tags: patch
Hi,
please package wxhexeditor 0.24, it fixes the ftbfs with gcc7.
I attach a diff between the debian directories for a package I created
locally. It builds fine with current gcc in sid.
Thanks
Norbert
-- System Information:
Debian Release: buster/sid
APT prefers unstable-debug
APT policy: (500, 'unstable-debug'), (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.15.11 (SMP w/8 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8),
LANGUAGE=en_US:en (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
Versions of packages wxhexeditor depends on:
ii libc6 2.27-2
ii libdisasm0 0.23-6+b1
ii libgcc1 1:8-20180320-1
ii libgomp1 8-20180320-1
ii libmhash2 0.9.9.9-7+b1
ii libstdc++6 8-20180320-1
ii libwxbase3.0-0v5 3.0.3.1+dfsg2-1
ii libwxgtk3.0-0v5 3.0.3.1+dfsg2-1
wxhexeditor recommends no packages.
wxhexeditor suggests no packages.
-- no debconf information
diff -urN wxhexeditor-0.23+repack/debian/changelog
wxhexeditor-0.24+repack/debian/changelog
--- wxhexeditor-0.23+repack/debian/changelog 2015-06-10 15:30:42.000000000
+0900
+++ wxhexeditor-0.24+repack/debian/changelog 2018-03-21 21:58:20.000000000
+0900
@@ -1,3 +1,10 @@
+wxhexeditor (0.24+repack-0.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * New upstream release.
+
+ -- Norbert Preining <prein...@debian.org> Wed, 21 Mar 2018 21:58:20 +0900
+
wxhexeditor (0.23+repack-2) unstable; urgency=medium
* Merge wxWidgets 3.0 changes from NMUs by Olly Betts.
diff -urN
wxhexeditor-0.23+repack/debian/patches/01-build-with-system-mhash.patch
wxhexeditor-0.24+repack/debian/patches/01-build-with-system-mhash.patch
--- wxhexeditor-0.23+repack/debian/patches/01-build-with-system-mhash.patch
2015-05-21 19:58:20.000000000 +0900
+++ wxhexeditor-0.24+repack/debian/patches/01-build-with-system-mhash.patch
2018-03-21 21:48:19.000000000 +0900
@@ -1,17 +1,22 @@
Description: Build with system mhash. Also fix the variables order.
---- a/Makefile
-+++ b/Makefile
-@@ -5,7 +5,7 @@
- CXX = `$(WXCONFIG) --cxx`
- LDFLAGS += -lgomp
- #add this ldflags for WinConsole "-Wl,--subsystem,console -mconsole" for
win-debug
--WXCXXFLAGS= `$(WXCONFIG) --cxxflags` -Iudis86 -Imhash/include -MMD -fopenmp
-+WXCXXFLAGS= `$(WXCONFIG) --cxxflags` -Iudis86 -MMD -fopenmp
+---
+ Makefile | 9 ++-------
+ src/HexDialogs.cpp | 2 +-
+ src/HexEditor.h | 2 +-
+ 3 files changed, 4 insertions(+), 9 deletions(-)
+
+--- wxHexEditor-0.24.orig/Makefile
++++ wxHexEditor-0.24/Makefile
+@@ -1,6 +1,6 @@
+ WXCONFIG ?= wx-config
+ HOST=
+-WXCXXFLAGS= `$(WXCONFIG) --cxxflags` -Iudis86 -Imhash/include -MMD -fopenmp
-Wall -O2
++WXCXXFLAGS= `$(WXCONFIG) --cxxflags` -Iudis86 -MMD -fopenmp -Wall -O2
WXLDFLAGS = `$(WXCONFIG) --libs` `$(WXCONFIG) --libs aui` `$(WXCONFIG) --libs
core`
- RC = `$(WXCONFIG) --rescomp`
- #RC = x86_64-w64-mingw32-windres --define WX_CPU_AMD64
-@@ -25,7 +25,7 @@
+ WXCXXFLAGS += -fopenmp
+ LDFLAGS += -lgomp
+@@ -22,7 +22,7 @@
src/HexEditorCtrl/wxHexCtrl/Tag.cpp\
src/HexEditorCtrl/HexEditorCtrlGui.cpp\
src/HexEditorFrame.cpp
@@ -20,31 +25,18 @@
OBJECTS=$(SOURCES:.cpp=.o)
DEPENDS=$(OBJECTS:.o=.d)
LANGUAGEDIRS=`ls -l ./locale | grep ^d | sed s/.*\ //g;`
-@@ -50,10 +50,10 @@
- MOBJECTS=$(LANGUAGES:.po=.mo)
-
- $(EXECUTABLE): $(OBJECTS)
-- $(CXX) ${LDFLAGS} $(OBJECTS) $(LIBS) ${CXXFLAGS} ${OPTFLAGS}
$(WXLDFLAGS) -o $@
-+ $(CXX) ${CXXFLAGS} ${CPPFLAGS} ${LDFLAGS} $(OBJECTS) $(LIBS)
$(WXLDFLAGS) -o $@
-
- .cpp.o: $(LIBS)
-- $(CXX) -c $(WXCXXFLAGS) $(OPTFLAGS) $(CXXFLAGS) $(CPPFLAGS) $< -o $@
-+ $(CXX) -c $(CXXFLAGS) $(CPPFLAGS) $(WXCXXFLAGS) $< -o $@
-
- %.o : %.rc
- $(RC) $(RCFLAGS) $< -o $@
-@@ -68,10 +68,6 @@
- cd udis86;./configure --host=$(HOST) CFLAGS="$(CFLAGS)"
CXXFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)"
+@@ -73,10 +73,6 @@
+ cd udis86;./configure --host=$(HOST) CC="$(CC)" CXX="$(CXX)"
CFLAGS="$(CFLAGS) ${OPTFLAGS}" CXXFLAGS="$(CXXFLAGS) ${OPTFLAGS}"
CPPFLAGS="$(CPPFLAGS)"
cd udis86/libudis86; $(MAKE) $(MFLAGS)
-mhash/lib/.libs/libmhash.a:
-- cd mhash; ./configure --host=$(HOST) CFLAGS="$(CFLAGS)"
CXXFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)"
+- cd mhash; ./configure --host=$(HOST) CC="$(CC)" CXX="$(CXX)"
CFLAGS="$(CFLAGS) ${OPTFLAGS}" CXXFLAGS="$(CXXFLAGS) ${OPTFLAGS}"
CPPFLAGS="$(CPPFLAGS)"
- cd mhash; $(MAKE) $(MFLAGS)
-
- win: $(RESOURCES) $(EXECUTABLE_WIN)
+ src/windrv.o:
+ $(CXX) $(LIBS) ${CXXFLAGS} ${OPTFLAGS} $(WXCXXFLAGS) $(WXLDFLAGS)
${LDFLAGS} -c src/windrv.cpp -o src/windrv.o
- #Stack override required for file comparison function...
-@@ -173,7 +169,6 @@
+@@ -193,7 +189,6 @@
rm -f locale/*/wxHexEditor.mo
distclean: clean
cd udis86;$(MAKE) distclean
@@ -52,8 +44,8 @@
# include the auto-generated dependency files
-include $(DEPENDS)
---- a/src/HexDialogs.cpp
-+++ b/src/HexDialogs.cpp
+--- wxHexEditor-0.24.orig/src/HexDialogs.cpp
++++ wxHexEditor-0.24/src/HexDialogs.cpp
@@ -24,7 +24,7 @@
#define NANINT 0xFFFFFFFFFFFFFFFFLL
#include "HexDialogs.h"
@@ -61,10 +53,10 @@
-#include "../mhash/include/mhash.h"
+#include <mhash.h>
- #ifdef _OPENMP_
- #include <omp.h>
---- a/src/HexEditor.h
-+++ b/src/HexEditor.h
+ #ifdef __SSE2__
+ #include <emmintrin.h>
+--- wxHexEditor-0.24.orig/src/HexEditor.h
++++ wxHexEditor-0.24/src/HexEditor.h
@@ -25,7 +25,7 @@
#ifndef _wxHexEditor_h_
#define _wxHexEditor_h_
diff -urN wxhexeditor-0.23+repack/debian/patches/06-use-libdisasm.patch
wxhexeditor-0.24+repack/debian/patches/06-use-libdisasm.patch
--- wxhexeditor-0.23+repack/debian/patches/06-use-libdisasm.patch
2015-05-21 19:56:03.000000000 +0900
+++ wxhexeditor-0.24+repack/debian/patches/06-use-libdisasm.patch
2018-03-21 22:10:34.202414165 +0900
@@ -1,60 +1,15 @@
Description: Use libdisasm, as libudis86 isn't yet in Debian.
---- a/src/HexEditorGui.cpp
-+++ b/src/HexEditorGui.cpp
-@@ -649,15 +649,6 @@
- wxBoxSizer* bSizerTop;
- bSizerTop = new wxBoxSizer( wxHORIZONTAL );
-
-- wxString m_choiceVendorChoices[] = { _("INTEL"), _("AMD") };
-- int m_choiceVendorNChoices = sizeof( m_choiceVendorChoices ) / sizeof(
wxString );
-- m_choiceVendor = new wxChoice( this, wxID_ANY, wxDefaultPosition,
wxDefaultSize, m_choiceVendorNChoices, m_choiceVendorChoices, 0 );
-- m_choiceVendor->SetSelection( 0 );
-- m_choiceVendor->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90,
90, false, wxEmptyString ) );
-- m_choiceVendor->SetToolTip( _("CPU Vendor") );
--
-- bSizerTop->Add( m_choiceVendor, 1, wxTOP|wxRIGHT|wxLEFT, 5 );
--
- wxString m_choiceASMTypeChoices[] = { _("INTEL"), _("AT&T") };
- int m_choiceASMTypeNChoices = sizeof( m_choiceASMTypeChoices ) /
sizeof( wxString );
- m_choiceASMType = new wxChoice( this, wxID_ANY, wxDefaultPosition,
wxDefaultSize, m_choiceASMTypeNChoices, m_choiceASMTypeChoices, 0 );
-@@ -666,15 +657,6 @@
-
- bSizerTop->Add( m_choiceASMType, 1, wxTOP|wxRIGHT|wxLEFT, 5 );
-
-- wxString m_choiceBitModeChoices[] = { _("16 Bit"), _("32 Bit"), _("64
Bit") };
-- int m_choiceBitModeNChoices = sizeof( m_choiceBitModeChoices ) /
sizeof( wxString );
-- m_choiceBitMode = new wxChoice( this, wxID_ANY, wxDefaultPosition,
wxDefaultSize, m_choiceBitModeNChoices, m_choiceBitModeChoices, 0 );
-- m_choiceBitMode->SetSelection( 1 );
-- m_choiceBitMode->SetToolTip( _("Disassembly Bit Mode") );
--
-- bSizerTop->Add( m_choiceBitMode, 1, wxTOP|wxRIGHT|wxLEFT, 5 );
--
--
- mainSizer->Add( bSizerTop, 0, wxEXPAND, 5 );
-
- m_dasmCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString,
wxDefaultPosition, wxDefaultSize, wxTE_DONTWRAP|wxTE_MULTILINE|wxTE_READONLY );
-@@ -686,17 +668,13 @@
- this->Layout();
-
- // Connect Events
-- m_choiceVendor->Connect( wxEVT_COMMAND_CHOICE_SELECTED,
wxCommandEventHandler( DisassemblerPanelGUI::OnUpdate ), NULL, this );
- m_choiceASMType->Connect( wxEVT_COMMAND_CHOICE_SELECTED,
wxCommandEventHandler( DisassemblerPanelGUI::OnUpdate ), NULL, this );
-- m_choiceBitMode->Connect( wxEVT_COMMAND_CHOICE_SELECTED,
wxCommandEventHandler( DisassemblerPanelGUI::OnUpdate ), NULL, this );
- }
-
- DisassemblerPanelGUI::~DisassemblerPanelGUI()
- {
- // Disconnect Events
-- m_choiceVendor->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED,
wxCommandEventHandler( DisassemblerPanelGUI::OnUpdate ), NULL, this );
- m_choiceASMType->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED,
wxCommandEventHandler( DisassemblerPanelGUI::OnUpdate ), NULL, this );
-- m_choiceBitMode->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED,
wxCommandEventHandler( DisassemblerPanelGUI::OnUpdate ), NULL, this );
-
- }
-
---- a/src/HexPanels.cpp
-+++ b/src/HexPanels.cpp
-@@ -373,14 +373,26 @@
+---
+ Makefile | 10 ++--------
+ src/HexEditorGui.cpp | 22 ----------------------
+ src/HexPanels.cpp | 28 ++++++++++++++++++++--------
+ src/HexPanels.h | 2 +-
+ 4 files changed, 23 insertions(+), 39 deletions(-)
+
+--- wxhexeditor-0.24+repack.orig/src/HexPanels.cpp
++++ wxhexeditor-0.24+repack/src/HexPanels.cpp
+@@ -393,14 +393,26 @@
}
void DisassemblerPanel::OnUpdate( wxCommandEvent& event){
@@ -89,8 +44,8 @@
+ }
m_dasmCtrl->ChangeValue( mydasm );
}
---- a/src/HexPanels.h
-+++ b/src/HexPanels.h
+--- wxhexeditor-0.24+repack.orig/src/HexPanels.h
++++ wxhexeditor-0.24+repack/src/HexPanels.h
@@ -27,7 +27,7 @@
#include "HexEditorFrame.h"
#include "HexEditorCtrl/HexEditorCtrl.h"
@@ -100,18 +55,17 @@
#ifdef WX_GCH
#include <wx_pch.h>
---- a/Makefile
-+++ b/Makefile
-@@ -5,7 +5,7 @@
- CXX = `$(WXCONFIG) --cxx`
- LDFLAGS += -lgomp
- #add this ldflags for WinConsole "-Wl,--subsystem,console -mconsole" for
win-debug
--WXCXXFLAGS= `$(WXCONFIG) --cxxflags` -Iudis86 -MMD -fopenmp
-+WXCXXFLAGS= `$(WXCONFIG) --cxxflags` -MMD -fopenmp
+--- wxhexeditor-0.24+repack.orig/Makefile
++++ wxhexeditor-0.24+repack/Makefile
+@@ -1,6 +1,6 @@
+ WXCONFIG ?= wx-config
+ HOST=
+-WXCXXFLAGS= `$(WXCONFIG) --cxxflags` -Iudis86 -MMD -fopenmp -Wall -O2
++WXCXXFLAGS= `$(WXCONFIG) --cxxflags` -MMD -fopenmp -Wall -O2
WXLDFLAGS = `$(WXCONFIG) --libs` `$(WXCONFIG) --libs aui` `$(WXCONFIG) --libs
core`
- RC = `$(WXCONFIG) --rescomp`
- #RC = x86_64-w64-mingw32-windres --define WX_CPU_AMD64
-@@ -25,7 +25,7 @@
+ WXCXXFLAGS += -fopenmp
+ LDFLAGS += -lgomp
+@@ -22,7 +22,7 @@
src/HexEditorCtrl/wxHexCtrl/Tag.cpp\
src/HexEditorCtrl/HexEditorCtrlGui.cpp\
src/HexEditorFrame.cpp
@@ -120,19 +74,19 @@
OBJECTS=$(SOURCES:.cpp=.o)
DEPENDS=$(OBJECTS:.o=.d)
LANGUAGEDIRS=`ls -l ./locale | grep ^d | sed s/.*\ //g;`
-@@ -63,11 +63,6 @@
+@@ -68,11 +68,6 @@
%.mo : %.po
$(MSGFMT) $< -o $@
-udis86/libudis86/.libs/libudis86.a:
- cd udis86;./autogen.sh
-- cd udis86;./configure --host=$(HOST) CFLAGS="$(CFLAGS)"
CXXFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)"
+- cd udis86;./configure --host=$(HOST) CC="$(CC)" CXX="$(CXX)"
CFLAGS="$(CFLAGS) ${OPTFLAGS}" CXXFLAGS="$(CXXFLAGS) ${OPTFLAGS}"
CPPFLAGS="$(CPPFLAGS)"
- cd udis86/libudis86; $(MAKE) $(MFLAGS)
-
- win: $(RESOURCES) $(EXECUTABLE_WIN)
+ src/windrv.o:
+ $(CXX) $(LIBS) ${CXXFLAGS} ${OPTFLAGS} $(WXCXXFLAGS) $(WXLDFLAGS)
${LDFLAGS} -c src/windrv.cpp -o src/windrv.o
- #Stack override required for file comparison function...
-@@ -168,7 +163,6 @@
+@@ -188,7 +183,6 @@
rm -rf $(EXECUTABLE_DIR_MAC)
rm -f locale/*/wxHexEditor.mo
distclean: clean
@@ -140,3 +94,55 @@
# include the auto-generated dependency files
-include $(DEPENDS)
+--- wxhexeditor-0.24+repack.orig/src/HexEditorGui.cpp
++++ wxhexeditor-0.24+repack/src/HexEditorGui.cpp
+@@ -672,15 +672,6 @@
+ wxBoxSizer* bSizerTop;
+ bSizerTop = new wxBoxSizer( wxHORIZONTAL );
+
+- wxString m_choiceVendorChoices[] = { _("INTEL"), _("AMD") };
+- int m_choiceVendorNChoices = sizeof( m_choiceVendorChoices ) / sizeof(
wxString );
+- m_choiceVendor = new wxChoice( this, wxID_ANY, wxDefaultPosition,
wxDefaultSize, m_choiceVendorNChoices, m_choiceVendorChoices, 0 );
+- m_choiceVendor->SetSelection( 0 );
+- m_choiceVendor->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(),
wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false,
wxEmptyString ) );
+- m_choiceVendor->SetToolTip( _("CPU Vendor") );
+-
+- bSizerTop->Add( m_choiceVendor, 1, wxTOP|wxRIGHT|wxLEFT, 5 );
+-
+ wxString m_choiceASMTypeChoices[] = { _("INTEL"), _("AT&T") };
+ int m_choiceASMTypeNChoices = sizeof( m_choiceASMTypeChoices ) /
sizeof( wxString );
+ m_choiceASMType = new wxChoice( this, wxID_ANY, wxDefaultPosition,
wxDefaultSize, m_choiceASMTypeNChoices, m_choiceASMTypeChoices, 0 );
+@@ -689,15 +680,6 @@
+
+ bSizerTop->Add( m_choiceASMType, 1, wxTOP|wxRIGHT|wxLEFT, 5 );
+
+- wxString m_choiceBitModeChoices[] = { _("16 Bit"), _("32 Bit"), _("64
Bit") };
+- int m_choiceBitModeNChoices = sizeof( m_choiceBitModeChoices ) /
sizeof( wxString );
+- m_choiceBitMode = new wxChoice( this, wxID_ANY, wxDefaultPosition,
wxDefaultSize, m_choiceBitModeNChoices, m_choiceBitModeChoices, 0 );
+- m_choiceBitMode->SetSelection( 1 );
+- m_choiceBitMode->SetToolTip( _("Disassembly Bit Mode") );
+-
+- bSizerTop->Add( m_choiceBitMode, 1, wxTOP|wxRIGHT|wxLEFT, 5 );
+-
+-
+ mainSizer->Add( bSizerTop, 0, wxEXPAND, 5 );
+
+ m_dasmCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString,
wxDefaultPosition, wxDefaultSize, wxTE_DONTWRAP|wxTE_MULTILINE|wxTE_READONLY );
+@@ -708,17 +690,13 @@
+ this->Layout();
+
+ // Connect Events
+- m_choiceVendor->Connect( wxEVT_COMMAND_CHOICE_SELECTED,
wxCommandEventHandler( DisassemblerPanelGUI::OnUpdate ), NULL, this );
+ m_choiceASMType->Connect( wxEVT_COMMAND_CHOICE_SELECTED,
wxCommandEventHandler( DisassemblerPanelGUI::OnUpdate ), NULL, this );
+- m_choiceBitMode->Connect( wxEVT_COMMAND_CHOICE_SELECTED,
wxCommandEventHandler( DisassemblerPanelGUI::OnUpdate ), NULL, this );
+ }
+
+ DisassemblerPanelGUI::~DisassemblerPanelGUI()
+ {
+ // Disconnect Events
+- m_choiceVendor->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED,
wxCommandEventHandler( DisassemblerPanelGUI::OnUpdate ), NULL, this );
+ m_choiceASMType->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED,
wxCommandEventHandler( DisassemblerPanelGUI::OnUpdate ), NULL, this );
+- m_choiceBitMode->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED,
wxCommandEventHandler( DisassemblerPanelGUI::OnUpdate ), NULL, this );
+
+ }
+
diff -urN wxhexeditor-0.23+repack/debian/patches/07-use-proper-opts.patch
wxhexeditor-0.24+repack/debian/patches/07-use-proper-opts.patch
--- wxhexeditor-0.23+repack/debian/patches/07-use-proper-opts.patch
2015-06-10 15:37:32.000000000 +0900
+++ wxhexeditor-0.24+repack/debian/patches/07-use-proper-opts.patch
2018-03-21 21:56:02.000000000 +0900
@@ -2,20 +2,19 @@
no static libgcc or libstdc++, use CFLAGS and friends
from the environment.
---- a/Makefile
-+++ b/Makefile
-@@ -1,12 +1,8 @@
- WXCONFIG = wx-config
--#CC ?= `$(WXCONFIG) --cc` #this doesn't look working here properly :(
--#CXX ?= `$(WXCONFIG) --cxx`
--CC = `$(WXCONFIG) --cc`
--CXX = `$(WXCONFIG) --cxx`
- LDFLAGS += -lgomp
- #add this ldflags for WinConsole "-Wl,--subsystem,console -mconsole" for
win-debug
--WXCXXFLAGS= `$(WXCONFIG) --cxxflags` -MMD -fopenmp
+---
+ Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- wxHexEditor-0.24.orig/Makefile
++++ wxHexEditor-0.24/Makefile
+@@ -1,7 +1,7 @@
+ WXCONFIG ?= wx-config
+ HOST=
+-WXCXXFLAGS= `$(WXCONFIG) --cxxflags` -MMD -fopenmp -Wall -O2
-WXLDFLAGS = `$(WXCONFIG) --libs` `$(WXCONFIG) --libs aui` `$(WXCONFIG) --libs
core`
-+WXCXXFLAGS= `$(WXCONFIG) --cxxflags` -MMD -fopenmp -DNDEBUG
++WXCXXFLAGS= `$(WXCONFIG) --cxxflags` -MMD -fopenmp -Wall -O2 -DNDEBUG
+WXLDFLAGS = -Wl,--as-needed `$(WXCONFIG) --libs` `$(WXCONFIG) --libs std,aui`
`$(WXCONFIG) --libs core`
- RC = `$(WXCONFIG) --rescomp`
- #RC = x86_64-w64-mingw32-windres --define WX_CPU_AMD64
- RCFLAGS = `$(WXCONFIG) --cxxflags | sed s/' '-m.*//g;`
+ WXCXXFLAGS += -fopenmp
+ LDFLAGS += -lgomp
+ #add this ldflags for WinConsole "-Wl,--subsystem,console -mconsole" for
win-debug
diff -urN wxhexeditor-0.23+repack/debian/patches/08-remove-debug.patch
wxhexeditor-0.24+repack/debian/patches/08-remove-debug.patch
--- wxhexeditor-0.23+repack/debian/patches/08-remove-debug.patch
2015-05-21 19:40:32.000000000 +0900
+++ wxhexeditor-0.24+repack/debian/patches/08-remove-debug.patch
2018-03-21 21:56:08.000000000 +0900
@@ -1,7 +1,13 @@
Description: Remove some debug printed on stdout.
---- a/src/HexEditor.cpp
-+++ b/src/HexEditor.cpp
+---
+ src/HexEditor.cpp | 2 ++
+ src/HexEditorCtrl/HexEditorCtrl.h | 2 ++
+ src/HexEditorFrame.cpp | 2 ++
+ 3 files changed, 6 insertions(+)
+
+--- wxHexEditor-0.24.orig/src/HexEditor.cpp
++++ wxHexEditor-0.24/src/HexEditor.cpp
@@ -42,9 +42,11 @@
tagpanel(tagpanel_),
dasmpanel(dasmpanel_) {
@@ -12,11 +18,11 @@
printf("Rahman ve Rahim olan Allah'ın adıyla.\n");
+ #endif
myfile = NULL;
- if( myfilename_ != NULL ) {
- if( !FileOpen( *myfilename_ ) ) {
---- a/src/HexEditorCtrl/HexEditorCtrl.h
-+++ b/src/HexEditorCtrl/HexEditorCtrl.h
-@@ -64,7 +64,9 @@
+ #ifndef DO_NOT_USE_THREAD_FOR_SCROLL
+ myscrollthread = NULL;
+--- wxHexEditor-0.24.orig/src/HexEditorCtrl/HexEditorCtrl.h
++++ wxHexEditor-0.24/src/HexEditorCtrl/HexEditorCtrl.h
+@@ -66,7 +66,9 @@
void SetState( bool new_state ){
state = new_state;
@@ -26,9 +32,9 @@
wxUpdateUIEvent event;
if( new_state )
event.SetString( wxT("Selected") );
---- a/src/HexEditorFrame.cpp
-+++ b/src/HexEditorFrame.cpp
-@@ -481,7 +481,9 @@
+--- wxHexEditor-0.24.orig/src/HexEditorFrame.cpp
++++ wxHexEditor-0.24/src/HexEditorFrame.cpp
+@@ -509,7 +509,9 @@
}
void HexEditorFrame::OnMenuEvent( wxCommandEvent& event ){
diff -urN
wxhexeditor-0.23+repack/debian/patches/11-wx3.0-fix-ftbfs-on-arm.patch
wxhexeditor-0.24+repack/debian/patches/11-wx3.0-fix-ftbfs-on-arm.patch
--- wxhexeditor-0.23+repack/debian/patches/11-wx3.0-fix-ftbfs-on-arm.patch
2015-06-10 15:26:17.000000000 +0900
+++ wxhexeditor-0.24+repack/debian/patches/11-wx3.0-fix-ftbfs-on-arm.patch
2018-03-21 21:57:50.000000000 +0900
@@ -2,14 +2,18 @@
Author: Olly Betts <o...@survex.com>
Last-Update: 2014-04-14
---- a/src/HexEditorCtrl/wxHexCtrl/wxHexCtrl.cpp
-+++ b/src/HexEditorCtrl/wxHexCtrl/wxHexCtrl.cpp
-@@ -2128,7 +2128,7 @@
+---
+ src/HexEditorCtrl/wxHexCtrl/wxHexCtrl.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- wxHexEditor-0.24.orig/src/HexEditorCtrl/wxHexCtrl/wxHexCtrl.cpp
++++ wxHexEditor-0.24/src/HexEditorCtrl/wxHexCtrl/wxHexCtrl.cpp
+@@ -2365,7 +2365,7 @@
else if(i==0x7E)
newCP += wxChar(0x203E);//Overline
else if(i<0x80)
-- newCP += ((i<0x20 or i==0x7F) ? '.' :
wxChar(i));
-+ newCP += wxChar((i<0x20 or i==0x7F) ? '.' :
i);
- else if( i>=0xA1 and i<0xE0)
+- newCP += ((i<0x20 || i==0x7F) ? '.' :
wxChar(i));
++ newCP += wxChar((i<0x20 or i==0x7F) ? '.' :
i);
+ else if( i>=0xA1 && i<0xE0)
newCP += wxChar(i-0xA0+0xFF60);
else
diff -urN
wxhexeditor-0.23+repack/debian/patches/12-disable-newer-upstream-version-check.patch
wxhexeditor-0.24+repack/debian/patches/12-disable-newer-upstream-version-check.patch
---
wxhexeditor-0.23+repack/debian/patches/12-disable-newer-upstream-version-check.patch
2015-05-21 19:45:12.000000000 +0900
+++
wxhexeditor-0.24+repack/debian/patches/12-disable-newer-upstream-version-check.patch
2018-03-21 21:57:54.000000000 +0900
@@ -5,18 +5,22 @@
Bug-Debian: https://bugs.debian.org/785248
Last-Update: 2015-05-14
---- a/src/HexEditorFrame.cpp
-+++ b/src/HexEditorFrame.cpp
-@@ -180,6 +180,7 @@
- MyNotebook->Connect( wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGED,
wxAuiNotebookEventHandler( HexEditorFrame::OnNotebookTabSelection ), NULL,this
);
+---
+ src/HexEditorFrame.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+--- wxHexEditor-0.24.orig/src/HexEditorFrame.cpp
++++ wxHexEditor-0.24/src/HexEditorFrame.cpp
+@@ -188,6 +188,7 @@
MyNotebook->Connect( wxEVT_COMMAND_AUINOTEBOOK_TAB_MIDDLE_UP,
wxAuiNotebookEventHandler( HexEditorFrame::OnNotebookTabClose ), NULL,this );
+ MyAUI->Connect( wxEVT_AUI_PANE_CLOSE, wxAuiManagerEventHandler(
HexEditorFrame::OnFloatingPaneClosed ), NULL, this );
+#if 0 /* Debian bug #785248 */
bool update_enable = false;
- if ( not wxConfigBase::Get()->Read(_T("UpdateCheck"), &update_enable )){
+ if ( !myConfigBase::Get()->Read(_T("UpdateCheck"), &update_enable )){
update_enable = true;
-@@ -198,6 +199,7 @@
- VersionChecker vc(
wxT("http://wxhexeditor.sourceforge.net/version.php";), wxT(_VERSION_) );
+@@ -206,6 +207,7 @@
+ VersionChecker vc(
wxT("http://www.wxhexeditor.org/version.php";), wxT(_VERSION_) );
}
}
+#endif
