diff options
| author | rakuco <rakuco@FreeBSD.org> | 2011-12-31 10:53:48 +0800 |
|---|---|---|
| committer | rakuco <rakuco@FreeBSD.org> | 2011-12-31 10:53:48 +0800 |
| commit | 2277326354160f835b4ce9e91f7a63e9daf95eeb (patch) | |
| tree | b274ccc59aa8d7b35833b4d747c274422aef96cd /x11 | |
| parent | f37b786f5bfa1c8189b8a84499551681d7c27f38 (diff) | |
| download | freebsd-ports-gnome-2277326354160f835b4ce9e91f7a63e9daf95eeb.tar.gz freebsd-ports-gnome-2277326354160f835b4ce9e91f7a63e9daf95eeb.tar.zst freebsd-ports-gnome-2277326354160f835b4ce9e91f7a63e9daf95eeb.zip | |
Fix a few build issues with clang.
Import my commit f1794e4 upstream (based on the PR's patch) as well as the
patch to describeresourcejob.h in the PR (which does not apply upstream because
the line it adds is already there).
No need to bump PORTREVISION, this commit only fixes the build for people who
had never been able to build the port anyway.
PR: ports/163699
Submitted by: Heath Nielson <heathn@gmail.com>
Approved by: avilla (mentor, implicit)
Diffstat (limited to 'x11')
3 files changed, 28 insertions, 0 deletions
diff --git a/x11/kde4-runtime/files/patch-nepomuk__services__storage__lib__createresourcejob.h b/x11/kde4-runtime/files/patch-nepomuk__services__storage__lib__createresourcejob.h new file mode 100644 index 000000000000..b9ef59292590 --- /dev/null +++ b/x11/kde4-runtime/files/patch-nepomuk__services__storage__lib__createresourcejob.h @@ -0,0 +1,8 @@ +--- ./nepomuk/services/storage/lib/createresourcejob.h ++++ ./nepomuk/services/storage/lib/createresourcejob.h +@@ -27,6 +27,7 @@ + #include <QtCore/QHash> + #include <QtCore/QUrl> + ++#include "datamanagement.h" + #include "nepomukdatamanagement_export.h" diff --git a/x11/kde4-runtime/files/patch-nepomuk__services__storage__lib__describeresourcejob.h b/x11/kde4-runtime/files/patch-nepomuk__services__storage__lib__describeresourcejob.h new file mode 100644 index 000000000000..9b3c43a44482 --- /dev/null +++ b/x11/kde4-runtime/files/patch-nepomuk__services__storage__lib__describeresourcejob.h @@ -0,0 +1,10 @@ +--- ./nepomuk/services/storage/lib/describeresourcesjob.h ++++ ./nepomuk/services/storage/lib/describeresourcesjob.h +@@ -27,6 +27,7 @@ + #include <QtCore/QList> + #include <QtCore/QUrl> + ++#include "datamanagement.h" + #include "nepomukdatamanagement_export.h" + + class QDBusPendingCallWatcher; diff --git a/x11/kde4-runtime/files/patch-nepomuk__services__storage__resourcemerger.cpp b/x11/kde4-runtime/files/patch-nepomuk__services__storage__resourcemerger.cpp new file mode 100644 index 000000000000..de82ee67879f --- /dev/null +++ b/x11/kde4-runtime/files/patch-nepomuk__services__storage__resourcemerger.cpp @@ -0,0 +1,10 @@ +--- ./nepomuk/services/storage/resourcemerger.cpp ++++ ./nepomuk/services/storage/resourcemerger.cpp +@@ -499,7 +499,7 @@ Soprano::Node Nepomuk::ResourceMerger::resolveUnmappedNode(const Soprano::Node& + QUrl newUri = createResourceUri(); + m_mappings.insert( QUrl(node.toN3()), newUri ); + +- Soprano::Node dateTime( Soprano::LiteralValue( QDateTime::currentDateTime() ) ); ++ Soprano::Node dateTime( ( Soprano::LiteralValue( QDateTime::currentDateTime() ) ) ); + m_model->addStatement( newUri, NAO::created(), dateTime, m_graph ); + m_model->addStatement( newUri, NAO::lastModified(), dateTime, m_graph ); |