mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-09 05:10:05 +02:00
56 lines
1.5 KiB
Plaintext
56 lines
1.5 KiB
Plaintext
From 6b1d5f1e026fd6f8cf488d117278a92e8e3ee50c Mon Sep 17 00:00:00 2001
|
|
From: Jaidyn Ann <jadedctrl@teknik.io>
|
|
Date: Mon, 28 Jun 2021 16:40:12 -0500
|
|
Subject: Fix ncurses header
|
|
|
|
|
|
diff --git a/meson.build b/meson.build
|
|
index 1084c82..4e4c70a 100644
|
|
--- a/meson.build
|
|
+++ b/meson.build
|
|
@@ -84,12 +84,17 @@ endif
|
|
if host_machine.system() == 'windows'
|
|
# FIXME: $host ?
|
|
ncurses_sys_prefix = '/usr/$host/sys-root/mingw'
|
|
+elif host_machine.system() == 'haiku'
|
|
+ ncurses_sys_prefix = \
|
|
+ run_command('finddir', 'B_SYSTEM_HEADERS_DIRECTORY').stdout().strip()
|
|
else
|
|
ncurses_sys_prefix = '/usr'
|
|
endif
|
|
|
|
ncurses_sys_dirs = [ncurses_sys_prefix + '/include/ncursesw',
|
|
- ncurses_sys_prefix + '/include']
|
|
+ ncurses_sys_prefix + '/include',
|
|
+ ncurses_sys_prefix + '/x86',
|
|
+ ncurses_sys_prefix ]
|
|
|
|
if ncurses_available
|
|
# Some distros put the headers in ncursesw/, some don't
|
|
--
|
|
2.30.2
|
|
|
|
|
|
From acf694704e43b56dbf0984fd808c5ced950df723 Mon Sep 17 00:00:00 2001
|
|
From: Jaidyn Ann <jadedctrl@teknik.io>
|
|
Date: Tue, 29 Jun 2021 09:31:31 -0500
|
|
Subject: cchat_t gntwm compat
|
|
|
|
|
|
diff --git a/gntwm.c b/gntwm.c
|
|
index ffb1f4a..affe57b 100644
|
|
--- a/gntwm.c
|
|
+++ b/gntwm.c
|
|
@@ -32,7 +32,7 @@
|
|
#define _GNU_SOURCE
|
|
#endif
|
|
|
|
-#if !defined _XOPEN_SOURCE_EXTENDED && (defined(__APPLE__) || defined(__unix__))
|
|
+#if !defined _XOPEN_SOURCE_EXTENDED && (defined(__APPLE__) || defined(__unix__) || defined(__HAIKU__))
|
|
#define _XOPEN_SOURCE_EXTENDED
|
|
#endif
|
|
|
|
--
|
|
2.30.2
|
|
|