mirror of the now-defunct rocklinux.org
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

45 lines
1.7 KiB

  1. # --- ROCK-COPYRIGHT-NOTE-BEGIN ---
  2. #
  3. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
  4. # Please add additional copyright information _after_ the line containing
  5. # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
  6. # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
  7. #
  8. # ROCK Linux: rock-src/package/blindcoder/nethack/hotfixes.patch
  9. # ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf
  10. #
  11. # This patch file is dual-licensed. It is available under the license the
  12. # patched project is licensed under, as long as it is an OpenSource license
  13. # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  14. # of the GNU General Public License as published by the Free Software
  15. # Foundation; either version 2 of the License, or (at your option) any later
  16. # version.
  17. #
  18. # --- ROCK-COPYRIGHT-NOTE-END ---
  19. This fixes a few compiler and linker errors.
  20. don't ask... please... just don't ask
  21. blindcoder
  22. --- ./win/Qt/qt_win.cpp 2003-06-08 20:56:11.000000000 +0200
  23. +++ ./win/Qt/qt_win.cpp 2003-06-08 14:27:30.000000000 +0200
  24. @@ -47,6 +47,8 @@ extern "C" {
  25. // enough, and we undefine NetHack macros which conflict with Qt
  26. // identifiers.
  27. +#include <math.h>
  28. +
  29. #define alloc hide_alloc // avoid treading on STL symbol
  30. #define lock hide_lock // avoid treading on STL symbol
  31. #ifdef _MSC_VER
  32. --- ./src/Makefile 2003-06-08 20:56:11.000000000 +0200
  33. +++ ./src/Makefile 2003-06-08 14:27:30.000000000 +0200
  34. @@ -147,1 +147,1 @@
  35. - winmisc.o winstat.o wintext.o winval.o tile.o
  36. + winmisc.o winstat.o wintext.o winval.o
  37. @@ -179,1 +179,1 @@
  38. -WINQTOBJ = qt_win.o qt_clust.o qttableview.o tile.o
  39. +WINQTOBJ = qt_win.o qt_clust.o qttableview.o
  40. @@ -191,1 +191,1 @@
  41. - gnyesno.o gnworn.o tile.o
  42. + gnyesno.o gnworn.o