Updated for the SDL2 port of Jump'n'Bump

4 files changed, 101 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3e5a95e046a7..a4ab7dbe7284 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,24 +1,26 @@
 pkgbase = jumpnbump-menu
 	pkgdesc = A pygtk launcher for jump'n'bump.
 	pkgver = 0.6
-	pkgrel = 4
+	pkgrel = 5
 	url = http://jumpbump.mine.nu/
 	arch = i686
 	arch = x86_64
 	license = GPL
 	makedepends = tar
 	makedepends = binutils
-	depends = jumpnbump
+	depends = jumpnbump>=1.60
 	depends = pygtk
 	optdepends = jumpnbump-levels: more levels for jumpnbump
 	source = http://fr.archive.ubuntu.com/ubuntu/pool/universe/j/jumpnbump/jumpnbump_1.50+dfsg1-3ubuntu1_.deb
 	source = jumpnbump.png
 	source = jumpnbump.desktop
 	source = menu.patch
-	sha256sums = 9f04df577541ea36e510003fc540d2a61f0b6786057cf982f7f650bc23148dbf
+	source = glade.patch
+	sha256sums = dd4930cb19b458c68d743f26f9a72120906d0e9cd7c4d1897b098f79d4334c18
 	sha256sums = 86affe4b630765a238bd704011cb4346d835a8d86dc7ed3c0980fbf14d3108b4
 	sha256sums = 1e18deece67700ac0e8e61a33e852a85ab4549f9d20b0595aa5bea91287c4d71
-	sha256sums = c155c82fbb9e8405ae5929695562c03da745aff084335c9f6d0fdf403c10c162
+	sha256sums = 51da6b326f1241679a4a191e512ad24d8ff0413f3e8e344a0825be893cc15cd8
+	sha256sums = adbcc65c336dc33514fc2a17cbfd487f80f962f688eb96d410f34e1791454819
 
 pkgname = jumpnbump-menu
 
diff --git a/PKGBUILD b/PKGBUILD
index ab05b3eb6a6d..95241d13ba7a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,22 +2,23 @@
 
 pkgname=jumpnbump-menu
 pkgver=0.6
-pkgrel=4
+pkgrel=5
 pkgdesc="A pygtk launcher for jump'n'bump."
 arch=('i686' 'x86_64')
 license=('GPL')
-depends=('jumpnbump' 'pygtk')
+depends=('jumpnbump>=1.60' 'pygtk')
 makedepends=('tar' 'binutils')
 optdepends=('jumpnbump-levels: more levels for jumpnbump')
 url="http://jumpbump.mine.nu/"
 [ "$CARCH" = "x86_64" ] && _arch=amd64
 [ "$CARCH" = "i686" ] && _arch=i386
-source=(http://fr.archive.ubuntu.com/ubuntu/pool/universe/j/jumpnbump/jumpnbump_1.50+dfsg1-3ubuntu1_${_arch}.deb jumpnbump.png jumpnbump.desktop menu.patch)
-sha256sums=('9f04df577541ea36e510003fc540d2a61f0b6786057cf982f7f650bc23148dbf'
+source=(http://fr.archive.ubuntu.com/ubuntu/pool/universe/j/jumpnbump/jumpnbump_1.50+dfsg1-3ubuntu1_${_arch}.deb jumpnbump.png jumpnbump.desktop menu.patch glade.patch)
+sha256sums=('dd4930cb19b458c68d743f26f9a72120906d0e9cd7c4d1897b098f79d4334c18'
             '86affe4b630765a238bd704011cb4346d835a8d86dc7ed3c0980fbf14d3108b4'
             '1e18deece67700ac0e8e61a33e852a85ab4549f9d20b0595aa5bea91287c4d71'
-            'c155c82fbb9e8405ae5929695562c03da745aff084335c9f6d0fdf403c10c162')
-[ "$CARCH" == "x86_64" ] && sha256sums=('dd4930cb19b458c68d743f26f9a72120906d0e9cd7c4d1897b098f79d4334c18' '86affe4b630765a238bd704011cb4346d835a8d86dc7ed3c0980fbf14d3108b4' '1e18deece67700ac0e8e61a33e852a85ab4549f9d20b0595aa5bea91287c4d71' 'c155c82fbb9e8405ae5929695562c03da745aff084335c9f6d0fdf403c10c162')
+            '51da6b326f1241679a4a191e512ad24d8ff0413f3e8e344a0825be893cc15cd8'
+            'adbcc65c336dc33514fc2a17cbfd487f80f962f688eb96d410f34e1791454819')
+[ "$CARCH" == "x86_64" ] && sha256sums=('dd4930cb19b458c68d743f26f9a72120906d0e9cd7c4d1897b098f79d4334c18' '86affe4b630765a238bd704011cb4346d835a8d86dc7ed3c0980fbf14d3108b4' '1e18deece67700ac0e8e61a33e852a85ab4549f9d20b0595aa5bea91287c4d71' '51da6b326f1241679a4a191e512ad24d8ff0413f3e8e344a0825be893cc15cd8' 'adbcc65c336dc33514fc2a17cbfd487f80f962f688eb96d410f34e1791454819')
 
 package() {
   cd $srcdir
@@ -26,17 +27,18 @@ package() {
 
   cd $srcdir/usr/games
   patch -p0 < ../../../menu.patch || return 1
+  
+  cd $srcdir/usr/share/games/jumpnbump/
+  patch -p0 < ../../../../glade.patch || return 1
 
   cd $srcdir/
 
   install -d $pkgdir/usr/bin
-  install -d $pkgdir/usr/lib/jumpnbump
   install -d $pkgdir/usr/share/{applications,icons,jumpnbump}
   install -d $pkgdir/usr/share/locale/fr/LC_MESSAGES
   cp jumpnbump.desktop $pkgdir/usr/share/applications/
   cp jumpnbump.png $pkgdir/usr/share/icons/jumpnbump.png
   cp usr/games/jumpnbump-menu $pkgdir/usr/bin/jumpnbump-menu
-  cp usr/lib/jumpnbump/* $pkgdir/usr/lib/jumpnbump/
   cp usr/share/games/jumpnbump/jumpnbump_menu.glade $pkgdir/usr/share/jumpnbump/jumpnbump_menu.glade
   cp usr/share/locale/fr/LC_MESSAGES/jumpnbump-menu.mo $pkgdir/usr/share/locale/fr/LC_MESSAGES/jumpnbump-menu.mo
 }
diff --git a/glade.patch b/glade.patch
new file mode 100644
index 000000000000..ab764fec369e
--- /dev/null
+++ b/glade.patch
@@ -0,0 +1,38 @@
+--- jumpnbump_menu.glade.orig	2015-12-12 11:41:27.155776724 +0100
++++ jumpnbump_menu.glade	2015-12-12 11:41:59.299972725 +0100
+@@ -5,7 +5,7 @@
+ 
+ <widget class="GtkWindow" id="main">
+   <property name="visible">True</property>
+-  <property name="title" translatable="yes">Jump n Bump menu</property>
++  <property name="title" translatable="yes">Jump'n'Bump</property>
+   <property name="type">GTK_WINDOW_TOPLEVEL</property>
+   <property name="window_position">GTK_WIN_POS_CENTER</property>
+   <property name="modal">False</property>
+@@ -48,26 +48,6 @@
+ 		</widget>
+ 		<packing>
+ 		  <property name="padding">0</property>
+-		  <property name="expand">False</property>
+-		  <property name="fill">False</property>
+-		</packing>
+-	      </child>
+-
+-	      <child>
+-		<widget class="GtkRadioButton" id="fireworks">
+-		  <property name="visible">True</property>
+-		  <property name="can_focus">True</property>
+-		  <property name="label" translatable="yes">_Fireworks</property>
+-		  <property name="use_underline">True</property>
+-		  <property name="relief">GTK_RELIEF_NORMAL</property>
+-		  <property name="active">False</property>
+-		  <property name="inconsistent">False</property>
+-		  <property name="draw_indicator">True</property>
+-		  <property name="group">standalone</property>
+-		  <signal name="toggled" handler="fireworks_mode" last_modification_time="Wed, 28 Aug 2002 12:46:22 GMT"/>
+-		</widget>
+-		<packing>
+-		  <property name="padding">0</property>
+ 		  <property name="expand">False</property>
+ 		  <property name="fill">False</property>
+ 		</packing>
diff --git a/menu.patch b/menu.patch
index 123091017f6a..94bf4b7a668c 100644
--- a/menu.patch
+++ b/menu.patch
@@ -1,5 +1,5 @@
 --- jumpnbump-menu.orig	2011-06-25 12:47:35.000000000 +0200
-+++ jumpnbump-menu	2015-05-22 13:26:47.153275252 +0200
++++ jumpnbump-menu	2015-12-13 11:31:09.575832463 +0100
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python2
@@ -17,7 +17,47 @@
  
  application = "jumpnbump-menu"
  gettext.install(application)
-@@ -214,6 +214,8 @@
+@@ -72,14 +72,6 @@
+     nogore.set_sensitive (1)
+     noflies.set_sensitive (1)
+ 
+-def fireworks_mode (widget):
+-    disable_enable_level (0)
+-    disable_enable_server (0)
+-    nogore.set_sensitive (0)
+-    nogore.set_active (0)
+-    noflies.set_sensitive (0)
+-    noflies.set_active (0)
+-
+ def disable_enable_server (setting):
+     server_entry.set_sensitive (setting)
+     player_num.set_sensitive (setting)
+@@ -127,8 +119,6 @@
+ def run (widget):
+     if (standalone.get_active()):
+         execute (*get_level()+common_options())
+-    elif (fireworks.get_active()):
+-        execute ('-fireworks', *common_options())
+     elif (client.get_active()):
+         execute ('-player', str (player_num.get_value_as_int()),
+                  '-connect', server_entry.get_text(),
+@@ -191,14 +181,13 @@
+ 
+     gui = gtk.glade.XML (gladefile, 'main', domain=application)
+ 
+-    global about_dialog, choosen_level, standalone, fireworks, client, server, treeview, \
++    global about_dialog, choosen_level, standalone, client, server, treeview, \
+            mirror, num_clients, server_entry, player_num, fullscreen, \
+            nogore, double_res, nosound, noflies, withmusic, image
+ 
+     about_dialog = None
+     choosen_level = ''
+     standalone = gui.get_widget ('standalone')
+-    fireworks = gui.get_widget ('fireworks')
+     client = gui.get_widget ('client')
+     server = gui.get_widget ('server')
+     treeview = gui.get_widget ('level_treeview')
+@@ -214,11 +203,12 @@
      noflies = gui.get_widget ('noflies')
      withmusic = gui.get_widget ('withmusic')
      image = gui.get_widget ('image')
@@ -26,3 +66,8 @@
      
      gui.signal_autoconnect ({'standalone_mode': standalone_mode,
                               'client_mode': client_mode,
+                              'server_mode': server_mode,
+-                             'fireworks_mode': fireworks_mode,
+                              'level_changed': level_changed, 
+                              'quit': lambda *args: gtk.main_quit(),
+                              'run': run,