... and what i did to fix them.

Hi,

i checked out SVN Revision 4405 of the area51 repository, merged it into my ports-tree and simply tried to make x11/kde4 with all options selected.

These issues have occured during build-time.

kdemultimedia4, kdepim4 and kdeutils4 failed due to some patching issues...
kdeedu4 fails since sed aka. ${REINPLACE_CMD} can't find "${WRKSRC}/../cmake/modules/FindNova.cmake"


Here is what i did to "fix" those issues and successfully build KDE 4.2 Beta 2

Looking into the patches i noticed some inconsistencies:
kdemultimedia4/files/patch-CMakeLists.txt tries the following changes:
- comment out some XINE (XCB)-relevant lines (but as far as i can see they don't exist) - add a line "add_subdirectory(dragonplayer)", although there's always a line "macro_optional_add_subdirectory(dragonplayer)"
(patch deleted)

kdepim4/files/patch-kmail_kmfoldermaildir.cpp tries this:
- add line "uidStr = uidStr.trimmed();", although it's already in the code
(patch deleted)

kdeutils4/files/patch-ark_plugins_libzipplugin-zipplugin.cpp seems to be out of date. The source-file has changed in the meantime. Matt already noted this in an email 2008-12-23 17:59, so i just copied his changes and it works.
(patch updated (see attachment)) - thanks Matt

Looks like those patches were created for an older state of the source. So could someone please have a look at them and (probably) remove/update them for actual area51?

kdeedu4 - the file "FindNova.cmake" referred in the Makefile does not exist in this directory and nowhere else in the kdeedu4-source, so maybe these lines should be removed from the post-patch section of the Makefile. (Another leftover from 4.11 or 4.13?)
(Makefile updated (see attachment)


Regards
Carsten

P.S: Just updated - files remain unchanged in rev 4406
# New ports collection Makefile for:    kdeedu
# Date created:                         2008-01-31
# Whom:                                 Martin Wilke <m...@freebsd.org>
#
# $FreeBSD$

PORTNAME=       kdeedu
PORTVERSION=    ${KDE4_VERSION}
CATEGORIES=     misc kde
MASTER_SITES=   ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR=     ${KDE4_BRANCH}/${PORTVERSION}/src
DIST_SUBDIR=    KDE

MAINTAINER=     k...@freebsd.org
COMMENT=        Collection of entertaining, educational programs for KDE

BUILD_DEPENDS=  ${LOCALBASE}/include/eigen/util.h:${PORTSDIR}/math/eigen \
                ${LOCALBASE}/lib/ocaml/facile/facile.a:${PORTSDIR}/math/facile \
                gmm++>=3.0.4:${PORTSDIR}/math/gmm++
LIB_DEPENDS=    usb-0.1:${PORTSDIR}/devel/libusb \
                boost_python:${PORTSDIR}/devel/boost-python \
                nova:${PORTSDIR}/astro/libnova \
                openbabel.3:${PORTSDIR}/science/openbabel \
                cfitsio.0:${PORTSDIR}/astro/cfitsio \
                qalculate.4:${PORTSDIR}/math/libqalculate \
                gsl.12:${PORTSDIR}/math/gsl

LATEST_LINK=    ${PORTNAME}4

USE_OCAML=      yes
NO_OCAML_RUNDEPENDS=    yes
USE_BZIP2=      yes
USE_QT_VER=     4
USE_KDE4=       kdelibs workspace kdeprefix kdehier automoc4
KDE4_BUILDENV=  yes
QT_COMPONENTS=  gui svg qmake_build moc_build rcc_build uic_build

#fix checking boost_python
CMAKE_ARGS+=    -DCMAKE_REQUIRED_INCLUDES:STRING="${LOCALBASE}/include"

post-extract:
        ${MKDIR} ${WRKSRC}

post-patch:
        #fix checking boost_python
        ${REINPLACE_CMD} -e 's|\(CMAKE_REQUIRED_INCLUDES $${_pydir}\)|\1 
${LOCALBASE}/include|' \
                 ${WRKSRC}/../cmake/modules/FindBoostPython.cmake

post-configure:
        ${REINPLACE_CMD} -e "s,-ldl,,g" 
${WRKSRC}/kalzium/src/CMakeFiles/kalzium.dir/build.make
        ${REINPLACE_CMD} -e "s,-ldl,,g" 
${WRKSRC}/kalzium/src/CMakeFiles/kalzium.dir/link.txt

.include <bsd.port.mk>
--- ../ark/plugins/libzipplugin/zipplugin.cpp.orig      2008-12-10 
10:13:03.000000000 -0600
+++ ../ark/plugins/libzipplugin/zipplugin.cpp   2008-12-12:22 
14:54:47.000000000 -0600
@@ -28,8 +28,8 @@

 #ifdef LIBZIP_COMPILED_WITH_32BIT_OFF_T

-#define __off_t_defined
-typedef quint32 off_t;
+// #define __off_t_defined
+// typedef quint32 off_t;

 #endif /* LIBZIP_COMPILED_WITH_32BIT_OFF_T */
_______________________________________________
kde-freebsd mailing list
kde-freebsd@kde.org
https://mail.kde.org/mailman/listinfo/kde-freebsd
See also http://freebsd.kde.org/ for latest information

Reply via email to