From 2e1f03fdd64d460210c37fa80d3b0bd34e745ec8 Mon Sep 17 00:00:00 2001 From: espie Date: Sun, 20 Jun 2010 16:20:16 +0000 Subject: [PATCH] seems those icons are a requirement for kded4 also note: you might have to disable compositing for startkde to work. (I know my radeon is causing things to fail otherwise) --- x11/kde4/Makefile | 4 +++- x11/kde4/libs/Makefile | 12 +++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/x11/kde4/Makefile b/x11/kde4/Makefile index c886ff57af4..0a709d6d9fc 100644 --- a/x11/kde4/Makefile +++ b/x11/kde4/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.18 2010/06/18 11:10:36 espie Exp $ +# $OpenBSD: Makefile,v 1.19 2010/06/20 16:20:16 espie Exp $ SUBDIR = # don't even try to keep these sorted @@ -6,8 +6,10 @@ SUBDIR += automoc SUBDIR += attica SUBDIR += akonadi + SUBDIR += oxygen-icons # libraries + SUBDIR += libs SUBDIR += pimlibs SUBDIR += qimageblitz diff --git a/x11/kde4/libs/Makefile b/x11/kde4/libs/Makefile index cada5ea1b59..40351bf38ae 100644 --- a/x11/kde4/libs/Makefile +++ b/x11/kde4/libs/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.12 2010/06/20 08:19:56 espie Exp $ +# $OpenBSD: Makefile,v 1.13 2010/06/20 16:20:16 espie Exp $ COMMENT = K Desktop Environment, libraries DISTNAME = kdelibs-${VERSION} @@ -45,7 +45,8 @@ BUILD_DEPENDS += ::misc/shared-mime-info \ ::misc/shared-desktop-ontologies RUN_DEPENDS += ::misc/shared-mime-info \ - ::misc/shared-desktop-ontologies + ::misc/shared-desktop-ontologies \ + ::x11/kde4/oxygen-icons LIB_DEPENDS += Half,Iex,IlmImf,Imath,IlmThread::graphics/openexr \ gif::graphics/libungif \ @@ -67,13 +68,10 @@ CONFIGURE_ARGS += -DGSSAPI_INCS:STRING="/usr/include/kerberosV" CONFIGURE_ARGS += -DGSSAPI_FLAVOR:STRING="HEIMDAL" CONFIGURE_ARGS += -DGSSAPI_FOUND:BOOL=TRUE -CONFIGURE_ARGS += -DKDE4_INCLUDE_INSTALL_DIR:String=/usr/local/include -CONFIGURE_ARGS += -DKDE4_LIB_INSTALL_DIR:String=/usr/local/lib +CONFIGURE_ARGS += -DKDE4_INCLUDE_INSTALL_DIR:String=${LOCALBASE}/include +CONFIGURE_ARGS += -DKDE4_LIB_INSTALL_DIR:String=${LOCALBASE}/lib -post-extract: -# cd ${WRKDIST}/cmake/modules && rm FindQt4.cmake MacroPushRequiredVars.cmake - post-extract: @if pkg_info -e 'kdelibs-<4'; then \ echo "Error: don't try to build with kde3 around"; \