From 771bbb58d1f571959fb2edb338e211f7fbc6f493 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= Date: Sun, 9 Dec 2012 01:27:41 +0100 Subject: [PATCH] - add kdepim 4.4 bcond --- kde4-kdepimlibs.spec | 8 +++++++ kdepimlibs-strict-parsing.patch | 39 +++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+) create mode 100644 kdepimlibs-strict-parsing.patch diff --git a/kde4-kdepimlibs.spec b/kde4-kdepimlibs.spec index 0cbf843..50c2281 100644 --- a/kde4-kdepimlibs.spec +++ b/kde4-kdepimlibs.spec @@ -1,5 +1,6 @@ # # Conditional build: +%bcond_with kdepim44 # %define qtver 4.8.1 %define _state stable @@ -16,6 +17,7 @@ Group: X11/Applications Source0: ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{orgname}-%{version}.tar.xz # Source0-md5: e9a04d6d033f9d9cafc8448fb22d36cd Patch100: %{name}-branch.diff +Patch101: kdepimlibs-strict-parsing.patch BuildRequires: Qt3Support-devel >= %{qtver} BuildRequires: QtCore-devel >= %{qtver} BuildRequires: QtDBus-devel >= %{qtver} @@ -49,6 +51,9 @@ Requires: akonadi-libs >= %{akonadiver} Requires: gpgme >= 1:1.2.0 Obsoletes: kdepimlibs4 Conflicts: kdepimlibs4 +%if %{without kdepim44} +Conflicts: kde4-kdepim < 4.5 +%endif BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -76,6 +81,9 @@ opartych na kdepimlibs. %prep %setup -q -n %{orgname}-%{version} #%%patch100 -p0 +%if %{with kdepim44} +%patch101 -p1 -R +%endif %build install -d build diff --git a/kdepimlibs-strict-parsing.patch b/kdepimlibs-strict-parsing.patch new file mode 100644 index 0000000..322befb --- /dev/null +++ b/kdepimlibs-strict-parsing.patch @@ -0,0 +1,39 @@ +From: Montel Laurent +Date: Wed, 19 Sep 2012 12:59:54 +0000 +Subject: Fix potential error when identity path is a string (bad conversion). +X-Git-Tag: v4.9.2 +X-Git-Url: http://quickgit.kde.org/?p=kdepimlibs.git&a=commitdiff&h=33acd1d6cc5a48974fc1093700d70caf04ae9644 +--- +Fix potential error when identity path is a string (bad conversion). + +in kde5 we will modify to akonadi::id +--- + + +--- a/kpimidentities/identity.cpp ++++ b/kpimidentities/identity.cpp +@@ -428,17 +428,20 @@ + + QString Identity::templates() const + { +- return property( QLatin1String( s_templates ) ).toString(); ++ const QString str = property( QLatin1String( s_templates ) ).toString(); ++ return verifyAkonadiId(str); + } + + QString Identity::drafts() const + { +- return property( QLatin1String( s_drafts ) ).toString(); ++ const QString str = property( QLatin1String( s_drafts ) ).toString(); ++ return verifyAkonadiId(str); + } + + QString Identity::fcc() const + { +- return property( QLatin1String( s_fcc ) ).toString(); ++ const QString str = property( QLatin1String( s_fcc ) ).toString(); ++ return verifyAkonadiId(str); + } + + QString Identity::transport() const + -- 2.44.0