1 |
commit: ce7af7ddc191da1193a220c050d094c657c9658b |
2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Jan 5 00:18:09 2018 +0000 |
4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Jan 5 00:36:40 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce7af7dd |
7 |
|
8 |
app-editors/wxhexeditor: bump to 0.24, use gtk3, other improvements |
9 |
|
10 |
* Update HOMEPAGE |
11 |
* Use wxGTK:3.0-gtk3, seems to work on a fast test, please report any regressions |
12 |
* Port to EAPI-6 |
13 |
* Update syslibs patch to apply against 0.24 and not add hardcoded -O2 to build |
14 |
* Remove l10n.eclass usage as intended during LINGUAS IUSE deEXPANDing |
15 |
* The upstream bump itself fixes compilation failure with gcc7 |
16 |
|
17 |
Closes: https://bugs.gentoo.org/639740 |
18 |
Package-Manager: Portage-2.3.19, Repoman-2.3.6 |
19 |
|
20 |
app-editors/wxhexeditor/Manifest | 1 + |
21 |
.../files/wxhexeditor-0.24-syslibs.patch | 76 ++++++++++++++++++++++ |
22 |
app-editors/wxhexeditor/wxhexeditor-0.24.ebuild | 40 ++++++++++++ |
23 |
3 files changed, 117 insertions(+) |
24 |
|
25 |
diff --git a/app-editors/wxhexeditor/Manifest b/app-editors/wxhexeditor/Manifest |
26 |
index c81cb377963..2ed195788c7 100644 |
27 |
--- a/app-editors/wxhexeditor/Manifest |
28 |
+++ b/app-editors/wxhexeditor/Manifest |
29 |
@@ -1 +1,2 @@ |
30 |
DIST wxHexEditor-v0.23-src.tar.bz2 2534659 BLAKE2B 932b2d9ab14dee71b5f5f57d89bc71c190c136c106339563ade44ea47e47819c4fdb32511296c14b3bebdfedd55a331c74e9a722e1d54e22ba53d203f753b57d SHA512 abbd2338c2d0d7d514342f5c330ea42c9ee1f3489c4661426927f51c802a7806e4ee965fa5d467c7b928ba87395eb6c351ab5f43f18d5fce836adede5f1d6be4 |
31 |
+DIST wxHexEditor-v0.24-src.tar.xz 900868 BLAKE2B 6748249d75e7570197a6c78378a8f3109bfa4c72bf32fe63e2abd31734d97fda3d56ecddb52ac5f9a18cc77b2c727f8277688f1bf75ef8f665a3a9cefd1cb8a6 SHA512 8589da169c90cca5abf6ba957d5c5e17e4211123dbdbaf0e04d31757113e7e302d40df58144ec25d431c7c4ce2fa2721b16621d03630ac8b90478c704a8c5b09 |
32 |
|
33 |
diff --git a/app-editors/wxhexeditor/files/wxhexeditor-0.24-syslibs.patch b/app-editors/wxhexeditor/files/wxhexeditor-0.24-syslibs.patch |
34 |
new file mode 100644 |
35 |
index 00000000000..af874128eac |
36 |
--- /dev/null |
37 |
+++ b/app-editors/wxhexeditor/files/wxhexeditor-0.24-syslibs.patch |
38 |
@@ -0,0 +1,76 @@ |
39 |
+Use system copies of mhash and udis86. |
40 |
+Also pass -fopenmp when linking to avoid build errors. |
41 |
+Remove -O2 from forced CXXFLAGS. |
42 |
+ |
43 |
+--- a/Makefile |
44 |
++++ b/Makefile |
45 |
+@@ -1,9 +1,9 @@ |
46 |
+ WXCONFIG ?= wx-config |
47 |
+ HOST= |
48 |
+-WXCXXFLAGS= `$(WXCONFIG) --cxxflags` -Iudis86 -Imhash/include -MMD -fopenmp -Wall -O2 |
49 |
++WXCXXFLAGS= `$(WXCONFIG) --cxxflags` -MMD -fopenmp -Wall |
50 |
+ WXLDFLAGS = `$(WXCONFIG) --libs` `$(WXCONFIG) --libs aui` `$(WXCONFIG) --libs core` |
51 |
+ WXCXXFLAGS += -fopenmp |
52 |
+-LDFLAGS += -lgomp |
53 |
++LDFLAGS += -fopenmp -lgomp |
54 |
+ #add this ldflags for WinConsole "-Wl,--subsystem,console -mconsole" for win-debug |
55 |
+ #LDFLAGS += -Wl,--subsystem,console -mconsole |
56 |
+ RC = `$(WXCONFIG) --rescomp` |
57 |
+@@ -22,7 +22,7 @@ SOURCES= src/HexEditorGui.cpp \ |
58 |
+ src/HexEditorCtrl/wxHexCtrl/Tag.cpp\ |
59 |
+ src/HexEditorCtrl/HexEditorCtrlGui.cpp\ |
60 |
+ src/HexEditorFrame.cpp |
61 |
+-LIBS = udis86/libudis86/.libs/libudis86.a mhash/lib/.libs/libmhash.a |
62 |
++LIBS = -ludis86 -lmhash |
63 |
+ OBJECTS=$(SOURCES:.cpp=.o) |
64 |
+ DEPENDS=$(OBJECTS:.o=.d) |
65 |
+ LANGUAGEDIRS=`ls -l ./locale | grep ^d | sed s/.*\ //g;` |
66 |
+@@ -68,15 +68,6 @@ langs: $(MOBJECTS) |
67 |
+ %.mo : %.po |
68 |
+ $(MSGFMT) $< -o $@ |
69 |
+ |
70 |
+-udis86/libudis86/.libs/libudis86.a: |
71 |
+- cd udis86;./autogen.sh |
72 |
+- cd udis86;./configure --host=$(HOST) CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS) ${OPTFLAGS}" CXXFLAGS="$(CXXFLAGS) ${OPTFLAGS}" CPPFLAGS="$(CPPFLAGS)" |
73 |
+- cd udis86/libudis86; $(MAKE) $(MFLAGS) |
74 |
+- |
75 |
+-mhash/lib/.libs/libmhash.a: |
76 |
+- cd mhash; ./configure --host=$(HOST) CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS) ${OPTFLAGS}" CXXFLAGS="$(CXXFLAGS) ${OPTFLAGS}" CPPFLAGS="$(CPPFLAGS)" |
77 |
+- cd mhash; $(MAKE) $(MFLAGS) |
78 |
+- |
79 |
+ src/windrv.o: |
80 |
+ $(CXX) $(LIBS) ${CXXFLAGS} ${OPTFLAGS} $(WXCXXFLAGS) $(WXLDFLAGS) ${LDFLAGS} -c src/windrv.cpp -o src/windrv.o |
81 |
+ |
82 |
+--- a/src/HexDialogs.cpp |
83 |
++++ b/src/HexDialogs.cpp |
84 |
+@@ -24,7 +24,7 @@ |
85 |
+ #define NANINT 0xFFFFFFFFFFFFFFFFLL |
86 |
+ #include "HexDialogs.h" |
87 |
+ #include <wx/progdlg.h> |
88 |
+-#include "../mhash/include/mhash.h" |
89 |
++#include <mhash.h> |
90 |
+ |
91 |
+ #ifdef __SSE2__ |
92 |
+ #include <emmintrin.h> |
93 |
+--- a/src/HexEditor.h |
94 |
++++ b/src/HexEditor.h |
95 |
+@@ -25,7 +25,7 @@ |
96 |
+ #ifndef _wxHexEditor_h_ |
97 |
+ #define _wxHexEditor_h_ |
98 |
+ |
99 |
+-#include "../mhash/include/mhash.h" |
100 |
++#include <mhash.h> |
101 |
+ |
102 |
+ #include <wx/ffile.h> |
103 |
+ #include <wx/clipbrd.h> |
104 |
+--- a/src/HexPanels.h |
105 |
++++ b/src/HexPanels.h |
106 |
+@@ -27,7 +27,7 @@ |
107 |
+ #include "HexEditorFrame.h" |
108 |
+ #include "HexEditorCtrl/HexEditorCtrl.h" |
109 |
+ #include "HexEditorCtrl/wxHexCtrl/wxHexCtrl.h" |
110 |
+-#include "../udis86/udis86.h" |
111 |
++#include <udis86.h> |
112 |
+ |
113 |
+ #ifdef WX_GCH |
114 |
+ #include <wx_pch.h> |
115 |
|
116 |
diff --git a/app-editors/wxhexeditor/wxhexeditor-0.24.ebuild b/app-editors/wxhexeditor/wxhexeditor-0.24.ebuild |
117 |
new file mode 100644 |
118 |
index 00000000000..a9a2abcec25 |
119 |
--- /dev/null |
120 |
+++ b/app-editors/wxhexeditor/wxhexeditor-0.24.ebuild |
121 |
@@ -0,0 +1,40 @@ |
122 |
+# Copyright 1999-2018 Gentoo Foundation |
123 |
+# Distributed under the terms of the GNU General Public License v2 |
124 |
+ |
125 |
+EAPI=6 |
126 |
+WX_GTK_VER=3.0-gtk3 |
127 |
+ |
128 |
+inherit toolchain-funcs wxwidgets |
129 |
+ |
130 |
+MY_PN="wxHexEditor" |
131 |
+ |
132 |
+DESCRIPTION="A cross-platform hex editor designed specially for large files" |
133 |
+HOMEPAGE="http://www.wxhexeditor.org/" |
134 |
+SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-v${PV}-src.tar.xz" |
135 |
+ |
136 |
+LICENSE="GPL-2" |
137 |
+SLOT="0" |
138 |
+KEYWORDS="~amd64 ~x86" |
139 |
+IUSE="" |
140 |
+ |
141 |
+DEPEND=" |
142 |
+ app-crypt/mhash |
143 |
+ dev-libs/udis86 |
144 |
+ x11-libs/wxGTK:${WX_GTK_VER}[X]" |
145 |
+RDEPEND="${DEPEND}" |
146 |
+ |
147 |
+S="${WORKDIR}/${MY_PN}" |
148 |
+ |
149 |
+PATCHES=( |
150 |
+ "${FILESDIR}"/${P}-syslibs.patch |
151 |
+) |
152 |
+ |
153 |
+pkg_pretend() { |
154 |
+ tc-has-openmp \ |
155 |
+ || die "${PN} uses OpenMP libraries. Please use an OpenMP-capable compiler." |
156 |
+} |
157 |
+ |
158 |
+src_prepare() { |
159 |
+ setup-wxwidgets |
160 |
+ default |
161 |
+} |