Date: Monday, October 5, 2015 @ 17:27:23 Author: foutrelis Revision: 143013
upgpkg: pcsx2 1.3.1-5 Fix startup crash with GCC 5.1 (FS#46563). Added: pcsx2/trunk/0001-common-fix-gcc-5.0-issue.patch Modified: pcsx2/trunk/PKGBUILD -------------------------------------+ 0001-common-fix-gcc-5.0-issue.patch | 89 ++++++++++++++++++++++++++++++++++ PKGBUILD | 16 ++++-- 2 files changed, 102 insertions(+), 3 deletions(-) Added: 0001-common-fix-gcc-5.0-issue.patch =================================================================== --- 0001-common-fix-gcc-5.0-issue.patch (rev 0) +++ 0001-common-fix-gcc-5.0-issue.patch 2015-10-05 15:27:23 UTC (rev 143013) @@ -0,0 +1,89 @@ +From 87bcb465c6c2238137dbf99890e9032930a5f6cd Mon Sep 17 00:00:00 2001 +From: Gregory Hainaut <[email protected]> +Date: Wed, 27 May 2015 18:20:06 +0200 +Subject: [PATCH] common: fix gcc 5.0 issue + +Don't use const for variable object + +Close issue #560 +--- + common/include/Utilities/Console.h | 8 ++++---- + common/src/Utilities/Console.cpp | 14 +++++++------- + 2 files changed, 11 insertions(+), 11 deletions(-) + +diff --git a/common/include/Utilities/Console.h b/common/include/Utilities/Console.h +index a4fb75f..3cec159 100644 +--- a/common/include/Utilities/Console.h ++++ b/common/include/Utilities/Console.h +@@ -236,7 +236,7 @@ public: + virtual ~ConsoleAttrScope() throw(); + }; + +-extern const IConsoleWriter Console; ++extern IConsoleWriter Console; + + extern void Console_SetActiveHandler( const IConsoleWriter& writer, FILE* flushfp=NULL ); + extern const wxString& ConsoleBuffer_Get(); +@@ -249,9 +249,9 @@ extern const IConsoleWriter ConsoleWriter_Assert; + extern const IConsoleWriter ConsoleWriter_Buffered; + extern const IConsoleWriter ConsoleWriter_wxError; + +-extern const NullConsoleWriter NullCon; ++extern NullConsoleWriter NullCon; + +-extern const IConsoleWriter DevConWriter; ++extern IConsoleWriter DevConWriter; + extern bool DevConWriterEnabled; + + #ifdef PCSX2_DEVBUILD +@@ -261,7 +261,7 @@ extern bool DevConWriterEnabled; + #endif + + #ifdef PCSX2_DEBUG +-extern const IConsoleWriter DbgConWriter; ++extern IConsoleWriter DbgConWriter; + # define DbgCon DbgConWriter + #else + # define DbgCon 0&&NullCon +diff --git a/common/src/Utilities/Console.cpp b/common/src/Utilities/Console.cpp +index 956a295..3ff0469 100644 +--- a/common/src/Utilities/Console.cpp ++++ b/common/src/Utilities/Console.cpp +@@ -55,11 +55,11 @@ void Console_SetActiveHandler( const IConsoleWriter& writer, FILE* flushfp ) + writer.DoWriteLn( ConsoleBuffer_Get() ); + } + +- const_cast<IConsoleWriter&>(Console) = writer; +- const_cast<IConsoleWriter&>(DevConWriter) = writer; ++ Console = writer; ++ DevConWriter = writer; + + #ifdef PCSX2_DEBUG +- const_cast<IConsoleWriter&>(DbgCon) = writer; ++ DbgCon = writer; + #endif + } + +@@ -597,15 +597,15 @@ ConsoleAttrScope::~ConsoleAttrScope() throw() + // + #define _DefaultWriter_ ConsoleWriter_Stdout + +-const IConsoleWriter Console = _DefaultWriter_; +-const IConsoleWriter DevConWriter = _DefaultWriter_; ++IConsoleWriter Console = _DefaultWriter_; ++IConsoleWriter DevConWriter = _DefaultWriter_; + bool DevConWriterEnabled = false; + + #ifdef PCSX2_DEBUG +-const IConsoleWriter DbgConWriter = _DefaultWriter_; ++IConsoleWriter DbgConWriter = _DefaultWriter_; + #endif + +-const NullConsoleWriter NullCon = {}; ++NullConsoleWriter NullCon = {}; + + // -------------------------------------------------------------------------------------- + // ConsoleLogSource (implementations) +-- +2.5.3 + Modified: PKGBUILD =================================================================== --- PKGBUILD 2015-10-05 15:20:54 UTC (rev 143012) +++ PKGBUILD 2015-10-05 15:27:23 UTC (rev 143013) @@ -5,7 +5,7 @@ pkgname=pcsx2 pkgver=1.3.1 -pkgrel=4 +pkgrel=5 pkgdesc='A Sony PlayStation 2 emulator' arch=('i686' 'x86_64') url='http://www.pcsx2.net' @@ -21,9 +21,19 @@ 'lib32-gtk-engine-murrine: Murrine GTK3 engine support' 'lib32-gtk-engine-unico: Unico GTK2 engine support') options=('!emptydirs') -source=("$pkgname-$pkgver.tar.gz::https://github.com/PCSX2/pcsx2/archive/v${pkgver}.tar.gz";) -sha256sums=('60ba9f7f85bf4337ca6962f9b437d549f16fc04ea0b6b261d7521e0416c2b8c9') +source=("$pkgname-$pkgver.tar.gz::https://github.com/PCSX2/pcsx2/archive/v${pkgver}.tar.gz"; + '0001-common-fix-gcc-5.0-issue.patch') +sha256sums=('60ba9f7f85bf4337ca6962f9b437d549f16fc04ea0b6b261d7521e0416c2b8c9' + 'dc3bdfaea2e024da1d16dd6142030b13b3e2a4540ba1685399e3109d026866c4') +prepare() { + cd pcsx2-${pkgver} + + # Fix startup crash with GCC 5.1 + # https://github.com/PCSX2/pcsx2/issues/560 + patch -Np1 -i ../0001-common-fix-gcc-5.0-issue.patch +} + build() { cd pcsx2-${pkgver}
