mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-23 12:10:06 +02:00
58 lines
2.0 KiB
Plaintext
58 lines
2.0 KiB
Plaintext
From a93f17e89f40469761039de937e94b17149f8ddc Mon Sep 17 00:00:00 2001
|
|
From: Begasus <begasus@gmail.com>
|
|
Date: Sun, 12 Nov 2023 15:10:18 +0100
|
|
Subject: Build fix
|
|
|
|
|
|
diff --git a/ctags/main/portable-scandir.c b/ctags/main/portable-scandir.c
|
|
index 5e7c400..2d7609a 100644
|
|
--- a/ctags/main/portable-scandir.c
|
|
+++ b/ctags/main/portable-scandir.c
|
|
@@ -184,9 +184,15 @@ scandir(const char *directory_name,
|
|
int namelength = strlen(entry->d_name) + 1; /* length with NULL */
|
|
int extra = 0;
|
|
|
|
+#ifdef __HAIKU__
|
|
+ if (offsetof(struct dirent, d_name) <= namelength) {
|
|
+ /* allocated space <= required space */
|
|
+ extra += namelength - offsetof(struct dirent, d_name);
|
|
+#else
|
|
if (sizeof(entry->d_name) <= namelength) {
|
|
/* allocated space <= required space */
|
|
extra += namelength - sizeof(entry->d_name);
|
|
+#endif
|
|
}
|
|
|
|
if (copy = (struct dirent *)eMalloc(sizeof(struct dirent) + extra), copy == NULL) {
|
|
--
|
|
2.50.1
|
|
|
|
|
|
From 1e70da98ae389f4cb254e48a5f0e64a139810252 Mon Sep 17 00:00:00 2001
|
|
From: Begasus <begasus@gmail.com>
|
|
Date: Sun, 12 Nov 2023 16:06:59 +0100
|
|
Subject: Add Haiku specifics
|
|
|
|
|
|
diff --git a/src/keyfile.c b/src/keyfile.c
|
|
index f8d729e..d9f28a8 100644
|
|
--- a/src/keyfile.c
|
|
+++ b/src/keyfile.c
|
|
@@ -90,6 +90,13 @@
|
|
# define GEANY_DEFAULT_FONT_SYMBOL_LIST "Helvetica Medium 12"
|
|
# define GEANY_DEFAULT_FONT_MSG_WINDOW "Menlo Medium 12"
|
|
# define GEANY_DEFAULT_FONT_EDITOR "Menlo Medium 12"
|
|
+#elif defined(__HAIKU__)
|
|
+# define GEANY_DEFAULT_TOOLS_TERMINAL "Terminal"
|
|
+# define GEANY_DEFAULT_TOOLS_BROWSER "WebPositive"
|
|
+# define GEANY_DEFAULT_USE_NATIVE_DLGS TRUE
|
|
+# define GEANY_DEFAULT_FONT_SYMBOL_LIST "Noto Sans Regular 10"
|
|
+# define GEANY_DEFAULT_FONT_MSG_WINDOW "Noto Sans Regular 10"
|
|
+# define GEANY_DEFAULT_FONT_EDITOR "Noto Sans Regular 10"
|
|
#else
|
|
# define GEANY_DEFAULT_TOOLS_TERMINAL "xterm -e \"/bin/sh %c\""
|
|
# define GEANY_DEFAULT_USE_NATIVE_DLGS FALSE
|
|
--
|
|
2.50.1
|
|
|