[meego-commits] 9350: Changes to Trunk:Testing/kcalcore

[Brian Harring]

Hi,
I have made the following changes to kcalcore in project Trunk:Testing. Please review and accept ASAP.

Thank You,
Brian Harring

[This message was auto-generated]

---

Request #9350:

  submit:   home:ferringb:qt:4.7.1:opengl/kcalcore(r3)(update) -> Trunk:Testing/kcalcore


Message:
    resending a compilation fix.  Process has zero say on branch vs otherwise- if it's confusing, _look at the changes_ (should be anyways).  As for i586 vs arm, again, look at the actual changes and the build logs for Trunk- partially valid, except arm fails in the exact same fashion, for the exact same reason, and is fixed in the exact same way.

State:   new          2010-11-09T19:48:09 ferringb
Comment: None



changes files:
--------------
--- kcalcore.changes
+++ kcalcore.changes
@@ -0,0 +1,3 @@
+* Tue Nov 09 2010 Brian Harring <brian.harring at intel.com> - 4.0.13
+- fix build failures against libical 0.46
+

new:
----
  fix-libical-0.46.patch

spec files:
-----------
--- kcalcore.spec
+++ kcalcore.spec
@@ -11,6 +11,7 @@
 Summary:        Extended KDE kcal calendar library port for Maemo
 Group:          System/Libraries
 Source0:        %{name}-%{version}.tar.gz
+Patch0:         fix-libical-0.46.patch
 BuildRequires:  doxygen
 BuildRequires:  fdupes
 BuildRequires:  graphviz
@@ -40,6 +41,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 touch src/libkcalcoren.so.%{ver_maj}.%{ver_min}.%{ver_pat}

other changes:
--------------

++++++ fix-libical-0.46.patch (new)
--- fix-libical-0.46.patch
+++ fix-libical-0.46.patch
+diff -urN kcalcore-4.0.13-original/src/icalformat_p.cpp kcalcore-4.0.13/src/icalformat_p.cpp
+--- kcalcore-4.0.13-original/src/icalformat_p.cpp	2010-10-01 00:46:43.000000000 -0700
++++ kcalcore-4.0.13/src/icalformat_p.cpp	2010-11-09 17:55:42.983383054 -0800
+@@ -795,11 +795,7 @@
+   if ( att->isUri() ) {
+     attach = icalattach_new_from_url( att->uri().toUtf8().data() );
+   } else {
+-#ifdef USE_ICAL_0_46
+     attach = icalattach_new_from_data( ( const char * )att->data().data(), 0, 0 );
+-#else
+-    attach = icalattach_new_from_data( ( unsigned char * )att->data().data(), 0, 0 );
+-#endif
+   }
+   icalproperty *p = icalproperty_new_attach( attach );
+