- rediff patches

diff --git a/frozen-bubble-kill-warning.patch b/frozen-bubble-kill-warning.patch
index 3ed37c2dd01c7c764e611dcaf67ddb305ba287a8..b38cae531045f220e17d0a654e37ecd993dc6226 100644 (file)
--- a/frozen-bubble-kill-warning.patch
+++ b/frozen-bubble-kill-warning.patch
@@ -1,16 +1,16 @@
-diff -Nur frozen-bubble-2.0.0.orig/server/net.c frozen-bubble-2.0.0.warning/server/net.c
---- frozen-bubble-2.0.0.orig/server/net.c      2006-10-27 10:30:13.000000000 +0000
-+++ frozen-bubble-2.0.0.warning/server/net.c   2006-10-29 13:23:21.000000000 +0000
-@@ -335,7 +335,7 @@
+diff -urNp -x '*.orig' frozen-bubble-2.2.0.org/server/net.c frozen-bubble-2.2.0/server/net.c
+--- frozen-bubble-2.2.0.org/server/net.c       2008-10-04 21:30:51.000000000 +0200
++++ frozen-bubble-2.2.0/server/net.c   2021-05-07 23:01:36.748775883 +0200
+@@ -394,7 +394,7 @@ static void download_blacklisted_IPs()
  void connections_manager(void)
  {
          struct sockaddr_in client_addr;
 -        ssize_t len = sizeof(client_addr);
 +        socklen_t len = sizeof(client_addr);
          struct timeval tv;
-         static char * greets_msg = NULL;
          double now, delta, rate;
-@@ -391,7 +391,7 @@
+ 
+@@ -454,7 +454,7 @@ void connections_manager(void)
                  conns = new_conns;
  
                  if (tcp_server_socket != -1 && FD_ISSET(tcp_server_socket, &conns_set)) {

diff --git a/frozen-bubble-make.patch b/frozen-bubble-make.patch
index eda6ef8dad469235fa33c7f343138c1fbc3e535e..1107f1a551760349299cd876747fd8f9ad2cde7c 100644 (file)
--- a/frozen-bubble-make.patch
+++ b/frozen-bubble-make.patch
@@ -1,6 +1,18 @@
---- frozen-bubble-2.0.0.orig/c_stuff/Makefile.PL       2006-10-19 23:46:35.000000000 +0300
-+++ frozen-bubble-2.0.0.make/c_stuff/Makefile.PL       2006-10-29 03:52:06.000000000 +0300
-@@ -77,6 +77,6 @@
+diff -urNp -x '*.orig' frozen-bubble-2.2.0.org/Makefile frozen-bubble-2.2.0/Makefile
+--- frozen-bubble-2.2.0.org/Makefile   2008-11-08 15:47:24.000000000 +0100
++++ frozen-bubble-2.2.0/Makefile       2021-05-07 23:01:33.552106730 +0200
+@@ -15,7 +15,6 @@ prepare:
+ 
+ dirs:
+       @if ! perl -e 'use SDL'; then echo -e "\n    *** I need perl-SDL installed"; false; fi
+-      @if ! perl -e 'use SDL; ($$mj, $$mn, $$mc) = split /\./, $$SDL::VERSION; exit 0 if $$mj > 1 || $$mn >= 19; exit 1'; then echo -e "\n    *** I need perl-SDL version 1.19.0 or upper"; false; fi
+       @for n in . $(DIRS); do \
+               [ "$$n" = "." ] || $(MAKE) -C $$n || exit $$? ;\
+       done
+diff -urNp -x '*.orig' frozen-bubble-2.2.0.org/c_stuff/Makefile.PL frozen-bubble-2.2.0/c_stuff/Makefile.PL
+--- frozen-bubble-2.2.0.org/c_stuff/Makefile.PL        2008-07-02 23:07:14.000000000 +0200
++++ frozen-bubble-2.2.0/c_stuff/Makefile.PL    2021-05-07 23:01:33.552106730 +0200
+@@ -77,6 +77,6 @@ WriteMakefile(
      'VERSION_FROM' => 'fb_c_stuff.pm', # finds VERSION
      'OBJECT'       => 'fb_c_stuff.o',
      'INC'          => chomp_(`sdl-config --cflags`) . ' ' . chomp_(`pkg-config SDL_Pango --cflags`) . ' -I.',
@@ -8,18 +20,9 @@
      'MAKEFILE'     => 'Makefile_c',
 +    'FIRST_MAKEFILE' => 'Makefile_c',
  );
---- frozen-bubble-2.0.0.orig/Makefile  2006-10-05 22:39:10.000000000 +0300
-+++ frozen-bubble-2.0.0.make/Makefile  2006-10-29 03:52:06.000000000 +0300
-@@ -13,7 +13,6 @@
- 
- dirs:
-       @if ! perl -e 'use SDL'; then echo -e "\n    *** I need perl-SDL installed"; false; fi
--      @if ! perl -e 'use SDL; ($$mj, $$mn, $$mc) = split /\./, $$SDL::VERSION; exit 0 if $$mj > 1 || $$mn >= 19; exit 1'; then echo -e "\n    *** I need perl-SDL version 1.19.0 or upper"; false; fi
-       @for n in . $(DIRS); do \
-               [ "$$n" = "." ] || $(MAKE) -C $$n ;\
-       done
---- frozen-bubble-2.0.0.orig/server/Makefile   2006-10-26 21:42:48.000000000 +0300
-+++ frozen-bubble-2.0.0.make/server/Makefile   2006-10-29 03:54:14.000000000 +0300
+diff -urNp -x '*.orig' frozen-bubble-2.2.0.org/server/Makefile frozen-bubble-2.2.0/server/Makefile
+--- frozen-bubble-2.2.0.org/server/Makefile    2008-07-02 23:07:28.000000000 +0200
++++ frozen-bubble-2.2.0/server/Makefile        2021-05-07 23:01:33.552106730 +0200
 @@ -1,6 +1,6 @@
  include ../settings.mk
  
@@ -28,7 +31,7 @@
  CPPFLAGS += -I. `pkg-config glib-2.0 --cflags` -DVERSION=\"$(shell cat ../VERSION)\"
  LDLIBS = `pkg-config glib-2.0 --libs`
  
-@@ -8,9 +8,9 @@
+@@ -8,9 +8,9 @@ ALLSRC = fb-server.c log.c tools.c game.
  ALLOBJ = $(subst .c,.o,$(ALLSRC))
  
  ifeq (1, $(DEBUG))