diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /app-editors/wxhexeditor/files | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'app-editors/wxhexeditor/files')
4 files changed, 328 insertions, 0 deletions
diff --git a/app-editors/wxhexeditor/files/wxhexeditor-0.20-makefile.patch b/app-editors/wxhexeditor/files/wxhexeditor-0.20-makefile.patch new file mode 100644 index 000000000000..b4d97b2ec25c --- /dev/null +++ b/app-editors/wxhexeditor/files/wxhexeditor-0.20-makefile.patch @@ -0,0 +1,108 @@ +--- a/makefile ++++ b/makefile +@@ -1,8 +1,8 @@ + WXCONFIG = wx-config + CC = `$(WXCONFIG) --cc` + CPP = `$(WXCONFIG) --cxx` +-CXXFLAGS= `$(WXCONFIG) --cxxflags` -Iudis86 -Imhash/include -MMD -O2 -c ${OPTFLAGS} +-LDFLAGS = `$(WXCONFIG) --libs` ++WXCXXFLAGS= `$(WXCONFIG) --cxxflags` -MMD -c ${OPTFLAGS} -fopenmp ${CXXFLAGS} ++WXLDFLAGS = `$(WXCONFIG) --libs` -fopenmp ${LDFLAGS} + RC = `$(WXCONFIG) --rescomp` + #RC = x86_64-w64-mingw32-windres --define WX_CPU_AMD64 + RCFLAGS = `$(WXCONFIG) --cxxflags | sed s/' '-m.*//g;` +@@ -19,7 +19,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 = -lmhash -ludis86 + OBJECTS=$(SOURCES:.cpp=.o) + DEPENDS=$(OBJECTS:.o=.d) + RESOURCES= resources/resource.rc +@@ -28,43 +28,35 @@ EXECUTABLE=wxHexEditor + EXECUTABLE_WIN=$(EXECUTABLE).exe + EXECUTABLE_DIR_MAC=$(EXECUTABLE).app + +-PREFIX = /usr/local ++DESTDIR = ++PREFIX = $(DESTDIR)/usr + BINDIR = $(PREFIX)/bin + DATADIR = $(PREFIX)/share + LOCALEDIR = $(DATADIR)/locale + +-VERSION = 0.12 Beta ++VERSION = 0.20 + + all: $(EXECUTABLE) + +-$(OBJECTS): $(LIBS) $(SOURCES) ++$(OBJECTS): $(SOURCES) + + $(EXECUTABLE): $(OBJECTS) +- $(CPP) $(OBJECTS) $(LIBS) $(LDFLAGS) -lgomp -o $@ ++ $(CPP) $(OBJECTS) $(LIBS) $(WXLDFLAGS) ${CXXFLAGS} -o $@ + +-.cpp.o: $(LIBS) +- $(CPP) $(CXXFLAGS) $< -o $@ ++.cpp.o: ++ $(CPP) $(WXCXXFLAGS) $< -o $@ + + %.o : %.rc + $(RC) $(RCFLAGS) $< -o $@ + +-udis86/libudis86/.libs/libudis86.a: +- cd udis86;./autogen.sh +- cd udis86;./configure --host=$(HOST) +- cd udis86/libudis86; $(MAKE) $(MFLAGS) +- +-mhash/lib/.libs/libmhash.a: +- cd mhash; ./configure --host=$(HOST) +- cd mhash; $(MAKE) $(MFLAGS) +- + win: $(RESOURCES) $(EXECUTABLE_WIN) + + #Stack override required for file comparison function... + $(EXECUTABLE_WIN): $(OBJECTS) $(RESOURCE_OBJ) +- $(CPP) $(OBJECTS) $(RESOURCE_OBJ) $(LIBS) $(LDFLAGS) -static-libgcc -static-libstdc++ -Wl,--stack,32000000 -o $@ ++ $(CPP) $(OBJECTS) $(RESOURCE_OBJ) $(LIBS) ${CXXFLAGS} $(WXLDFLAGS) -static-libgcc -static-libstdc++ -Wl,--stack,32000000 -o $@ + + maclink: $(OBJECTS) +- $(CPP) $(OBJECTS) $(LIBS) $(LDFLAGS) -lexpat -Wl,-stack_size,0x2000000 -o $(EXECUTABLE) ++ $(CPP) $(OBJECTS) $(LIBS) ${CXXFLAGS} $(WXLDFLAGS) -lexpat -Wl,-stack_size,0x2000000 -o $(EXECUTABLE) + + mac: maclink + mkdir -p $(EXECUTABLE_DIR_MAC)/Contents +--- 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 _OPENMP + #include <omp.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> diff --git a/app-editors/wxhexeditor/files/wxhexeditor-0.21-desktop-validation.patch b/app-editors/wxhexeditor/files/wxhexeditor-0.21-desktop-validation.patch new file mode 100644 index 000000000000..aa2bb39bf85a --- /dev/null +++ b/app-editors/wxhexeditor/files/wxhexeditor-0.21-desktop-validation.patch @@ -0,0 +1,17 @@ +--- a/resources/wxHexEditor.desktop ++++ b/resources/wxHexEditor.desktop +@@ -1,12 +1,11 @@ + [Desktop Entry] +-Version=v1.0 ++Version=1.0 + Encoding=UTF-8 + Name=wxHexEditor + GenericName=wxHexEditor + Comment=A hex editor for huge files and devices + Exec=wxHexEditor +-Icon=wxHexEditor.png ++Icon=wxHexEditor + Terminal=false + Type=Application +-MimeType=* + Categories=Utility;TextEditor; diff --git a/app-editors/wxhexeditor/files/wxhexeditor-0.21-makefile.patch b/app-editors/wxhexeditor/files/wxhexeditor-0.21-makefile.patch new file mode 100644 index 000000000000..34efd652abbe --- /dev/null +++ b/app-editors/wxhexeditor/files/wxhexeditor-0.21-makefile.patch @@ -0,0 +1,107 @@ +- respect CXXFLAGS/LDFLAGS +- install into /usr +- use system mhash and udis86 + +--- a/makefile ++++ b/makefile +@@ -1,8 +1,8 @@ + WXCONFIG = wx-config + CC = `$(WXCONFIG) --cc` + CXX = `$(WXCONFIG) --cxx` +-CXXFLAGS= `$(WXCONFIG) --cxxflags` -Iudis86 -Imhash/include -MMD -O2 -c ${OPTFLAGS} +-LDFLAGS = `$(WXCONFIG) --libs` ++WXCXXFLAGS= `$(WXCONFIG) --cxxflags` -MMD -O2 -c ${OPTFLAGS} ++WXLDFLAGS = `$(WXCONFIG) --libs` + RC = `$(WXCONFIG) --rescomp` + #RC = x86_64-w64-mingw32-windres --define WX_CPU_AMD64 + RCFLAGS = `$(WXCONFIG) --cxxflags | sed s/' '-m.*//g;` +@@ -21,7 +21,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=tr +@@ -32,7 +32,7 @@ EXECUTABLE=wxHexEditor + EXECUTABLE_WIN=$(EXECUTABLE).exe + EXECUTABLE_DIR_MAC=$(EXECUTABLE).app + +-PREFIX = /usr/local ++PREFIX = /usr + BINDIR = $(PREFIX)/bin + DATADIR = $(PREFIX)/share + LOCALEDIR = $(DATADIR)/locale +@@ -46,10 +46,10 @@ $(OBJECTS): $(LIBS) $(SOURCES) + MOBJECTS=$(LANGUAGES:.po=.mo) + + $(EXECUTABLE): $(OBJECTS) +- $(CXX) $(OBJECTS) $(LIBS) $(LDFLAGS) -lgomp -o $@ ++ $(CXX) $(OBJECTS) $(LIBS) ${CXXFLAGS} $(WXLDFLAGS) ${LDFLAGS} -lgomp -o $@ + + .cpp.o: $(LIBS) +- $(CXX) $(CXXFLAGS) $< -o $@ ++ $(CXX) $(WXCXXFLAGS) ${CXXFLAGS} $< -o $@ + + %.o : %.rc + $(RC) $(RCFLAGS) $< -o $@ +@@ -59,23 +59,14 @@ langs: $(MOBJECTS) + %.mo : %.po + $(MSGFMT) $< -o $@ + +-udis86/libudis86/.libs/libudis86.a: +- cd udis86;./autogen.sh +- cd udis86;./configure --host=$(HOST) +- cd udis86/libudis86; $(MAKE) $(MFLAGS) +- +-mhash/lib/.libs/libmhash.a: +- cd mhash; ./configure --host=$(HOST) +- cd mhash; $(MAKE) $(MFLAGS) +- + win: $(RESOURCES) $(EXECUTABLE_WIN) + + #Stack override required for file comparison function... + $(EXECUTABLE_WIN): $(OBJECTS) $(RESOURCE_OBJ) +- $(CXX) $(OBJECTS) $(RESOURCE_OBJ) $(LIBS) $(LDFLAGS) -static-libgcc -static-libstdc++ -Wl,--stack,32000000 -o $@ ++ $(CXX) $(OBJECTS) $(RESOURCE_OBJ) $(LIBS) ${CXXFLAGS} $(WXLDFLAGS) ${LDFLAGS} -static-libgcc -static-libstdc++ -Wl,--stack,32000000 -o $@ + + maclink: $(OBJECTS) +- $(CXX) $(OBJECTS) $(LIBS) $(LDFLAGS) -lexpat -lgomp -Wl,-stack_size,0x2000000 -o $(EXECUTABLE) ++ $(CXX) $(OBJECTS) $(LIBS) ${CXXFLAGS} $(WXLDFLAGS) ${LDFLAGS} -lexpat -lgomp -Wl,-stack_size,0x2000000 -o $(EXECUTABLE) + + mac: maclink langs + mkdir -p $(EXECUTABLE_DIR_MAC)/Contents +--- 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 _OPENMP + #include <omp.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> diff --git a/app-editors/wxhexeditor/files/wxhexeditor-0.22-makefile.patch b/app-editors/wxhexeditor/files/wxhexeditor-0.22-makefile.patch new file mode 100644 index 000000000000..5e40694487f4 --- /dev/null +++ b/app-editors/wxhexeditor/files/wxhexeditor-0.22-makefile.patch @@ -0,0 +1,96 @@ + Makefile | 19 +++++-------------- + src/HexDialogs.cpp | 2 +- + src/HexEditor.h | 2 +- + src/HexPanels.h | 2 +- + 4 files changed, 8 insertions(+), 17 deletions(-) + +diff --git a/Makefile b/Makefile +index ead0702..cb80ddf 100755 +--- a/Makefile ++++ b/Makefile +@@ -1,9 +1,9 @@ + WXCONFIG = wx-config + CC = `$(WXCONFIG) --cc` + CXX = `$(WXCONFIG) --cxx` +-CFLAGS = -O2 +-CXXFLAGS = -O2 +-WXCXXFLAGS= `$(WXCONFIG) --cxxflags` -Iudis86 -Imhash/include -MMD -O2 -c ${OPTFLAGS} ++CFLAGS ?= -O2 ++CXXFLAGS ?= -O2 ++WXCXXFLAGS= `$(WXCONFIG) --cxxflags` -MMD -O2 -c ${OPTFLAGS} + WXLDFLAGS = `$(WXCONFIG) --libs` + RC = `$(WXCONFIG) --rescomp` + #RC = x86_64-w64-mingw32-windres --define WX_CPU_AMD64 +@@ -23,7 +23,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=tr ru +@@ -34,7 +34,7 @@ EXECUTABLE=wxHexEditor + EXECUTABLE_WIN=$(EXECUTABLE).exe + EXECUTABLE_DIR_MAC=$(EXECUTABLE).app + +-PREFIX = /usr/local ++PREFIX = /usr + BINDIR = $(PREFIX)/bin + DATADIR = $(PREFIX)/share + LOCALEDIR = $(DATADIR)/locale +@@ -61,15 +61,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}" CXXFLAGS="${CXXFLAGS}" +- cd udis86/libudis86; $(MAKE) $(MFLAGS) +- +-mhash/lib/.libs/libmhash.a: +- cd mhash; ./configure --host=$(HOST) CC=$(CC) CXX=$(CXX) CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" +- cd mhash; $(MAKE) $(MFLAGS) +- + win: $(RESOURCES) $(EXECUTABLE_WIN) + + #Stack override required for file comparison function... +diff --git a/src/HexDialogs.cpp b/src/HexDialogs.cpp +index 133830e..6ea0cc0 100644 +--- 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 _OPENMP + #include <omp.h> +diff --git a/src/HexEditor.h b/src/HexEditor.h +index 7946d05..d4e1eb8 100644 +--- 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> +diff --git a/src/HexPanels.h b/src/HexPanels.h +index d498fa9..9f2ad5d 100644 +--- 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> |