[pkgsrc/trunk]: pkgsrc/emulators/qemu qemu: Readd support for curses(3) (do n...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/28e99533f197
branches:  trunk
changeset: 448267:28e99533f197
user:      leot <leot%pkgsrc.org@localhost>
date:      Sat Mar 06 21:50:34 2021 +0000

description:
qemu: Readd support for curses(3) (do not force ncursesw)

PKGREVISION++

diffstat:

 emulators/qemu/Makefile                  |   7 +++----
 emulators/qemu/distinfo                  |   4 ++--
 emulators/qemu/patches/patch-meson.build |  12 +++++++++++-
 3 files changed, 16 insertions(+), 7 deletions(-)

diffs (85 lines):

diff -r bb18681cf1e8 -r 28e99533f197 emulators/qemu/Makefile
--- a/emulators/qemu/Makefile   Sat Mar 06 21:23:28 2021 +0000
+++ b/emulators/qemu/Makefile   Sat Mar 06 21:50:34 2021 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.265 2021/03/06 11:19:34 reinoud Exp $
+# $NetBSD: Makefile,v 1.266 2021/03/06 21:50:34 leot Exp $
 
 DISTNAME=      qemu-5.2.0
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    emulators
 MASTER_SITES=  https://download.qemu.org/
 EXTRACT_SUFX=  .tar.xz
@@ -16,7 +16,6 @@
 USE_CURSES=            resize_term wide
 USE_LANGUAGES+=                c c++
 USE_TOOLS+=            bison flex gmake makeinfo perl:build pod2man pkg-config
-FAKE_NCURSES=          yes
 UNLIMIT_RESOURCES=     datasize
 HAS_CONFIGURE=         yes
 
@@ -174,7 +173,6 @@
 .include "../../archivers/lzo/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/jemalloc/buildlink3.mk"
-.include "../../devel/ncursesw/buildlink3.mk"
 .include "../../devel/snappy/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
@@ -184,6 +182,7 @@
 .include "../../security/libgcrypt/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
 .include "../../x11/pixman/buildlink3.mk"
+.include "../../mk/curses.buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r bb18681cf1e8 -r 28e99533f197 emulators/qemu/distinfo
--- a/emulators/qemu/distinfo   Sat Mar 06 21:23:28 2021 +0000
+++ b/emulators/qemu/distinfo   Sat Mar 06 21:50:34 2021 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.172 2021/03/06 11:19:34 reinoud Exp $
+$NetBSD: distinfo,v 1.173 2021/03/06 21:50:34 leot Exp $
 
 SHA1 (palcode-clipper) = e25ae10a10e0801e47b62b9ee2d10c8ccb4ee940
 RMD160 (palcode-clipper) = a637f1cc38dabfdff36e3f02b6dd02d7c63cb8db
@@ -29,7 +29,7 @@
 SHA1 (patch-include_sysemu_hw_accel.h) = d083cd51434e28eb0d647b5107d34018b0ef63dc
 SHA1 (patch-include_sysemu_kvm.h) = 9847abe3be70bd708a521310f5d5515e45a1a5a0
 SHA1 (patch-include_sysemu_nvmm.h) = 1fe49c4f11910d6faf683ae3233f783a0b03ce5a
-SHA1 (patch-meson.build) = 65f1f51403b6def24640396ad26bb7c25a16dae0
+SHA1 (patch-meson.build) = a931d40f4d4fccfe506c5999017cdd1135717cfc
 SHA1 (patch-meson__options.txt) = 286d097f596baa5af244a990d2874f1a7ee65198
 SHA1 (patch-net_tap-solaris.c) = cc953c9a624dd55ace4e130d0b31bbfb956c17d5
 SHA1 (patch-qemu-options.hx) = e2f264117f703aa4ccf56219f370c3b1303e8b07
diff -r bb18681cf1e8 -r 28e99533f197 emulators/qemu/patches/patch-meson.build
--- a/emulators/qemu/patches/patch-meson.build  Sat Mar 06 21:23:28 2021 +0000
+++ b/emulators/qemu/patches/patch-meson.build  Sat Mar 06 21:50:34 2021 +0000
@@ -1,8 +1,9 @@
-$NetBSD: patch-meson.build,v 1.2 2021/03/06 11:19:34 reinoud Exp $
+$NetBSD: patch-meson.build,v 1.3 2021/03/06 21:50:34 leot Exp $
 
 * Add NetBSD support.
 * Detect iconv in libc properly for pkgsrc (pkgsrc removes -liconv)
   to fix qemu-system-aarch64 link.
+* Detect curses (non-ncurses{,w} too)
 
 --- meson.build.orig   2020-12-08 16:59:44.000000000 +0000
 +++ meson.build
@@ -55,6 +56,15 @@
  if 'CONFIG_WHPX' not in accelerators and get_option('whpx').enabled()
    error('WHPX not available on this platform')
  endif
+@@ -517,7 +531,7 @@ if have_system and not get_option('curse
+       has_curses_h = cc.has_header('curses.h', args: curses_compile_args)
+     endif
+     if has_curses_h
+-      curses_libname_list = (targetos == 'windows' ? ['pdcurses'] : ['ncursesw', 'cursesw'])
++      curses_libname_list = (targetos == 'windows' ? ['pdcurses'] : ['ncursesw', 'cursesw', 'curses'])
+       foreach curses_libname : curses_libname_list
+         libcurses = cc.find_library(curses_libname,
+                                     required: false,
 @@ -535,7 +549,7 @@ if have_system and not get_option('curse
      endif
    endif