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

Updated readline to 6.1, and added a bit more to the python-3.2a3 patch

Browse Source
This commit is contained in:
Scott McCreary
2010-10-26 18:03:13 +00:00
parent e219660c0e
commit aff64b9aef
6 changed files with 123 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
dev-lang/python/patches/python-3.2a3.patch
View File

@@ -5,6 +5,66 @@ diff -urN Python-3.2a3/Lib/plat-haiku/regen Python-3.2a3-haiku/Lib/plat-haiku/re
+#! /bin/sh
+set -v
+python$EXE ../../Tools/scripts/h2py.py -i '(u_long)' /boot/develop/headers/posix/netinet/in.h
diff -urN Python-3.2a3/Modules/resource.c Python-3.2a3-haiku/Modules/resource.c
--- Python-3.2a3/Modules/resource.c 2010-05-09 08:52:27.038797312 -0700
+++ Python-3.2a3-haiku/Modules/resource.c 2010-10-26 09:40:31.530055168 -0700
@@ -86,6 +86,7 @@
PyFloat_FromDouble(doubletime(ru.ru_utime)));
PyStructSequence_SET_ITEM(result, 1,
PyFloat_FromDouble(doubletime(ru.ru_stime)));
+#ifndef __HAIKU__
PyStructSequence_SET_ITEM(result, 2, PyLong_FromLong(ru.ru_maxrss));
PyStructSequence_SET_ITEM(result, 3, PyLong_FromLong(ru.ru_ixrss));
PyStructSequence_SET_ITEM(result, 4, PyLong_FromLong(ru.ru_idrss));
@@ -100,7 +101,7 @@
PyStructSequence_SET_ITEM(result, 13, PyLong_FromLong(ru.ru_nsignals));
PyStructSequence_SET_ITEM(result, 14, PyLong_FromLong(ru.ru_nvcsw));
PyStructSequence_SET_ITEM(result, 15, PyLong_FromLong(ru.ru_nivcsw));
-
+#endif
if (PyErr_Occurred()) {
Py_DECREF(result);
return NULL;
diff -urN Python-3.2a3/Modules/socketmodule.c Python-3.2a3-haiku/Modules/socketmodule.c
--- Python-3.2a3/Modules/socketmodule.c 2010-09-28 15:03:27.048234496 -0700
+++ Python-3.2a3-haiku/Modules/socketmodule.c 2010-10-26 09:42:24.675545088 -0700
@@ -4595,7 +4595,9 @@
PyModule_AddIntConstant(m, "SOCK_DGRAM", SOCK_DGRAM);
/* We have incomplete socket support. */
PyModule_AddIntConstant(m, "SOCK_RAW", SOCK_RAW);
+#ifndef __HAIKU__
PyModule_AddIntConstant(m, "SOCK_SEQPACKET", SOCK_SEQPACKET);
+#endif
#if defined(SOCK_RDM)
PyModule_AddIntConstant(m, "SOCK_RDM", SOCK_RDM);
#endif
diff -urN Python-3.2a3/Modules/socketmodule.h Python-3.2a3-haiku/Modules/socketmodule.h
--- Python-3.2a3/Modules/socketmodule.h 2010-08-28 13:42:55.046399488 -0700
+++ Python-3.2a3-haiku/Modules/socketmodule.h 2010-10-26 09:36:23.904658944 -0700
@@ -47,6 +47,10 @@
# undef AF_NETLINK
#endif
+#if defined (__HAIKU__)
+# undef HAVE_BLUETOOTH_BLUETOOTH_H
+#endif
+
#ifdef HAVE_BLUETOOTH_BLUETOOTH_H
#include <bluetooth/bluetooth.h>
#include <bluetooth/rfcomm.h>
diff -urN Python-3.2a3/Modules/spwdmodule.c Python-3.2a3-haiku/Modules/spwdmodule.c
--- Python-3.2a3/Modules/spwdmodule.c 2010-05-15 09:27:27.038535168 -0700
+++ Python-3.2a3-haiku/Modules/spwdmodule.c 2010-10-26 09:41:38.998506496 -0700
@@ -80,7 +80,9 @@
SETS(setIndex++, p->sp_namp);
SETS(setIndex++, p->sp_pwdp);
+#ifndef __HAIKU__
SETI(setIndex++, p->sp_lstchg);
+#endif
SETI(setIndex++, p->sp_min);
SETI(setIndex++, p->sp_max);
SETI(setIndex++, p->sp_warn);
diff -urN Python-3.2a3/Python/bltinmodule.c Python-3.2a3-haiku/Python/bltinmodule.c
--- Python-3.2a3/Python/bltinmodule.c 2010-09-27 14:08:38.054788096 -0700
+++ Python-3.2a3-haiku/Python/bltinmodule.c 2010-10-25 13:10:52.010747904 -0700