rpms/vice/devel vice-2.1-gcc44.patch,NONE,1.1 vice.spec,1.6,1.7
Author: jwrdegoede
Update of /cvs/nonfree/rpms/vice/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv22148
Modified Files:
vice.spec
Added Files:
vice-2.1-gcc44.patch
Log Message:
* Wed Apr 1 2009 Hans de Goede <j.w.r.degoede(a)hhs.nl> 2.1-3
- Fix building with gcc 4.4
vice-2.1-gcc44.patch:
--- NEW FILE vice-2.1-gcc44.patch ---
diff -up vice-2.1/src/arch/unix/joy.c~ vice-2.1/src/arch/unix/joy.c
--- vice-2.1/src/arch/unix/joy.c~ 2008-10-25 21:35:56.000000000 +0200
+++ vice-2.1/src/arch/unix/joy.c 2009-04-01 10:32:24.000000000 +0200
@@ -131,7 +131,7 @@ static int use_old_api=1;
#define JS_DATA_TYPE joystick
#define JS_RETURN sizeof(struct joystick)
int use_old_api=1;
-#elif
+#else
#error Unknown Joystick
#endif
Index: vice.spec
===================================================================
RCS file: /cvs/nonfree/rpms/vice/devel/vice.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- vice.spec 29 Mar 2009 15:23:11 -0000 1.6
+++ vice.spec 1 Apr 2009 09:00:25 -0000 1.7
@@ -1,6 +1,6 @@
Name: vice
Version: 2.1
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Emulator for a variety of Commodore 8bit machines
Group: Applications/Emulators
License: GPL
@@ -19,6 +19,7 @@
Patch2: vice-htmlview.patch
Patch3: vice-tmpnam.patch
Patch4: vice-1.20-monitor-crash.patch
+Patch5: vice-2.1-gcc44.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libXt-devel libXext-devel libXxf86vm-devel libXxf86dga-devel
BuildRequires: giflib-devel libjpeg-devel libgnomeui-devel ffmpeg-devel
@@ -38,6 +39,7 @@
%patch2 -p1 -z .htmlview
%patch3 -p1 -z .tmpnam
%patch4 -p1 -z .mon
+%patch5 -p1
for i in man/*.1 doc/*.info*; do
iconv -f ISO-8859-1 -t UTF8 $i > $i.tmp
mv $i.tmp $i
@@ -116,6 +118,9 @@
%changelog
+* Wed Apr 1 2009 Hans de Goede <j.w.r.degoede(a)hhs.nl> 2.1-3
+- Fix building with gcc 4.4
+
* Sun Mar 29 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.1-2
- rebuild for new F11 features