- fix libdir on 64bit arch

[packages/frozen-bubble.git] / frozen-bubble-make.patch

diff --git a/frozen-bubble-make.patch b/frozen-bubble-make.patch
index 5cd6b2427dc9531769ffa608f66ce1b7d565468a..fecfe5c9c27d6b905b28c761072e3a73d65fe3b9 100644 (file)
--- a/frozen-bubble-make.patch
+++ b/frozen-bubble-make.patch
@@ -1,10 +1,52 @@
---- frozen-bubble-1.0.0/c_stuff/Makefile.PL.orig       2002-04-18 11:44:20.000000000 +0200
-+++ frozen-bubble-1.0.0/c_stuff/Makefile.PL    2004-07-14 23:44:02.047303392 +0200
-@@ -55,6 +55,6 @@
+diff -Nur frozen-bubble-2.0.0.orig/c_stuff/Makefile.PL frozen-bubble-2.0.0.make/c_stuff/Makefile.PL
+--- 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 @@
      'VERSION_FROM' => 'fb_c_stuff.pm', # finds VERSION
      'OBJECT'       => 'fb_c_stuff.o',
-     'INC'          => chomp_(`sdl-config --cflags`) . ' -I.',
+     'INC'          => chomp_(`sdl-config --cflags`) . ' ' . chomp_(`pkg-config SDL_Pango --cflags`) . ' -I.',
 -    'OPTIMIZE'     => '-O2 -Wall',
      'MAKEFILE'     => 'Makefile_c',
 +    'FIRST_MAKEFILE' => 'Makefile_c',
  );
+diff -Nur frozen-bubble-2.0.0.orig/Makefile frozen-bubble-2.0.0.make/Makefile
+--- 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
+diff -Nur frozen-bubble-2.0.0.orig/server/Makefile frozen-bubble-2.0.0.make/server/Makefile
+--- 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
+@@ -1,22 +1,22 @@
+ PREFIX = /usr/local
+ LIBDIR = $(PREFIX)/lib
+ 
+-CFLAGS ?= -g -Wall -Werror -pipe `pkg-config glib-2.0 --cflags`
++CFLAGS ?= -Wall -Werror -pipe `pkg-config glib-2.0 --cflags`
+ LIBS ?= `pkg-config glib-2.0 --libs`
+ 
+ ALLSRC = fb-server.c log.c tools.c game.c net.c
+ ALLOBJ = $(subst .c,.o,$(ALLSRC))
+ 
+ ifeq (1, $(DEBUG))
+-CFLAGS := $(CFLAGS) $(ADDCFLAGS) -DDEBUG -g
++CFLAGS := $(CFLAGS) $(OPTIMIZE) -DDEBUG -g
+ else
+-CFLAGS := $(CFLAGS) $(ADDCFLAGS)
++CFLAGS := $(CFLAGS) $(OPTIMIZE)
+ endif
+ 
+ all: .depend fb-server
+ 
+ fb-server: $(ALLOBJ)
+-      $(CC) $(LIBS) -o $@ $^
++      $(CC) $(OTHERLDFLAGS) -o $@ $^ $(LIBS)
+ 
+ .c.o:
+       $(CC) -I. $(CFLAGS) -DVERSION=\"$(shell cat ../VERSION)\" -c $<