Hello community, here is the log from the commit of package wxhexeditor for openSUSE:Factory checked in at 2017-02-07 12:03:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/wxhexeditor (Old) and /work/SRC/openSUSE:Factory/.wxhexeditor.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "wxhexeditor" Changes: -------- --- /work/SRC/openSUSE:Factory/wxhexeditor/wxhexeditor.changes 2017-01-24 10:34:20.290428959 +0100 +++ /work/SRC/openSUSE:Factory/.wxhexeditor.new/wxhexeditor.changes 2017-02-07 12:03:36.468430742 +0100 @@ -1,0 +2,9 @@ +Fri Feb 3 09:30:20 UTC 2017 - davejpla...@gmail.com + +- Update to git version 0.23+git20161226 (boo#1022460): + * See https://github.com/EUA/wxHexEditor/commits/master +- Removed wxhexeditor-0.23-func-return.patch: fixed upstream. + Rebased wxhexeditor-0.23-mhash.patch and + wxhexeditor-remove-debug.patch. + +------------------------------------------------------------------- @@ -10 +19 @@ -- Fix "find requires" (remove %wx_requires). +- Fix "find requires" (remove %wx_requires) (boo#1022637). Old: ---- wxHexEditor-v0.23-src.tar.bz2 wxhexeditor-0.23-func-return.patch New: ---- wxHexEditor-0.23+git20161226.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wxhexeditor.spec ++++++ --- /var/tmp/diff_new_pack.4bzWmj/_old 2017-02-07 12:03:36.940363978 +0100 +++ /var/tmp/diff_new_pack.4bzWmj/_new 2017-02-07 12:03:36.944363411 +0100 @@ -1,7 +1,7 @@ # # spec file for package wxhexeditor # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,25 +17,25 @@ %define _name wxHexEditor +%define _rev 07f791b4b1a767b1bb214e4ac921019f015d8ea2 Name: wxhexeditor -Version: 0.23 +Version: 0.23+git20161226 Release: 0 Summary: A free HEX editor / disk editor License: GPL-2.0 Group: Development/Tools/Other -Url: http://wxhexeditor.org/ -Source: http://downloads.sf.net/%{name}/%{_name}-v%{version}-src.tar.bz2 +Url: https://github.com/EUA/wxHexEditor +Source: https://github.com/EUA/wxHexEditor/archive/%{_rev}.tar.gz#/%{_name}-%{version}.tar.gz # PATCH-FIX-OPENSUSE wxhexeditor-0.23-mhash.patch lazy.k...@opensuse.org -- Use system mhash library. Patch0: %{name}-0.23-mhash.patch -# PATCH-FIX-OPENSUSE wxhexeditor-0.23-func-return.patch sor.ale...@meowr.ru -- Fix no-return-in-nonvoid-function. -Patch1: %{name}-0.23-func-return.patch # PATCH-FIX-OPENSUSE wxhexeditor-remove-debug.patch zai...@opensuse.org -- Remove debug msg that include nonsense. -Patch2: wxhexeditor-remove-debug.patch +Patch1: wxhexeditor-remove-debug.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: gcc-c++ BuildRequires: libtool BuildRequires: mhash-devel +BuildRequires: pkg-config BuildRequires: update-desktop-files BuildRequires: wxWidgets-devel >= 3 Recommends: %{name}-lang @@ -56,14 +56,15 @@ %lang_package %prep -%setup -q -n %{_name} -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 +%setup -q -n %{_name}-%{_rev} +%patch0 -p0 +%patch1 -p0 chmod -x docs/* %build -make %{?_smp_mflags} CFLAGS='%{optflags}' CXXFLAGS='%{optflags}' +make %{?_smp_mflags} V=1 \ + CFLAGS='%{optflags}' \ + CXXFLAGS='%{optflags}' %install %make_install PREFIX=%{_prefix} ++++++ wxhexeditor-0.23-mhash.patch ++++++ --- /var/tmp/diff_new_pack.4bzWmj/_old 2017-02-07 12:03:36.976358886 +0100 +++ /var/tmp/diff_new_pack.4bzWmj/_new 2017-02-07 12:03:36.976358886 +0100 @@ -1,17 +1,19 @@ ---- a/Makefile -+++ b/Makefile -@@ -5,8 +5,8 @@ - CXX = `$(WXCONFIG) --cxx` +Index: Makefile +=================================================================== +--- Makefile.orig 2016-12-26 05:28:09.000000000 +0200 ++++ Makefile 2017-02-03 10:27:44.684071069 +0200 +@@ -4,8 +4,9 @@ WXCONFIG = wx-config + CC = $(shell echo `$(WXCONFIG) --cc`) + CXX = $(shell echo `$(WXCONFIG) --cxx`) LDFLAGS += -lgomp ++LDFLAGS += -lmhash #add this ldflags for WinConsole "-Wl,--subsystem,console -mconsole" for win-debug --WXCXXFLAGS= `$(WXCONFIG) --cxxflags` -Iudis86 -Imhash/include -MMD -fopenmp --WXLDFLAGS = `$(WXCONFIG) --libs` `$(WXCONFIG) --libs aui` `$(WXCONFIG) --libs core` -+WXCXXFLAGS= `$(WXCONFIG) --cxxflags` -Iudis86 -MMD -fopenmp -+WXLDFLAGS = `$(WXCONFIG) --libs` `$(WXCONFIG) --libs aui` `$(WXCONFIG) --libs core` $(LDFLAGS) -lmhash +-WXCXXFLAGS= `$(WXCONFIG) --cxxflags` -Iudis86 -Imhash/include -MMD -fopenmp -Wall ++WXCXXFLAGS= `$(WXCONFIG) --cxxflags` -Iudis86 -MMD -fopenmp -Wall + WXLDFLAGS = `$(WXCONFIG) --libs` `$(WXCONFIG) --libs aui` `$(WXCONFIG) --libs core` RC = `$(WXCONFIG) --rescomp` #RC = x86_64-w64-mingw32-windres --define WX_CPU_AMD64 - RCFLAGS = `$(WXCONFIG) --cxxflags | sed s/' '-m.*//g;` -@@ -25,7 +25,7 @@ +@@ -25,7 +26,7 @@ SOURCES= src/HexEditorGui.cpp \ src/HexEditorCtrl/wxHexCtrl/Tag.cpp\ src/HexEditorCtrl/HexEditorCtrlGui.cpp\ src/HexEditorFrame.cpp @@ -20,18 +22,20 @@ OBJECTS=$(SOURCES:.cpp=.o) DEPENDS=$(OBJECTS:.o=.d) LANGUAGEDIRS=`ls -l ./locale | grep ^d | sed s/.*\ //g;` -@@ -68,10 +68,6 @@ - cd udis86;./configure --host=$(HOST) CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" +@@ -73,9 +74,9 @@ udis86/libudis86/.libs/libudis86.a: + 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) ++##mhash/lib/.libs/libmhash.a: ++## cd mhash; ./configure --host=$(HOST) CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS) ${OPTFLAGS}" CXXFLAGS="$(CXXFLAGS) ${OPTFLAGS}" CPPFLAGS="$(CPPFLAGS)" ++## cd mhash; $(MAKE) $(MFLAGS) - #Stack override required for file comparison function... -@@ -173,7 +169,6 @@ + src/windrv.o: + $(CXX) $(LIBS) ${CXXFLAGS} ${OPTFLAGS} $(WXLDFLAGS) ${LDFLAGS} -c src/windrv.cpp -o src/windrv.o +@@ -181,7 +182,6 @@ clean: rm -f locale/*/wxHexEditor.mo distclean: clean cd udis86;$(MAKE) distclean ++++++ wxhexeditor-remove-debug.patch ++++++ --- /var/tmp/diff_new_pack.4bzWmj/_old 2017-02-07 12:03:36.988357188 +0100 +++ /var/tmp/diff_new_pack.4bzWmj/_new 2017-02-07 12:03:36.992356623 +0100 @@ -1,8 +1,10 @@ Description: Remove some debug printed on stdout. ---- a/src/HexEditor.cpp -+++ b/src/HexEditor.cpp -@@ -42,9 +42,11 @@ +Index: src/HexEditor.cpp +=================================================================== +--- src/HexEditor.cpp.orig 2016-12-26 05:28:09.000000000 +0200 ++++ src/HexEditor.cpp 2017-02-03 09:48:37.772995172 +0200 +@@ -42,9 +42,11 @@ HexEditor::HexEditor( wxWindow* parent, tagpanel(tagpanel_), dasmpanel(dasmpanel_) { ComparatorHexEditor=NULL; @@ -12,11 +14,13 @@ 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; +Index: src/HexEditorCtrl/HexEditorCtrl.h +=================================================================== +--- src/HexEditorCtrl/HexEditorCtrl.h.orig 2016-12-26 05:28:09.000000000 +0200 ++++ src/HexEditorCtrl/HexEditorCtrl.h 2017-02-03 09:48:37.772995172 +0200 +@@ -66,7 +66,9 @@ class Select{ //for using EventHandler void SetState( bool new_state ){ state = new_state; @@ -26,9 +30,11 @@ wxUpdateUIEvent event; if( new_state ) event.SetString( wxT("Selected") ); ---- a/src/HexEditorFrame.cpp -+++ b/src/HexEditorFrame.cpp -@@ -481,7 +481,9 @@ +Index: src/HexEditorFrame.cpp +=================================================================== +--- src/HexEditorFrame.cpp.orig 2016-12-26 05:28:09.000000000 +0200 ++++ src/HexEditorFrame.cpp 2017-02-03 09:48:37.772995172 +0200 +@@ -497,7 +497,9 @@ HexEditor* HexEditorFrame::GetActiveHexE } void HexEditorFrame::OnMenuEvent( wxCommandEvent& event ){
