[pkgsrc/trunk]: pkgsrc/emulators/dosbox-x dosbox-x: fix build on non-Linux & ...

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/124631815092
branches:  trunk
changeset: 390617:124631815092
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Sat Dec 24 15:23:41 2022 +0000

description:
dosbox-x: fix build on non-Linux & non-FreeBSD

diffstat:

 emulators/dosbox-x/distinfo                                     |   4 +-
 emulators/dosbox-x/patches/patch-src_output_output__surface.cpp |  11 +++++----
 2 files changed, 8 insertions(+), 7 deletions(-)

diffs (41 lines):

diff -r 480d9a5789f7 -r 124631815092 emulators/dosbox-x/distinfo
--- a/emulators/dosbox-x/distinfo       Sat Dec 24 14:24:34 2022 +0000
+++ b/emulators/dosbox-x/distinfo       Sat Dec 24 15:23:41 2022 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.26 2022/11/06 21:31:57 triaxx Exp $
+$NetBSD: distinfo,v 1.27 2022/12/24 15:23:41 wiz Exp $
 
 BLAKE2s (dosbox-x-0.84.3.tar.gz) = 2d77836763becdcd507adede587b39b9051d8f26fa6d37c485f04245f5d9fd7d
 SHA512 (dosbox-x-0.84.3.tar.gz) = 82bebe82dd84962dca0182d9236cb8549d9f873f7fe562a863481535fa5d956e283b5f4f1d29cd0adbf8763c844ad0f181e3308d5e7c99ed80f44e3f47998c9f
@@ -8,4 +8,4 @@
 SHA1 (patch-include_iconvpp.hpp) = dcf1428d202ad0b71b898741908f00445b55fd54
 SHA1 (patch-src_dos_dos__programs.cpp) = 984c9fc621536046044e76f096969f7d90902627
 SHA1 (patch-src_libs_physfs_physfs__platform__unix.c) = 5cde2acf3691478f1d91945b3942c968af2eadc6
-SHA1 (patch-src_output_output__surface.cpp) = b1f6fc85edf8f0d3afc54de0f95d8640ddce149b
+SHA1 (patch-src_output_output__surface.cpp) = 93590fa2e76071b3e6c2e5fd5d4f4e9f50b6b481
diff -r 480d9a5789f7 -r 124631815092 emulators/dosbox-x/patches/patch-src_output_output__surface.cpp
--- a/emulators/dosbox-x/patches/patch-src_output_output__surface.cpp   Sat Dec 24 14:24:34 2022 +0000
+++ b/emulators/dosbox-x/patches/patch-src_output_output__surface.cpp   Sat Dec 24 15:23:41 2022 +0000
@@ -1,16 +1,17 @@
-$NetBSD: patch-src_output_output__surface.cpp,v 1.1 2022/11/06 21:31:57 triaxx Exp $
+$NetBSD: patch-src_output_output__surface.cpp,v 1.2 2022/12/24 15:23:42 wiz Exp $
 
-Fix linking error on FreeBSD (from FreeBSD ports).
+Match #ifdef with the one for the code definition.
 
 --- src/output/output_surface.cpp.orig 2022-09-01 22:55:29.000000000 +0000
 +++ src/output/output_surface.cpp
-@@ -24,7 +24,9 @@ void OUTPUT_SURFACE_Initialize()
+@@ -24,8 +24,10 @@ void OUTPUT_SURFACE_Initialize()
      // blitting the wrong dimensions to the window and trigger an X11 BadValue error.
      // Set up an error handler that prints the error to STDERR and then returns,
      // instead of the default handler which prints an error and exit()s this program.
-+#if !defined(__FreeBSD__)
++#ifdef LINUX
      X11_ErrorHandlerInstall();
+ #endif
 +#endif
- #endif
  }
  
+ void OUTPUT_SURFACE_Select()