On 2012-12-15 (Saturday) 19:16:52 Alberto Villa wrote:
> On Sat, Dec 15, 2012 at 7:04 PM, Schaich Alonso
>
> <alonsoscha...@fastmail.fm> wrote:
> > I have upgraded area51's qt ports to qt-4.8.4 (which was rather easy). The
> > svn diff to the QT subpath of the area51 repository is attached.
> >
> > Works on HEAD and STABLE-9. Could someone review and commit it to area51?
> > ^-^
> I'd like to first merge back Qt 5 changes, which I should be able to
> do quite soon. Thanks for your patch.
> --
> Alberto Villa, FreeBSD committer <avi...@freebsd.org>
> http://people.FreeBSD.org/~avilla
Hello again,
I went ahead and built x11/kde4 on CURRENT with clang. The modifications I had
to do are attached, basically it's:
(1) Fix a nepomuk-core testcase
(2) Fix + workaround the recent cyrus-sasl update that broke kdepimlibs (seems
to have been fixed on ports but not area51)
(3) make xine dependency optional in kde4-runtime (because it's useless if
phonon-xine is not used)
I'm sorry I can't be of help at Qt5 but I could try updating kde to 4.9.4 or a
4.10 beta.
Any chances that kde-4.10 will work with qt-5?
Index: deskutils/kdepim4/Makefile
===================================================================
--- deskutils/kdepim4/Makefile (revision 8831)
+++ deskutils/kdepim4/Makefile (working copy)
@@ -13,7 +13,7 @@
LIB_DEPENDS= gpgme.19:${PORTSDIR}/security/gpgme \
assuan.0:${PORTSDIR}/security/libassuan \
- sasl2.2:${PORTSDIR}/security/cyrus-sasl2 \
+ sasl2.3:${PORTSDIR}/security/cyrus-sasl2 \
boost_thread.4:${PORTSDIR}/devel/boost-libs \
grantlee_gui.0:${PORTSDIR}/devel/grantlee \
clucene.0:${PORTSDIR}/textproc/clucene
Index: deskutils/kdepimlibs4/Makefile
===================================================================
--- deskutils/kdepimlibs4/Makefile (revision 8831)
+++ deskutils/kdepimlibs4/Makefile (working copy)
@@ -12,7 +12,7 @@
COMMENT= Libraries for KDE-PIM applications
LIB_DEPENDS= gpgme.19:${PORTSDIR}/security/gpgme \
- sasl2.2:${PORTSDIR}/security/cyrus-sasl2 \
+ sasl2.3:${PORTSDIR}/security/cyrus-sasl2 \
boost_thread.4:${PORTSDIR}/devel/boost-libs \
ical.44:${PORTSDIR}/devel/libical \
uuid.1:${PORTSDIR}/misc/e2fsprogs-libuuid \
Index: deskutils/kdepimlibs4/files/patch-kioslave__smtp__command.h
===================================================================
--- deskutils/kdepimlibs4/files/patch-kioslave__smtp__command.h (revision 0)
+++ deskutils/kdepimlibs4/files/patch-kioslave__smtp__command.h (working copy)
@@ -0,0 +1,14 @@
+--- kioslave/smtp/command.h~ 2012-08-13 10:50:39.000000000 +0200
++++ kioslave/smtp/command.h 2012-12-16 15:01:48.000000000 +0100
+@@ -32,6 +32,11 @@
+ #ifndef __KIOSMTP_COMMAND_H__
+ #define __KIOSMTP_COMMAND_H__
+
++/*
++ * cyrus-sasl-2.1.26's sasl/sasl.h uses size_t, but lacks the
++ * inclusion of stddef.h
++ */
++#include <cstddef>
+
+ extern "C" {
+ #include <sasl/sasl.h>
Index: sysutils/nepomuk-core/files/patch-autotests__test__querytests.cpp
===================================================================
--- sysutils/nepomuk-core/files/patch-autotests__test__querytests.cpp (revision 0)
+++ sysutils/nepomuk-core/files/patch-autotests__test__querytests.cpp (working copy)
@@ -0,0 +1,11 @@
+--- autotests/test/querytests.cpp.orig 2012-12-16 12:50:16.000000000 +0100
++++ autotests/test/querytests.cpp 2012-12-16 12:51:01.000000000 +0100
+@@ -295,7 +295,7 @@
+
+ // Resource Type Term
+ {
+- Query::Query query( ResourceTypeTerm( NAO::Tag() ) );
++ Query::Query query ((ResourceTypeTerm (NAO::Tag ())));
+
+ QSet<QUrl> uris;
+ NepomukStatementIterator it( RDF::type() );
Index: x11/kde4-runtime/Makefile
===================================================================
--- x11/kde4-runtime/Makefile (revision 8831)
+++ x11/kde4-runtime/Makefile (working copy)
@@ -13,7 +13,6 @@
LIB_DEPENDS= IlmImf.6:${PORTSDIR}/graphics/OpenEXR \
jpeg.11:${PORTSDIR}/graphics/jpeg \
exiv2.12:${PORTSDIR}/graphics/exiv2 \
- xine.2:${PORTSDIR}/multimedia/libxine \
slp.1:${PORTSDIR}/net/openslp \
smbclient.0:${PORTSDIR}/net/samba-libsmbclient \
ssh.4:${PORTSDIR}/security/libssh \
@@ -44,10 +43,11 @@
MAN1= kdesu.1
MAN8= nepomukserver.8 nepomukservicestub.8
-OPTIONS_DEFINE= NEPOMUK SPEAKER ZEITGEIST
+OPTIONS_DEFINE= NEPOMUK SPEAKER XINE ZEITGEIST
NEPOMUK_DESC= Nepomuk semantic desktop (installs Virtuoso)
SPEAKER_DESC= Speaker setup GUI (requires PulseAudio)
+XINE_DESC= Build KCM for phonon\'s xine backend (requires libxine)
ZEITGEIST_DESC= Event logging via Zeitgeist
# Explicitly disable ALSA, see for details:
@@ -73,6 +73,10 @@
RUN_DEPENDS+= zeitgeist-daemon:${PORTSDIR}/sysutils/zeitgeist
.endif
+.if ${PORT_OPTIONS:MXINE}
+LIB_DEPENDS+= xine.2:${PORTSDIR}/multimedia/libxine
+.endif
+
.include <bsd.port.pre.mk>
.if ${OSVERSION} < 800505 || (${OSVERSION} >= 900000 && ${OSVERSION} < 900012)
_______________________________________________
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
