Request 3259 (accepted)

libkolab.spec Changed

0001-Search-for-threads-just-like-libkolabxml-does.patch Deleted

debian.changelog Changed

debian.control Changed

debian.rules Changed

@@ -5,7 +5,7 @@
 PHPEXT := $(shell php-config --extension-dir)
 PHPINC := $(shell php-config --include-dir)
 
-PHP_VERSIONS=8.2 8.1 8.0 7.4 7.3
+PHP_VERSIONS=8.2 8.1 8.0 7.4 7.3 7.2
 
 export DH_VERBOSE=1
 export DH_OPTIONS=-v
@@ -71,6 +71,13 @@
 		done ; \
 	fi
 
+	# Build php vanilla
+	if  $$(php-config --vernum) -gt 70000 ; then \
+		sed -r -i -e 's/-c\+\+ -php0-9? -I/-c++ -php7 -I/g' cmake/modules/SWIGUtils.cmake ; \
+	else \
+		sed -r -i -e 's/-c\+\+ -php0-9? -I/-c++ -php5 -I/g' cmake/modules/SWIGUtils.cmake ; \
+	fi
+
 	dh_auto_build --buildsystem cmake --builddirectory php-vanilla
 
 	# Build python versions via pybuild
@@ -84,6 +91,11 @@
 			if  ! -f "/opt/plesk/php/$${version}/bin/php-config"  ; then \
 				continue ; \
 			fi ; \
+			if  $$(/opt/plesk/php/$${version}/bin/php-config --vernum) -gt 70000 ; then \
+				sed -r -i -e 's/-c\+\+ -php0-9? -I/-c++ -php7 -I/g' cmake/modules/SWIGUtils.cmake ; \
+			else \
+				sed -r -i -e 's/-c\+\+ -php0-9? -I/-c++ -php5 -I/g' cmake/modules/SWIGUtils.cmake ; \
+			fi ; \
 			dh_auto_configure --buildsystem cmake --builddirectory php-$${version} -- \
 				-DLIB_INSTALL_DIR=/usr/lib \
                 -DBoost_NO_BOOST_CMAKE=ON \
@@ -97,6 +109,13 @@
 		done ; \
 	fi
 
+	# Configure php vanilla
+	if  $$(php-config --vernum) -gt 70000 ; then \
+		sed -r -i -e 's/-c\+\+ -php0-9? -I/-c++ -php7 -I/g' cmake/modules/SWIGUtils.cmake ; \
+	else \
+		sed -r -i -e 's/-c\+\+ -php0-9? -I/-c++ -php5 -I/g' cmake/modules/SWIGUtils.cmake ; \
+	fi
+
 	dh_auto_configure --buildsystem cmake --builddirectory php-vanilla -- \
 		-DLIB_INSTALL_DIR=/usr/lib \
 		-DBoost_NO_BOOST_CMAKE=ON \
@@ -131,6 +150,8 @@
 		echo "debian/kolab.ini etc/php/7.4/mods-available" >> debian/php-kolab.install ; \
 	elif  -d "/etc/php/7.3/mods-available" ; then \
 		echo "debian/kolab.ini etc/php/7.3/mods-available" >> debian/php-kolab.install ; \
+	elif  -d "/etc/php/7.2/mods-available" ; then \
+		echo "debian/kolab.ini etc/php/7.2/mods-available" >> debian/php-kolab.install ; \
 	else \
 		echo "debian/kolab.ini etc/php/mods-available" >> debian/php-kolab.install ; \
 	fi
@@ -144,6 +165,11 @@
 			if  ! -f "/opt/plesk/php/$${version}/bin/php-config" ; then \
 				continue ; \
 			fi ; \
+			if  $$(/opt/plesk/php/$${version}/bin/php-config --vernum) -gt 70000 ; then \
+				sed -r -i -e 's/-c\+\+ -php0-9? -I/-c++ -php7 -I/g' cmake/modules/SWIGUtils.cmake ; \
+			else \
+				sed -r -i -e 's/-c\+\+ -php0-9? -I/-c++ -php5 -I/g' cmake/modules/SWIGUtils.cmake ; \
+			fi ; \
 			shver=$$(echo $${version} | sed -e 's/\.//g') ; \
 			make -C php-$${version} install DESTDIR=$(PWD)/debian/plesk-php$${shver}-kolab/ ; \
 			mkdir -p debian/plesk-php$${shver}-kolab/opt/plesk/php/$${version}/etc/php.d/ ; \

libkolab-3.2.0.tar.gz/CMakeLists.txt -> libkolab-3.1.0.tar.gz/CMakeLists.txt Changed

@@ -30,7 +30,7 @@
 # 0.1.1 (patch release for 0.1.0)
 # 0.2 (0.2 development version towards 0.2.0)
 set(Libkolab_VERSION_MAJOR 3)
-set(Libkolab_VERSION_MINOR 2)
+set(Libkolab_VERSION_MINOR 1)
 # Enable the full x.y.z version only for release versions
 set(Libkolab_VERSION_PATCH 0)
 #set(Libkolab_VERSION ${Libkolab_VERSION_MAJOR}.${Libkolab_VERSION_MINOR}.${Libkolab_VERSION_PATCH})
@@ -55,8 +55,7 @@
 
 find_package(Qt5 REQUIRED Core Xml)
 # FIXME: Seems to be required for libkolabxml, but should be fixed in libkolabxml
-set(Boost_USE_MULTITHREADED ON)
-find_package(Boost REQUIRED COMPONENTS thread system)
+find_package(Boost REQUIRED system thread)
 
 # Do the building
 find_package(Libkolabxml 1.1.1 REQUIRED)
@@ -71,11 +70,7 @@
 
 include(FindPackageHandleStandardArgs)
 
-find_package(KF5CalendarCore "5.9.3" CONFIG REQUIRED)
-if (KF5CalendarCore_VERSION VERSION_LESS "5.12.1")
-    message("Building with legacy kcalcore")
-    add_definitions(-DLEGACY_KCALCORE=1)
-endif()
+find_package(KF5CalendarCore "5.12.1" CONFIG REQUIRED)
 find_package(KF5Mime "4.84.0" CONFIG REQUIRED)
 
 find_package(SWIG)

libkolab-3.2.0.tar.gz/cmake/modules/SWIGUtils.cmake -> libkolab-3.1.0.tar.gz/cmake/modules/SWIGUtils.cmake Changed

libkolab-3.2.0.tar.gz/conversion/kcalconversion.cpp -> libkolab-3.1.0.tar.gz/conversion/kcalconversion.cpp Changed

@@ -293,33 +293,6 @@
          * Since that means the semantics of the two are different, we have to store the kolab uid as a custom property.
          */
         // QUrl::fromPercentEncoding(
-#ifdef LEGACY_KCALCORE
-        KCalCore::Attendee::Ptr attendee = KCalCore::Attendee::Ptr(new KCalCore::Attendee(fromStdString(a.contact().name()),
-                                                                                          fromStdString(a.contact().email()),
-                                                                                          a.rsvp(),
-                                                                                          toPartStat(a.partStat()),
-                                                                                          toRole(a.role()) ));
-        if (!a.contact().uid().empty()) { //TODO Identify contact from addressbook based on uid
-            attendee->customProperties().setNonKDECustomProperty(CUSTOM_KOLAB_CONTACT_UUID, fromStdString(a.contact().uid()));
-        }
-        if (!a.delegatedTo().empty()) {
-            if (a.delegatedTo().size() > 1) {
-                WARNING("multiple delegatees are not supported");
-            }
-
-            attendee->setDelegate(toMailto(a.delegatedTo().front().email(), a.delegatedTo().front().name()).toString());
-        }
-        if (!a.delegatedFrom().empty()) {
-            if (a.delegatedFrom().size() > 1) {
-                WARNING("multiple delegators are not supported");
-            }
-            attendee->setDelegator(toMailto(a.delegatedFrom().front().email(), a.delegatedFrom().front().name()).toString());
-        }
-        if (a.cutype() != CutypeIndividual) {
-            attendee->customProperties().setNonKDECustomProperty(CUSTOM_KOLAB_CONTACT_CUTYPE, QString::number(a.cutype()));
-        }
-        i.addAttendee(attendee);
-#else
         KCalCore::Attendee attendee(fromStdString(a.contact().name()),
                                     fromStdString(a.contact().email()),
                                     a.rsvp(),
@@ -345,21 +318,8 @@
             attendee.customProperties().setNonKDECustomProperty(CUSTOM_KOLAB_CONTACT_CUTYPE, QString::number(a.cutype()));
         }
         i.addAttendee(attendee);
-#endif
     }
     foreach (const Kolab::Attachment a, e.attachments()) {
-#ifdef LEGACY_KCALCORE
-        KCalCore::Attachment::Ptr ptr;
-        if (!a.uri().empty()) {
-            ptr = KCalCore::Attachment::Ptr(new KCalCore::Attachment(fromStdString(a.uri()), fromStdString(a.mimetype())));
-        } else {
-            ptr = KCalCore::Attachment::Ptr(new KCalCore::Attachment(QByteArray::fromRawData(a.data().c_str(), a.data().size()).toBase64(), fromStdString(a.mimetype())));
-        }
-        if (!a.label().empty()) {
-            ptr->setLabel(fromStdString(a.label()));
-        }
-        i.addAttachment(ptr);
-#else
         KCalCore::Attachment ptr;
         if (!a.uri().empty()) {
             ptr = KCalCore::Attachment(fromStdString(a.uri()), fromStdString(a.mimetype()));
@@ -370,7 +330,6 @@
             ptr.setLabel(fromStdString(a.label()));
         }
         i.addAttachment(ptr);
-#endif
     }
 
     QMap<QByteArray, QString> props;
@@ -401,31 +360,6 @@
     i.setDescription(toStdString(e.description()));
     i.setStatus(fromStatus(e.status()));
     std::vector<Kolab::Attendee> attendees;
-#ifdef LEGACY_KCALCORE
-    foreach (const KCalCore::Attendee::Ptr attendee, e.attendees()) {
-        const QString &uid = attendee->customProperties().nonKDECustomProperty(CUSTOM_KOLAB_CONTACT_UUID);
-        Kolab::Attendee a(Kolab::ContactReference(toStdString(attendee->email()), toStdString(attendee->name()), toStdString(uid)));
-        a.setRSVP(attendee->RSVP());
-        a.setPartStat(fromPartStat(attendee->status()));
-        a.setRole(fromRole(attendee->role()));
-        if (!attendee->delegate().isEmpty()) {
-            std::string name;
-            const std::string &email = fromMailto(QUrl(attendee->delegate()), name);
-            a.setDelegatedTo(std::vector<Kolab::ContactReference>() << Kolab::ContactReference(email, name));
-        }
-        if (!attendee->delegator().isEmpty()) {
-            std::string name;
-            const std::string &email = fromMailto(QUrl(attendee->delegator()), name);
-            a.setDelegatedFrom(std::vector<Kolab::ContactReference>() << Kolab::ContactReference(email, name));
-        }
-        const QString &cutype = attendee->customProperties().nonKDECustomProperty(CUSTOM_KOLAB_CONTACT_CUTYPE);
-        if (!cutype.isEmpty()) {
-            a.setCutype(static_cast<Kolab::Cutype>(cutype.toInt()));
-        }
-        
-        attendees.push_back(a);
-    }
-#else
     foreach (const KCalCore::Attendee attendee, e.attendees()) {
         const QString &uid = attendee.customProperties().nonKDECustomProperty(CUSTOM_KOLAB_CONTACT_UUID);
         Kolab::Attendee a(Kolab::ContactReference(toStdString(attendee.email()), toStdString(attendee.name()), toStdString(uid)));
@@ -449,21 +383,8 @@
         
         attendees.push_back(a);
     }
-#endif
     i.setAttendees(attendees);
     std::vector<Kolab::Attachment> attachments;
-#ifdef LEGACY_KCALCORE
-    foreach (const KCalCore::Attachment::Ptr &ptr, e.attachments()) {
-        Kolab::Attachment a;
-        if (ptr->isUri()) {
-            a.setUri(toStdString(ptr->uri()), toStdString(ptr->mimeType()));
-        } else {
-            a.setData(std::string(ptr->decodedData().data(), ptr->decodedData().size()), toStdString(ptr->mimeType()));
-        }
-        a.setLabel(toStdString(ptr->label()));
-        attachments.push_back(a);
-    }
-#else
     foreach (const KCalCore::Attachment &ptr, e.attachments()) {
         Kolab::Attachment a;
         if (ptr.isUri()) {
@@ -474,7 +395,6 @@
         a.setLabel(toStdString(ptr.label()));
         attachments.push_back(a);
     }
-#endif
     i.setAttachments(attachments);
 
     std::vector<Kolab::CustomProperty> customProperties;
@@ -741,11 +661,7 @@
         i.setLocation(fromStdString(e.location())); //TODO detect richtext
     }
     if (e.organizer().isValid()) {
-#ifdef LEGACY_KCALCORE
-        i.setOrganizer(KCalCore::Person::Ptr(new KCalCore::Person(fromStdString(e.organizer().name()), fromStdString(e.organizer().email())))); //TODO handle uid too
-#else
         i.setOrganizer(KCalCore::Person(fromStdString(e.organizer().name()), fromStdString(e.organizer().email()))); //TODO handle uid too
-#endif
     }
     if (!e.url().empty()) {
         i.setNonKDECustomProperty(CUSTOM_KOLAB_URL, fromStdString(e.url()));
@@ -761,11 +677,7 @@
             case Kolab::Alarm::EMailAlarm: {
                 KCalCore::Person::List receipents;
                 foreach (Kolab::ContactReference c ,a.attendees()) {
-#ifdef LEGACY_KCALCORE
-                    KCalCore::Person::Ptr person = KCalCore::Person::Ptr(new KCalCore::Person(fromStdString(c.name()), fromStdString(c.email())));
-#else
                     KCalCore::Person person(fromStdString(c.name()), fromStdString(c.email()));
-#endif
                     receipents.append(person);
                 }
                 alarm->setEmailAlarm(fromStdString(a.summary()), fromStdString(a.description()), receipents);
@@ -803,15 +715,9 @@
 {
     i.setPriority(fromPriority(e.priority()));
     i.setLocation(toStdString(e.location()));
-#ifdef LEGACY_KCALCORE
-    if (!e.organizer()->email().isEmpty()) {
-        i.setOrganizer(Kolab::ContactReference(Kolab::ContactReference::EmailReference, toStdString(e.organizer()->email()), toStdString(e.organizer()->name()))); //TODO handle uid too
-    }
-#else
     if (!e.organizer().email().isEmpty()) {
         i.setOrganizer(Kolab::ContactReference(Kolab::ContactReference::EmailReference, toStdString(e.organizer().email()), toStdString(e.organizer().name()))); //TODO handle uid too
     }
-#endif
     i.setUrl(toStdString(e.nonKDECustomProperty(CUSTOM_KOLAB_URL)));
     i.setRecurrenceID(fromDate(e.recurrenceId()), e.thisAndFuture());
     getRecurrence(i, e);
@@ -830,15 +736,9 @@
                 break;
             case KCalCore::Alarm::Email: {
                 std::vector<Kolab::ContactReference> receipents;
-#ifdef LEGACY_KCALCORE
-                foreach(const KCalCore::Person::Ptr &p, a->mailAddresses()) {
-                    receipents.push_back(Kolab::ContactReference(toStdString(p->email()), toStdString(p->name())));
-                }
-#else
                 foreach(const KCalCore::Person &p, a->mailAddresses()) {
                     receipents.push_back(Kolab::ContactReference(toStdString(p.email()), toStdString(p.name())));
                 }
-#endif
                 alarm = Kolab::Alarm(toStdString(a->mailSubject()), toStdString(a->mailText()), receipents);
             }
                 break;

libkolab-3.2.0.tar.gz/tests/kcalconversiontest.cpp -> libkolab-3.1.0.tar.gz/tests/kcalconversiontest.cpp Changed

@@ -50,7 +50,6 @@
 void compareAttendeesVectors(const KCalCore::Attendee::List &list, const KCalCore::Attendee::List &other)
 {
     QCOMPARE(list.size(), other.size());
-#ifndef LEGACY_KCALCORE
     for (int i = 0 ; i < list.size(); i++) {
         KCalCore::Attendee at1 = list.at(i);
         at1.setUid(QString());
@@ -58,7 +57,6 @@
         at2.setUid(QString());
         QCOMPARE(at1, at2);
     }
-#endif
 }
 
 void KCalConversionTest::initTestCase()
@@ -194,25 +192,19 @@
         kcal.setPriority(3);
         kcal.setStatus(KCalCore::Incidence::StatusConfirmed);
         kcal.setLocation("location");
-#ifndef LEGACY_KCALCORE
         kcal.setOrganizer(KCalCore::Person("organizer", "organizer@email"));
-#endif
         //Url
         kcal.setNonKDECustomProperty("X-KOLAB-URL", "http://test.org");
-#ifndef LEGACY_KCALCORE
         KCalCore::Attendee att("attendee", "attendee@email", false, KCalCore::Attendee::NeedsAction, KCalCore::Attendee::ReqParticipant);
         att.setDelegate("mailto:delegatee<delegatee@email>");
         att.setDelegator("mailto:delegator<delegator@email>");
         kcal.addAttendee(att);
         kcal.addAttachment(KCalCore::Attachment(QString("uri"), "mimetype/mime"));
-#endif
-#ifndef LEGACY_KCALCORE
         KCalCore::Alarm::Ptr alarm = KCalCore::Alarm::Ptr(new KCalCore::Alarm(&kcal));    
         KCalCore::Person::List addressees;
         addressees.append(KCalCore::Person("name", "email@email"));
         alarm->setEmailAlarm("subject", "text", addressees, QStringList()); //No support for attachments
         kcal.addAlarm(alarm);
-#endif
         //TODO alarms
 
         kcal.setNonKDECustomProperty("X-KOLAB-key1", "value1");
@@ -396,10 +388,8 @@
     QCOMPARE(e->priority(), kcal.priority());
     QCOMPARE(e->status(), kcal.status());
     QCOMPARE(e->location(), kcal.location());
-#ifndef LEGACY_KCALCORE
     QCOMPARE(e->organizer().name(), kcal.organizer().name());
     QCOMPARE(e->organizer().email(), kcal.organizer().email());
-#endif
     QCOMPARE(e->nonKDECustomProperty("X-KOLAB-URL"), kcal.nonKDECustomProperty("X-KOLAB-URL"));
     //otherwise we'd break the customProperties comparison
     e->removeNonKDECustomProperty("X-KOLAB-URL");

libkolab.dsc Changed

Overview

Request 3259 (accepted)

Request History