PR#1: Fix building with wxWidgets 3.0 - rpms/bear

rpms / bear

#1 Fix building with wxWidgets 3.0

Closed 5 years ago by swt2c. Opened 5 years ago by swt2c.

rpms/ swt2c/bear wxGTK3 into master

Fix building with wxWidgets 3.0

Scott Talbert • 5 years ago

d8f85a9

bear.spec

file modified

+7 -4

		`@@ -4,11 +4,12 @@`

		`Name: bear`
		`Version: 0.7.0`
		`- Release: 0.21.20161230git%{shortcommit0}%{?dist}`
		`+ Release: 0.22.20161230git%{shortcommit0}%{?dist}`
		`Summary: Game engine and editors dedicated to creating great 2D games`
		`License: GPLv3+ and CC-BY-SA`
		`URL: https://github.com/j-jorge/bear`
		`Source0: https://github.com/j-jorge/bear/archive/%{commit0}/%{name}-%{commit0}.tar.gz#/%{name}-%{shortcommit0}.tar.gz`
		`+ Patch0: wxwidgets-3.0.patch`

		`# Build is broken on ppc64le`
		`%if 0%{?fedora} >= 26`
		`@@ -30,8 +31,7 @@`
		`BuildRequires: pkgconfig(freetype2)`
		`BuildRequires: pkgconfig(sdl2)`
		`BuildRequires: pkgconfig(SDL2_mixer)`
		`- BuildRequires: wxGTK-devel`
		`- BuildConflicts: wxGTK3-devel`
		`+ BuildRequires: wxGTK3-devel`
		`Requires: hicolor-icon-theme`


		`@@ -74,7 +74,7 @@`
		`Development files for %{name}`

		`%prep`
		`- %setup -qn %{name}-%{commit0}`
		`+ %autosetup -n %{name}-%{commit0} -p 1`

		`# change docbook_to_man to docbook2man`
		`sed -i -e 's\|docbook-to-man\|docbook2man\|g' cmake-helper/docbook-to-man.cmake`
		`@@ -146,6 +146,9 @@`


		`%changelog`
		`+ * Wed Jun 27 2018 Scott Talbert <swt@techie.net> - 0.7.0-0.22.20161230git781ec80`
		`+ - Fix building with wxWidgets 3.0`
		`+`
		`* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.0-0.21.20161230git781ec80`
		`- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild`

wxwidgets-3.0.patch

file added

+61

		`@@ -0,0 +1,61 @@`
		`+ From b8f212a2e6cc4b4d169f0e916f6ee2fd18973cf8 Mon Sep 17 00:00:00 2001`
		`+ From: Scott Talbert <swt@techie.net>`
		`+ Date: Thu, 28 Jun 2018 17:37:25 -0400`
		`+ Subject: [PATCH] Fix compilation with wxWidgets 3.0`
		`+`
		`+ ---`
		`+ bear-factory/CMakeLists.txt \| 2 ++`
		`+ bear-factory/bear-editor/src/bf/code/accelerator_table.cpp \| 2 +-`
		`+ .../bear-editor/src/bf/code/base_editor_application.cpp \| 7 +++++--`
		`+ 3 files changed, 8 insertions(+), 3 deletions(-)`
		`+`
		`+ diff --git a/bear-factory/CMakeLists.txt b/bear-factory/CMakeLists.txt`
		`+ index 6c01034..fb40cde 100644`
		`+ --- a/bear-factory/CMakeLists.txt`
		`+ +++ b/bear-factory/CMakeLists.txt`
		`+ @@ -99,6 +99,8 @@ if( NOT wxWidgets_FOUND )`
		`+ message( "wxWidgets not found" )`
		`+ endif( NOT wxWidgets_FOUND )`
		`+`
		`+ +add_definitions( "-DNDEBUG" )`
		`+ +`
		`+ #-------------------------------------------------------------------------------`
		`+ # path to the images used in the interface`
		`+ if( NOT BF_IMAGES_PATH )`
		`+ diff --git a/bear-factory/bear-editor/src/bf/code/accelerator_table.cpp b/bear-factory/bear-editor/src/bf/code/accelerator_table.cpp`
		`+ index d9420eb..4a33140 100644`
		`+ --- a/bear-factory/bear-editor/src/bf/code/accelerator_table.cpp`
		`+ +++ b/bear-factory/bear-editor/src/bf/code/accelerator_table.cpp`
		`+ @@ -99,6 +99,6 @@ void bf::accelerator_table::on_key_pressed( wxKeyEvent& event )`
		`+ if ( it != m_accelerators.end() )`
		`+ {`
		`+ wxCommandEvent command( wxEVT_COMMAND_MENU_SELECTED, it->second );`
		`+ - m_event_handler.ProcessEvent( command );`
		`+ + m_event_handler.GetEventHandler()->ProcessEvent( command );`
		`+ }`
		`+ } // accelerator_table::on_key_pressed()`
		`+ diff --git a/bear-factory/bear-editor/src/bf/code/base_editor_application.cpp b/bear-factory/bear-editor/src/bf/code/base_editor_application.cpp`
		`+ index e49f15f..074f14e 100644`
		`+ --- a/bear-factory/bear-editor/src/bf/code/base_editor_application.cpp`
		`+ +++ b/bear-factory/bear-editor/src/bf/code/base_editor_application.cpp`
		`+ @@ -347,12 +347,15 @@ int bf::base_editor_application::find_option_index`
		`+ */`
		`+ void bf::base_editor_application::remove_options_at( int index, int count )`
		`+ {`
		`+ + // In wx 3.0, argv is a wxCmdLineArgsArray, so need to fetch a mutable copy`
		`+ + wxChar** argv_copy = argv;`
		`+ for ( int i=index; (i+count <= argc); ++i )`
		`+ - argv[i] = argv[i + count];`
		`+ + argv_copy[i] = argv_copy[i + count];`
		`+`
		`+ for ( int i=0; i != count; ++i )`
		`+ {`
		`+ --argc;`
		`+ - argv[argc] = NULL;`
		`+ + argv_copy[argc] = NULL;`
		`+ }`
		`+ + argv = argv_copy;`
		`+ } // base_editor_application::remove_options_at()`
		`+ --`
		`+ 2.17.1`
		`+`