nethack-qt/nethack-qt.patch

   1 diff -Nur nethack-3.4.3/Makefile backup/nethack-3.4.3/Makefile
   2 --- nethack-3.4.3/Makefile      2008-10-02 11:57:15.000000000 +0800
   3 +++ backup/nethack-3.4.3/Makefile       2008-10-02 18:50:07.000000000 +0800
   4 @@ -15,10 +15,10 @@
   5
   6  # make NetHack
   7  PREFIX  = /usr
   8 -GAME     = nethack
   9 +GAME     = nethack-qt
  10  # GAME     = nethack.prg
  11 -GAMEUID  = games
  12 -GAMEGRP  = bin
  13 +GAMEUID  = root
  14 +GAMEGRP  = games
  15
  16  # Permissions - some places use setgid instead of setuid, for instance
  17  # See also the option "SECURE" in include/config.h
  18 @@ -35,13 +35,13 @@
  19  # therefore there should not be anything in GAMEDIR that you want to keep
  20  # (if there is, you'll have to do the installation by hand or modify the
  21  # instructions)
  22 -GAMEDIR  = $(PREFIX)/games/lib/$(GAME)dir
  23 +GAMEDIR  = $(PREFIX)/share/$(GAME)
  24  VARDIR  = $(GAMEDIR)
  25 -SHELLDIR = $(PREFIX)/games
  26 +SHELLDIR = $(PREFIX)/bin
  27
  28  # per discussion in Install.X11 and Install.Qt
  29 -VARDATND =
  30 -# VARDATND = x11tiles NetHack.ad pet_mark.xbm
  31 +# VARDATND =
  32 +VARDATND = x11tiles NetHack.ad pet_mark.xbm rip.xpm
  33  # VARDATND = x11tiles NetHack.ad pet_mark.xbm rip.xpm
  34  # for Atari/Gem
  35  # VARDATND = nh16.img title.img GEM_RSC.RSC rip.img
  36 diff -Nur nethack-3.4.3/include/config.h backup/nethack-3.4.3/include/config.h
  37 --- nethack-3.4.3/include/config.h      2003-12-08 07:39:13.000000000 +0800
  38 +++ backup/nethack-3.4.3/include/config.h       2008-10-02 11:33:26.000000000 +0800
  39 @@ -43,8 +43,8 @@
  40   * Some combinations make no sense.  See the installation document.
  41   */
  42  #define TTY_GRAPHICS   /* good old tty based graphics */
  43 -/* #define X11_GRAPHICS */     /* X11 interface */
  44 -/* #define QT_GRAPHICS */      /* Qt interface */
  45 +#define X11_GRAPHICS   /* X11 interface */
  46 +#define QT_GRAPHICS    /* Qt interface */
  47  /* #define GNOME_GRAPHICS */   /* Gnome interface */
  48  /* #define MSWIN_GRAPHICS */   /* Windows NT, CE, Graphics */
  49
  50 @@ -169,8 +169,8 @@
  51
  52  #ifdef UNIX
  53  /* path and file name extension for compression program */
  54 -#define COMPRESS "/usr/bin/compress"   /* Lempel-Ziv compression */
  55 -#define COMPRESS_EXTENSION ".Z"                /* compress's extension */
  56 +#define COMPRESS "/bin/gzip"   /* Lempel-Ziv compression */
  57 +#define COMPRESS_EXTENSION ".gz"               /* compress's extension */
  58  /* An example of one alternative you might want to use: */
  59  /* #define COMPRESS "/usr/local/bin/gzip" */   /* FSF gzip compression */
  60  /* #define COMPRESS_EXTENSION ".gz" */         /* normal gzip extension */
  61 @@ -185,7 +185,7 @@
  62   *     a tar-like file, thus making a neater installation.  See *conf.h
  63   *     for detailed configuration.
  64   */
  65 -/* #define DLB */      /* not supported on all platforms */
  66 +#define DLB    /* not supported on all platforms */
  67
  68  /*
  69   *     Defining INSURANCE slows down level changes, but allows games that
  70 @@ -204,7 +204,7 @@
  71   * otherwise it will be the current directory.
  72   */
  73  # ifndef HACKDIR
  74 -#  define HACKDIR "/usr/games/lib/nethackdir"
  75 +#  define HACKDIR "/usr/share/nethack"
  76  # endif
  77
  78  /*
  79 diff -Nur nethack-3.4.3/include/unixconf.h backup/nethack-3.4.3/include/unixconf.h
  80 --- nethack-3.4.3/include/unixconf.h    2003-12-08 07:39:13.000000000 +0800
  81 +++ backup/nethack-3.4.3/include/unixconf.h     2008-10-02 11:14:38.000000000 +0800
  82 @@ -37,7 +37,7 @@
  83  #define NETWORK                /* if running on a networked system */
  84                         /* e.g. Suns sharing a playground through NFS */
  85  /* #define SUNOS4 */   /* SunOS 4.x */
  86 -/* #define LINUX */    /* Another Unix clone */
  87 +#define LINUX  /* Another Unix clone */
  88  /* #define CYGWIN32 */ /* Unix on Win32 -- use with case sensitive defines */
  89  /* #define GENIX */    /* Yet Another Unix Clone */
  90  /* #define HISX */     /* Bull Unix for XPS Machines */
  91 @@ -132,7 +132,7 @@
  92   * "extra output" method is used, but not all systems provide access to
  93   * a fine-grained timer.
  94   */
  95 -/* #define TIMED_DELAY */      /* usleep() */
  96 +#define TIMED_DELAY    /* usleep() */
  97  #endif
  98
  99  /*
 100 diff -Nur nethack-3.4.3/src/Makefile backup/nethack-3.4.3/src/Makefile
 101 --- nethack-3.4.3/src/Makefile  2008-10-02 11:57:15.000000000 +0800
 102 +++ backup/nethack-3.4.3/src/Makefile   2008-10-02 18:25:25.000000000 +0800
 103 @@ -186,7 +186,8 @@
 104  # Files for a Qt port
 105  #
 106  WINQTSRC = ../win/Qt/qt_win.cpp ../win/Qt/qt_clust.cpp ../win/Qt/qttableview.cpp
 107 -WINQTOBJ = qt_win.o qt_clust.o qttableview.o tile.o
 108 +# WINQTOBJ = qt_win.o qt_clust.o qttableview.o tile.o
 109 +WINQTOBJ = qt_win.o qt_clust.o qttableview.o
 110  #
 111  # Files for a Gnome port
 112  #
 113 @@ -214,8 +215,8 @@
 114
 115  #
 116  #
 117 -WINSRC = $(WINTTYSRC)
 118 -WINOBJ = $(WINTTYOBJ)
 119 +WINSRC = $(WINTTYSRC) $(WINX11SRC) $(WINQTSRC)
 120 +WINOBJ = $(WINTTYOBJ) $(WINX11OBJ) $(WINQTOBJ)
 121
 122  # on some systems the termcap library is in -ltermcap or -lcurses
 123  # on 386 Xenix, the -ltermlib tputs() seems not to work; use -lcurses instead
 124 @@ -230,8 +231,8 @@
 125  # WINTTYLIB = -ltermcap
 126  # WINTTYLIB = -lcurses
 127  # WINTTYLIB = -lcurses16
 128 -# WINTTYLIB = -lncurses
 129 -WINTTYLIB = -ltermlib
 130 +WINTTYLIB = -lncurses
 131 +# WINTTYLIB = -ltermlib
 132  #
 133  # libraries for X11
 134  # If USE_XPM is defined in config.h, you will also need -lXpm here.
 135 @@ -241,7 +242,9 @@
 136  # WINX11LIB = -lXaw -lXmu -lXpm -lXext -lXt -lX11 -lSM -lICE -lm # BSD/OS 2.0
 137  #
 138  # libraries for Qt
 139 -WINQTLIB = -L$(QTDIR)/lib -lqt
 140 +#WINQTLIB = -L$(QTDIR)/lib -lqt
 141 +WINQTLIB = -L$(QTDIR)/lib -lqt-mt
 142 +
 143  #
 144  # libraries for KDE (with Qt)
 145  WINKDELIB = -lkdecore -lkdeui -lXext
 146 @@ -255,7 +258,7 @@
 147  # libraries for BeOS
 148  WINBELIB = -lbe
 149
 150 -WINLIB = $(WINTTYLIB)
 151 +WINLIB = $(WINTTYLIB) $(WINX11LIB) $(WINQTLIB)
 152
 153  # any other strange libraries your system needs (for Sysunix only -- the more
 154  # specialized targets should already be right)
 155 @@ -285,7 +288,7 @@
 156  LIBS =
 157
 158  # make NetHack
 159 -GAME     = nethack
 160 +GAME     = nethack-qt
 161  # GAME     = nethack.prg
 162
 163  # if you defined RANDOM in unixconf.h/tosconf.h since your system did not come
 164 diff -Nur nethack-3.4.3/win/X11/NetHack.ad backup/nethack-3.4.3/win/X11/NetHack.ad
 165 --- nethack-3.4.3/win/X11/NetHack.ad    2003-12-08 07:39:13.000000000 +0800
 166 +++ backup/nethack-3.4.3/win/X11/NetHack.ad     2008-10-02 11:14:38.000000000 +0800
 167 @@ -3,13 +3,13 @@
 168  ! The rip window applies if the GRAPHIC_TOMBSTONE option is turned on, and
 169  ! requires a 12 pixel font for correct appearance.
 170  !
 171 -NetHack*font:                          variable
 172 +NetHack*font:                          fixed
 173  NetHack*display_file*font:             fixed
 174  NetHack*tombstone*font:                        fixed
 175  NetHack*text*rip*font:                 -*-times-medium-r-*-*-12-*-*-*-*-*-*-*
 176  NetHack*menu*font:                     fixed
 177  NetHack*text*font:                     fixed
 178 -NetHack*map*font:                      nh10
 179 +NetHack*map*font:                      fixed
 180
 181  ! To use full-color tiles for the map, uncomment the tile file name.
 182  ! If you use a 100dpi (or greater) monitor you may wish to double the
 183 @@ -19,7 +19,7 @@
 184  ! the custom format - to enlarge an XPM file, use processing tools
 185  ! such as XV or preferably PBMplus.
 186  !
 187 -!NetHack.tile_file: x11tiles
 188 +NetHack.tile_file: x11tiles
 189  !NetHack.double_tile_size: True
 190  !
 191  ! The annotation of pets.