diff options
Diffstat (limited to 'patches/3.4.3-gtk2.patch')
-rw-r--r-- | patches/3.4.3-gtk2.patch | 149 |
1 files changed, 149 insertions, 0 deletions
diff --git a/patches/3.4.3-gtk2.patch b/patches/3.4.3-gtk2.patch new file mode 100644 index 0000000..f10a1d3 --- /dev/null +++ b/patches/3.4.3-gtk2.patch @@ -0,0 +1,149 @@ +--- include/config.h.orig 2005-11-01 01:07:26.000000000 +0100 ++++ include/config.h 2005-11-01 01:10:17.000000000 +0100 +@@ -49,0 +50 @@ ++#define GTK2_GRAPHICS /* Gtk2 interface */ +@@ -55 +56 @@ +- * tty, X11, mac, amii, BeOS, Qt, Gem, Gnome ++ * tty, X11, mac, amii, BeOS, Qt, Gem, Gnome, Gtk2 +@@ -105,0 +107,9 @@ ++#ifdef GTK2_GRAPHICS ++ #define USE_XPM /* Use XPM format for images (required) */ ++ #define GRAPHIC_TOMBSTONE /* Use graphical tombstone (rip.ppm) */ ++ #ifndef DEFAULT_WINDOW_SYS ++ #define DEFAULT_WINDOW_SYS "Gtk2" ++ #endif ++ #define ENABLE_NLS /* Use translated gui strings */ ++#endif ++ +@@ -341 +351 @@ +-/* #define SCORE_ON_BOTL */ /* added by Gary Erickson (erickson@ucivax) */ ++#define SCORE_ON_BOTL /* added by Gary Erickson (erickson@ucivax) */ +@@ -352 +362 @@ +-/*#define AUTOPICKUP_EXCEPTIONS */ /* exceptions to autopickup */ ++#define AUTOPICKUP_EXCEPTIONS /* exceptions to autopickup */ +--- src/Makefile.orig 2005-11-01 01:07:35.000000000 +0100 ++++ src/Makefile 2005-11-01 01:14:40.000000000 +0100 +@@ -150,0 +151,3 @@ ++# Only used for the Gtk2 interface. ++GTK2INC=`pkg-config gtk+-2.0 --cflags` `pkg-config hildon-libs --cflags` `pkg-config libosso --cflags` `pkg-config dbus-1 --cflags` ++ +@@ -202,0 +206,9 @@ ++# Files for a Gtk2 port ++# ++WINGTK2SRC = ../win/gtk2/g2bind.c ../win/gtk2/g2main.c ../win/gtk2/g2mesg.c\ ++ ../win/gtk2/g2player.c ../win/gtk2/g2map.c ../win/gtk2/g2marsh.c\ ++ ../win/gtk2/g2status.c ../win/gtk2/g2menu.c ../win/gtk2/g2text.c\ ++ ../win/gtk2/g2equip.c ../win/gtk2/g2minipad.c ++WINGTK2OBJ = g2bind.o g2main.o g2mesg.o g2player.o g2map.o g2marsh.o g2status.o\ ++ g2menu.o g2text.o g2equip.o g2minipad.o tile.o ++ +@@ -217,2 +229,2 @@ +-WINSRC = $(WINTTYSRC) $(WINX11SRC) +-WINOBJ = $(WINTTYOBJ) $(WINX11OBJ) ++WINSRC = $(WINTTYSRC) $(WINGTK2SRC) ++WINOBJ = $(WINTTYOBJ) $(WINGTK2OBJ) +@@ -251,0 +264,3 @@ ++# libraries for Gtk2 ++WINGTK2LIB =`pkg-config gtk+-2.0 --libs` `pkg-config hildon-libs --libs` `pkg-config libosso --libs` `pkg-config dbus-1 --libs` ++# +@@ -258 +273 @@ +-WINLIB = $(WINTTYLIB) $(WINX11LIB) ++WINLIB = $(WINTTYLIB) $(WINGTK2LIB) +@@ -341 +356,2 @@ +-WINCSRC = $(WINTTYSRC) $(WINX11SRC) $(WINGNOMESRC) $(WINGEMSRC) ++WINCSRC = $(WINTTYSRC) $(WINX11SRC) $(WINGNOMESRC) $(WINGTK2SRC)$(WINGEMSRC) ++ +@@ -675,0 +692,24 @@ ++# Gtk2 stuff ++g2bind.o: ../win/gtk2/g2bind.c ../win/gtk2/g2bind.h $(HACK_H) ++ $(CC) $(MAEMO_FLAGS) $(CFLAGS) $(GTK2INC) -c ../win/gtk2/g2bind.c ++g2main.o: ../win/gtk2/g2main.c ../win/gtk2/g2main.h ../win/gtk2/g2i18n.h $(HACK_H) ++ $(CC) $(MAEMO_FLAGS) $(CFLAGS) $(GTK2INC) -c ../win/gtk2/g2main.c ++g2mesg.o: ../win/gtk2/g2mesg.c ../win/gtk2/g2mesg.h $(HACK_H) ++ $(CC) $(MAEMO_FLAGS) $(CFLAGS) $(GTK2INC) -c ../win/gtk2/g2mesg.c ++g2player.o: ../win/gtk2/g2player.c ../win/gtk2/g2player.h ../win/gtk2/g2i18n.h $(HACK_H) ++ $(CC) $(MAEMO_FLAGS) $(CFLAGS) $(GTK2INC) -c ../win/gtk2/g2player.c ++g2map.o: ../win/gtk2/g2map.c ../win/gtk2/g2map.h $(HACK_H) ++ $(CC) $(MAEMO_FLAGS) $(CFLAGS) $(GTK2INC) -c ../win/gtk2/g2map.c ++g2marsh.o: ../win/gtk2/g2marsh.c ../win/gtk2/g2marsh.h $(HACK_H) ++ $(CC) $(MAEMO_FLAGS) $(CFLAGS) $(GTK2INC) -c ../win/gtk2/g2marsh.c ++g2status.o: ../win/gtk2/g2status.c ../win/gtk2/g2status.h ../win/gtk2/g2i18n.h $(HACK_H) ++ $(CC) $(MAEMO_FLAGS) $(CFLAGS) $(GTK2INC) -c ../win/gtk2/g2status.c ++g2menu.o: ../win/gtk2/g2menu.c ../win/gtk2/g2menu.h ../win/gtk2/g2i18n.h $(HACK_H) ++ $(CC) $(MAEMO_FLAGS) $(CFLAGS) $(GTK2INC) -c ../win/gtk2/g2menu.c ++g2text.o: ../win/gtk2/g2text.c ../win/gtk2/g2text.h $(HACK_H) ++ $(CC) $(MAEMO_FLAGS) $(CFLAGS) $(GTK2INC) -c ../win/gtk2/g2text.c ++g2equip.o: ../win/gtk2/g2equip.c ../win/gtk2/g2equip.h ../win/gtk2/g2i18n.h $(HACK_H) ++ $(CC) $(MAEMO_FLAGS) $(CFLAGS) $(GTK2INC) -c ../win/gtk2/g2equip.c ++g2minipad.o: ../win/gtk2/g2minipad.c ../win/gtk2/g2minipad.h ../win/gtk2/g2i18n.h $(HACK_H) ++ $(CC) $(MAEMO_FLAGS) $(CFLAGS) $(GTK2INC) -c ../win/gtk2/g2minipad.c ++# GEM stuff +@@ -811,0 +850 @@ ++ +--- Makefile.orig 2005-11-01 01:07:46.000000000 +0100 ++++ Makefile 2005-11-01 01:16:46.000000000 +0100 +@@ -43 +43 @@ +-VARDATND = x11tiles pet_mark.xbm rip.xpm ++# VARDATND = x11tiles pet_mark.xbm rip.xpm +@@ -51,0 +52 @@ ++VARDATND = x11tiles equip.png rip.xpm mapbg.xpm gtk2hack.png gold24.png pad_unclicked.png pad_clicked.png +@@ -165,0 +167,12 @@ ++# for gtk2 ++equip.png: ++ (cd dat ; $(MAKE) equip.png ) ++gtk2hack.png: ++ (cd dat ; $(MAKE) gtk2hack.png ) ++gold24.png: ++ (cd dat ; $(MAKE) gold24.png ) ++pad_unclicked.png: ++ (cd dat ; $(MAKE) pad_unclicked.png ) ++pad_clicked.png: ++ (cd dat ; $(MAKE) pad_clicked.png ) ++ +@@ -244,0 +254,3 @@ ++# copy translations for gtk2hack ++ (cd dat ; $(MAKE) locale ) ++ cp -r dat/locale $(GAMEDIR) +--- src/windows.c.orig 2005-11-01 01:47:51.000000000 +0100 ++++ src/windows.c 2005-11-01 01:48:48.000000000 +0100 +@@ -39,0 +40,4 @@ ++#ifdef GTK2_GRAPHICS ++#include "winGtk2.h" ++extern struct window_procs Gtk2_procs; ++#endif +@@ -80,0 +85,3 @@ ++#ifdef GTK2_GRAPHICS ++ { &Gtk2_procs, 0 }, ++#endif + +--- dat/Makefile.orig 2005-11-01 18:52:11.000000000 +0100 ++++ dat/Makefile 2005-04-27 15:01:53.000000000 +0200 +@@ -44,3 +43,0 @@ +-NetHack.ad: ../win/X11/NetHack.ad +- cp ../win/X11/NetHack.ad NetHack.ad +- +@@ -55,0 +53,21 @@ ++#for gtk2 ++equip.png: ../win/gtk2/equip.png ++ cp ../win/gtk2/equip.png equip.png ++ ++gtk2hack.png: ../win/gtk2/gtk2hack.png ++ cp ../win/gtk2/gtk2hack.png gtk2hack.png ++ ++gold24.png: ../win/gtk2/gold24.png ++ cp ../win/gtk2/gold24.png gold24.png ++ ++pad_unclicked.png: ../win/gtk2/pad_unclicked.png ++ cp ../win/gtk2/pad_unclicked.png pad_unclicked.png ++ ++pad_clicked.png: ../win/gtk2/pad_clicked.png ++ cp ../win/gtk2/pad_clicked.png pad_clicked.png ++ ++locale: ../win/gtk2/po/* ++ if [ -e locale ] ; then rm -r locale; fi ++ mkdir locale; ++ cd ../win/gtk2/ && ./copy_trans.sh ++ +@@ -144 +156 @@ +- -rm -f rip.img GEM_RSC.RSC title.img nh16.img NetHack.ad ++ -rm -f rip.img GEM_RSC.RSC title.img nh16.img |