Kolab Groupware OBS

_service:set_version:libkolab.spec Changed

libkolab.spec Changed

_service:recompress:tar_scm:libkolab-0.6.git.1409127986.tar.gz/CMakeLists.txt -> _service:recompress:tar_scm:libkolab-0.6.git.1412585128.tar.gz/CMakeLists.txt Changed

@@ -55,7 +55,7 @@
 include(MacroLogFeature)
 
 # Do the building
-find_package(Libkolabxml 1.0 REQUIRED)
+find_package(Libkolabxml 1.1 REQUIRED)
 macro_log_feature(Libkolabxml_FOUND "Libkolabxml" "Kolab XML Format 3 serializing library" "http://git.kolab.org/libkolabxml/" TRUE "1.0" "Required for reading/writing Kolab XML Objects")
 
 find_package(Qt4 4.6.0 REQUIRED)
@@ -91,7 +91,7 @@
     set( KDE_LIBRARIES ${Libcalendaring_LIBRARIES} )
     message("${Libcalendaring_INCLUDE_DIRS} ${Libcalendaring_LIBRARIES}")
 else()
-    set( KDE_INCLUDES ${KDEPIMLIBS_INCLUDE_DIRS} ${KDE4_INCLUDE_DIR})
+    set( KDE_INCLUDES ${KDEPIMLIBS_INCLUDE_DIRS} ${KDE4_INCLUDES} )
     set( KDE_LIBRARIES
         ${KDEPIMLIBS_KCALCORE_LIBS}
         ${KDEPIMLIBS_KABC_LIBS}
@@ -119,6 +119,16 @@
 
 configure_file(libkolab-version.h.cmake "${CMAKE_BINARY_DIR}/libkolab-version.h" @ONLY)
 
+set(CMAKE_REQUIRED_FLAGS ${CMAKE_CXX_FLAGS})
+set(CMAKE_REQUIRED_INCLUDES "/opt/devel/kolab/include/")
+# include(CheckIncludeFileCXX)
+# check_include_file_cxx(akonadi/tag.h HAVE_TAG_H)
+#check_include_file_cxx doesn't work for some reason, so we use find_path instead.
+#we have to make sure that we only search in KDE_INCLUDES though, to not accidentally include a system akonadi/tag.h
+#when we're searching for one in libcalendaring.
+find_path(HAVE_TAG_H akonadi/tag.h PATHS ${KDE_INCLUDES} NO_DEFAULT_PATH NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_PATH NO_CMAKE_ENVIRONMENT_PATH)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libkolab_config.h.in ${CMAKE_CURRENT_BINARY_DIR}/libkolab_config.h)
+
 add_subdirectory(kolabformatV2)
 add_subdirectory(conversion)
 add_subdirectory(calendaring)
@@ -180,6 +190,7 @@
     kolabformat/errorhandler.h
     kolabformat/xmlobject.h
     kolabformat/mimeobject.h
+    ${CMAKE_CURRENT_BINARY_DIR}/libkolab_config.h
     conversion/kcalconversion.h
     conversion/kabcconversion.h
     conversion/commonconversion.h

_service:recompress:tar_scm:libkolab-0.6.git.1409127986.tar.gz/kolabformat/kolabobject.cpp -> _service:recompress:tar_scm:libkolab-0.6.git.1412585128.tar.gz/kolabformat/kolabobject.cpp Changed

@@ -70,12 +70,12 @@
     // qDebug() << path;
     int start = path.indexOf("user");
     if (start < 0) {
-        kWarning() << "Couldn't find \"user\" in path: " << path;
+        Warning() << "Couldn't find \"user\" in path: " << path;
         return RelationMember();
     }
     path = path.mid(start + 1);
     if (path.size() < 2) {
-        kWarning() << "Incomplete path: " << path;
+        Warning() << "Incomplete path: " << path;
         return RelationMember();
     }
     // user-name
@@ -144,8 +144,10 @@
     ObjectType mObjectType;
     Version mVersion;
     Kolab::Freebusy mFreebusy;
+#ifdef HAVE_TAG_H
     Akonadi::Tag mTag;
     QStringList mTagMembers;
+#endif
     ObjectType mOverrideObjectType;
     Version mOverrideVersion;
     bool mDoOverrideVersion;
@@ -390,6 +392,7 @@
             mFreebusy = fb;
         }
             break;
+#ifdef HAVE_TAG_H
         case RelationConfigurationObject: {
             const Kolab::Configuration &configuration = Kolab::readConfiguration(xml, false);
             const Kolab::Relation &relation = configuration.relation();
@@ -406,6 +409,7 @@
 
         }
             break;
+#endif
         default:
             Critical() << "no kolab object found ";
             printMessageDebugInfo(msg);
@@ -532,6 +536,7 @@
     return d->mFreebusy;
 }
 
+#ifdef HAVE_TAG_H
 Akonadi::Tag KolabObjectReader::getTag() const
 {
     return d->mTag;
@@ -541,6 +546,7 @@
 {
     return d->mTagMembers;
 }
+#endif
 
 
 //Normalize incidences before serializing them
@@ -720,6 +726,7 @@
     return  Mime::createMessage(Conversion::fromStdString(freebusy.uid()), xCalMimeType(), freebusyKolabType(), Conversion::fromStdString(v3String).toUtf8(), true, getProductId(productId));
 }
 
+#ifdef HAVE_TAG_H
 KMime::Message::Ptr KolabObjectWriter::writeTag(const Akonadi::Tag &tag, const QStringList &members, Version v, const QString &productId)
 {
     ErrorHandler::clearErrors();
@@ -741,6 +748,7 @@
     ErrorHandler::handleLibkolabxmlErrors();
     return  Mime::createMessage(Conversion::fromStdString(configuration.uid()), kolabMimeType(), relationKolabType(), Conversion::fromStdString(v3String).toUtf8(), true, getProductId(productId));
 }
+#endif

_service:recompress:tar_scm:libkolab-0.6.git.1409127986.tar.gz/kolabformat/kolabobject.h -> _service:recompress:tar_scm:libkolab-0.6.git.1412585128.tar.gz/kolabformat/kolabobject.h Changed

@@ -20,7 +20,11 @@
 
 #include <kolab_export.h>
 
+#include <libkolab_config.h>
+
+#ifdef HAVE_TAG_H
 #include <akonadi/tag.h>
+#endif
 #include <kabc/addressee.h>
 #include <kabc/contactgroup.h>
 #include <kcalcore/incidence.h>
@@ -99,8 +103,10 @@
     KMime::Message::Ptr getNote() const;
     QStringList getDictionary(QString &lang) const;
     Freebusy getFreebusy() const;
+#ifdef HAVE_TAG_H
     Akonadi::Tag getTag() const;
     QStringList getTagMembers() const;
+#endif
 
 private:
     //@cond PRIVATE
@@ -125,7 +131,9 @@
     static KMime::Message::Ptr writeNote(const KMime::Message::Ptr &, Version v = KolabV3, const QString &productId = QString());
     static KMime::Message::Ptr writeDictionary(const QStringList &, const QString &lang, Version v = KolabV3, const QString &productId = QString());
     static KMime::Message::Ptr writeFreebusy(const Kolab::Freebusy &, Version v = KolabV3, const QString &productId = QString());
+#ifdef HAVE_TAG_H
     static KMime::Message::Ptr writeTag(const Akonadi::Tag &, const QStringList &items, Version v = KolabV3, const QString &productId = QString());
+#endif
     
 };

_service:recompress:tar_scm:libkolab-0.6.git.1412585128.tar.gz/libkolab_config.h.in Added

_service:set_version:libkolab.dsc Changed

Changes of Revision 3