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

this builds with gcc4. Note that kdelibs3+4 is not yet supported.

Browse Source
This commit is contained in:
espie 2010-06-18 11:14:41 +00:00
parent 02fca7332e
commit da4e70fa67
11 changed files with 844 additions and 541 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
x11/kde4/libs/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.10 2008/07/25 20:25:59 sthen Exp $
# $OpenBSD: Makefile,v 1.11 2010/06/18 11:14:41 espie Exp $
COMMENT = K Desktop Environment, libraries
DISTNAME = kdelibs-${VERSION}
PKGNAME = ${DISTNAME}p1
PKGNAME = ${DISTNAME}
SHARED_LIBS += kaudiodevicelist 4.0 # .4.0
SHARED_LIBS += kde3support 0.0 # .4.0
@ -47,10 +47,21 @@ SHARED_LIBS += phononexperimental 0.0 # .4.0
SHARED_LIBS += kpty 0.0 # .4.0
SHARED_LIBS += nepomuk 0.0 # .0.0
BUILD_DEPENDS += ::misc/shared-mime-info
RUN_DEPENDS += ::misc/shared-mime-info
SHARED_LIBS += krossqtsplugin 0.0
SHARED_LIBS += kjsapi 0.0
SHARED_LIBS += kdewebkit 0.0
SHARED_LIBS += knewstuff3 0.0
SHARED_LIBS += kunitconversion 0.0
SHARED_LIBS += plasma 0.0
LIB_DEPENDS += Half,Iex,IlmImf,Imath::graphics/openexr \
BUILD_DEPENDS += ::misc/shared-mime-info \
::x11/kde4/automoc \
::databases/soprano
RUN_DEPENDS += ::misc/shared-mime-info \
::databases/soprano
LIB_DEPENDS += Half,Iex,IlmImf,Imath,IlmThread::graphics/openexr \
gif::graphics/libungif \
jasper::graphics/jasper \
bz2::archivers/bzip2 \
@ -58,10 +69,9 @@ LIB_DEPENDS += Half,Iex,IlmImf,Imath::graphics/openexr \
enchant::textproc/enchant \
xslt::textproc/libxslt \
pcre,pcreposix::devel/pcre \
dbus-1::x11/dbus \
fam::sysutils/fam \
streams,streamanalyzer::databases/strigi \
soprano,sopranoclient::databases/soprano
attica::x11/kde4/attica \
lzma::archivers/xz
# we don't have krb5-config
CONFIGURE_ARGS += -DGSSAPI_LIBS:STRING="-lgssapi -lkrb5 -lasn1 -lcom_err"
@ -70,14 +80,22 @@ CONFIGURE_ARGS += -DGSSAPI_FLAVOR:STRING="HEIMDAL"
CONFIGURE_ARGS += -DGSSAPI_FOUND:BOOL=TRUE
post-extract:
cd ${WRKDIST}/cmake/modules && rm FindQt4.cmake MacroPushRequiredVars.cmake
# cd ${WRKDIST}/cmake/modules && rm FindQt4.cmake MacroPushRequiredVars.cmake
WANTLIB += ICE SM X11 Xau Xcursor Xdmcp Xext Xft Xi Xinerama Xpm
WANTLIB += Xrandr Xrender Xfixes Xtst c fontconfig freetype jpeg m png
post-extract:
@if pkg_info -e 'kdelibs-<4'; then \
echo "Error: don't try to build with kde3 around"; \
exit 1; \
fi
WANTLIB += ICE SM X11 Xau Xcursor Xdmcp Xext Xft Xpm
WANTLIB += Xrender Xfixes Xtst c jpeg m png
WANTLIB += pthread stdc++ util z
WANTLIB += Qt3Support QtDBus QtDesigner QtGui QtSvg QtXml QtTest
WANTLIB += QtNetwork xml2 ssl glib-2.0 gthread-2.0 intl iconv
WANTLIB += Qt3Support QtDBus QtDesigner QtGui QtSvg QtXml
WANTLIB += QtNetwork xml2 intl
WANTLIB += asn1 com_err gssapi krb5
WANTLIB += QtOpenGL QtScript QtWebKit phonon
WANTLIB += Xss GL fam

10
x11/kde4/libs/distinfo
View File

@ -1,5 +1,5 @@
MD5 (kde/kdelibs-4.0.1.tar.bz2) = SnVqo8yJJu+6LuC4peB43Q==
RMD160 (kde/kdelibs-4.0.1.tar.bz2) = 1EejjWDencEinDvicnTzXDiewGw=
SHA1 (kde/kdelibs-4.0.1.tar.bz2) = Jhu2mo4RaMSJCk57+fkJxbqxoDk=
SHA256 (kde/kdelibs-4.0.1.tar.bz2) = +ugW2eI5Mv8Dbxx8ezXo+pCumcLgg29nC20od44JmjA=
SIZE (kde/kdelibs-4.0.1.tar.bz2) = 9061224
MD5 (kde/kdelibs-4.4.4.tar.bz2) = HP2UEIt2VFiSaMDZd2/TYQ==
RMD160 (kde/kdelibs-4.4.4.tar.bz2) = n3VTMpJ/nT3z2ApuctRa8AVbFY8=
SHA1 (kde/kdelibs-4.4.4.tar.bz2) = gLyFYY5iiYbaasNkUHGIriyP+Vs=
SHA256 (kde/kdelibs-4.4.4.tar.bz2) = bwigxrG+i6XsdYci9zFZjvtSl4/IduxPWXKOVd9vm8s=
SIZE (kde/kdelibs-4.4.4.tar.bz2) = 14086349

21
x11/kde4/libs/patches/patch-cmake_modules_FindKDE4Internal_cmake
View File

@ -1,21 +0,0 @@
$OpenBSD: patch-cmake_modules_FindKDE4Internal_cmake,v 1.1 2008/01/21 21:47:56 espie Exp $
--- cmake/modules/FindKDE4Internal.cmake.orig Sat Jan 5 00:59:39 2008
+++ cmake/modules/FindKDE4Internal.cmake Sat Jan 19 15:44:04 2008
@@ -252,7 +252,7 @@ endif(kdelibs_SOURCE_DIR)
if (_kdeBootStrapping)
set(KDE4_INCLUDE_DIR ${kdelibs_SOURCE_DIR})
- set(KDE4_KDECORE_LIBS ${QT_QTCORE_LIBRARY} kdecore)
+ set(KDE4_KDECORE_LIBS ${QT_QTCORE_LIBRARY} ${QT_CORE_LIB_DEPENDENCIES} kdecore)
set(KDE4_KDEUI_LIBS ${KDE4_KDECORE_LIBS} kdeui)
set(KDE4_KIO_LIBS ${KDE4_KDEUI_LIBS} kio)
set(KDE4_KPARTS_LIBS ${KDE4_KIO_LIBS} kparts)
@@ -262,7 +262,7 @@ if (_kdeBootStrapping)
set(KDE4_KUTILS_LIBS ${KDE4_KIO_LIBS} kutils)
set(KDE4_KDE3SUPPORT_LIBS ${KDE4_KIO_LIBS} kde3support)
set(KDE4_SOLID_LIBS ${KDE4_KDECORE_LIBS} solid)
- set(KDE4_PHONON_LIBS ${QT_QTDBUS_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} phonon)
+ set(KDE4_PHONON_LIBS ${QT_QTDBUS_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_DBUS_LIB_DEPENDENCIES} ${QT_CORE_LIB_DEPENDENCIES} ${QT_GUI_LIB_DEPENDENCIES} phonon)
set(KDE4_KAUDIODEVICELIST_LIBS ${KDE4_SOLID_LIBS} kaudiodevicelist)
set(KDE4_KFILE_LIBS ${KDE4_KDE3SUPPORT_LIBS} kfile)
set(KDE4_KHTML_LIBS ${KDE4_KPARTS_LIBS} khtml)

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

@ -1,12 +0,0 @@
$OpenBSD: patch-cmake_modules_KDE4Macros_cmake,v 1.3 2008/02/09 13:18:16 espie Exp $
--- cmake/modules/KDE4Macros.cmake.orig Thu Jan 31 00:53:57 2008
+++ cmake/modules/KDE4Macros.cmake Fri Feb 1 19:47:26 2008
@@ -861,6 +861,8 @@ macro (KDE4_ADD_EXECUTABLE _target_NAME)
target_link_libraries(${_target_NAME} ${QT_QTMAIN_LIBRARY})
endif (WIN32)
+ set_target_properties(${_target_NAME} PROPERTIES LINKER_LANGUAGE CXX)
+
endmacro (KDE4_ADD_EXECUTABLE)

16
x11/kde4/libs/patches/patch-kdecore_network_ConfigureChecks_cmake
View File

@ -1,16 +0,0 @@
$OpenBSD: patch-kdecore_network_ConfigureChecks_cmake,v 1.1 2008/01/21 21:47:56 espie Exp $
--- kdecore/network/ConfigureChecks.cmake.orig Mon Jan 21 15:22:24 2008
+++ kdecore/network/ConfigureChecks.cmake Mon Jan 21 15:23:00 2008
@@ -44,9 +44,9 @@ check_function_exists(if_nametoindex HAVE_IF_NAMETOIN
check_prototype_exists(getservbyname_r netdb.h HAVE_GETSERVBYNAME_R_PROTO)
-check_symbol_exists(freeaddrinfo "sys/socket.h;netdb.h" HAVE_FREEADDRINFO)
-check_symbol_exists(getnameinfo "sys/socket.h;netdb.h" HAVE_GETNAMEINFO)
-check_symbol_exists(getaddrinfo "sys/socket.h;netdb.h" HAVE_GETADDRINFO)
+check_symbol_exists(freeaddrinfo "sys/types.h;sys/socket.h;netdb.h" HAVE_FREEADDRINFO)
+check_symbol_exists(getnameinfo "sys/types.h;sys/socket.h;netdb.h" HAVE_GETNAMEINFO)
+check_symbol_exists(getaddrinfo "sys/types.h;sys/socket.h;netdb.h" HAVE_GETADDRINFO)
check_symbol_exists(res_init "sys/types.h;netinet/in.h;arpa/nameser.h;resolv.h" HAVE_RES_INIT)
# redundant? check_function_exists(res_init HAVE_RES_INIT)

58
x11/kde4/libs/patches/patch-kio_misc_kssld_kssld_dbusmetatypes_h
View File

@ -1,58 +0,0 @@
$OpenBSD: patch-kio_misc_kssld_kssld_dbusmetatypes_h,v 1.1 2008/01/21 21:47:56 espie Exp $
--- kio/misc/kssld/kssld_dbusmetatypes.h.orig Sat Jan 19 19:36:11 2008
+++ kio/misc/kssld/kssld_dbusmetatypes.h Sat Jan 19 19:36:30 2008
@@ -59,7 +59,27 @@ QDBusArgument &operator<<(QDBusArgument &argument, con
return argument;
}
+QDBusArgument &operator<<(QDBusArgument &argument, const KSslError::Error &error)
+{
+ argument.beginStructure(); //overhead ho!
+ argument << static_cast<int>(error);
+ argument.endStructure();
+ return argument;
+}
+
+const QDBusArgument &operator>>(const QDBusArgument &argument, KSslError::Error &error)
+{
+ int data;
+ argument.beginStructure();
+ argument >> data;
+ argument.endStructure();
+ error = static_cast<KSslError::Error>(data);
+ return argument;
+}
+
+
+
const QDBusArgument &operator>>(const QDBusArgument &argument, KSslCertificateRule &rule)
{
QSslCertificate cert;
@@ -76,26 +96,6 @@ const QDBusArgument &operator>>(const QDBusArgument &a
ret.setExpiryDateTime(QDateTime::fromString(expiryStr, Qt::ISODate));
ret.setIgnoredErrors(ignoredErrors);
rule = ret;
- return argument;
-}
-
-
-QDBusArgument &operator<<(QDBusArgument &argument, const KSslError::Error &error)
-{
- argument.beginStructure(); //overhead ho!
- argument << static_cast<int>(error);
- argument.endStructure();
- return argument;
-}
-
-
-const QDBusArgument &operator>>(const QDBusArgument &argument, KSslError::Error &error)
-{
- int data;
- argument.beginStructure();
- argument >> data;
- argument.endStructure();
- error = static_cast<KSslError::Error>(data);
return argument;
}

11
x11/kde4/libs/patches/patch-kioslave_http_http_h
View File

@ -1,11 +0,0 @@
$OpenBSD: patch-kioslave_http_http_h,v 1.1 2008/01/21 21:47:56 espie Exp $
--- kioslave/http/http.h.orig Sat Jan 5 01:00:11 2008
+++ kioslave/http/http.h Sat Jan 19 15:44:04 2008
@@ -26,6 +26,7 @@
#define HTTP_H_
+#include <sys/types.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#include <string.h>

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

@ -1,7 +1,7 @@
$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 Mon Jan 28 00:23:31 2008
@@ -475,6 +475,12 @@ void Collector::markCurrentThreadConservatively()
$OpenBSD: patch-kjs_collector_cpp,v 1.4 2010/06/18 11:14:42 espie Exp $
--- kjs/collector.cpp.orig Tue Jul 28 21:44:08 2009
+++ kjs/collector.cpp Sat May 29 13:55:42 2010
@@ -507,6 +507,12 @@ static inline void* currentThreadStackBase()
static pthread_t stackThread;
pthread_t thread = pthread_self();
if (stackBase == 0 || thread != stackThread) {
@ -14,16 +14,11 @@ $OpenBSD: patch-kjs_collector_cpp,v 1.3 2008/01/29 00:24:41 espie Exp $
pthread_attr_t sattr;
#if HAVE(PTHREAD_NP_H) || defined(__NetBSD__)
// e.g. on FreeBSD 5.4, neundorf@kde.org
@@ -495,10 +501,11 @@ void Collector::markCurrentThreadConservatively()
pthread_attr_getstackaddr(&sattr, &stackBase);
@@ -525,6 +531,7 @@ static inline void* currentThreadStackBase()
stackBase = (char *)stackBase + stackSize; // a matter of interpretation, apparently...
assert(stackBase);
stackThread = thread;
- }
+#endif
}
#else
#error Need a way to get the stack base on this platform
#endif
+ }
void *dummy;
void *stackPointer = &dummy;

14
x11/kde4/libs/patches/patch-nepomuk_rcgen_rcgen_cpp
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-nepomuk_rcgen_rcgen_cpp,v 1.1 2008/02/09 13:18:16 espie Exp $
--- nepomuk/rcgen/rcgen.cpp.orig Mon Feb 4 19:43:58 2008
+++ nepomuk/rcgen/rcgen.cpp Mon Feb 4 19:44:23 2008
@@ -23,7 +23,9 @@
static int usage()
{
- QTextStream( stderr, QIODevice::WriteOnly )
+ QTextStream out( stderr, QIODevice::WriteOnly );
+
+ out
<< "Usage:" << endl
<< " " << QCoreApplication::instance()->arguments()[0] << " --writeall [--templates <tmpl1> [<tmpl2> [<tmpl3> ...]]] --target <sourcefolder> --ontologies <ontologyfile(s)>" << endl
<< " " << QCoreApplication::instance()->arguments()[0] << " --listincludes --ontologies <ontologyfile(s)>" << endl

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

@ -1,12 +0,0 @@
$OpenBSD: patch-solid_solid_device_p_h,v 1.1 2008/01/21 21:47:56 espie Exp $
--- solid/solid/device_p.h.orig Thu Oct 25 01:19:19 2007
+++ solid/solid/device_p.h Thu Oct 25 01:20:39 2007
@@ -40,7 +40,7 @@ namespace Solid
QString udi() const { return m_udi; }
- Ifaces::Device *backendObject() const { return m_backendObject; }
+ QPointer<Ifaces::Device> backendObject() const { return m_backendObject; }
void setBackendObject(Ifaces::Device *object);
DeviceInterface *interface(const DeviceInterface::Type &type) const;

1168
x11/kde4/libs/pkg/PLIST
View File

File diff suppressed because it is too large Load Diff