Add -build.patch which fixes build with recent gcc and cmake. Release 5

diff --git a/kde4-kdepimlibs-build.patch b/kde4-kdepimlibs-build.patch
new file mode 100644 (file)
index 0000000..2fb1053
--- /dev/null
+++ b/kde4-kdepimlibs-build.patch
@@ -0,0 +1,21 @@
+--- kdepimlibs-4.14.10/akonadi/tests/CMakeLists.txt.hack       2017-09-29 23:54:38.673252098 +0200
++++ kdepimlibs-4.14.10/akonadi/tests/CMakeLists.txt    2017-09-29 23:55:06.178018357 +0200
+@@ -22,6 +22,7 @@ include_directories(
+   ${QJSON_INCLUDE_DIR}
+   ${CMAKE_SOURCE_DIR}/akonadi
+   ${CMAKE_BINARY_DIR}/akonadi
++  ${CMAKE_BINARY_DIR}/akonadi/akonadi-kde_autogen/include
+   ${CMAKE_BINARY_DIR}/akonadi/kmime
+   ${CMAKE_BINARY_DIR}/kmime
+ )
+--- kdepimlibs-4.14.10/kmime/tests/auto/contenttest.cpp.hackfix        2017-10-01 10:30:09.685591897 +0200
++++ kdepimlibs-4.14.10/kmime/tests/auto/contenttest.cpp        2017-10-01 10:30:16.752624161 +0200
+@@ -320,7 +320,7 @@ void ContentTest::testEncodedContent()
+ void ContentTest::testDecodedContent()
+ {
+   Content *c = new Content();
+-  c->setBody( '\0' );
++  c->setBody( "\0" );
+   QVERIFY( c->decodedContent() == QByteArray() );
+   c->setBody( QByteArray() );
+   QVERIFY( c->decodedContent() == QByteArray() );

diff --git a/kde4-kdepimlibs.spec b/kde4-kdepimlibs.spec
index 7f56ae7ff8517d3698271fe50214b0ced54ca01a..5666f28c6b077d07c4e2a62391e3f7a0e54aaa65 100644 (file)
--- a/kde4-kdepimlibs.spec
+++ b/kde4-kdepimlibs.spec
@@ -12,11 +12,12 @@ Summary:    Personal Information Management (PIM) libraries for KDE
 Summary(pl.UTF-8):     Biblioteki zarządzania informacjami osobistymi (PIM) dla KDE
 Name:          kde4-kdepimlibs
 Version:       4.14.10
-Release:       4
+Release:       5
 License:       GPL
 Group:         X11/Applications
 Source0:       http://download.kde.org/Attic/applications/15.04.3/src/%{orgname}-%{version}.tar.xz
 # Source0-md5: 098c975fb970621dc8382ed3c28de0eb
+Patch0:                %{name}-build.patch
 Patch100:      %{name}-branch.diff
 Patch101:      kdepimlibs-strict-parsing.patch
 BuildRequires: Qt3Support-devel >= %{qtver}
@@ -84,6 +85,7 @@ opartych na kdepimlibs.
 
 %prep
 %setup -q -n %{orgname}-%{version}
+%patch0 -p1
 #%%patch100 -p0
 %if %{with kdepim44}
 %patch101 -p1 -R