rpm/wxhexeditor
SHA256
1
0
Fork 0
forked from pool/wxhexeditor
Code Pull Requests Activity

Compare commits

merge into: rpm:factory
Branches Tags
rpm:factory pool:factory
...
pull from: pool:factory
Branches Tags
pool:factory rpm:factory

2 Commits
factory ... factory

Author SHA256 Message Date
Ana Guerrero
35d9fc276b Accepting request 1227686 from editors 
OBS-URL: https://build.opensuse.org/request/show/1227686
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/wxhexeditor?expand=0&rev=16
 2024-12-02 15:59:36 +00:00
Martin Pluskal
2e65fffa69 - Add ebe2449fac22089825d124935a215fd1c0739403.patch: Fix build for 
wxWidgets v3.1.2. Following this, replace wxWidgets-3_0-devel
  with wxWidgets-devel BuildRequires.

OBS-URL: https://build.opensuse.org/package/show/editors/wxhexeditor?expand=0&rev=36
 2024-12-02 08:47:14 +00:00
3 changed files with 52 additions and 2 deletions
Expand all files Collapse all files

40
ebe2449fac22089825d124935a215fd1c0739403.patch Normal file
View File

@@ -0,0 +1,40 @@
From ebe2449fac22089825d124935a215fd1c0739403 Mon Sep 17 00:00:00 2001
From: GT <george@tsimperopoulos.com>
Date: Tue, 10 Sep 2019 23:52:19 +0100
Subject: [PATCH] Fix build for wxWidgets v3.1.2
---
src/HexDialogs.cpp | 2 +-
src/HexEditorCtrl/HexEditorCtrl.cpp | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/HexDialogs.cpp b/src/HexDialogs.cpp
index 260571b4..9c312ba4 100644
--- a/src/HexDialogs.cpp
+++ b/src/HexDialogs.cpp
@@ -420,7 +420,7 @@ void FindDialog::OnChar( wxKeyEvent& event ){
}
void FindDialog::EventHandler( wxCommandEvent& event ){
- WX_CLEAR_ARRAY(parent->HighlightArray )
+ WX_CLEAR_ARRAY(parent->HighlightArray);
parent->HighlightArray.Shrink();
if( event.GetId() == btnFind->GetId())
diff --git a/src/HexEditorCtrl/HexEditorCtrl.cpp b/src/HexEditorCtrl/HexEditorCtrl.cpp
index 37a6e4b0..6f3a4a0e 100644
--- 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();

7
wxhexeditor.changes
View File

@@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Nov 27 14:08:46 UTC 2024 - Bjørn Lie <bjorn.lie@gmail.com>
- Add ebe2449fac22089825d124935a215fd1c0739403.patch: Fix build for
wxWidgets v3.1.2. Following this, replace wxWidgets-3_0-devel
with wxWidgets-devel BuildRequires.
-------------------------------------------------------------------
Tue Feb 20 15:16:30 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>

7
wxhexeditor.spec
View File

@@ -1,7 +1,7 @@
#
# spec file for package wxhexeditor
#
# Copyright (c) 2020 SUSE LLC
# Copyright (c) 2024 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -39,6 +39,8 @@ Patch2: wxhexeditor-fixdesktopfile.patch
Patch3: wxhexeditor-fix-arm.patch
# PATCH-FEATURE-UPSTREAM - https://github.com/EUA/wxHexEditor/pull/173
Patch4: wxhexeditor-appdata.patch
# PATCH-FIX-UPSTREAM ebe2449fac22089825d124935a215fd1c0739403.patch -- Fix build for wxWidgets v3.1.2
Patch5: https://github.com/EUA/wxHexEditor/commit/ebe2449fac22089825d124935a215fd1c0739403.patch
%if %{with gcc6}
%if 0%{?sle_version} >= 120200
#!BuildIgnore: libgcc_s1
@@ -54,7 +56,7 @@ BuildRequires: libtool
BuildRequires: mhash-devel
BuildRequires: pkg-config
BuildRequires: update-desktop-files
BuildRequires: wxWidgets-3_0-devel
BuildRequires: wxWidgets-devel
Recommends: %{name}-lang
%description
@@ -76,6 +78,7 @@ rm -rf mhash
%patch -P 2
%patch -P 3 -p1
%patch -P 4 -p1
%patch -P 5 -p1
chmod -x docs/*
cp -v udis86/LICENSE LICENSE-udis86
cp -v docs/GPL.txt .