[gentoo-commits] repo/gentoo:master commit in: app-editors/wxhexeditor/

2024-07-18 Thread Pacho Ramos 
commit: d38aadb58054a2fc41053aa7038c7dbb2ef8a9a2
Author: Pacho Ramos  gentoo  org>
AuthorDate: Thu Jul 18 18:41:59 2024 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Thu Jul 18 19:02:58 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d38aadb5

app-editors/wxhexeditor: drop 0.24-r2

Signed-off-by: Pacho Ramos  gentoo.org>

 app-editors/wxhexeditor/wxhexeditor-0.24-r2.ebuild | 47 --
 1 file changed, 47 deletions(-)

diff --git a/app-editors/wxhexeditor/wxhexeditor-0.24-r2.ebuild 
b/app-editors/wxhexeditor/wxhexeditor-0.24-r2.ebuild
deleted file mode 100644
index f37ea1296050..
--- a/app-editors/wxhexeditor/wxhexeditor-0.24-r2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# 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.0-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
-)
-
-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
-}

[gentoo-commits] repo/gentoo:master commit in: app-editors/wxhexeditor/files/, app-editors/wxhexeditor/

2024-06-16 Thread Pacho Ramos 
commit: 8f6783a0d99fdc5c8ae7753d3c338eabcfb60a66
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sun Jun 16 09:30:34 2024 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sun Jun 16 09:30:34 2024 +
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  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 ..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 
+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 ..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
+}

[gentoo-commits] repo/gentoo:master commit in: app-editors/wxhexeditor/

2024-05-05 Thread Sam James 
commit: c88dedc2eee275af180bbf6a5341c372a8d79182
Author: Eli Schwartz  gmail  com>
AuthorDate: Mon May  6 04:47:37 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Mon May  6 06:05:22 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c88dedc2

app-editors/wxhexeditor: mark as LTO-unsafe

Closes: https://bugs.gentoo.org/854414
Signed-off-by: Eli Schwartz  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 app-editors/wxhexeditor/wxhexeditor-0.24-r1.ebuild | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app-editors/wxhexeditor/wxhexeditor-0.24-r1.ebuild 
b/app-editors/wxhexeditor/wxhexeditor-0.24-r1.ebuild
index 6d3401c0390b..9d44eb00cbc8 100644
--- a/app-editors/wxhexeditor/wxhexeditor-0.24-r1.ebuild
+++ b/app-editors/wxhexeditor/wxhexeditor-0.24-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 MY_PN="wxHexEditor"
 WX_GTK_VER=3.0-gtk3
-inherit toolchain-funcs wxwidgets
+inherit flag-o-matic toolchain-funcs wxwidgets
 
 DESCRIPTION="A cross-platform hex editor designed specially for large files"
 HOMEPAGE="https://github.com/EUA/wxHexEditor";
@@ -40,4 +40,9 @@ pkg_setup() {
 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
 }

[gentoo-commits] repo/gentoo:master commit in: app-editors/wxhexeditor/

2024-05-05 Thread Sam James 
commit: 42b792144873fd306e0e2819d98d883fc9f3eddc
Author: Eli Schwartz  gmail  com>
AuthorDate: Mon May  6 04:49:53 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Mon May  6 06:05:24 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42b79214

app-editors/wxhexeditor: update EAPI 7 -> 8

Signed-off-by: Eli Schwartz  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 .../{wxhexeditor-0.24-r1.ebuild => wxhexeditor-0.24-r2.ebuild}  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-editors/wxhexeditor/wxhexeditor-0.24-r1.ebuild 
b/app-editors/wxhexeditor/wxhexeditor-0.24-r2.ebuild
similarity index 99%
rename from app-editors/wxhexeditor/wxhexeditor-0.24-r1.ebuild
rename to app-editors/wxhexeditor/wxhexeditor-0.24-r2.ebuild
index 9d44eb00cbc8..5a9ff210d43a 100644
--- a/app-editors/wxhexeditor/wxhexeditor-0.24-r1.ebuild
+++ b/app-editors/wxhexeditor/wxhexeditor-0.24-r2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 MY_PN="wxHexEditor"
 WX_GTK_VER=3.0-gtk3

[gentoo-commits] repo/gentoo:master commit in: app-editors/wxhexeditor/

2024-05-05 Thread Sam James 
commit: 07d7ae55b29a02f07388c41a395191e5a5e1b69d
Author: Eli Schwartz  gmail  com>
AuthorDate: Mon May  6 04:50:53 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Mon May  6 06:05:24 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07d7ae55

app-editors/wxhexeditor: fix EmptyGlobalAssignment

Signed-off-by: Eli Schwartz  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 app-editors/wxhexeditor/wxhexeditor-0.24-r2.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app-editors/wxhexeditor/wxhexeditor-0.24-r2.ebuild 
b/app-editors/wxhexeditor/wxhexeditor-0.24-r2.ebuild
index 5a9ff210d43a..f37ea1296050 100644
--- a/app-editors/wxhexeditor/wxhexeditor-0.24-r2.ebuild
+++ b/app-editors/wxhexeditor/wxhexeditor-0.24-r2.ebuild
@@ -14,7 +14,6 @@ 
SRC_URI="https://downloads.sourceforge.net/${PN}/${MY_PN}-v${PV}-src.tar.xz";
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~riscv ~x86"
-IUSE=""
 
 DEPEND="
app-crypt/mhash

[gentoo-commits] repo/gentoo:master commit in: app-editors/wxhexeditor/

2024-05-05 Thread Sam James 
commit: b3238653974ec24f5215a788c99f534cc5181f2b
Author: Eli Schwartz  gmail  com>
AuthorDate: Mon May  6 04:48:46 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Mon May  6 06:05:23 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3238653

app-editors/wxhexeditor: add github upstream metadata

Signed-off-by: Eli Schwartz  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 app-editors/wxhexeditor/metadata.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app-editors/wxhexeditor/metadata.xml 
b/app-editors/wxhexeditor/metadata.xml
index 3e5da8810f40..f5de54f05a07 100644
--- a/app-editors/wxhexeditor/metadata.xml
+++ b/app-editors/wxhexeditor/metadata.xml
@@ -7,5 +7,6 @@
   
   
 wxhexeditor
+EUA/wxHexEditor

[gentoo-commits] repo/gentoo:master commit in: app-editors/wxhexeditor/

2021-10-29 Thread Yixun Lan 
commit: 151e8ea3971dc3be239dacc220268efeaa2586cc
Author: Yongxiang Liang  gmail  com>
AuthorDate: Wed Oct 27 19:19:56 2021 +
Commit: Yixun Lan  gentoo  org>
CommitDate: Fri Oct 29 13:30:03 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=151e8ea3

app-editors/wxhexeditor: keyword ~riscv

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Yongxiang Liang  gmail.com>
Signed-off-by: Yixun Lan  gentoo.org>

 app-editors/wxhexeditor/wxhexeditor-0.24-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-editors/wxhexeditor/wxhexeditor-0.24-r1.ebuild 
b/app-editors/wxhexeditor/wxhexeditor-0.24-r1.ebuild
index a31c4b0aa43..e1458645fea 100644
--- a/app-editors/wxhexeditor/wxhexeditor-0.24-r1.ebuild
+++ b/app-editors/wxhexeditor/wxhexeditor-0.24-r1.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-v${PV}-src.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="

[gentoo-commits] repo/gentoo:master commit in: app-editors/wxhexeditor/

2021-03-17 Thread Andreas Sturmlechner 
commit: 6f7dc9339871026f5204a83d9b674813bb788a50
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Mar 14 23:21:36 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Mar 17 15:40:14 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f7dc933

app-editors/wxhexeditor: Drop 0.24 (r0)

Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 app-editors/wxhexeditor/wxhexeditor-0.24.ebuild | 43 -
 1 file changed, 43 deletions(-)

diff --git a/app-editors/wxhexeditor/wxhexeditor-0.24.ebuild 
b/app-editors/wxhexeditor/wxhexeditor-0.24.ebuild
deleted file mode 100644
index 517f24a35eb..000
--- 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
-}

[gentoo-commits] repo/gentoo:master commit in: app-editors/wxhexeditor/, app-editors/wxhexeditor/files/

2021-03-17 Thread Andreas Sturmlechner 
commit: d24b70d988eb3212ee9c6ceea1a00cc8618562c8
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Mar 14 23:20:19 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Mar 17 15:40:11 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d24b70d9

app-editors/wxhexeditor: EAPI-7 bump, fix desktop file, HOMEPAGE

Closes: https://bugs.gentoo.org/733762
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../files/wxhexeditor-0.24-desktop.patch   | 13 +++
 app-editors/wxhexeditor/wxhexeditor-0.24-r1.ebuild | 43 ++
 2 files changed, 56 insertions(+)

diff --git a/app-editors/wxhexeditor/files/wxhexeditor-0.24-desktop.patch 
b/app-editors/wxhexeditor/files/wxhexeditor-0.24-desktop.patch
new file mode 100644
index 000..7d3d54da09a
--- /dev/null
+++ b/app-editors/wxhexeditor/files/wxhexeditor-0.24-desktop.patch
@@ -0,0 +1,13 @@
+Index: resources/wxHexEditor.desktop
+===
+--- a/resources/wxHexEditor.desktop2017-03-16 05:50:42.0 +0200
 b/resources/wxHexEditor.desktop2017-03-24 12:16:39.931400635 +0200
+@@ -8,6 +8,7 @@ Exec=wxHexEditor
+ Icon=wxHexEditor
+ Terminal=false
+ Type=Application
+-Categories=Utility;TextEditor;Utility;
++Categories=Utility;TextEditor;
++Keywords=disk;drive;volume;harddisk;hdd;disc;cdrom;dvd;partition;iso;image;backup;restore;editor;
+ 
Keywords[en_GB]=disk;drive;volume;harddisk;hdd;disc;cdrom;dvd;partition;iso;image;backup;restore;editor;
+ 

diff --git a/app-editors/wxhexeditor/wxhexeditor-0.24-r1.ebuild 
b/app-editors/wxhexeditor/wxhexeditor-0.24-r1.ebuild
new file mode 100644
index 000..a31c4b0aa43
--- /dev/null
+++ b/app-editors/wxhexeditor/wxhexeditor-0.24-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="wxHexEditor"
+WX_GTK_VER=3.0-gtk3
+inherit toolchain-funcs wxwidgets
+
+DESCRIPTION="A cross-platform hex editor designed specially for large files"
+HOMEPAGE="https://github.com/EUA/wxHexEditor";
+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
+   "${FILESDIR}"/${P}-desktop.patch
+)
+
+pkg_pretend() {
+   [[ ${MERGE_TYPE} != binary ]] && tc-check-openmp
+}
+
+pkg_setup() {
+   [[ ${MERGE_TYPE} != binary ]] && tc-check-openmp
+}
+
+src_prepare() {
+   setup-wxwidgets
+   default
+}

[gentoo-commits] repo/gentoo:master commit in: app-editors/wxhexeditor/files/, app-editors/wxhexeditor/

2018-01-06 Thread Mart Raudsepp 
commit: c44809603709f0c06ac9ce3601b43e94cb031ae2
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Sat Jan  6 14:25:16 2018 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sat Jan  6 14:33:20 2018 +
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..000
--- 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 0xLL
- #include "HexDialogs.h"
- #include 
--#include "../mhash/include/mhash.h"
-+#include 
- 
- #ifdef _OPENMP_
-#include 
 a/src/HexEditor.h
-+++ b/src/HexEditor.h
-@@ -25,7 +25,7 @@
- #ifndef _wxHexEditor_h_
- #define _wxHexEditor_h_
- 
--#include "../mhash/include/mhash.h"
-+#include 
- 
- #include 
- #include 
 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 
- 
- #ifdef WX_GCH
- #include 

diff --git a/app-editors/wxhexeditor/wxhexeditor-0.23.ebuild 
b/app-editors/wxhexeditor/wxhexeditor-0.23.ebuild
deleted file mode 100644
index 21b74845f48..000
--- 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 toolcha

[gentoo-commits] repo/gentoo:master commit in: app-editors/wxhexeditor/

2018-01-06 Thread Mart Raudsepp 
commit: 1421404023e0fb576668f0c2bb5eab5671f22dcc
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Sat Jan  6 14:23:32 2018 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sat Jan  6 14:33:14 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14214040

app-editors/wxhexeditor: Improve OpenMP checks

Use tc-check-opemp instead of tc-has-openmp for consistent error output.
Check it in pkg_setup too.
Don't do the check for binary packages.

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 app-editors/wxhexeditor/wxhexeditor-0.24.ebuild | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app-editors/wxhexeditor/wxhexeditor-0.24.ebuild 
b/app-editors/wxhexeditor/wxhexeditor-0.24.ebuild
index a9a2abcec25..dbdf1906fe8 100644
--- a/app-editors/wxhexeditor/wxhexeditor-0.24.ebuild
+++ b/app-editors/wxhexeditor/wxhexeditor-0.24.ebuild
@@ -30,8 +30,11 @@ PATCHES=(
 )
 
 pkg_pretend() {
-   tc-has-openmp \
-   || die "${PN} uses OpenMP libraries. Please use an 
OpenMP-capable compiler."
+[[ ${MERGE_TYPE} != binary ]] && tc-check-openmp
+}
+
+pkg_setup() {
+[[ ${MERGE_TYPE} != binary ]] && tc-check-openmp
 }
 
 src_prepare() {

[gentoo-commits] repo/gentoo:master commit in: app-editors/wxhexeditor/files/, app-editors/wxhexeditor/

2018-01-04 Thread Mart Raudsepp 
commit: ce7af7ddc191da1193a220c050d094c657c9658b
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Fri Jan  5 00:18:09 2018 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Fri Jan  5 00:36:40 2018 +
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 000..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 0xLL
+ #include "HexDialogs.h"
+ #include 
+-#include "../mhash/include/mhash.h"
++#include 
+ 
+ #ifdef __SSE2__
+   #include 
+--- a/src/HexEditor.h
 b/src/HexEditor.h
+@@ -25,7 +25,7 @@
+ #ifndef _wxHexEditor_h_
+ #define _wxHexEditor_h_
+ 
+-#include "../mhash/include/mhash.h"
++#include 
+ 
+ #include 
+ #include 
+--- 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 
+ 
+ #ifdef WX_GCH
+ #include 

diff --git a/app-editors/wxhexeditor/wxhexeditor-0.24.ebuild 
b/app-editors/wxhexeditor/wxhexeditor-0.24.ebuild
new file mode 100644
index 000..a9a2abcec25
--- /dev/null
+++ b/app-editors/wxhexeditor/wxhexeditor-0.24.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foun

[gentoo-commits] repo/gentoo:master commit in: app-editors/wxhexeditor/, app-editors/wxhexeditor/files/

2016-05-24 Thread Pacho Ramos 
commit: b99ff07ace23bd5667dc10e2e3c9b5d01aef97c4
Author: Pacho Ramos  gentoo  org>
AuthorDate: Tue May 24 18:47:32 2016 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Tue May 24 19:12:25 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b99ff07a

app-editors/wxhexeditor: Drop old version relying on obsolete wxGTK

Package-Manager: portage-2.3.0_rc1

 app-editors/wxhexeditor/Manifest   |  1 -
 .../files/wxhexeditor-0.22-makefile.patch  | 96 --
 app-editors/wxhexeditor/wxhexeditor-0.22.ebuild| 38 -
 3 files changed, 135 deletions(-)

diff --git a/app-editors/wxhexeditor/Manifest b/app-editors/wxhexeditor/Manifest
index 692e74d..401331d 100644
--- a/app-editors/wxhexeditor/Manifest
+++ b/app-editors/wxhexeditor/Manifest
@@ -1,2 +1 @@
-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.22-makefile.patch 
b/app-editors/wxhexeditor/files/wxhexeditor-0.22-makefile.patch
deleted file mode 100644
index 5e40694..000
--- a/app-editors/wxhexeditor/files/wxhexeditor-0.22-makefile.patch
+++ /dev/null
@@ -1,96 +0,0 @@
- 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 0xLL
- #include "HexDialogs.h"
- #include 
--#include "../mhash/include/mhash.h"
-+#include 
- 
- #ifdef _OPENMP
-#include 
-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 
- 
- #include 
- #include 
-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 
- 
- #ifdef WX_GCH
- #include 

diff --git a/app-editors/wxhexeditor/wxhexeditor-0.22.ebuild 
b/app-editors/wxhexeditor/wxhexeditor-0.22.ebuild
deleted file mode 100644
index 30902ad..000
--- a/app-editors/wx

[gentoo-commits] repo/gentoo:master commit in: app-editors/wxhexeditor/files/, app-editors/wxhexeditor/

2015-12-14 Thread Ryan Hill 
commit: 268cc759a217c912551369dc6189982b4afa008d
Author: Ryan Hill  gentoo  org>
AuthorDate: Mon Dec 14 23:38:03 2015 +
Commit: Ryan Hill  gentoo  org>
CommitDate: Mon Dec 14 23:38:03 2015 +
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  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..000
--- 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) $(

[gentoo-commits] repo/gentoo:master commit in: app-editors/wxhexeditor/, app-editors/wxhexeditor/files/

2015-12-14 Thread Ryan Hill 
commit: 36f20e902afe189529639ba25fe6ccaccf31c6da
Author: Ryan Hill  gentoo  org>
AuthorDate: Mon Dec 14 23:35:33 2015 +
Commit: Ryan Hill  gentoo  org>
CommitDate: Mon Dec 14 23:35:33 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36f20e90

app-editors/wxhexeditor: Version bump, bug #542790.

Package-Manager: portage-2.2.26
Signed-off-by: Ryan Hill  gentoo.org>

 app-editors/wxhexeditor/Manifest   |  1 +
 .../files/wxhexeditor-0.23-syslibs.patch   | 84 ++
 app-editors/wxhexeditor/wxhexeditor-0.23.ebuild| 46 
 3 files changed, 131 insertions(+)

diff --git a/app-editors/wxhexeditor/Manifest b/app-editors/wxhexeditor/Manifest
index bdecce4..a757244 100644
--- a/app-editors/wxhexeditor/Manifest
+++ b/app-editors/wxhexeditor/Manifest
@@ -1,3 +1,4 @@
 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.23-syslibs.patch 
b/app-editors/wxhexeditor/files/wxhexeditor-0.23-syslibs.patch
new file mode 100644
index 000..341c63b
--- /dev/null
+++ b/app-editors/wxhexeditor/files/wxhexeditor-0.23-syslibs.patch
@@ -0,0 +1,84 @@
+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 0xLL
+ #include "HexDialogs.h"
+ #include 
+-#include "../mhash/include/mhash.h"
++#include 
+ 
+ #ifdef _OPENMP_
+#include 
+--- a/src/HexEditor.h
 b/src/HexEditor.h
+@@ -25,7 +25