rpms/auriferous/F-11 auriferous-1.0.1-extra-keys.patch, NONE, 1.1 auriferous-1.0.1-silence-looping-warn.patch, NONE, 1.1 auriferous-1.0.1-fixes.patch, 1.1, 1.2 auriferous.desktop, 1.2, 1.3 auriferous.spec, 1.6, 1.7
Hans de Goede
jwrdegoede at fedoraproject.org
Tue Dec 1 19:55:12 UTC 2009
Author: jwrdegoede
Update of /cvs/extras/rpms/auriferous/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16554
Modified Files:
auriferous-1.0.1-fixes.patch auriferous.desktop
auriferous.spec
Added Files:
auriferous-1.0.1-extra-keys.patch
auriferous-1.0.1-silence-looping-warn.patch
Log Message:
* Sun Nov 29 2009 Hans de Goede <hdegoede at redhat.com> 1.0.1-10
- Fix levels not loading
- Fix getting stuck at top of ladder below bar (in level 2)
- Add support for several non alpha numeric keys in key bindings dialog
- Silence ClanLib warning about sound stream looping not being implemented
- Fix crash on exit (real fix is in ClanLib06, #542178)
auriferous-1.0.1-extra-keys.patch:
submenu.cpp | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
--- NEW FILE auriferous-1.0.1-extra-keys.patch ---
diff -up auriferous-1.0.1/auriferous/submenu.cpp~ auriferous-1.0.1/auriferous/submenu.cpp
--- auriferous-1.0.1/auriferous/submenu.cpp~ 2009-11-29 11:58:15.000000000 +0100
+++ auriferous-1.0.1/auriferous/submenu.cpp 2009-11-29 21:07:24.000000000 +0100
@@ -434,6 +434,7 @@ CL_String Submenu::key_name(int k)
case CL_KEY_TAB: str = "Tab"; break;
case CL_KEY_ENTER: str = "Enter"; break;
case CL_KEY_SPACE: str = "Space"; break;
+ case CL_KEY_BACKSPACE: str = "Backspace"; break;
case CL_KEY_INSERT: str = "Insert"; break;
case CL_KEY_DELETE: str = "Delete"; break;
case CL_KEY_HOME: str = "Home"; break;
@@ -445,6 +446,7 @@ CL_String Submenu::key_name(int k)
case CL_KEY_SCRLOCK: str = "Scroll Lock"; break;
case CL_KEY_PRINT: str = "Print Screen"; break;
case CL_KEY_PAUSE: str = "Pause"; break;
+ case CL_KEY_KP_DECIMAL: str = "KP Period"; break;
case CL_KEY_KP_0: str = "KP 0"; break;
case CL_KEY_KP_1: str = "KP 1"; break;
case CL_KEY_KP_2: str = "KP 2"; break;
@@ -460,6 +462,21 @@ CL_String Submenu::key_name(int k)
case CL_KEY_KP_MINUS: str = "KP Minus"; break;
case CL_KEY_KP_PLUS: str = "KP Plus"; break;
case CL_KEY_KP_ENTER: str = "KP Enter"; break;
+ case CL_KEY_GRAVE: str = "Grave"; break;
+ case CL_KEY_SUBTRACT: str = "Minus"; break;
+ case CL_KEY_EQUALS: str = "Equals"; break;
+ case CL_KEY_LEFT_BRACKET: str = "Left Bracket"; break;
+ case CL_KEY_RIGHT_BRACKET: str = "Right Bracket"; break;
+ case CL_KEY_SEMICOLON: str = "Semicolon"; break;
+ case CL_KEY_QUOTE: str = "Quote"; break;
+ case CL_KEY_COMMA: str = "Comma"; break;
+ case CL_KEY_PERIOD: str = "Period"; break;
+ case CL_KEY_DIVIDE: str = "Divide"; break;
+ case CL_KEY_BACKSLASH: str = "Backslash"; break;
+ case CL_KEY_LWIN: str = "Left Win"; break;
+ case CL_KEY_RWIN: str = "Right Win"; break;
+ case CL_KEY_APPS: str = "Menu"; break;
+ case CL_KEY_COMPOSE: str = "Compose"; break;
case CL_NUM_KEYS: str = "CL_NUM_KEYS"; break;
case CL_KEY_NONE_OF_THE_ABOVE: str = "unknown"; break;
}
auriferous-1.0.1-silence-looping-warn.patch:
resources.cpp | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
--- NEW FILE auriferous-1.0.1-silence-looping-warn.patch ---
diff -up auriferous-1.0.1/auriferous/resources.cpp~ auriferous-1.0.1/auriferous/resources.cpp
--- auriferous-1.0.1/auriferous/resources.cpp~ 2002-05-30 15:23:11.000000000 +0200
+++ auriferous-1.0.1/auriferous/resources.cpp 2009-12-01 11:54:56.000000000 +0100
@@ -489,7 +489,7 @@ CL_SoundBuffer_Session* Resources::Jungl
{
CL_SoundBuffer *sample= new CL_SoundBuffer(new CL_VorbisSoundProvider("music/jungle.ogg", res), true);
jungle = new CL_SoundBuffer_Session(sample->prepare());
- jungle->set_looping(true);
+ //jungle->set_looping(true);
}
return jungle;
}
@@ -499,7 +499,7 @@ CL_SoundBuffer_Session* Resources::Tech(
{
CL_SoundBuffer *sample= new CL_SoundBuffer(new CL_VorbisSoundProvider("music/tech.ogg", res), true);
tech = new CL_SoundBuffer_Session(sample->prepare());
- tech->set_looping(true);
+ //tech->set_looping(true);
}
return tech;
}
@@ -509,7 +509,7 @@ CL_SoundBuffer_Session* Resources::Lava(
{
CL_SoundBuffer *sample= new CL_SoundBuffer(new CL_VorbisSoundProvider("music/lava.ogg", res), true);
lava = new CL_SoundBuffer_Session(sample->prepare());
- lava->set_looping(true);
+ //lava->set_looping(true);
}
return lava;
}
@@ -519,7 +519,7 @@ CL_SoundBuffer_Session* Resources::Ice()
{
CL_SoundBuffer *sample= new CL_SoundBuffer(new CL_VorbisSoundProvider("music/ice.ogg", res), true);
ice = new CL_SoundBuffer_Session(sample->prepare());
- ice->set_looping(true);
+ //ice->set_looping(true);
}
return ice;
}
@@ -529,7 +529,7 @@ CL_SoundBuffer_Session* Resources::Aqua(
{
CL_SoundBuffer *sample= new CL_SoundBuffer(new CL_VorbisSoundProvider("music/aqua.ogg", res), true);
aqua = new CL_SoundBuffer_Session(sample->prepare());
- aqua->set_looping(true);
+ //aqua->set_looping(true);
}
return aqua;
}
auriferous-1.0.1-fixes.patch:
auriferous-1.0.1/auriferous/auriferous.cpp | 6 ++-
auriferous-1.0.1/auriferous/config.cpp | 4 +-
auriferous-1.0.1/auriferous/editor.cpp | 5 ++
auriferous-1.0.1/auriferous/game.cpp | 5 ++
auriferous-1.0.1/auriferous/game.h | 4 ++
auriferous-1.0.1/auriferous/global_types.h | 1
auriferous-1.0.1/auriferous/mainscreen.cpp | 50 +++++++++++++++++++----------
auriferous-1.0.1/auriferous/map.cpp | 18 +++++-----
auriferous-1.0.1/auriferous/map_sample.cpp | 32 +++++++++++-------
auriferous-1.0.1/auriferous/menu.cpp | 13 ++++---
auriferous-1.0.1/auriferous/monk_ai.cpp | 6 +--
auriferous-1.0.1/auriferous/resources.scr | 10 ++---
auriferous-1.0.1/auriferous/submenu.cpp | 8 ++--
auriferous-1.0.1/auriferous/submenu.h | 2 -
auriferous/player.cpp | 3 +
15 files changed, 107 insertions(+), 60 deletions(-)
Index: auriferous-1.0.1-fixes.patch
===================================================================
RCS file: /cvs/extras/rpms/auriferous/F-11/auriferous-1.0.1-fixes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- auriferous-1.0.1-fixes.patch 31 Jul 2006 18:15:03 -0000 1.1
+++ auriferous-1.0.1-fixes.patch 1 Dec 2009 19:55:12 -0000 1.2
@@ -305,6 +305,18 @@ diff -ur auriferous-1.0.1.orig/auriferou
objects.sort();
}
}
+@@ -270,7 +270,10 @@
+ while(!in.eof())
+ {
+ last=in.get();
+- a=&last;
++ char buf[2];
++ buf[0] = last;
++ buf[1] = 0;
++ a=buf;
+
+ if(!in.eof())
+ {
diff -ur auriferous-1.0.1.orig/auriferous/menu.cpp auriferous-1.0.1/auriferous/menu.cpp
--- auriferous-1.0.1.orig/auriferous/menu.cpp 2002-05-29 19:50:08.000000000 +0200
+++ auriferous-1.0.1/auriferous/menu.cpp 2006-07-20 20:00:46.000000000 +0200
@@ -422,3 +434,29 @@ diff -ur auriferous-1.0.1.orig/auriferou
private:
+--- auriferous-1.0.1/auriferous/editor.cpp~ 2002-05-30 16:36:43.000000000 +0200
++++ auriferous-1.0.1/auriferous/editor.cpp 2009-11-29 21:15:28.000000000 +0100
+@@ -562,7 +562,10 @@ void Editor::load_map()
+ while(!in.eof())
+ {
+ last=in.get();
+- a=&last;
++ char buf[2];
++ buf[0]=last;
++ buf[1]=0;
++ a=buf;
+
+ if(!in.eof())
+ {
+--- auriferous-1.0.1/auriferous/player.cpp 2002-05-30 18:38:35.000000000 +0200
++++ auriferous-1.0.1.new/auriferous/player.cpp 2009-11-30 23:52:58.000000000 +0100
+@@ -344,7 +346,8 @@
+ if(sample->map->get_maptile(map_x(16), map_y(16))->get_type()==LADDER || sample->map->get_maptile(map_x(16), map_y(16)+32)->get_type()==LADDER)
+ y=sample->map->get_maptile(map_x(16), map_y(16))->get_y();
+ }
+- else if(dir!=STOPPED && controller->is_up() && (sample->map->get_maptile(map_x(16), map_y()+32)->get_type()==LADDER || sample->map->get_maptile(map_x(16), map_y())->get_type()==LADDER) && !sample->map->get_maptile(map_x(16), map_y())->is_blocking())
++ else if(dir!=STOPPED && controller->is_up() && (sample->map->get_maptile(map_x(16), map_y()+32)->get_type()==LADDER || sample->map->get_maptile(map_x(16), map_y())->get_type()==LADDER) && !sample->map->get_maptile(map_x(16), map_y())->is_blocking() &&
++ (sample->map->get_maptile(map_x(16), map_y(-speed*timer->time_elapsed())+32)->get_type()==LADDER || sample->map->get_maptile(map_x(16), map_y(-speed*timer->time_elapsed()))->get_type()==LADDER))
+ {
+ x=sample->map->get_maptile(map_x(16), map_y(16))->get_x();
+ sprite->set_new(0.2f, 22, 27);
Index: auriferous.desktop
===================================================================
RCS file: /cvs/extras/rpms/auriferous/F-11/auriferous.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- auriferous.desktop 5 Aug 2007 18:36:27 -0000 1.2
+++ auriferous.desktop 1 Dec 2009 19:55:12 -0000 1.3
@@ -1,9 +1,8 @@
[Desktop Entry]
-Encoding=UTF-8
Name=Auriferous
Comment=Game inspired by the classic Loderunner
Exec=auriferous
-Icon=auriferous.png
+Icon=auriferous
Terminal=false
StartupNotify=false
Type=Application
Index: auriferous.spec
===================================================================
RCS file: /cvs/extras/rpms/auriferous/F-11/auriferous.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- auriferous.spec 10 Apr 2009 07:49:07 -0000 1.6
+++ auriferous.spec 1 Dec 2009 19:55:12 -0000 1.7
@@ -1,6 +1,6 @@
Name: auriferous
Version: 1.0.1
-Release: 7%{?dist}
+Release: 10%{?dist}
Summary: Game inspired by the classic Loderunner
Group: Amusements/Games
License: GPLv2+
@@ -15,8 +15,11 @@ Source1: playerr.png
Source2: auriferous.desktop
Patch0: auriferous-1.0.1-fixes.patch
Patch1: auriferous-1.0.1-destdir.patch
+Patch2: auriferous-1.0.1-extra-keys.patch
+Patch3: auriferous-1.0.1-silence-looping-warn.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: ClanLib06-devel ImageMagick desktop-file-utils
+BuildRequires: ClanLib06-devel >= ClanLib06-0.6.5-16, desktop-file-utils
+Requires: hicolor-icon-theme
%description
An arcade style like game. The goal is to fight out all gold from the caves and
@@ -33,7 +36,10 @@ display cannot handle this you are out o
%setup -q
%patch0 -p1 -z .fix
%patch1 -p1 -z .destdir
-cp %{SOURCE1} auriferous/pics/game
+%patch2 -p1 -z .keys
+%patch3 -p1
+touch -r configure.in auriferous/Makefile.am
+cp -a %{SOURCE1} auriferous/pics/game
%build
@@ -64,17 +70,17 @@ rm -rf $RPM_BUILD_ROOT
%post
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
- %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
%postun
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
- %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ $1 -eq 0 ] ; then
+ touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
%files
%defattr(-,root,root,-)
@@ -86,6 +92,19 @@ fi
%changelog
+* Sun Nov 29 2009 Hans de Goede <hdegoede at redhat.com> 1.0.1-10
+- Fix levels not loading
+- Fix getting stuck at top of ladder below bar (in level 2)
+- Add support for several non alpha numeric keys in key bindings dialog
+- Silence ClanLib warning about sound stream looping not being implemented
+- Fix crash on exit (real fix is in ClanLib06, #542178)
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.1-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Jul 15 2009 Hans de Goede <hdegoede at redhat.com> 1.0.1-8
+- Fix FTBFS caused by automake input file timestamp issues (#511454)
+
* Fri Apr 10 2009 Hans de Goede <hdegoede at redhat.com> 1.0.1-7
- Remove non free jungle.ogg song
More information about the fedora-extras-commits
mailing list