cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

better kjs patch.

Browse Source 
Fix incorrect fix for GSSAPI
This commit is contained in:
espie 2008-01-29 00:24:40 +00:00
parent 2e2b3aaf33
commit 470c2e0cf5
3 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
x11/kde4/libs/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.6 2008/01/28 21:02:54 todd Exp $
# $OpenBSD: Makefile,v 1.7 2008/01/29 00:24:40 espie Exp $
COMMENT = K Desktop Environment, libraries
DISTNAME = kdelibs-${VERSION}
PKGNAME = ${DISTNAME}
PKGNAME = ${DISTNAME}p0
SHARED_LIBS += kaudiodevicelist 4.0 # .4.0
SHARED_LIBS += kde3support 0.0 # .4.0
@ -65,6 +65,7 @@ LIB_DEPENDS += Half,Iex,IlmImf,Imath::graphics/openexr \
CONFIGURE_ARGS += -DGSSAPI_LIBS:STRING="-lgssapi -lkrb5 -lasn1 -lcom_err"
CONFIGURE_ARGS += -DGSSAPI_INCS:STRING="/usr/include/kerberosV"
CONFIGURE_ARGS += -DGSSAPI_FLAVOR:STRING="HEIMDAL"
CONFIGURE_ARGS += -DGSSAPI_FOUND:BOOL=TRUE
WANTLIB += ICE SM X11 Xau Xcursor Xdmcp Xext Xft Xi Xinerama Xpm

12
x11/kde4/libs/patches/patch-kioslave_http_CMakeLists_txt
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-kioslave_http_CMakeLists_txt,v 1.1 2008/01/21 21:47:56 espie Exp $
--- kioslave/http/CMakeLists.txt.orig Mon Jan 21 16:32:09 2008
+++ kioslave/http/CMakeLists.txt Mon Jan 21 16:39:58 2008
@@ -23,7 +23,7 @@ endif(GSSAPI_FOUND)
configure_file(config-gssapi.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-gssapi.h )
-include_directories( ${KDE4_KIO_INCLUDES} ${ZLIB_INCLUDE_DIR} )
+include_directories( ${KDE4_KIO_INCLUDES} ${ZLIB_INCLUDE_DIR} ${GSSAPI_INCS} )
include_directories( ${CMAKE_SOURCE_DIR}/interfaces ${CMAKE_SOURCE_DIR}/kio/httpfilter )
add_subdirectory( kcookiejar )

9
x11/kde4/libs/patches/patch-kjs_collector_cpp
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-kjs_collector_cpp,v 1.2 2008/01/21 21:47:56 espie Exp $
$OpenBSD: patch-kjs_collector_cpp,v 1.3 2008/01/29 00:24:41 espie Exp $
--- kjs/collector.cpp.orig Sat Jan 5 00:59:52 2008
+++ kjs/collector.cpp Sat Jan 19 15:44:04 2008
@@ -475,6 +475,11 @@ void Collector::markCurrentThreadConservatively()
+++ kjs/collector.cpp Mon Jan 28 00:23:31 2008
@@ -475,6 +475,12 @@ void Collector::markCurrentThreadConservatively()
static pthread_t stackThread;
pthread_t thread = pthread_self();
if (stackBase == 0 || thread != stackThread) {
@ -9,11 +9,12 @@ $OpenBSD: patch-kjs_collector_cpp,v 1.2 2008/01/21 21:47:56 espie Exp $
+ stack_t sinfo;
+ pthread_stackseg_np(thread, &sinfo);
+ stackBase = (char *)sinfo.ss_sp - sinfo.ss_size;
+ stackThread = thread;
+#else
pthread_attr_t sattr;
#if HAVE(PTHREAD_NP_H) || defined(__NetBSD__)
// e.g. on FreeBSD 5.4, neundorf@kde.org
@@ -495,10 +500,11 @@ void Collector::markCurrentThreadConservatively()
@@ -495,10 +501,11 @@ void Collector::markCurrentThreadConservatively()
pthread_attr_getstackaddr(&sattr, &stackBase);
assert(stackBase);
stackThread = thread;