1 |
commit: 36f20e902afe189529639ba25fe6ccaccf31c6da |
2 |
Author: Ryan Hill <rhill <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Dec 14 23:35:33 2015 +0000 |
4 |
Commit: Ryan Hill <rhill <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Dec 14 23:35:33 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36f20e90 |
7 |
|
8 |
app-editors/wxhexeditor: Version bump, bug #542790. |
9 |
|
10 |
Package-Manager: portage-2.2.26 |
11 |
Signed-off-by: Ryan Hill <rhill <AT> gentoo.org> |
12 |
|
13 |
app-editors/wxhexeditor/Manifest | 1 + |
14 |
.../files/wxhexeditor-0.23-syslibs.patch | 84 ++++++++++++++++++++++ |
15 |
app-editors/wxhexeditor/wxhexeditor-0.23.ebuild | 46 ++++++++++++ |
16 |
3 files changed, 131 insertions(+) |
17 |
|
18 |
diff --git a/app-editors/wxhexeditor/Manifest b/app-editors/wxhexeditor/Manifest |
19 |
index bdecce4..a757244 100644 |
20 |
--- a/app-editors/wxhexeditor/Manifest |
21 |
+++ b/app-editors/wxhexeditor/Manifest |
22 |
@@ -1,3 +1,4 @@ |
23 |
DIST wxHexEditor-v0.20-src.tar.bz2 1194554 SHA256 a3dda32eb62e3ec1c9760519302bcef688253d48b3d2c566f9629c4e4246ae55 SHA512 f8138fb892528fd7d131b0931f52cb6b19dc984aa831882d7f60f557527e6bb559429a11b5a1307cf51d1a8974123627d15ccee87561970784a75910929f85a3 WHIRLPOOL 9d3343060f815fae7b2512b098c3a1c4853c062040cb2b180bf7402231295d27e96a3996aca041ce2f694f2cc84bb6dfbc419797079713afb254900187d100e0 |
24 |
DIST wxHexEditor-v0.21-src.tar.bz2 1760192 SHA256 076111ebcf1472e80ec9a16223ca60bdf4598689cc5aa076a4f9760bba51f17f SHA512 bea80a139bb76e47ed5d3644f923b4b042d8842bb3522e88e2c84947eadc7f49f2599438f583ea8a1fde05356886d8fb20f679398e1519c13acd8e4dd49ad729 WHIRLPOOL fd5ebc1609183b8879254461c7eb1a22355a2f71ca45452a6dd21ca8164c5b8b96474d9d1c01b2aea962d4d47c291e3b43d8bf1d337c7bcff6c1c109c3fe29b9 |
25 |
DIST wxHexEditor-v0.22-src.tar.bz2 2329754 SHA256 3c04725d218d21807ee78ccdd4bc78d302b92139c92bbd0a0edc53f2d0003996 SHA512 d846b30110bf2c864ec8dc45d1a4e9e333ec79379e335d7ecf5c8eed18a22bf2af26de1bcdca1977c94f2789a82c6eaf5fd2c2a91389f4c20f219a974c5e18ac WHIRLPOOL 44988f4349bc78ce7dd975ce7332a72dc5176e3308a9837e0634cce55e029a758488ed1ff07fdcd1f8c64638b0bf86ea8b73cc4c8f7b7400384487eb6bbfea1d |
26 |
+DIST wxHexEditor-v0.23-src.tar.bz2 2534659 SHA256 24a5a8b8df3abfbc3836d07b379003b45ea0ab0d2d45cb9611c797c595f8972b SHA512 abbd2338c2d0d7d514342f5c330ea42c9ee1f3489c4661426927f51c802a7806e4ee965fa5d467c7b928ba87395eb6c351ab5f43f18d5fce836adede5f1d6be4 WHIRLPOOL 808bc8694a89f1eadb1b2c772cd69c76c7e3aba82d793f94f75a6392de5009546c2ada78bd8513f551edfd878251056ace367d9bbfdb21cd5f0bea4899c30c9f |
27 |
|
28 |
diff --git a/app-editors/wxhexeditor/files/wxhexeditor-0.23-syslibs.patch b/app-editors/wxhexeditor/files/wxhexeditor-0.23-syslibs.patch |
29 |
new file mode 100644 |
30 |
index 0000000..341c63b |
31 |
--- /dev/null |
32 |
+++ b/app-editors/wxhexeditor/files/wxhexeditor-0.23-syslibs.patch |
33 |
@@ -0,0 +1,84 @@ |
34 |
+Use system copies of mhash and udis86. |
35 |
+Also pass -fopenmp when linking to avoid build errors. |
36 |
+ |
37 |
+--- a/Makefile |
38 |
++++ b/Makefile |
39 |
+@@ -3,9 +3,9 @@ WXCONFIG = wx-config |
40 |
+ #CXX ?= `$(WXCONFIG) --cxx` |
41 |
+ CC = `$(WXCONFIG) --cc` |
42 |
+ CXX = `$(WXCONFIG) --cxx` |
43 |
+-LDFLAGS += -lgomp |
44 |
++LDFLAGS += -fopenmp -lgomp |
45 |
+ #add this ldflags for WinConsole "-Wl,--subsystem,console -mconsole" for win-debug |
46 |
+-WXCXXFLAGS= `$(WXCONFIG) --cxxflags` -Iudis86 -Imhash/include -MMD -fopenmp |
47 |
++WXCXXFLAGS= `$(WXCONFIG) --cxxflags` -MMD -fopenmp |
48 |
+ WXLDFLAGS = `$(WXCONFIG) --libs` `$(WXCONFIG) --libs aui` `$(WXCONFIG) --libs core` |
49 |
+ RC = `$(WXCONFIG) --rescomp` |
50 |
+ #RC = x86_64-w64-mingw32-windres --define WX_CPU_AMD64 |
51 |
+@@ -25,7 +25,7 @@ SOURCES= src/HexEditorGui.cpp \ |
52 |
+ src/HexEditorCtrl/wxHexCtrl/Tag.cpp\ |
53 |
+ src/HexEditorCtrl/HexEditorCtrlGui.cpp\ |
54 |
+ src/HexEditorFrame.cpp |
55 |
+-LIBS = udis86/libudis86/.libs/libudis86.a mhash/lib/.libs/libmhash.a |
56 |
++LIBS = -ludis86 -lmhash |
57 |
+ OBJECTS=$(SOURCES:.cpp=.o) |
58 |
+ DEPENDS=$(OBJECTS:.o=.d) |
59 |
+ LANGUAGEDIRS=`ls -l ./locale | grep ^d | sed s/.*\ //g;` |
60 |
+@@ -36,7 +36,7 @@ EXECUTABLE=wxHexEditor |
61 |
+ EXECUTABLE_WIN=$(EXECUTABLE).exe |
62 |
+ EXECUTABLE_DIR_MAC=$(EXECUTABLE).app |
63 |
+ |
64 |
+-PREFIX = /usr/local |
65 |
++PREFIX = /usr |
66 |
+ BINDIR = $(PREFIX)/bin |
67 |
+ DATADIR = $(PREFIX)/share |
68 |
+ LOCALEDIR = $(DATADIR)/locale |
69 |
+@@ -63,15 +63,6 @@ langs: $(MOBJECTS) |
70 |
+ %.mo : %.po |
71 |
+ $(MSGFMT) $< -o $@ |
72 |
+ |
73 |
+-udis86/libudis86/.libs/libudis86.a: |
74 |
+- cd udis86;./autogen.sh |
75 |
+- cd udis86;./configure --host=$(HOST) CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" |
76 |
+- cd udis86/libudis86; $(MAKE) $(MFLAGS) |
77 |
+- |
78 |
+-mhash/lib/.libs/libmhash.a: |
79 |
+- cd mhash; ./configure --host=$(HOST) CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" |
80 |
+- cd mhash; $(MAKE) $(MFLAGS) |
81 |
+- |
82 |
+ win: $(RESOURCES) $(EXECUTABLE_WIN) |
83 |
+ |
84 |
+ #Stack override required for file comparison function... |
85 |
+--- a/src/HexDialogs.cpp |
86 |
++++ b/src/HexDialogs.cpp |
87 |
+@@ -24,7 +24,7 @@ |
88 |
+ #define NANINT 0xFFFFFFFFFFFFFFFFLL |
89 |
+ #include "HexDialogs.h" |
90 |
+ #include <wx/progdlg.h> |
91 |
+-#include "../mhash/include/mhash.h" |
92 |
++#include <mhash.h> |
93 |
+ |
94 |
+ #ifdef _OPENMP_ |
95 |
+ #include <omp.h> |
96 |
+--- a/src/HexEditor.h |
97 |
++++ b/src/HexEditor.h |
98 |
+@@ -25,7 +25,7 @@ |
99 |
+ #ifndef _wxHexEditor_h_ |
100 |
+ #define _wxHexEditor_h_ |
101 |
+ |
102 |
+-#include "../mhash/include/mhash.h" |
103 |
++#include <mhash.h> |
104 |
+ |
105 |
+ #include <wx/ffile.h> |
106 |
+ #include <wx/clipbrd.h> |
107 |
+--- a/src/HexPanels.h |
108 |
++++ b/src/HexPanels.h |
109 |
+@@ -27,7 +27,7 @@ |
110 |
+ #include "HexEditorFrame.h" |
111 |
+ #include "HexEditorCtrl/HexEditorCtrl.h" |
112 |
+ #include "HexEditorCtrl/wxHexCtrl/wxHexCtrl.h" |
113 |
+-#include "../udis86/udis86.h" |
114 |
++#include <udis86.h> |
115 |
+ |
116 |
+ #ifdef WX_GCH |
117 |
+ #include <wx_pch.h> |
118 |
|
119 |
diff --git a/app-editors/wxhexeditor/wxhexeditor-0.23.ebuild b/app-editors/wxhexeditor/wxhexeditor-0.23.ebuild |
120 |
new file mode 100644 |
121 |
index 0000000..a108387 |
122 |
--- /dev/null |
123 |
+++ b/app-editors/wxhexeditor/wxhexeditor-0.23.ebuild |
124 |
@@ -0,0 +1,46 @@ |
125 |
+# Copyright 1999-2015 Gentoo Foundation |
126 |
+# Distributed under the terms of the GNU General Public License v2 |
127 |
+# $Id$ |
128 |
+ |
129 |
+EAPI="5" |
130 |
+ |
131 |
+PLOCALES="ar cs de es fr hu_HU it ja_JP nl_NL pl pt_BR ro ru tr zh_CN" |
132 |
+ |
133 |
+inherit eutils l10n toolchain-funcs wxwidgets |
134 |
+ |
135 |
+MY_PN="wxHexEditor" |
136 |
+ |
137 |
+DESCRIPTION="A cross-platform hex editor designed specially for large files" |
138 |
+HOMEPAGE="http://wxhexeditor.sourceforge.net/" |
139 |
+SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-v${PV}-src.tar.bz2" |
140 |
+ |
141 |
+LICENSE="GPL-2" |
142 |
+SLOT="0" |
143 |
+KEYWORDS="~amd64 ~x86" |
144 |
+IUSE="" |
145 |
+ |
146 |
+DEPEND=" |
147 |
+ app-crypt/mhash |
148 |
+ dev-libs/udis86 |
149 |
+ x11-libs/wxGTK:3.0[X]" |
150 |
+RDEPEND="${DEPEND}" |
151 |
+ |
152 |
+S="${WORKDIR}/${MY_PN}" |
153 |
+ |
154 |
+pkg_pretend() { |
155 |
+ tc-has-openmp \ |
156 |
+ || die "${PN} uses OpenMP libraries. Please use an OpenMP-capable compiler." |
157 |
+} |
158 |
+ |
159 |
+src_prepare() { |
160 |
+ WX_GTK_VER="3.0" need-wxwidgets unicode |
161 |
+ epatch "${FILESDIR}"/${P}-syslibs.patch |
162 |
+ |
163 |
+ do_kill_locale() { |
164 |
+ rm -r "${S}"/locale/${1} |
165 |
+ } |
166 |
+ |
167 |
+ rm "${S}"/locale/wxHexEditor.pot |
168 |
+ l10n_find_plocales_changes "${S}"/locale '' '' |
169 |
+ l10n_for_each_disabled_locale_do do_kill_locale |
170 |
+} |