Hello community, here is the log from the commit of package kdepim4-runtime for openSUSE:Factory checked in at 2012-12-07 14:23:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdepim4-runtime (Old) and /work/SRC/openSUSE:Factory/.kdepim4-runtime.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdepim4-runtime", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/kdepim4-runtime/kdepim4-runtime.changes 2012-11-08 07:43:47.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kdepim4-runtime.new/kdepim4-runtime.changes 2012-12-07 14:24:08.000000000 +0100 @@ -1,0 +2,22 @@ +Sat Dec 1 20:01:32 UTC 2012 - [email protected] + +- Update to 4.9.90 + * This is the second Beta release for 4.10. Contains bugfixes + +------------------------------------------------------------------- +Sun Nov 25 13:08:04 UTC 2012 - [email protected] + +- Add buildfix-qjson_0_8_0.diff. Fixes build with QJson 0.8.0 + +------------------------------------------------------------------- +Sun Nov 25 11:25:54 UTC 2012 - [email protected] + +- Drop patch 4_8_branch.diff as it is not used at all + +------------------------------------------------------------------- +Sat Nov 24 12:49:51 UTC 2012 - [email protected] + +- Update to 4.9.80 + * See http://www.kde.org/announcements/announce-4.10-beta1.php + +------------------------------------------------------------------- @@ -5 +27 @@ - * see http://kde.org/announcements/4.9.3/ for details + * see http://kde.org/announcements/announce-4.9.3.php for details @@ -11 +33 @@ - * see http://kde.org/announcements/4.9.2/ for details + * see http://kde.org/announcements/announce-4.9.2.php for details Old: ---- 4_8_BRANCH.diff kdepim-runtime-4.9.3.tar.xz New: ---- buildfix-qjson_0_8_0.diff kdepim-runtime-4.9.90.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdepim4-runtime.spec ++++++ --- /var/tmp/diff_new_pack.bUbdPX/_old 2012-12-07 14:24:09.000000000 +0100 +++ /var/tmp/diff_new_pack.bUbdPX/_new 2012-12-07 14:24:09.000000000 +0100 @@ -17,7 +17,7 @@ Name: kdepim4-runtime -Version: 4.9.3 +Version: 4.9.90 Release: 0 Summary: Base package of kdepim License: LGPL-2.1+ @@ -25,12 +25,13 @@ Url: http://www.kde.org Source0: kdepim-runtime-%{version}.tar.xz Source1: akonadi.png -Patch0: 4_8_BRANCH.diff +Patch0: buildfix-qjson_0_8_0.diff Patch1: disable-knut.diff BuildRequires: fdupes BuildRequires: libkdepimlibs4-devel >= %{version} BuildRequires: libkgapi-devel >= 0.4.0 BuildRequires: libkolab-devel >= 0.2.0 +BuildRequires: nepomuk-core-devel BuildRequires: xz Suggests: kontact Obsoletes: kde4-akonadi < 4.2.90 @@ -61,11 +62,11 @@ %install cd build - %make_install + %kde4_makeinstall cd .. #remove menu entries of development tools - mkdir -p %{buildroot}%{_datadir}/pixmaps - install $RPM_SOURCE_DIR/akonadi.png %{buildroot}%{_datadir}/pixmaps/ + mkdir -p %{buildroot}%{_kde4_datadir}/pixmaps + install $RPM_SOURCE_DIR/akonadi.png %{buildroot}%{_kde4_datadir}/pixmaps/ %suse_update_desktop_file -u akonaditray Network Email %fdupes -s %{buildroot} # remove stuff we don't want to package @@ -84,30 +85,31 @@ %files %defattr(-,root,root) -%{_datadir}/akonadi -%{_datadir}/autostart/kaddressbookmigrator.desktop -%{_datadir}/dbus-1/interfaces/* -%{_datadir}/mime/packages/*.xml -%{_datadir}/pixmaps/akonadi.png -%{_datadir}/ontology/kde/ %{_kde4_applicationsdir}/accountwizard.desktop %{_kde4_applicationsdir}/akonaditray.desktop %{_kde4_appsdir}/akonadi %{_kde4_appsdir}/akonadi_maildispatcher_agent/ +%{_kde4_appsdir}/akonadi_nepomuk_feeder/ +%{_kde4_appsdir}/nepomukpimindexerutility/ %{_kde4_bindir}/* %{_kde4_configdir}/* +%{_kde4_datadir}/akonadi +%{_kde4_datadir}/autostart/kaddressbookmigrator.desktop +%{_kde4_datadir}/dbus-1/interfaces/* +%{_kde4_datadir}/mime/packages/*.xml +%{_kde4_datadir}/ontology/kde/ +%{_kde4_datadir}/pixmaps/akonadi.png %{_kde4_iconsdir}/hicolor/*/apps/*.png %{_kde4_libdir}/libakonadi-filestore.so.4* %{_kde4_libdir}/libakonadi-xml.so.4* +%{_kde4_libdir}/libkdepim-copy.so %{_kde4_libdir}/libkdepim-copy.so.4* %{_kde4_libdir}/libkmindexreader.so.4* %{_kde4_libdir}/libmaildir.so.4* +%{_kde4_libdir}/libnepomukfeederpluginlib.a %{_kde4_modulesdir}/* -%{_kde4_servicetypesdir}/davgroupwareprovider.desktop %{_kde4_servicetypesdir}/akonadinepomukfeeder.desktop +%{_kde4_servicetypesdir}/davgroupwareprovider.desktop %{_kde4_sharedir}/services -%{_kde4_libdir}/libnepomukfeederpluginlib.a -%{_kde4_libdir}/libkdepim-runtime-dms-copy.so -%{_kde4_libdir}/libkdepim-copy.so %changelog ++++++ buildfix-qjson_0_8_0.diff ++++++ commit ca06d09b6b78381bb152deb02c31ecb9d6a43210 Author: Christophe Giboudeaux <[email protected]> Date: Sat Nov 24 21:53:56 2012 +0100 Fix build with QJson >= 0.8.0 diff --git a/resources/google/calendar/CMakeLists.txt b/resources/google/calendar/CMakeLists.txt index 6bf7eaf..62659eb 100644 --- a/resources/google/calendar/CMakeLists.txt +++ b/resources/google/calendar/CMakeLists.txt @@ -1,5 +1,10 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}") +# QJson 0.8.0 is BIC +if(QJSON_VERSION VERSION_GREATER 0.7.1) + add_definitions(-DUSE_QJSON_0_8) +endif() + set(calendarresource_SRCS calendareditor.cpp calendarresource.cpp diff --git a/resources/google/calendar/defaultreminderattribute.cpp b/resources/google/calendar/defaultreminderattribute.cpp index 879a2c3..7dc45b4 100644 --- a/resources/google/calendar/defaultreminderattribute.cpp +++ b/resources/google/calendar/defaultreminderattribute.cpp @@ -79,7 +79,11 @@ QByteArray DefaultReminderAttribute::serialized() const } QJson::Serializer serializer; + #if !defined( USE_QJSON_0_8 ) return serializer.serialize( list ); + #else + return serializer.serialize( list, 0 ); + #endif } Alarm::List DefaultReminderAttribute::alarms( Incidence *incidence ) const -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
