* [gentoo-commits] repo/gentoo:master commit in: app-editors/wxhexeditor/files/, app-editors/wxhexeditor/
@ 2015-12-14 23:34 Ryan Hill
0 siblings, 0 replies; 4+ messages in thread
From: Ryan Hill @ 2015-12-14 23:34 UTC (permalink / raw
To: gentoo-commits
commit: 268cc759a217c912551369dc6189982b4afa008d
Author: Ryan Hill <rhill <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 14 23:38:03 2015 +0000
Commit: Ryan Hill <rhill <AT> gentoo <DOT> org>
CommitDate: Mon Dec 14 23:38:03 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=268cc759
app-editors/wxhexeditor: Remove old.
Package-Manager: portage-2.2.26
Signed-off-by: Ryan Hill <rhill <AT> gentoo.org>
app-editors/wxhexeditor/Manifest | 2 -
.../files/wxhexeditor-0.20-makefile.patch | 108 ---------------------
.../wxhexeditor-0.21-desktop-validation.patch | 17 ----
.../files/wxhexeditor-0.21-makefile.patch | 107 --------------------
app-editors/wxhexeditor/wxhexeditor-0.20.ebuild | 35 -------
app-editors/wxhexeditor/wxhexeditor-0.21.ebuild | 38 --------
6 files changed, 307 deletions(-)
diff --git a/app-editors/wxhexeditor/Manifest b/app-editors/wxhexeditor/Manifest
index a757244..692e74d 100644
--- a/app-editors/wxhexeditor/Manifest
+++ b/app-editors/wxhexeditor/Manifest
@@ -1,4 +1,2 @@
-DIST wxHexEditor-v0.20-src.tar.bz2 1194554 SHA256 a3dda32eb62e3ec1c9760519302bcef688253d48b3d2c566f9629c4e4246ae55 SHA512 f8138fb892528fd7d131b0931f52cb6b19dc984aa831882d7f60f557527e6bb559429a11b5a1307cf51d1a8974123627d15ccee87561970784a75910929f85a3 WHIRLPOOL 9d3343060f815fae7b2512b098c3a1c4853c062040cb2b180bf7402231295d27e96a3996aca041ce2f694f2cc84bb6dfbc419797079713afb254900187d100e0
-DIST wxHexEditor-v0.21-src.tar.bz2 1760192 SHA256 076111ebcf1472e80ec9a16223ca60bdf4598689cc5aa076a4f9760bba51f17f SHA512 bea80a139bb76e47ed5d3644f923b4b042d8842bb3522e88e2c84947eadc7f49f2599438f583ea8a1fde05356886d8fb20f679398e1519c13acd8e4dd49ad729 WHIRLPOOL fd5ebc1609183b8879254461c7eb1a22355a2f71ca45452a6dd21ca8164c5b8b96474d9d1c01b2aea962d4d47c291e3b43d8bf1d337c7bcff6c1c109c3fe29b9
DIST wxHexEditor-v0.22-src.tar.bz2 2329754 SHA256 3c04725d218d21807ee78ccdd4bc78d302b92139c92bbd0a0edc53f2d0003996 SHA512 d846b30110bf2c864ec8dc45d1a4e9e333ec79379e335d7ecf5c8eed18a22bf2af26de1bcdca1977c94f2789a82c6eaf5fd2c2a91389f4c20f219a974c5e18ac WHIRLPOOL 44988f4349bc78ce7dd975ce7332a72dc5176e3308a9837e0634cce55e029a758488ed1ff07fdcd1f8c64638b0bf86ea8b73cc4c8f7b7400384487eb6bbfea1d
DIST wxHexEditor-v0.23-src.tar.bz2 2534659 SHA256 24a5a8b8df3abfbc3836d07b379003b45ea0ab0d2d45cb9611c797c595f8972b SHA512 abbd2338c2d0d7d514342f5c330ea42c9ee1f3489c4661426927f51c802a7806e4ee965fa5d467c7b928ba87395eb6c351ab5f43f18d5fce836adede5f1d6be4 WHIRLPOOL 808bc8694a89f1eadb1b2c772cd69c76c7e3aba82d793f94f75a6392de5009546c2ada78bd8513f551edfd878251056ace367d9bbfdb21cd5f0bea4899c30c9f
diff --git a/app-editors/wxhexeditor/files/wxhexeditor-0.20-makefile.patch b/app-editors/wxhexeditor/files/wxhexeditor-0.20-makefile.patch
deleted file mode 100644
index b4d97b2..0000000
--- a/app-editors/wxhexeditor/files/wxhexeditor-0.20-makefile.patch
+++ /dev/null
@@ -1,108 +0,0 @@
---- 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
deleted file mode 100644
index aa2bb39..0000000
--- a/app-editors/wxhexeditor/files/wxhexeditor-0.21-desktop-validation.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- 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
deleted file mode 100644
index 34efd65..0000000
--- a/app-editors/wxhexeditor/files/wxhexeditor-0.21-makefile.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-- 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/wxhexeditor-0.20.ebuild b/app-editors/wxhexeditor/wxhexeditor-0.20.ebuild
deleted file mode 100644
index 606be30..0000000
--- a/app-editors/wxhexeditor/wxhexeditor-0.20.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-WX_GTK_VER="2.8"
-
-inherit eutils toolchain-funcs wxwidgets
-
-MY_PN="wxHexEditor"
-
-DESCRIPTION="A cross-platform hex editor designed specially for large files"
-HOMEPAGE="http://wxhexeditor.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-v${PV}-src.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="app-crypt/mhash
- dev-libs/udis86
- x11-libs/wxGTK:2.8[X]"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_PN}"
-
-pkg_pretend() {
- tc-has-openmp \
- || die "${PN} uses OpenMP libraries. Please use an OpenMP-capable compiler."
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-makefile.patch
-}
diff --git a/app-editors/wxhexeditor/wxhexeditor-0.21.ebuild b/app-editors/wxhexeditor/wxhexeditor-0.21.ebuild
deleted file mode 100644
index 62b8a31..0000000
--- a/app-editors/wxhexeditor/wxhexeditor-0.21.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-WX_GTK_VER="2.8"
-
-inherit eutils toolchain-funcs wxwidgets
-
-MY_PN="wxHexEditor"
-
-DESCRIPTION="A cross-platform hex editor designed specially for large files"
-HOMEPAGE="http://wxhexeditor.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-v${PV}-src.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="app-crypt/mhash
- dev-libs/udis86
- x11-libs/wxGTK:2.8[X]"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_PN}"
-
-pkg_pretend() {
- tc-has-openmp \
- || die "${PN} uses OpenMP libraries. Please use an OpenMP-capable compiler."
-}
-
-src_prepare() {
- # parts sent upstream : https://sourceforge.net/p/wxhexeditor/patches/8/
- epatch "${FILESDIR}"/${P}-makefile.patch
- # sent upstream : https://sourceforge.net/p/wxhexeditor/patches/9/
- epatch "${FILESDIR}"/${P}-desktop-validation.patch
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-editors/wxhexeditor/files/, app-editors/wxhexeditor/
@ 2018-01-05 0:37 Mart Raudsepp
0 siblings, 0 replies; 4+ messages in thread
From: Mart Raudsepp @ 2018-01-05 0:37 UTC (permalink / raw
To: gentoo-commits
commit: ce7af7ddc191da1193a220c050d094c657c9658b
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 5 00:18:09 2018 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Fri Jan 5 00:36:40 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce7af7dd
app-editors/wxhexeditor: bump to 0.24, use gtk3, other improvements
* Update HOMEPAGE
* Use wxGTK:3.0-gtk3, seems to work on a fast test, please report any regressions
* Port to EAPI-6
* Update syslibs patch to apply against 0.24 and not add hardcoded -O2 to build
* Remove l10n.eclass usage as intended during LINGUAS IUSE deEXPANDing
* The upstream bump itself fixes compilation failure with gcc7
Closes: https://bugs.gentoo.org/639740
Package-Manager: Portage-2.3.19, Repoman-2.3.6
app-editors/wxhexeditor/Manifest | 1 +
.../files/wxhexeditor-0.24-syslibs.patch | 76 ++++++++++++++++++++++
app-editors/wxhexeditor/wxhexeditor-0.24.ebuild | 40 ++++++++++++
3 files changed, 117 insertions(+)
diff --git a/app-editors/wxhexeditor/Manifest b/app-editors/wxhexeditor/Manifest
index c81cb377963..2ed195788c7 100644
--- a/app-editors/wxhexeditor/Manifest
+++ b/app-editors/wxhexeditor/Manifest
@@ -1 +1,2 @@
DIST wxHexEditor-v0.23-src.tar.bz2 2534659 BLAKE2B 932b2d9ab14dee71b5f5f57d89bc71c190c136c106339563ade44ea47e47819c4fdb32511296c14b3bebdfedd55a331c74e9a722e1d54e22ba53d203f753b57d SHA512 abbd2338c2d0d7d514342f5c330ea42c9ee1f3489c4661426927f51c802a7806e4ee965fa5d467c7b928ba87395eb6c351ab5f43f18d5fce836adede5f1d6be4
+DIST wxHexEditor-v0.24-src.tar.xz 900868 BLAKE2B 6748249d75e7570197a6c78378a8f3109bfa4c72bf32fe63e2abd31734d97fda3d56ecddb52ac5f9a18cc77b2c727f8277688f1bf75ef8f665a3a9cefd1cb8a6 SHA512 8589da169c90cca5abf6ba957d5c5e17e4211123dbdbaf0e04d31757113e7e302d40df58144ec25d431c7c4ce2fa2721b16621d03630ac8b90478c704a8c5b09
diff --git a/app-editors/wxhexeditor/files/wxhexeditor-0.24-syslibs.patch b/app-editors/wxhexeditor/files/wxhexeditor-0.24-syslibs.patch
new file mode 100644
index 00000000000..af874128eac
--- /dev/null
+++ b/app-editors/wxhexeditor/files/wxhexeditor-0.24-syslibs.patch
@@ -0,0 +1,76 @@
+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>
diff --git a/app-editors/wxhexeditor/wxhexeditor-0.24.ebuild b/app-editors/wxhexeditor/wxhexeditor-0.24.ebuild
new file mode 100644
index 00000000000..a9a2abcec25
--- /dev/null
+++ b/app-editors/wxhexeditor/wxhexeditor-0.24.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+WX_GTK_VER=3.0-gtk3
+
+inherit toolchain-funcs wxwidgets
+
+MY_PN="wxHexEditor"
+
+DESCRIPTION="A cross-platform hex editor designed specially for large files"
+HOMEPAGE="http://www.wxhexeditor.org/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-v${PV}-src.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+ app-crypt/mhash
+ dev-libs/udis86
+ x11-libs/wxGTK:${WX_GTK_VER}[X]"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_PN}"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-syslibs.patch
+)
+
+pkg_pretend() {
+ tc-has-openmp \
+ || die "${PN} uses OpenMP libraries. Please use an OpenMP-capable compiler."
+}
+
+src_prepare() {
+ setup-wxwidgets
+ default
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-editors/wxhexeditor/files/, app-editors/wxhexeditor/
@ 2018-01-06 14:33 Mart Raudsepp
0 siblings, 0 replies; 4+ messages in thread
From: Mart Raudsepp @ 2018-01-06 14:33 UTC (permalink / raw
To: gentoo-commits
commit: c44809603709f0c06ac9ce3601b43e94cb031ae2
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 6 14:25:16 2018 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sat Jan 6 14:33:20 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4480960
app-editors/wxhexeditor: remove old
Package-Manager: Portage-2.3.19, Repoman-2.3.6
app-editors/wxhexeditor/Manifest | 1 -
.../files/wxhexeditor-0.23-syslibs.patch | 84 ----------------------
app-editors/wxhexeditor/wxhexeditor-0.23.ebuild | 45 ------------
app-editors/wxhexeditor/wxhexeditor-0.24.ebuild | 4 +-
4 files changed, 2 insertions(+), 132 deletions(-)
diff --git a/app-editors/wxhexeditor/Manifest b/app-editors/wxhexeditor/Manifest
index 2ed195788c7..6599d4e7fbe 100644
--- a/app-editors/wxhexeditor/Manifest
+++ b/app-editors/wxhexeditor/Manifest
@@ -1,2 +1 @@
-DIST wxHexEditor-v0.23-src.tar.bz2 2534659 BLAKE2B 932b2d9ab14dee71b5f5f57d89bc71c190c136c106339563ade44ea47e47819c4fdb32511296c14b3bebdfedd55a331c74e9a722e1d54e22ba53d203f753b57d SHA512 abbd2338c2d0d7d514342f5c330ea42c9ee1f3489c4661426927f51c802a7806e4ee965fa5d467c7b928ba87395eb6c351ab5f43f18d5fce836adede5f1d6be4
DIST wxHexEditor-v0.24-src.tar.xz 900868 BLAKE2B 6748249d75e7570197a6c78378a8f3109bfa4c72bf32fe63e2abd31734d97fda3d56ecddb52ac5f9a18cc77b2c727f8277688f1bf75ef8f665a3a9cefd1cb8a6 SHA512 8589da169c90cca5abf6ba957d5c5e17e4211123dbdbaf0e04d31757113e7e302d40df58144ec25d431c7c4ce2fa2721b16621d03630ac8b90478c704a8c5b09
diff --git a/app-editors/wxhexeditor/files/wxhexeditor-0.23-syslibs.patch b/app-editors/wxhexeditor/files/wxhexeditor-0.23-syslibs.patch
deleted file mode 100644
index 341c63bd8dd..00000000000
--- a/app-editors/wxhexeditor/files/wxhexeditor-0.23-syslibs.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-Use system copies of mhash and udis86.
-Also pass -fopenmp when linking to avoid build errors.
-
---- a/Makefile
-+++ b/Makefile
-@@ -3,9 +3,9 @@ WXCONFIG = wx-config
- #CXX ?= `$(WXCONFIG) --cxx`
- CC = `$(WXCONFIG) --cc`
- CXX = `$(WXCONFIG) --cxx`
--LDFLAGS += -lgomp
-+LDFLAGS += -fopenmp -lgomp
- #add this ldflags for WinConsole "-Wl,--subsystem,console -mconsole" for win-debug
--WXCXXFLAGS= `$(WXCONFIG) --cxxflags` -Iudis86 -Imhash/include -MMD -fopenmp
-+WXCXXFLAGS= `$(WXCONFIG) --cxxflags` -MMD -fopenmp
- WXLDFLAGS = `$(WXCONFIG) --libs` `$(WXCONFIG) --libs aui` `$(WXCONFIG) --libs core`
- RC = `$(WXCONFIG) --rescomp`
- #RC = x86_64-w64-mingw32-windres --define WX_CPU_AMD64
-@@ -25,7 +25,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;`
-@@ -36,7 +36,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
-@@ -63,15 +63,6 @@ langs: $(MOBJECTS)
- %.mo : %.po
- $(MSGFMT) $< -o $@
-
--udis86/libudis86/.libs/libudis86.a:
-- cd udis86;./autogen.sh
-- cd udis86;./configure --host=$(HOST) CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" 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; $(MAKE) $(MFLAGS)
--
- win: $(RESOURCES) $(EXECUTABLE_WIN)
-
- #Stack override required for file comparison function...
---- 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/wxhexeditor-0.23.ebuild b/app-editors/wxhexeditor/wxhexeditor-0.23.ebuild
deleted file mode 100644
index 21b74845f48..00000000000
--- a/app-editors/wxhexeditor/wxhexeditor-0.23.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PLOCALES="ar cs de es fr hu_HU it ja_JP nl_NL pl pt_BR ro ru tr zh_CN"
-
-inherit eutils l10n toolchain-funcs wxwidgets
-
-MY_PN="wxHexEditor"
-
-DESCRIPTION="A cross-platform hex editor designed specially for large files"
-HOMEPAGE="http://wxhexeditor.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-v${PV}-src.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
- app-crypt/mhash
- dev-libs/udis86
- x11-libs/wxGTK:3.0[X]"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_PN}"
-
-pkg_pretend() {
- tc-has-openmp \
- || die "${PN} uses OpenMP libraries. Please use an OpenMP-capable compiler."
-}
-
-src_prepare() {
- WX_GTK_VER="3.0" need-wxwidgets unicode
- epatch "${FILESDIR}"/${P}-syslibs.patch
-
- do_kill_locale() {
- rm -r "${S}"/locale/${1}
- }
-
- rm "${S}"/locale/wxHexEditor.pot
- l10n_find_plocales_changes "${S}"/locale '' ''
- l10n_for_each_disabled_locale_do do_kill_locale
-}
diff --git a/app-editors/wxhexeditor/wxhexeditor-0.24.ebuild b/app-editors/wxhexeditor/wxhexeditor-0.24.ebuild
index dbdf1906fe8..517f24a35eb 100644
--- a/app-editors/wxhexeditor/wxhexeditor-0.24.ebuild
+++ b/app-editors/wxhexeditor/wxhexeditor-0.24.ebuild
@@ -30,11 +30,11 @@ PATCHES=(
)
pkg_pretend() {
- [[ ${MERGE_TYPE} != binary ]] && tc-check-openmp
+ [[ ${MERGE_TYPE} != binary ]] && tc-check-openmp
}
pkg_setup() {
- [[ ${MERGE_TYPE} != binary ]] && tc-check-openmp
+ [[ ${MERGE_TYPE} != binary ]] && tc-check-openmp
}
src_prepare() {
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-editors/wxhexeditor/files/, app-editors/wxhexeditor/
@ 2024-06-16 9:37 Pacho Ramos
0 siblings, 0 replies; 4+ messages in thread
From: Pacho Ramos @ 2024-06-16 9:37 UTC (permalink / raw
To: gentoo-commits
commit: 8f6783a0d99fdc5c8ae7753d3c338eabcfb60a66
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 16 09:30:34 2024 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sun Jun 16 09:30:34 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f6783a0
app-editors/wxhexeditor: Use wxGTK 3.2
Closes: https://bugs.gentoo.org/929137
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>
.../wxhexeditor/files/wxhexeditor-0.24-wx3.2.patch | 31 ++++++++++++++
app-editors/wxhexeditor/wxhexeditor-0.24-r3.ebuild | 48 ++++++++++++++++++++++
2 files changed, 79 insertions(+)
diff --git a/app-editors/wxhexeditor/files/wxhexeditor-0.24-wx3.2.patch b/app-editors/wxhexeditor/files/wxhexeditor-0.24-wx3.2.patch
new file mode 100644
index 000000000000..6bbeb2109a56
--- /dev/null
+++ b/app-editors/wxhexeditor/files/wxhexeditor-0.24-wx3.2.patch
@@ -0,0 +1,31 @@
+Description: Fix compatibility with wxWidgets 3.2
+Author: Scott Talbert <swt@techie.net>
+Last-Update: 2022-10-17
+Forwarded: no
+
+--- a/src/HexDialogs.cpp
++++ b/src/HexDialogs.cpp
+@@ -420,7 +420,7 @@ void FindDialog::OnChar( wxKeyEvent& eve
+ }
+
+ void FindDialog::EventHandler( wxCommandEvent& event ){
+- WX_CLEAR_ARRAY(parent->HighlightArray )
++ WX_CLEAR_ARRAY(parent->HighlightArray );
+ parent->HighlightArray.Shrink();
+
+ if( event.GetId() == btnFind->GetId())
+--- a/src/HexEditorCtrl/HexEditorCtrl.cpp
++++ b/src/HexEditorCtrl/HexEditorCtrl.cpp
+@@ -64,9 +64,9 @@ HexEditorCtrl::~HexEditorCtrl( void ){
+ Dynamic_Disconnector();
+ Clear();
+
+- WX_CLEAR_ARRAY(MainTagArray)
+- WX_CLEAR_ARRAY(HighlightArray)
+- WX_CLEAR_ARRAY(CompareArray)
++ WX_CLEAR_ARRAY(MainTagArray);
++ WX_CLEAR_ARRAY(HighlightArray);
++ WX_CLEAR_ARRAY(CompareArray);
+
+ MainTagArray.Shrink();
+ HighlightArray.Shrink();
diff --git a/app-editors/wxhexeditor/wxhexeditor-0.24-r3.ebuild b/app-editors/wxhexeditor/wxhexeditor-0.24-r3.ebuild
new file mode 100644
index 000000000000..40e10aaf5241
--- /dev/null
+++ b/app-editors/wxhexeditor/wxhexeditor-0.24-r3.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN="wxHexEditor"
+WX_GTK_VER=3.2-gtk3
+inherit flag-o-matic toolchain-funcs wxwidgets
+
+DESCRIPTION="A cross-platform hex editor designed specially for large files"
+HOMEPAGE="https://github.com/EUA/wxHexEditor"
+SRC_URI="https://downloads.sourceforge.net/${PN}/${MY_PN}-v${PV}-src.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+DEPEND="
+ app-crypt/mhash
+ dev-libs/udis86
+ x11-libs/wxGTK:${WX_GTK_VER}[X]"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_PN}"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-syslibs.patch
+ "${FILESDIR}"/${P}-desktop.patch
+ "${FILESDIR}"/${P}-wx3.2.patch
+)
+
+pkg_pretend() {
+ [[ ${MERGE_TYPE} != binary ]] && tc-check-openmp
+}
+
+pkg_setup() {
+ [[ ${MERGE_TYPE} != binary ]] && tc-check-openmp
+}
+
+src_prepare() {
+ setup-wxwidgets
+ default
+
+ # -Werror=odr, -Werror=lto-type-mismatch
+ # https://bugs.gentoo.org/854414
+ # https://github.com/EUA/wxHexEditor/issues/222
+ filter-lto
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-06-16 9:37 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-01-06 14:33 [gentoo-commits] repo/gentoo:master commit in: app-editors/wxhexeditor/files/, app-editors/wxhexeditor/ Mart Raudsepp
-- strict thread matches above, loose matches on Subject: below --
2024-06-16 9:37 Pacho Ramos
2018-01-05 0:37 Mart Raudsepp
2015-12-14 23:34 Ryan Hill
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox