Author: musuruan Update of /cvs/nonfree/rpms/plus4emu/F-15 In directory se02.es.rpmfusion.net:/tmp/cvs-serv18904 Modified Files: plus4emu.spec Added Files: plus4emu-1.2.9.2-gcc45.patch plus4emu-1.2.9.2-gcc46.patch Log Message: * Mon Apr 09 2012 Andrea Musuruane <musuruan(a)gmail.com&gt; 1.2.9.2-5 - Made a new patch to compile with GCC 4.5 - Made a new patch to compile with GCC 4.6 plus4emu-1.2.9.2-gcc45.patch: compress0.cpp | 2 +- compress1.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) --- NEW FILE plus4emu-1.2.9.2-gcc45.patch --- diff -durN plus4emu-1.2.9.2.orig/util/compress/compress0.cpp plus4emu-1.2.9.2/util/compress/compress0.cpp --- plus4emu-1.2.9.2.orig/util/compress/compress0.cpp 2008-09-25 00:03:19.000000000 +0200 +++ plus4emu-1.2.9.2/util/compress/compress0.cpp 2010-11-11 18:21:20.123173434 +0100 @@ -604,7 +604,7 @@ optimizeMatchDistanceRepeats = r.optimizeMatchDistanceRepeats; } - Compressor_M0::CompressionParameters::CompressionParameters& + Compressor_M0::CompressionParameters& Compressor_M0::CompressionParameters::operator=( const CompressionParameters& r) { diff -durN plus4emu-1.2.9.2.orig/util/compress/compress1.cpp plus4emu-1.2.9.2/util/compress/compress1.cpp --- plus4emu-1.2.9.2.orig/util/compress/compress1.cpp 2008-09-26 15:00:31.000000000 +0200 +++ plus4emu-1.2.9.2/util/compress/compress1.cpp 2010-11-11 18:16:38.980633378 +0100 @@ -924,7 +924,7 @@ splitOptimizationDepth = 9; } - Compressor_M1::CompressionParameters::CompressionParameters& + Compressor_M1::CompressionParameters& Compressor_M1::CompressionParameters::operator=( const CompressionParameters& r) { plus4emu-1.2.9.2-gcc46.patch: SConstruct | 1 + 1 file changed, 1 insertion(+) --- NEW FILE plus4emu-1.2.9.2-gcc46.patch --- diff -durN plus4emu-1.2.9.2.orig/SConstruct plus4emu-1.2.9.2/SConstruct --- plus4emu-1.2.9.2.orig/SConstruct 2008-09-25 00:04:22.000000000 +0200 +++ plus4emu-1.2.9.2/SConstruct 2012-04-09 14:17:07.165952212 +0200 @@ -76,6 +76,7 @@ if not plus4emuGLGUIEnvironment.ParseConfig( '%s --use-gl --use-images --cxxflags --ldflags' % fltkConfig): raise Exception() + plus4emuGLGUIEnvironment.Append(LIBS = ['GL']) except: print 'WARNING: could not run fltk-config' plus4emuGLGUIEnvironment.Append(LIBS = ['fltk_images', 'fltk_gl']) Index: plus4emu.spec =================================================================== RCS file: /cvs/nonfree/rpms/plus4emu/F-15/plus4emu.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- plus4emu.spec 29 Mar 2009 15:08:37 -0000 1.6 +++ plus4emu.spec 9 Apr 2012 12:49:57 -0000 1.7 @@ -2,7 +2,7 @@ Name: plus4emu Version: 1.2.9.2 -Release: 2%{?dist} +Release: 5%{?dist} Summary: Portable emulator of the Commodore 264 family of computers Group: Applications/Emulators License: GPLv2+ @@ -15,6 +15,8 @@ Source5: %{binprefix}makecfg.desktop Patch0: %{name}-1.2.9-SConstruct.patch Patch1: %{name}-1.2.5-fixpathissue.patch +Patch2: %{name}-1.2.9.2-gcc45.patch +Patch3: %{name}-1.2.9.2-gcc46.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils BuildRequires: fltk-fluid >= 1.1.0 @@ -35,6 +37,8 @@ %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 +%patch3 -p1 # Fix EOL chars sed -i 's/\r//' README NEWS @@ -110,6 +114,16 @@ %changelog +* Mon Apr 09 2012 Andrea Musuruane <musuruan(a)gmail.com&gt; 1.2.9.2-5 +- Made a new patch to compile with GCC 4.5 +- Made a new patch to compile with GCC 4.6 + +* Thu Mar 08 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 1.2.9.2-4 +- Rebuilt for c++ ABI breakage + +* Thu Feb 09 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 1.2.9.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Sun Mar 29 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1.2.9.2-2 - rebuild for new F11 features