diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:56:41 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:56:41 +0100 |
commit | d87262dd706fec50cd150aab3e93883b6337466d (patch) | |
tree | 246b44c33ad7a57550430b0a60fa0df86a3c9e68 /app-editors/wxhexeditor | |
parent | 71bc00c87bba1ce31de0dac6c3b7fd1aee6917fc (diff) |
gentoo resync : 14.07.2018
Diffstat (limited to 'app-editors/wxhexeditor')
-rw-r--r-- | app-editors/wxhexeditor/Manifest | 4 | ||||
-rw-r--r-- | app-editors/wxhexeditor/files/wxhexeditor-0.24-syslibs.patch | 76 | ||||
-rw-r--r-- | app-editors/wxhexeditor/metadata.xml | 11 | ||||
-rw-r--r-- | app-editors/wxhexeditor/wxhexeditor-0.24.ebuild | 43 |
4 files changed, 0 insertions, 134 deletions
diff --git a/app-editors/wxhexeditor/Manifest b/app-editors/wxhexeditor/Manifest deleted file mode 100644 index 9c01e27e7d72..000000000000 --- a/app-editors/wxhexeditor/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -AUX wxhexeditor-0.24-syslibs.patch 2458 BLAKE2B 65dc8a710fb33826b5ae9a9ae2b31cdf58e58252aa4be8df37a4e18495faaaee066c95f1b527d91c71b9b38d8123cc1cac91e9e0386a67ed77b0b8e24ad43016 SHA512 658526b38bb3e3313174ac464711ccceb3606e38e6826c62b4dcb5dca79c6ef32c6d7c84e883035572431eebaf0b7e2ace154df406f2338f39aace84d9fe9403 -DIST wxHexEditor-v0.24-src.tar.xz 900868 BLAKE2B 6748249d75e7570197a6c78378a8f3109bfa4c72bf32fe63e2abd31734d97fda3d56ecddb52ac5f9a18cc77b2c727f8277688f1bf75ef8f665a3a9cefd1cb8a6 SHA512 8589da169c90cca5abf6ba957d5c5e17e4211123dbdbaf0e04d31757113e7e302d40df58144ec25d431c7c4ce2fa2721b16621d03630ac8b90478c704a8c5b09 -EBUILD wxhexeditor-0.24.ebuild 780 BLAKE2B f956a2b44390a6a3d673778d06f63af8747cd200dd01858ca8b3de527e52b2c19d4cee9dabffce2fd6827e9336fca1076ae56fef4282160686163748be067407 SHA512 a8027cecbedf4a9ace1d163bbc14d29941f53f20844b4eea0a845076b9d8440376c4c87728bd88d53a5dd5a470f0279a0cea639e54a37a4786ad06e566606732 -MISC metadata.xml 352 BLAKE2B 6b049a05b438e20e604ed3c93e89e66d5f18cb0dc7322a9f4d5cdd976ba074b625b162baa30ff8b2276429826caec1d22a757945e14a845be3b6bfe9eaeb69b3 SHA512 918e551de8f159920d7d98010dc748efb0e9a79c9a11f6d6fcd44127d3779a66510da18cbccc69a974472bf3f230fd5cadbc15665a4a3710b8c1b92237725f6a 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> diff --git a/app-editors/wxhexeditor/metadata.xml b/app-editors/wxhexeditor/metadata.xml deleted file mode 100644 index 9065be762a9d..000000000000 --- a/app-editors/wxhexeditor/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>wxwidgets@gentoo.org</email> - <name>Gentoo wxWidgets Project</name> - </maintainer> - <upstream> - <remote-id type="sourceforge">wxhexeditor</remote-id> - </upstream> -</pkgmetadata> diff --git a/app-editors/wxhexeditor/wxhexeditor-0.24.ebuild b/app-editors/wxhexeditor/wxhexeditor-0.24.ebuild deleted file mode 100644 index 517f24a35eb8..000000000000 --- a/app-editors/wxhexeditor/wxhexeditor-0.24.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# 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() { - [[ ${MERGE_TYPE} != binary ]] && tc-check-openmp -} - -pkg_setup() { - [[ ${MERGE_TYPE} != binary ]] && tc-check-openmp -} - -src_prepare() { - setup-wxwidgets - default -} |