From d87262dd706fec50cd150aab3e93883b6337466d Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sat, 14 Jul 2018 20:56:41 +0100
Subject: gentoo resync : 14.07.2018

---
 .../files/wxhexeditor-0.24-syslibs.patch           | 76 ----------------------
 1 file changed, 76 deletions(-)
 delete mode 100644 app-editors/wxhexeditor/files/wxhexeditor-0.24-syslibs.patch

(limited to 'app-editors/wxhexeditor/files/wxhexeditor-0.24-syslibs.patch')

diff --git a/app-editors/wxhexeditor/files/wxhexeditor-0.24-syslibs.patch b/app-editors/wxhexeditor/files/wxhexeditor-0.24-syslibs.patch
deleted file mode 100644
index af874128eac1..000000000000
--- a/app-editors/wxhexeditor/files/wxhexeditor-0.24-syslibs.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-Use system copies of mhash and udis86.
-Also pass -fopenmp when linking to avoid build errors.
-Remove -O2 from forced CXXFLAGS.
-
---- a/Makefile
-+++ b/Makefile
-@@ -1,9 +1,9 @@
- WXCONFIG ?= wx-config
- HOST=
--WXCXXFLAGS= `$(WXCONFIG) --cxxflags` -Iudis86 -Imhash/include -MMD -fopenmp -Wall -O2
-+WXCXXFLAGS= `$(WXCONFIG) --cxxflags` -MMD -fopenmp -Wall
- WXLDFLAGS = `$(WXCONFIG) --libs` `$(WXCONFIG) --libs aui` `$(WXCONFIG) --libs core`
- WXCXXFLAGS += -fopenmp
--LDFLAGS += -lgomp
-+LDFLAGS += -fopenmp -lgomp
- #add this ldflags for WinConsole  "-Wl,--subsystem,console -mconsole" for win-debug
- #LDFLAGS += -Wl,--subsystem,console -mconsole
- RC = `$(WXCONFIG) --rescomp`
-@@ -22,7 +22,7 @@ SOURCES= src/HexEditorGui.cpp \
- 			src/HexEditorCtrl/wxHexCtrl/Tag.cpp\
- 			src/HexEditorCtrl/HexEditorCtrlGui.cpp\
- 			src/HexEditorFrame.cpp
--LIBS = udis86/libudis86/.libs/libudis86.a mhash/lib/.libs/libmhash.a
-+LIBS = -ludis86 -lmhash
- OBJECTS=$(SOURCES:.cpp=.o)
- DEPENDS=$(OBJECTS:.o=.d)
- LANGUAGEDIRS=`ls -l ./locale | grep ^d | sed s/.*\ //g;`
-@@ -68,15 +68,6 @@ langs: $(MOBJECTS)
- %.mo : %.po
- 	$(MSGFMT) $< -o $@
- 
--udis86/libudis86/.libs/libudis86.a:
--	cd udis86;./autogen.sh
--	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) CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS) ${OPTFLAGS}" CXXFLAGS="$(CXXFLAGS) ${OPTFLAGS}" CPPFLAGS="$(CPPFLAGS)"
--	cd mhash; $(MAKE) $(MFLAGS)
--
- src/windrv.o:
- 	$(CXX) $(LIBS) ${CXXFLAGS} ${OPTFLAGS} $(WXCXXFLAGS) $(WXLDFLAGS) ${LDFLAGS} -c src/windrv.cpp -o src/windrv.o
- 
---- a/src/HexDialogs.cpp
-+++ b/src/HexDialogs.cpp
-@@ -24,7 +24,7 @@
- #define NANINT 0xFFFFFFFFFFFFFFFFLL
- #include "HexDialogs.h"
- #include <wx/progdlg.h>
--#include "../mhash/include/mhash.h"
-+#include <mhash.h>
- 
- #ifdef __SSE2__
- 	#include <emmintrin.h>
---- a/src/HexEditor.h
-+++ b/src/HexEditor.h
-@@ -25,7 +25,7 @@
- #ifndef _wxHexEditor_h_
- #define _wxHexEditor_h_
- 
--#include "../mhash/include/mhash.h"
-+#include <mhash.h>
- 
- #include <wx/ffile.h>
- #include <wx/clipbrd.h>
---- a/src/HexPanels.h
-+++ b/src/HexPanels.h
-@@ -27,7 +27,7 @@
- #include "HexEditorFrame.h"
- #include "HexEditorCtrl/HexEditorCtrl.h"
- #include "HexEditorCtrl/wxHexCtrl/wxHexCtrl.h"
--#include "../udis86/udis86.h"
-+#include <udis86.h>
- 
- #ifdef WX_GCH
- #include <wx_pch.h>
-- 
cgit v1.2.3