haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-23 04:00:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Updated patch for subversion-1.6.5, mostly based on Ingo's previous patch for subversion 1.2.1, note that this is yet untested, but "should" work.

Browse Source
This commit is contained in:
Scott McCreary
2009-09-03 16:42:30 +00:00
parent f225013266
commit e17350b5e1
1 changed files with 51 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
dev-util/subversion/subversion-1.6.5-haiku-2.diff Normal file
View File

@@ -0,0 +1,51 @@
diff -urN subversion-1.6.5/subversion/libsvn_subr/config_file.c subversion-1.6.5-haiku/subversion/libsvn_subr/config_file.c
--- subversion-1.6.5/subversion/libsvn_subr/config_file.c 2009-08-17 18:33:43.000000000 +0000
+++ subversion-1.6.5-haiku/subversion/libsvn_subr/config_file.c 2009-09-03 09:01:10.000000000 +0000
@@ -32,6 +32,11 @@
#include "svn_private_config.h"
+#ifdef __HAIKU__
+# include <FindDirectory.h>
+# include <StorageDefs.h>
+#endif
+
/* Used to terminate lines in large multi-line string literals. */
#define NL APR_EOL_STR
@@ -326,7 +331,19 @@
SVN_CONFIG__SUBDIRECTORY, fname, NULL);
}
-#else /* ! WIN32 */
+#elif defined(__HAIKU__)
+{
+ char folder[B_PATH_NAME_LENGTH];
+
+ status_t error = find_directory (B_USER_SETTINGS_DIRECTORY, -1, true,
+ folder, sizeof(folder));
+ if (error)
+ return SVN_NO_ERROR;
+
+ *path_p = svn_path_join_many (pool, folder,
+ SVN_CONFIG__USER_DIRECTORY, fname, NULL);
+}
+#else /* ! WIN32 && !__HAIKU__ */
*path_p = svn_path_join_many(pool, SVN_CONFIG__SYS_DIRECTORY, fname, NULL);
diff -urN subversion-1.6.5/subversion/libsvn_subr/config_impl.h subversion-1.6.5-haiku/subversion/libsvn_subr/config_impl.h
--- subversion-1.6.5/subversion/libsvn_subr/config_impl.h 2009-01-27 13:23:50.000000000 +0000
+++ subversion-1.6.5-haiku/subversion/libsvn_subr/config_impl.h 2009-09-03 08:54:11.000000000 +0000
@@ -109,7 +109,10 @@
or svn_config_get_user_config_path() instead. */
#ifdef WIN32
# define SVN_CONFIG__SUBDIRECTORY "Subversion"
-#else /* ! WIN32 */
+#elif defined __HAIKU__ /* HAIKU */
+# define SVN_CONFIG__SYS_DIRECTORY "/etc/subversion"
+# define SVN_CONFIG__USR_DIRECTORY "subversion"
+#else /* ! WIN32 && ! __HAIKU__ */
# define SVN_CONFIG__SYS_DIRECTORY "/etc/subversion"
# define SVN_CONFIG__USR_DIRECTORY ".subversion"
#endif /* WIN32 */