Commit b882df36 authored by Marcel Wiesweg's avatar Marcel Wiesweg
Browse files

Disable the current implementation of a digikam-nepomuk integration.

By information from the Nepomuk maintainer, the relevant API have been replaced.
Essentially, the current code is at best not functional, at worst polluting your Nepomuk db.
A new implementation needs to be written based on current APIs.

BUG: 258837
BUG: 264124
BUG: 276457
CCBUG: 279404
BUG: 282918
BUG: 283168
BUG: 304052
CCBUG: 305079
parent c98a4459
......@@ -9,7 +9,7 @@ OPTION(ENABLE_PRESENTATIONMODE "Build digiKam with presentation mode support (de
OPTION(ENABLE_THUMBS_DB "Build digiKam with thumbnails database support (default=ON)" ON)
OPTION(ENABLE_INTERNALMYSQL "Look for MySQL server executable at build time (default=ON)" ON)
OPTION(ENABLE_ADVANCEDDEBUGMSG "Build digiKam with more internal debug message (default=OFF)" OFF)
OPTION(ENABLE_NEPOMUKSUPPORT "Build digiKam with Nepomuk support (default=ON)" ON)
#OPTION(ENABLE_NEPOMUKSUPPORT "Build digiKam with Nepomuk support (default=ON)" ON)
OPTION(ENABLE_LCMS2 "Link digiKam to LCMS2 instead LCMS1 (experimental) (default=OFF)" OFF)
# NOTE: since 6.11.24, libpgf do not support very well OpenMP. We disable it temporally.
......@@ -369,25 +369,25 @@ MACRO_BOOL_TO_01(ENABLE_THUMBS_DB USE_THUMBS_DB)
MACRO_BOOL_TO_01(ENABLE_ADVANCEDDEBUGMSG USE_ADVANCEDDEBUGMSG)
# Win32 compilation with Nepomuk is broken. It's temporally disabled.
IF (ENABLE_NEPOMUKSUPPORT)
IF (${KDE_VERSION} VERSION_GREATER "4.3.99")
MACRO_OPTIONAL_FIND_PACKAGE(Nepomuk)
MACRO_LOG_FEATURE(NEPOMUK_FOUND "Nepomuk" "The Nepomuk libraries"
"http://www.kde.org" FALSE "" "Nepomuk extends the search and tagging")
MACRO_OPTIONAL_FIND_PACKAGE(SharedDesktopOntologies 0.2)
MACRO_LOG_FEATURE(SHAREDDESKTOPONTOLOGIES_FOUND "Shared desktop ontologies" "Desktop ontologies"
"http://oscaf.sourceforge.net" TRUE "0.2" "Ontologies necessary for the Nepomuk semantic desktop.")
IF (NEPOMUK_FOUND AND SHAREDDESKTOPONTOLOGIES_FOUND)
SET(NEPOMUK_FOUND TRUE)
ELSE (NEPOMUK_FOUND AND SHAREDDESKTOPONTOLOGIES_FOUND)
SET(NEPOMUK_FOUND FALSE)
ENDIF (NEPOMUK_FOUND AND SHAREDDESKTOPONTOLOGIES_FOUND)
MACRO_BOOL_TO_01(NEPOMUK_FOUND HAVE_NEPOMUK)
ENDIF (${KDE_VERSION} VERSION_GREATER "4.3.99")
ENDIF (ENABLE_NEPOMUKSUPPORT)
#IF (ENABLE_NEPOMUKSUPPORT)
# IF (${KDE_VERSION} VERSION_GREATER "4.3.99")
# MACRO_OPTIONAL_FIND_PACKAGE(Nepomuk)
# MACRO_LOG_FEATURE(NEPOMUK_FOUND "Nepomuk" "The Nepomuk libraries"
# "http://www.kde.org" FALSE "" "Nepomuk extends the search and tagging")
#
# MACRO_OPTIONAL_FIND_PACKAGE(SharedDesktopOntologies 0.2)
# MACRO_LOG_FEATURE(SHAREDDESKTOPONTOLOGIES_FOUND "Shared desktop ontologies" "Desktop ontologies"
# "http://oscaf.sourceforge.net" TRUE "0.2" "Ontologies necessary for the Nepomuk semantic desktop.")
#
# IF (NEPOMUK_FOUND AND SHAREDDESKTOPONTOLOGIES_FOUND)
# SET(NEPOMUK_FOUND TRUE)
# ELSE (NEPOMUK_FOUND AND SHAREDDESKTOPONTOLOGIES_FOUND)
# SET(NEPOMUK_FOUND FALSE)
# ENDIF (NEPOMUK_FOUND AND SHAREDDESKTOPONTOLOGIES_FOUND)
#
# MACRO_BOOL_TO_01(NEPOMUK_FOUND HAVE_NEPOMUK)
# ENDIF (${KDE_VERSION} VERSION_GREATER "4.3.99")
#ENDIF (ENABLE_NEPOMUKSUPPORT)
MACRO_OPTIONAL_FIND_PACKAGE(Doxygen)
......@@ -468,18 +468,18 @@ ELSE(KDEPIMLIBS_FOUND)
MESSAGE(STATUS "")
ENDIF(KDEPIMLIBS_FOUND)
IF(NEPOMUK_FOUND)
MESSAGE(STATUS " Nepomuk libraries found.................. YES (optional)")
ELSE(NEPOMUK_FOUND)
IF (${KDE_VERSION} VERSION_GREATER "4.4.0")
MESSAGE(STATUS " Nepomuk libraries found.................. NO (optional)")
ELSE (${KDE_VERSION} VERSION_GREATER "4.4.0")
MESSAGE(STATUS " Nepomuk libraries found.................. NO (at least KDE 4.4 and shared-desktop-ontologies required)")
ENDIF (${KDE_VERSION} VERSION_GREATER "4.4.0")
MESSAGE(STATUS "")
MESSAGE(STATUS " digiKam will be compiled without support for the Nepomuk semantic desktop services.")
MESSAGE(STATUS "")
ENDIF(NEPOMUK_FOUND)
#IF(NEPOMUK_FOUND)
# MESSAGE(STATUS " Nepomuk libraries found.................. YES (optional)")
#ELSE(NEPOMUK_FOUND)
# IF (${KDE_VERSION} VERSION_GREATER "4.4.0")
# MESSAGE(STATUS " Nepomuk libraries found.................. NO (optional)")
# ELSE (${KDE_VERSION} VERSION_GREATER "4.4.0")
# MESSAGE(STATUS " Nepomuk libraries found.................. NO (at least KDE 4.4 and shared-desktop-ontologies required)")
# ENDIF (${KDE_VERSION} VERSION_GREATER "4.4.0")
# MESSAGE(STATUS "")
# MESSAGE(STATUS " digiKam will be compiled without support for the Nepomuk semantic desktop services.")
# MESSAGE(STATUS "")
#ENDIF(NEPOMUK_FOUND)
IF(GLIB2_FOUND)
MESSAGE(STATUS " libglib2 library found................... YES (optional)")
......@@ -623,9 +623,9 @@ IF(DIGIKAM_CAN_BE_COMPILED)
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/utilities/qmlshow)
ENDIF(USE_PRESENTATION_MODE)
IF(NEPOMUK_FOUND)
INCLUDE_DIRECTORIES(${SOPRANO_INCLUDE_DIR} ${NEPOMUK_INCLUDE_DIR})
ENDIF(NEPOMUK_FOUND)
#IF(NEPOMUK_FOUND)
# INCLUDE_DIRECTORIES(${SOPRANO_INCLUDE_DIR} ${NEPOMUK_INCLUDE_DIR})
#ENDIF(NEPOMUK_FOUND)
IF(PGF_FOUND)
INCLUDE_DIRECTORIES(${PGF_INCLUDE_DIRS})
......
......@@ -21,6 +21,16 @@
*
* ============================================================ */
#if 0
// The digikam nepomuk implementation is not only buggy, but based on nepomuk
// API which is now deprecated/unfunctional and or removed.
// In short, it needs to be rewritten.
// Code is left as an example as quite a few problems were solved with it
// at a time when the corresponding nepomuk interface were operating.
#include "digikamnepomukservice.moc"
// Qt includes
......@@ -1234,3 +1244,5 @@ KSharedConfig::Ptr NepomukService::digikamConfig() const
} // namespace Digikam
NEPOMUK_EXPORT_SERVICE(Digikam::NepomukService, "digikamnepomukservice")
#endif
......@@ -21,6 +21,18 @@
*
* ============================================================ */
#if 0
// The digikam nepomuk implementation is not only buggy, but based on nepomuk
// API which is now deprecated/unfunctional and or removed.
// In short, it needs to be rewritten.
// Code is left as an example as quite a few problems were solved with it
// at a time when the corresponding nepomuk interface were operating.
#ifndef DIGIKAMNEPOMUKSERVICE_H
#define DIGIKAMNEPOMUKSERVICE_H
......@@ -139,3 +151,4 @@ private:
} // namespace Digikam
#endif // DIGIKAMNEPOMUKSERVICE_H
#endif
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment