mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-09 21:30:08 +02:00
212 lines
6.9 KiB
Plaintext
212 lines
6.9 KiB
Plaintext
From 5aa9cb0c6bf9ce1deb8eca9eb171c5f66561f868 Mon Sep 17 00:00:00 2001
|
|
From: Jerome Duval <jerome.duval@gmail.com>
|
|
Date: Tue, 17 Jun 2014 19:57:08 +0000
|
|
Subject: Haiku patch
|
|
|
|
based on patch from 2.38.1
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
index 51048f4..594e325 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -149,6 +149,10 @@ case "$host" in
|
|
;;
|
|
esac
|
|
case $host in
|
|
+ *-*-haiku*)
|
|
+ glib_os_haiku=yes
|
|
+ LIBS="-lnetwork $LIBS"
|
|
+ ;;
|
|
*-*-linux*)
|
|
glib_os_linux=yes
|
|
;;
|
|
@@ -193,6 +197,7 @@ AM_CONDITIONAL(OS_WIN32, [test "$glib_native_win32" = "yes"])
|
|
AM_CONDITIONAL(OS_WIN32_X64, [test "$LIB_EXE_MACHINE_FLAG" = "X64"])
|
|
AM_CONDITIONAL(OS_UNIX, [test "$glib_native_win32" != "yes"])
|
|
AM_CONDITIONAL(OS_LINUX, [test "$glib_os_linux" = "yes"])
|
|
+AM_CONDITIONAL(OS_HAIKU, [test "$glib_os_haiku" = "yes"])
|
|
AM_CONDITIONAL(OS_CARBON, [test "$glib_have_carbon" = "yes"])
|
|
AM_CONDITIONAL(OS_COCOA, [test "$glib_have_cocoa" = "yes"])
|
|
|
|
@@ -1945,8 +1950,8 @@ AS_IF([ test x"$have_threads" = xposix], [
|
|
# One of them does for most gcc versions and some other platforms/compilers
|
|
# too and could be considered as the canonical way to go.
|
|
case $host in
|
|
- *-*-cygwin*|*-*-darwin*)
|
|
- # skip cygwin and darwin -pthread or -pthreads test
|
|
+ *-*-cygwin*|*-*-darwin*|*-*-haiku*)
|
|
+ # skip cygwin, darwin and haiku -pthread or -pthreads test
|
|
;;
|
|
*-solaris*)
|
|
# These compiler/linker flags work with both Sun Studio and gcc
|
|
@@ -2111,6 +2116,15 @@ if test "x$G_THREAD_LIBS" = xerror; then
|
|
AC_MSG_ERROR($LIBS_NOT_FOUND_1$have_threads$LIBS_NOT_FOUND_2)
|
|
fi
|
|
|
|
+case $host in
|
|
+ *-*-haiku*)
|
|
+ G_THREAD_LIBS="-lbe -lroot"
|
|
+ G_THREAD_LIBS_EXTRA="-L\$(top_builddir_full)/.libs"
|
|
+ ;;
|
|
+ *)
|
|
+ ;;
|
|
+esac
|
|
+
|
|
AC_MSG_CHECKING(thread related libraries)
|
|
AC_MSG_RESULT($G_THREAD_LIBS)
|
|
|
|
diff --git a/gio/Makefile.am b/gio/Makefile.am
|
|
index b7f91cc..80ee9ff 100644
|
|
--- a/gio/Makefile.am
|
|
+++ b/gio/Makefile.am
|
|
@@ -726,7 +726,11 @@ gio_querymodules_LDADD = libgio-2.0.la \
|
|
gconstructor_as_data.h: $(top_srcdir)/glib/gconstructor.h data-to-c.pl
|
|
$(AM_V_GEN) $(srcdir)/data-to-c.pl $(top_srcdir)/glib/gconstructor.h gconstructor_code > $@.tmp && mv $@.tmp $@
|
|
|
|
-glib_compile_schemas_LDADD = $(top_builddir)/glib/libglib-2.0.la
|
|
+glib_compile_schemas_LDADD = libgio-2.0.la \
|
|
+ $(top_builddir)/gobject/libgobject-2.0.la \
|
|
+ $(top_builddir)/gmodule/libgmodule-2.0.la \
|
|
+ $(top_builddir)/glib/libglib-2.0.la \
|
|
+ $(NULL)
|
|
glib_compile_schemas_SOURCES = \
|
|
gconstructor_as_data.h \
|
|
gvdb/gvdb-format.h \
|
|
diff --git a/gio/gdbusmessage.c b/gio/gdbusmessage.c
|
|
index d9d8f37..c604606 100644
|
|
--- a/gio/gdbusmessage.c
|
|
+++ b/gio/gdbusmessage.c
|
|
@@ -33,6 +33,9 @@
|
|
#elif MAJOR_IN_SYSMACROS
|
|
#include <sys/sysmacros.h>
|
|
#endif
|
|
+#ifdef __HAIKU__
|
|
+#include <SupportDefs.h>
|
|
+#endif
|
|
|
|
#include "gdbusutils.h"
|
|
#include "gdbusmessage.h"
|
|
@@ -3474,8 +3477,13 @@ g_dbus_message_print (GDBusMessage *message,
|
|
fs = g_string_new (NULL);
|
|
if (fstat (fds[n], &statbuf) == 0)
|
|
{
|
|
+#ifdef __HAIKU__
|
|
+ g_string_append_printf (fs, "%s" "dev=%" B_PRIiDEV, fs->len > 0 ? "," : "",
|
|
+ statbuf.st_dev);
|
|
+#else
|
|
g_string_append_printf (fs, "%s" "dev=%d:%d", fs->len > 0 ? "," : "",
|
|
major (statbuf.st_dev), minor (statbuf.st_dev));
|
|
+#endif
|
|
g_string_append_printf (fs, "%s" "mode=0%o", fs->len > 0 ? "," : "",
|
|
statbuf.st_mode);
|
|
g_string_append_printf (fs, "%s" "ino=%" G_GUINT64_FORMAT, fs->len > 0 ? "," : "",
|
|
@@ -3484,8 +3492,13 @@ g_dbus_message_print (GDBusMessage *message,
|
|
(guint) statbuf.st_uid);
|
|
g_string_append_printf (fs, "%s" "gid=%u", fs->len > 0 ? "," : "",
|
|
(guint) statbuf.st_gid);
|
|
+#ifdef __HAIKU__
|
|
+ g_string_append_printf (fs, "%s" "rdev=%" B_PRIiDEV, fs->len > 0 ? "," : "",
|
|
+ statbuf.st_rdev);
|
|
+#else
|
|
g_string_append_printf (fs, "%s" "rdev=%d:%d", fs->len > 0 ? "," : "",
|
|
major (statbuf.st_rdev), minor (statbuf.st_rdev));
|
|
+#endif
|
|
g_string_append_printf (fs, "%s" "size=%" G_GUINT64_FORMAT, fs->len > 0 ? "," : "",
|
|
(guint64) statbuf.st_size);
|
|
g_string_append_printf (fs, "%s" "atime=%" G_GUINT64_FORMAT, fs->len > 0 ? "," : "",
|
|
diff --git a/gio/gunixmounts.c b/gio/gunixmounts.c
|
|
index 2e2ff5e..dddcadc 100644
|
|
--- a/gio/gunixmounts.c
|
|
+++ b/gio/gunixmounts.c
|
|
@@ -712,7 +712,18 @@ _g_get_unix_mounts (void)
|
|
|
|
return return_list;
|
|
}
|
|
+#elif defined(__HAIKU__)
|
|
+static char *
|
|
+get_mtab_monitor_file (void)
|
|
+{
|
|
+ return NULL;
|
|
+}
|
|
|
|
+static GList *
|
|
+_g_get_unix_mounts (void)
|
|
+{
|
|
+ return NULL;
|
|
+}
|
|
/* Common code {{{2 */
|
|
#else
|
|
#error No _g_get_unix_mounts() implementation for system
|
|
@@ -1111,7 +1122,7 @@ _g_get_unix_mount_points (void)
|
|
return g_list_reverse (return_list);
|
|
}
|
|
/* Interix {{{2 */
|
|
-#elif defined(__INTERIX)
|
|
+#elif defined(__INTERIX) || defined(__HAIKU__)
|
|
static GList *
|
|
_g_get_unix_mount_points (void)
|
|
{
|
|
diff --git a/glib/gutils.c b/glib/gutils.c
|
|
index 360a4d5..4cbd53b 100644
|
|
--- a/glib/gutils.c
|
|
+++ b/glib/gutils.c
|
|
@@ -74,6 +74,11 @@
|
|
#include "gwin32.h"
|
|
#endif
|
|
|
|
+#if defined(__HAIKU__)
|
|
+#include <FindDirectory.h>
|
|
+#include <fs_info.h>
|
|
+#endif
|
|
+
|
|
|
|
/**
|
|
* SECTION:misc_utils
|
|
@@ -366,7 +371,7 @@ g_find_program_in_path (const gchar *program)
|
|
}
|
|
|
|
path = g_getenv ("PATH");
|
|
-#if defined(G_OS_UNIX)
|
|
+#ifdef G_OS_UNIX
|
|
if (path == NULL)
|
|
{
|
|
/* There is no 'PATH' in the environment. The default
|
|
@@ -1404,6 +1409,34 @@ load_user_special_dirs (void)
|
|
g_user_special_dirs[G_USER_DIRECTORY_VIDEOS] = find_folder (kMovieDocumentsFolderType);
|
|
}
|
|
|
|
+#elif defined(__HAIKU__)
|
|
+static void
|
|
+load_user_special_dirs (void)
|
|
+{
|
|
+ char path[B_PATH_NAME_LENGTH + B_FILE_NAME_LENGTH];
|
|
+
|
|
+ dev_t volume = dev_for_path("/boot");
|
|
+ if (find_directory(B_DESKTOP_DIRECTORY, volume, false, path, sizeof(path))
|
|
+ == B_OK) {
|
|
+ g_user_special_dirs[G_USER_DIRECTORY_DESKTOP] = g_strdup(path);
|
|
+ g_user_special_dirs[G_USER_DIRECTORY_DOWNLOAD] = g_strdup(path);
|
|
+ } else {
|
|
+ g_user_special_dirs[G_USER_DIRECTORY_DOCUMENTS] = NULL;
|
|
+ g_user_special_dirs[G_USER_DIRECTORY_DESKTOP] = NULL;
|
|
+ }
|
|
+
|
|
+ if (find_directory(B_USER_DIRECTORY, volume, false, path, sizeof(path))
|
|
+ == B_OK) {
|
|
+ g_user_special_dirs[G_USER_DIRECTORY_DOCUMENTS] = g_strdup(path);
|
|
+ } else
|
|
+ g_user_special_dirs[G_USER_DIRECTORY_DOWNLOAD] = NULL;
|
|
+
|
|
+ g_user_special_dirs[G_USER_DIRECTORY_MUSIC] = NULL;
|
|
+ g_user_special_dirs[G_USER_DIRECTORY_PICTURES] = NULL;
|
|
+ g_user_special_dirs[G_USER_DIRECTORY_PUBLIC_SHARE] = NULL;
|
|
+ g_user_special_dirs[G_USER_DIRECTORY_TEMPLATES] = NULL;
|
|
+ g_user_special_dirs[G_USER_DIRECTORY_VIDEOS] = NULL;
|
|
+}
|
|
#elif defined(G_OS_WIN32)
|
|
|
|
static void
|
|
--
|
|
2.2.2
|
|
|