[packages/kde4-kdepimlibs] Add -build.patch which fixes build with recent gcc and cmake. Release 5
megabajt
megabajt at pld-linux.org
Sun Oct 1 15:58:20 CEST 2017
commit 9bd9505fc146ea198ab209f207c0b2089e7b6a6f
Author: Marcin Banasiak <marcin.banasiak at gmail.com>
Date: Sun Oct 1 15:56:44 2017 +0200
Add -build.patch which fixes build with recent gcc and cmake. Release 5
kde4-kdepimlibs-build.patch | 21 +++++++++++++++++++++
kde4-kdepimlibs.spec | 4 +++-
2 files changed, 24 insertions(+), 1 deletion(-)
---
diff --git a/kde4-kdepimlibs.spec b/kde4-kdepimlibs.spec
index 7f56ae7..5666f28 100644
--- 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
diff --git a/kde4-kdepimlibs-build.patch b/kde4-kdepimlibs-build.patch
new file mode 100644
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() );
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kde4-kdepimlibs.git/commitdiff/9bd9505fc146ea198ab209f207c0b2089e7b6a6f
More information about the pld-cvs-commit
mailing list