commit jumpnbump for openSUSE:Factory
Hello community, here is the log from the commit of package jumpnbump for openSUSE:Factory checked in at Mon Sep 28 08:56:34 CEST 2009. -------- --- jumpnbump/jumpnbump.changes 2007-08-21 21:10:24.000000000 +0200 +++ /mounts/work_src_done/STABLE/jumpnbump/jumpnbump.changes 2009-07-30 13:55:54.000000000 +0200 @@ -1,0 +2,9 @@ +Thu Jul 30 09:55:54 UTC 2009 - lnussel@suse.de + +- install to _bindir instead of /usr/games +- fix displayed version +- import patches from debian git repo + * fix temporary file issues + * use python-gtk menu instead of tcl one + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- jumpnbump-1.50-Exit-fullscreen-mode-when-you-quit.diff jumpnbump-1.50-Import-jumpnbump_menu.diff jumpnbump-1.50-Use-safe-temporary-files.diff jumpnbump-1.50-exit-fullscreen-mode-early-to-avoid-crash.diff jumpnbump-1.50-handle-SDL-quit-event.diff jumpnbump-1.55-version.patch jumpnbump_menu-default.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jumpnbump.spec ++++++ --- /var/tmp/diff_new_pack.V407I2/_old 2009-09-28 08:56:16.000000000 +0200 +++ /var/tmp/diff_new_pack.V407I2/_new 2009-09-28 08:56:16.000000000 +0200 @@ -19,18 +19,28 @@ Name: jumpnbump -BuildRequires: SDL_image-devel SDL_mixer-devel SDL_net-devel libdrm-devel update-desktop-files xorg-x11 +BuildRequires: SDL_image-devel SDL_mixer-devel SDL_net-devel update-desktop-files xorg-x11 License: GPL v2 or later -Url: http://www.jumpbump.mine.nu/ -Group: Amusements/Games/Action/Other +Url: http://gnu.ethz.ch/jumpbump.mine.nu/ +Group: Amusements/Games/Action/Arcade Version: 1.55 -Release: 246 +Release: 247 +Requires: python-gtk Summary: Funny Game with Cute Little Bunnies BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: %{name}-%{version}.tar.gz Source1: jumpnbump.desktop Source2: jumpnbump-levels-0.0.20020825_selected.tar.bz2 Patch0: jumpnbump-1.55-jnbmenudefaults.diff +Patch1: jumpnbump-1.55-version.patch +# http://repo.or.cz/w/jumpnbump.git +Patch20: jumpnbump-1.50-Exit-fullscreen-mode-when-you-quit.diff +Patch21: jumpnbump-1.50-Use-safe-temporary-files.diff +Patch22: jumpnbump-1.50-exit-fullscreen-mode-early-to-avoid-crash.diff +Patch23: jumpnbump-1.50-Import-jumpnbump_menu.diff +Patch24: jumpnbump-1.50-handle-SDL-quit-event.diff +# +Patch50: jumpnbump_menu-default.diff %description You are a cute little bunny and you have to avoid the other bunnies @@ -47,21 +57,33 @@ %prep rm -rf %{buildroot} -%setup -a 2 -n jumpnbump-1.50 +%setup -q -a 2 -n jumpnbump-1.50 %patch0 -p1 +%patch1 -p0 +%patch20 -p1 +%patch21 -p1 +%patch22 -p1 +%patch23 -p1 +%patch24 -p1 +%patch50 -p1 %build ./autogen.sh -%configure --bindir=%{_prefix}/games +%configure make %{?jobs:-j%jobs} %install -rm -rf %{buildroot} make DESTDIR=%{buildroot} install -install -m 755 modify/{gobpack,jnbpack,jnbunpack} %{buildroot}%{_prefix}/games +install -m 755 modify/{gobpack,jnbpack,jnbunpack} %{buildroot}%{_bindir} +sed -e 's,/usr/share/games,%{_datadir},;s,/usr/games,%{_bindir},;s/jumpnbump-unpack/jnbunpack/' \ + < contrib/jumpnbump_menu/jumpnbump_menu.py \ + > %{buildroot}%{_bindir}/jumpnbump_menu +chmod 755 %{buildroot}%{_bindir}/jumpnbump_menu +install -m 644 contrib/jumpnbump_menu/jumpnbump_menu.glade %{buildroot}%{_datadir}/jumpnbump # # get rid of superfluous scripts -/bin/rm -v %{buildroot}%{_prefix}/games/jumpnbump{-kdialog,-xdialog,.fbcon,.svgalib} +/bin/rm -v %{buildroot}%{_bindir}/jumpnbump{-kdialog,-xdialog,.fbcon,.svgalib} +/bin/rm -v %{buildroot}%{_bindir}/jnbmenu.tcl # rm -rf levelmaking/CVS install -d -m 755 %{buildroot}%{_datadir}/pixmaps @@ -73,9 +95,7 @@ done cd .. # -%if %suse_version > 820 %suse_update_desktop_file -i %name "Game ArcadeGame" -%endif %clean rm -rf %{buildroot} @@ -83,19 +103,17 @@ %files %defattr(-,root,root) %doc levelmaking -%doc AUTHORS COPYING ChangeLog README TODO -%doc XF86Config-4 *.txt jumpnbump.html -%{_prefix}/games/jumpnbump -%{_prefix}/games/jnbmenu.tcl -%{_prefix}/games/gobpack -%{_prefix}/games/jnbpack -%{_prefix}/games/jnbunpack +%doc AUTHORS COPYING ChangeLog README LINKS +%doc gob.txt +%{_bindir}/jumpnbump_menu +%{_bindir}/jumpnbump +%{_bindir}/gobpack +%{_bindir}/jnbpack +%{_bindir}/jnbunpack %dir %{_datadir}/jumpnbump %{_datadir}/jumpnbump/* %{_datadir}/pixmaps/* %doc %{_mandir}/man6/* -%if %suse_version > 820 %{_datadir}/applications/* -%endif %changelog ++++++ jumpnbump-1.50-Exit-fullscreen-mode-when-you-quit.diff ++++++
From 568f2432f3de8ef5d3fea76313fef78f813534c2 Mon Sep 17 00:00:00 2001 From: Ansgar Burchardt
Date: Mon, 8 Dec 2008 01:23:07 +0100 Subject: [PATCH 1/8] Exit fullscreen mode when you quit
see http://bugs.debian.org/338705 --- globals.pre | 1 + main.c | 1 + sdl/gfx.c | 5 +++++ 3 files changed, 7 insertions(+), 0 deletions(-) diff --git a/globals.h b/globals.h index 87c5506..babf59a 100644 --- a/globals.h +++ b/globals.h @@ -344,6 +344,7 @@ void register_mask(void *pixels); #ifdef USE_SDL /* long filelength(int handle); */ void fs_toggle(); +void exit_fullscreen(); int intr_sysupdate(); #endif diff --git a/main.c b/main.c index 6efdd04..76c9463 100644 --- a/main.c +++ b/main.c @@ -3338,6 +3338,7 @@ void deinit_program(void) free(mask_pic); remove_keyb_handler(); + exit_fullscreen(); #ifdef DOS regs.x.ax = 0x3; diff --git a/sdl/gfx.c b/sdl/gfx.c index 9585632..4cea7e5 100644 --- a/sdl/gfx.c +++ b/sdl/gfx.c @@ -226,6 +226,11 @@ void fs_toggle() fullscreen ^= 1; } +void exit_fullscreen() +{ + if (fullscreen) + fs_toggle(); +} void wait_vrt(int mix) { -- 1.6.2.1 ++++++ jumpnbump-1.50-Import-jumpnbump_menu.diff ++++++ ++++ 1214 lines (skipped) ++++++ jumpnbump-1.50-Use-safe-temporary-files.diff ++++++
From 8b6432e02528b6908fe6acaba7ad29027b7c7564 Mon Sep 17 00:00:00 2001 From: Ansgar Burchardt
Date: Mon, 8 Dec 2008 01:33:13 +0100 Subject: [PATCH 2/8] Use safe temporary files
This may break Jump'n'bump on Windows. Maybe the patch should be
cleaned up a bit.
see http://bugs.debian.org/500611
---
modify/jnbunpack.c | 8 +++++++-
sdl/sound.c | 28 ++++++++++++++++++----------
2 files changed, 25 insertions(+), 11 deletions(-)
diff --git a/modify/jnbunpack.c b/modify/jnbunpack.c
index de7c851..aa55d79 100644
--- a/modify/jnbunpack.c
+++ b/modify/jnbunpack.c
@@ -23,6 +23,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include
From 3b256e0e683a0a41dff71f0e00b4458ae40ef7e5 Mon Sep 17 00:00:00 2001 From: Ansgar Burchardt
Date: Sat, 13 Dec 2008 14:33:50 +0100 Subject: [PATCH 6/8] exit fullscreen mode early to avoid crash
Jump'n'bump would crash when leaving the game from fullscreen mode and sound was available. This patch makes Jump'n'bump exit fullscreen mode early. see http://bugs.debian.org/432361 --- main.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/main.c b/main.c index 76c9463..2db1f18 100644 --- a/main.c +++ b/main.c @@ -3324,6 +3324,8 @@ void deinit_program(void) __dpmi_regs regs; #endif + exit_fullscreen(); + dj_stop(); dj_free_mod(MOD_MENU); dj_free_mod(MOD_GAME); @@ -3338,7 +3340,6 @@ void deinit_program(void) free(mask_pic); remove_keyb_handler(); - exit_fullscreen(); #ifdef DOS regs.x.ax = 0x3; -- 1.6.2.1 ++++++ jumpnbump-1.50-handle-SDL-quit-event.diff ++++++
From f18a70c85ebce8842da18ac0333b4d6db8f8479f Mon Sep 17 00:00:00 2001 From: Ansgar Burchardt
Date: Sat, 13 Dec 2008 15:00:01 +0100 Subject: [PATCH 8/8] handle SDL quit event
This patch makes Jump'n'bump quit when pressing the close button or using other means to ask Jump'n'bump to quit (e.g. Alt+F4). See http://bugs.debian.org/487333 --- sdl/interrpt.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/sdl/interrpt.c b/sdl/interrpt.c index 91a27ab..d6ab688 100644 --- a/sdl/interrpt.c +++ b/sdl/interrpt.c @@ -419,6 +419,9 @@ int intr_sysupdate() break; } break; + case SDL_QUIT: + deinit_program(); + break; default: break; } -- 1.6.2.1 ++++++ jumpnbump-1.55-version.patch ++++++ --- globals.h +++ globals.h @@ -95,7 +95,7 @@ #define MOVEMENT_RIGHT 2 #define MOVEMENT_UP 3 -#define JNB_VERSION "1.50" +#define JNB_VERSION "1.55" #define JNB_WIDTH 400 #define JNB_HEIGHT 256 ++++++ jumpnbump.desktop ++++++ --- /var/tmp/diff_new_pack.V407I2/_old 2009-09-28 08:56:17.000000000 +0200 +++ /var/tmp/diff_new_pack.V407I2/_new 2009-09-28 08:56:17.000000000 +0200 @@ -4,5 +4,5 @@ Name=Jump'n Bump GenericName=Jump'n'Run Comment=Funny game with cute little bunnies -Exec=jnbmenu.tcl -Icon=jumpnbump32 +Exec=jumpnbump_menu +Icon=jumpnbump64 ++++++ jumpnbump_menu-default.diff ++++++ Index: jumpnbump-1.50/contrib/jumpnbump_menu/jumpnbump_menu.glade =================================================================== --- jumpnbump-1.50.orig/contrib/jumpnbump_menu/jumpnbump_menu.glade +++ jumpnbump-1.50/contrib/jumpnbump_menu/jumpnbump_menu.glade @@ -429,7 +429,7 @@ <property name="label" translatable="yes">No _gore</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="active">False</property> + <property name="active">True</property> <property name="inconsistent">False</property> <property name="draw_indicator">True</property> </widget> @@ -447,7 +447,7 @@ <property name="label" translatable="yes">_Double resolution</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="active">False</property> + <property name="active">True</property> <property name="inconsistent">False</property> <property name="draw_indicator">True</property> </widget> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de