Updated to 1.61

4 files changed, 26 insertions, 44 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ca57abe53f81..94e5fe3f81db 100755
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = jumpnbump
 	pkgdesc = You, as a bunny, have to jump on your opponents to make them explode. It's a true multiplayer game which can't be played alone. It has network support. This program is a Unix port of the old DOS game by brainchilddesign. SDL2 port.
-	pkgver = 1.60
-	pkgrel = 7
+	pkgver = 1.61
+	pkgrel = 1
 	url = https://libregames.gitlab.io/jumpnbump/
 	arch = i686
 	arch = x86_64
@@ -12,12 +12,12 @@ pkgbase = jumpnbump
 	depends = pygtk
 	optdepends = jumpnbump-levels: more levels for jumpnbump
 	conflicts = jumpnbump-menu
-	source = https://gitlab.com/LibreGames/jumpnbump/uploads/9f3a356c52f433e3af10f1ef800fce5d/jumpnbump-1.60.tar.xz
+	source = https://gitlab.com/LibreGames/jumpnbump/uploads/95acdae2a232513f068e260977371dcf/jumpnbump-1.61.tar.xz
 	source = menu.patch
 	source = desktop.patch
-	sha256sums = 174891415af2c4db683c657001f83a0efc64a56fafc4ba543709b9d9ff92b655
-	sha256sums = 824c16bd23e2cac4d5f9f6fc891f915f2fc5b64a2a27bddcc457cf614350fb34
-	sha256sums = 0290fbb0eaac2aaf4d962e72282889eb6f0655db6918910762739004f9581da0
+	sha256sums = 6a81300336cc4616d8343f65bea6776cf3d71862e50b5d08dab52a46da58d7ad
+	sha256sums = c779543e05f954886d6ef3a3a8e552358e3590b8c8416fe29dbdf022a613fc13
+	sha256sums = 03f21c44bb5c930f3da1d9b532b95395a587a7c4e9e80b235f964fb15971edb9
 
 pkgname = jumpnbump
 
diff --git a/PKGBUILD b/PKGBUILD
index a092bfc3222b..b3b050b2817a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,8 +3,8 @@
 # Maintainer: mirandir <mirandir[AT]orange[DOT]fr>
 
 pkgname=jumpnbump
-pkgver=1.60
-pkgrel=7
+pkgver=1.61
+pkgrel=1
 pkgdesc="You, as a bunny, have to jump on your opponents to make them explode. It's a true multiplayer game which can't be played alone. It has network support. This program is a Unix port of the old DOS game by brainchilddesign. SDL2 port."
 arch=('i686' 'x86_64')
 url="https://libregames.gitlab.io/jumpnbump/"
@@ -12,10 +12,10 @@ license=('GPL')
 depends=('sdl2' 'sdl2_mixer' 'sdl2_net' 'pygtk')
 optdepends=('jumpnbump-levels: more levels for jumpnbump')
 conflicts=('jumpnbump-menu')
-source=(https://gitlab.com/LibreGames/jumpnbump/uploads/9f3a356c52f433e3af10f1ef800fce5d/jumpnbump-${pkgver}.tar.xz menu.patch desktop.patch)
-sha256sums=('174891415af2c4db683c657001f83a0efc64a56fafc4ba543709b9d9ff92b655'
-            '824c16bd23e2cac4d5f9f6fc891f915f2fc5b64a2a27bddcc457cf614350fb34'
-            '0290fbb0eaac2aaf4d962e72282889eb6f0655db6918910762739004f9581da0')
+source=(https://gitlab.com/LibreGames/jumpnbump/uploads/95acdae2a232513f068e260977371dcf/jumpnbump-${pkgver}.tar.xz menu.patch desktop.patch)
+sha256sums=('6a81300336cc4616d8343f65bea6776cf3d71862e50b5d08dab52a46da58d7ad'
+            'c779543e05f954886d6ef3a3a8e552358e3590b8c8416fe29dbdf022a613fc13'
+            '03f21c44bb5c930f3da1d9b532b95395a587a7c4e9e80b235f964fb15971edb9')
 
 build() {
   cd $srcdir/${pkgname}-${pkgver}/menu
@@ -23,12 +23,14 @@ build() {
   
   cd "${srcdir}/${pkgname}-${pkgver}/"
   
-  make PREFIX=/usr
+  make PREFIX=/usr all
+  make PREFIX=/usr -C menu
 }
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make PREFIX="${pkgdir}/usr/" install
+  make PREFIX="${pkgdir}/usr/" install -C menu
   
   cd ${pkgdir}/usr/share/applications/
   rm "jumpnbump.desktop"
diff --git a/desktop.patch b/desktop.patch
index 7de78a86bff8..699f5d44d96b 100644
--- a/desktop.patch
+++ b/desktop.patch
@@ -1,4 +1,4 @@
---- jumpnbump-menu.desktop.orig	2017-05-21 20:14:40.172306054 +0200
+--- /dev/null	2017-05-21 20:14:40.172306054 +0200
 +++ jumpnbump-menu.desktop	2017-05-21 20:15:00.565445873 +0200
 @@ -1,10 +1,10 @@
  [Desktop Entry]
diff --git a/menu.patch b/menu.patch
index 0fa3ab4e11cc..96cb91a82d3e 100644
--- a/menu.patch
+++ b/menu.patch
@@ -1,31 +1,11 @@
---- jumpnbump_menu.py.pre.orig	2017-05-21 20:06:53.393232483 +0200
-+++ jumpnbump_menu.py.pre	2017-05-21 20:10:36.387911904 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- 
- # Author: Martin Willemoes Hansen
- # License: Gnu GPL
-@@ -147,11 +147,8 @@
- 
- def get_level():
-     level = []
--    if (mirror.get_active()):
--        level.append('-mirror')
--    else:
--        level.append('-dat')
--        level.append(choosen_level)
-+    level.append('-dat')
-+    level.append(choosen_level)
- 
-     return level
- 
-@@ -224,6 +221,8 @@
-     noflies = gui.get_widget('noflies')
-     withmusic = gui.get_widget('withmusic')
-     image = gui.get_widget('image')
-+    mainwindow = gui.get_widget('main')
+--- jumpnbump_menu.py.pre.orig	2019-09-02 13:30:08.000000000 +0200
++++ jumpnbump_menu.py.pre	2020-03-05 19:47:09.743913822 +0100
+@@ -236,6 +236,8 @@
+     withmusic = gui.get_object('withmusic')
+     image = gui.get_object('image')
+     about_dialog = gui.get_object('about')
++    mainwindow = gui.get_object('main')
 +    mainwindow.set_icon_from_file('/usr/share/icons/jumpnbump.png')
- 
-     gui.signal_autoconnect({'standalone_mode': standalone_mode,
-                             'client_mode': client_mode,
+     
+     gui.connect_signals({'standalone_mode': standalone_mode,
+                          'client_mode': client_mode,