rpms/mirrormagic/devel mirrormagic-2.0.2-fs-toggle.patch, NONE, 1.1 mirrormagic-2.0.2-highscore.patch, NONE, 1.1 mirrormagic-2.0.2-yesno.patch, NONE, 1.1 mirrormagic-2.0.2-fixes.patch, 1.1, 1.2 mirrormagic.desktop, 1.1, 1.2 mirrormagic.spec, 1.1, 1.2
Hans de Goede (jwrdegoede)
fedora-extras-commits at redhat.com
Sat Mar 10 13:15:59 UTC 2007
- Previous message (by thread): rpms/cfengine/EL-4 .cvsignore, 1.13, 1.14 cfengine.spec, 1.15, 1.16 sources, 1.13, 1.14
- Next message (by thread): owners owners.epel.list,1.58,1.59 owners.list,1.2451,1.2452
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: jwrdegoede
Update of /cvs/extras/rpms/mirrormagic/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29034
Modified Files:
mirrormagic-2.0.2-fixes.patch mirrormagic.desktop
mirrormagic.spec
Added Files:
mirrormagic-2.0.2-fs-toggle.patch
mirrormagic-2.0.2-highscore.patch
mirrormagic-2.0.2-yesno.patch
Log Message:
* Sat Mar 10 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 2.0.2-3
- Splitoff 3 seperate patches from patch0 for upstream merging
- Fixup .desktop file categories for games-menus usage
mirrormagic-2.0.2-fs-toggle.patch:
--- NEW FILE mirrormagic-2.0.2-fs-toggle.patch ---
diff -ur mirrormagic-2.0.2.orig/src/events.c mirrormagic-2.0.2/src/events.c
--- mirrormagic-2.0.2.orig/src/events.c 2001-01-14 17:14:33.000000000 +0100
+++ mirrormagic-2.0.2/src/events.c 2006-09-29 14:44:13.000000000 +0200
@@ -134,6 +134,13 @@
case EVENT_CLIENTMESSAGE:
HandleClientMessageEvent((ClientMessageEvent *) event);
break;
+
+#ifdef TARGET_SDL // hack SDL returns this when toggling fullscreen
+ case EVENT_FULLSCREENTOGGLE:
+ if (game_status == SETUP) // redraw the setup screen to update fs status
+ DrawSetupScreen();
+ break;
+#endif
default:
break;
diff -ur mirrormagic-2.0.2.orig/src/libgame/sdl.c mirrormagic-2.0.2/src/libgame/sdl.c
--- mirrormagic-2.0.2.orig/src/libgame/sdl.c 2002-03-19 04:10:37.000000000 +0100
+++ mirrormagic-2.0.2/src/libgame/sdl.c 2006-09-29 13:48:10.000000000 +0200
@@ -14,7 +14,7 @@
#include "system.h"
#include "sound.h"
#include "misc.h"
-
+#include "../main.h"
#if defined(TARGET_SDL)
@@ -930,6 +930,20 @@
((ButtonEvent *)event)->y = 0;
}
#endif
+ if (event->type == EVENT_KEYPRESS)
+ {
+ /* make alt + enter toggle fullscreen */
+ if ( (((KeyEvent *)event)->keysym.sym == KSYM_Return) &&
+ (((KeyEvent *)event)->keysym.mod == KMOD_LALT) )
+ {
+ if(SDL_WM_ToggleFullScreen(SDL_GetVideoSurface()))
+ {
+ video.fullscreen_enabled = !video.fullscreen_enabled;
+ setup.fullscreen = video.fullscreen_enabled;
+ }
+ event->type = EVENT_FULLSCREENTOGGLE;
+ }
+ }
}
#endif /* TARGET_SDL */
--- mirrormagic-2.0.2/src/libgame/sdl.h~ 2006-10-24 20:12:34.000000000 +0200
+++ mirrormagic-2.0.2/src/libgame/sdl.h 2006-10-24 20:12:34.000000000 +0200
@@ -87,6 +87,7 @@
#define EVENT_CLIENTMESSAGE SDL_QUIT
#define EVENT_MAPNOTIFY SDL_USEREVENT + 4
#define EVENT_UNMAPNOTIFY SDL_USEREVENT + 5
+#define EVENT_FULLSCREENTOGGLE SDL_USEREVENT + 6
#define KSYM_UNDEFINED SDLK_UNKNOWN
mirrormagic-2.0.2-highscore.patch:
--- NEW FILE mirrormagic-2.0.2-highscore.patch ---
diff -ur mirrormagic-2.0.2.orig/src/files.c mirrormagic-2.0.2/src/files.c
--- mirrormagic-2.0.2.orig/src/files.c 2002-03-18 04:09:16.000000000 +0100
+++ mirrormagic-2.0.2/src/files.c 2006-09-29 12:09:17.000000000 +0200
@@ -183,7 +183,11 @@
static char *getScoreDir(char *level_subdir)
{
static char *score_dir = NULL;
+#ifdef USE_USERDATADIR_FOR_COMMONDATA
+ char *data_dir = getUserDataDir();
+#else
char *data_dir = options.rw_base_directory;
+#endif
char *score_subdir = SCORES_DIRECTORY;
if (score_dir)
mirrormagic-2.0.2-yesno.patch:
--- NEW FILE mirrormagic-2.0.2-yesno.patch ---
diff -ur mirrormagic-2.0.2.orig/src/tools.c mirrormagic-2.0.2/src/tools.c
--- mirrormagic-2.0.2.orig/src/tools.c 2002-03-19 03:53:26.000000000 +0100
+++ mirrormagic-2.0.2/src/tools.c 2006-09-29 14:01:07.000000000 +0200
@@ -1310,6 +1310,18 @@
case KSYM_Escape:
result = 0;
break;
+
+ case KSYM_y:
+ case KSYM_Y:
+ if (req_state & REQ_ASK)
+ result = TRUE;
+ break;
+
+ case KSYM_n:
+ case KSYM_N:
+ if (req_state & REQ_ASK)
+ result = FALSE;
+ break;
default:
break;
mirrormagic-2.0.2-fixes.patch:
Index: mirrormagic-2.0.2-fixes.patch
===================================================================
RCS file: /cvs/extras/rpms/mirrormagic/devel/mirrormagic-2.0.2-fixes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mirrormagic-2.0.2-fixes.patch 6 Oct 2006 20:08:42 -0000 1.1
+++ mirrormagic-2.0.2-fixes.patch 10 Mar 2007 13:15:26 -0000 1.2
@@ -19,101 +19,6 @@
Request("No Level without Gregor Mc Duffin please !", REQ_CONFIRM);
else
{
-diff -ur mirrormagic-2.0.2.orig/src/events.c mirrormagic-2.0.2/src/events.c
---- mirrormagic-2.0.2.orig/src/events.c 2001-01-14 17:14:33.000000000 +0100
-+++ mirrormagic-2.0.2/src/events.c 2006-09-29 14:44:13.000000000 +0200
-@@ -134,6 +134,13 @@
- case EVENT_CLIENTMESSAGE:
- HandleClientMessageEvent((ClientMessageEvent *) event);
- break;
-+
-+#ifdef TARGET_SDL // hack SDL returns this when toggling fullscreen
-+ case (Uint8)-1:
-+ if (game_status == SETUP) // redraw the setup screen to update fs status
-+ DrawSetupScreen();
-+ break;
-+#endif
-
- default:
- break;
-diff -ur mirrormagic-2.0.2.orig/src/files.c mirrormagic-2.0.2/src/files.c
---- mirrormagic-2.0.2.orig/src/files.c 2002-03-18 04:09:16.000000000 +0100
-+++ mirrormagic-2.0.2/src/files.c 2006-09-29 12:09:17.000000000 +0200
-@@ -183,7 +183,7 @@
- static char *getScoreDir(char *level_subdir)
- {
- static char *score_dir = NULL;
-- char *data_dir = options.rw_base_directory;
-+ char *data_dir = getUserDataDir();
- char *score_subdir = SCORES_DIRECTORY;
-
- if (score_dir)
-diff -ur mirrormagic-2.0.2.orig/src/libgame/misc.c mirrormagic-2.0.2/src/libgame/misc.c
---- mirrormagic-2.0.2.orig/src/libgame/misc.c 2002-03-19 02:57:15.000000000 +0100
-+++ mirrormagic-2.0.2/src/libgame/misc.c 2006-09-29 12:13:03.000000000 +0200
-@@ -423,7 +423,6 @@
- options.server_host = NULL;
- options.server_port = 0;
- options.ro_base_directory = RO_BASE_PATH;
-- options.rw_base_directory = RW_BASE_PATH;
- options.level_directory = RO_BASE_PATH "/" LEVELS_DIRECTORY;
- options.serveronly = FALSE;
- options.network = FALSE;
-@@ -492,9 +491,7 @@
- if (option_arg == NULL)
- Error(ERR_EXIT_HELP, "option '%s' requires an argument", option_str);
-
-- /* this should be extended to separate options for ro and rw data */
- options.ro_base_directory = option_arg;
-- options.rw_base_directory = option_arg;
- if (option_arg == next_option)
- options_left++;
-
-diff -ur mirrormagic-2.0.2.orig/src/libgame/sdl.c mirrormagic-2.0.2/src/libgame/sdl.c
---- mirrormagic-2.0.2.orig/src/libgame/sdl.c 2002-03-19 04:10:37.000000000 +0100
-+++ mirrormagic-2.0.2/src/libgame/sdl.c 2006-09-29 13:48:10.000000000 +0200
-@@ -14,7 +14,7 @@
- #include "system.h"
- #include "sound.h"
- #include "misc.h"
--
-+#include "../main.h"
-
- #if defined(TARGET_SDL)
-
-@@ -930,6 +930,21 @@
- ((ButtonEvent *)event)->y = 0;
- }
- #endif
-+ if (event->type == EVENT_KEYPRESS)
-+ {
-+ /* make alt + enter toggle fullscreen */
-+ if ( (((KeyEvent *)event)->keysym.sym == KSYM_Return) &&
-+ (((KeyEvent *)event)->keysym.mod == KMOD_LALT) )
-+ {
-+ if(SDL_WM_ToggleFullScreen(SDL_GetVideoSurface()))
-+ {
-+ video.fullscreen_enabled = !video.fullscreen_enabled;
-+ setup.fullscreen = video.fullscreen_enabled;
-+ }
-+ /* make this an invalid event so the enter has no further results */
-+ event->type = -1;
-+ }
-+ }
- }
-
- #endif /* TARGET_SDL */
-diff -ur mirrormagic-2.0.2.orig/src/libgame/system.h mirrormagic-2.0.2/src/libgame/system.h
---- mirrormagic-2.0.2.orig/src/libgame/system.h 2002-03-19 03:42:52.000000000 +0100
-+++ mirrormagic-2.0.2/src/libgame/system.h 2006-09-29 12:13:06.000000000 +0200
-@@ -154,7 +154,6 @@
- char *server_host;
- int server_port;
- char *ro_base_directory;
-- char *rw_base_directory;
- char *level_directory;
- boolean serveronly;
- boolean network;
diff -ur mirrormagic-2.0.2.orig/src/main.h mirrormagic-2.0.2/src/main.h
--- mirrormagic-2.0.2.orig/src/main.h 2003-06-07 18:04:37.000000000 +0200
+++ mirrormagic-2.0.2/src/main.h 2006-09-29 11:36:39.000000000 +0200
@@ -125,25 +30,3 @@
extern struct SetupInfo setup;
extern struct GameInfo game;
extern struct LaserInfo laser;
-diff -ur mirrormagic-2.0.2.orig/src/tools.c mirrormagic-2.0.2/src/tools.c
---- mirrormagic-2.0.2.orig/src/tools.c 2002-03-19 03:53:26.000000000 +0100
-+++ mirrormagic-2.0.2/src/tools.c 2006-09-29 14:01:07.000000000 +0200
-@@ -1310,6 +1310,18 @@
- case KSYM_Escape:
- result = 0;
- break;
-+
-+ case KSYM_y:
-+ case KSYM_Y:
-+ if (req_state & REQ_ASK)
-+ result = TRUE;
-+ break;
-+
-+ case KSYM_n:
-+ case KSYM_N:
-+ if (req_state & REQ_ASK)
-+ result = FALSE;
-+ break;
-
- default:
- break;
Index: mirrormagic.desktop
===================================================================
RCS file: /cvs/extras/rpms/mirrormagic/devel/mirrormagic.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mirrormagic.desktop 6 Oct 2006 20:08:42 -0000 1.1
+++ mirrormagic.desktop 10 Mar 2007 13:15:26 -0000 1.2
@@ -7,4 +7,4 @@
Terminal=false
StartupNotify=false
Type=Application
-Categories=Application;Game;ArcadeGame;
+Categories=Game;LogicGame;
Index: mirrormagic.spec
===================================================================
RCS file: /cvs/extras/rpms/mirrormagic/devel/mirrormagic.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mirrormagic.spec 6 Oct 2006 20:08:42 -0000 1.1
+++ mirrormagic.spec 10 Mar 2007 13:15:26 -0000 1.2
@@ -1,6 +1,6 @@
Name: mirrormagic
Version: 2.0.2
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Puzzle game where you steer a beam of light using mirrors
Group: Amusements/Games
License: GPL
@@ -10,8 +10,12 @@
Source2: %{name}.png
Patch0: %{name}-%{version}-fixes.patch
Patch1: %{name}-%{version}-64bit.patch
+Patch2: %{name}-%{version}-fs-toggle.patch
+Patch3: %{name}-%{version}-highscore.patch
+Patch4: %{name}-%{version}-yesno.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: SDL_image-devel SDL_mixer-devel desktop-file-utils
+Requires: hicolor-icon-theme
%description
MirrorMagic is a game where you shoot around obstacles to collect energy using
@@ -23,13 +27,16 @@
%prep
%setup -q
-%patch0 -p1 -z .fixes
-%patch1 -p1 -z .64bit
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
%build
make %{?_smp_mflags} RO_GAME_DIR=%{_datadir}/%{name} \
- OPTIONS="$RPM_OPT_FLAGS" sdl
+ OPTIONS="$RPM_OPT_FLAGS -DUSE_USERDATADIR_FOR_COMMONDATA" sdl
%install
@@ -42,7 +49,6 @@
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor fedora \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
- --add-category X-Fedora \
%{SOURCE1}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
install -p -m 644 %{SOURCE2} \
@@ -55,15 +61,11 @@
%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
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
%postun
touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
- %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
%files
@@ -76,6 +78,10 @@
%changelog
+* Sat Mar 10 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 2.0.2-3
+- Splitoff 3 seperate patches from patch0 for upstream merging
+- Fixup .desktop file categories for games-menus usage
+
* Sat Sep 30 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 2.0.2-2
- Add a patch which fixes running (startup) on 64 bit archs
- Previous message (by thread): rpms/cfengine/EL-4 .cvsignore, 1.13, 1.14 cfengine.spec, 1.15, 1.16 sources, 1.13, 1.14
- Next message (by thread): owners owners.epel.list,1.58,1.59 owners.list,1.2451,1.2452
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list