rev 5757 - in trunk/packages/kdepim/debian: . patches

Sune Vuorela pusling-guest at alioth.debian.org
Fri Mar 16 13:29:32 CET 2007


Author: pusling-guest
Date: 2007-03-16 12:29:31 +0000 (Fri, 16 Mar 2007)
New Revision: 5757

Added:
   trunk/packages/kdepim/debian/patches/20_pilot-link0.12.2.pilotAppInfo.h.diff
   trunk/packages/kdepim/debian/patches/20_pilot-link0.12.2.pilotMemo.h.diff
Modified:
   trunk/packages/kdepim/debian/changelog
Log:
fix ftbfs


Modified: trunk/packages/kdepim/debian/changelog
===================================================================
--- trunk/packages/kdepim/debian/changelog	2007-03-14 08:49:02 UTC (rev 5756)
+++ trunk/packages/kdepim/debian/changelog	2007-03-16 12:29:31 UTC (rev 5757)
@@ -1,3 +1,13 @@
+kdepim (4:3.5.6.dfsg.1-3) experimental; urgency=low
+
+  * The pilot-link-please-don't-break-your-api-release
+
+  +++ Changes by Sune Vuorela
+  * Pull 2 patches from pim+ branch to fix compilation with pilot-link 0.12.2
+    (Closes: #414843)
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 14 Mar 2007 10:49:37 +0100
+
 kdepim (4:3.5.6.dfsg.1-2) experimental; urgency=low
 
   * Add two patches pushed out from kde upstream

Added: trunk/packages/kdepim/debian/patches/20_pilot-link0.12.2.pilotAppInfo.h.diff
===================================================================
--- trunk/packages/kdepim/debian/patches/20_pilot-link0.12.2.pilotAppInfo.h.diff	2007-03-14 08:49:02 UTC (rev 5756)
+++ trunk/packages/kdepim/debian/patches/20_pilot-link0.12.2.pilotAppInfo.h.diff	2007-03-16 12:29:31 UTC (rev 5757)
@@ -0,0 +1,19 @@
+--- kdepim-3.5.5+/kpilot/lib/pilotAppInfo.h	2007/02/08 23:21:06	631756
++++ kdepim-3.5.5+/kpilot/lib/pilotAppInfo.h	2007/02/14 15:21:51	633614
+@@ -136,8 +136,15 @@
+ * (again, from pilot-link).
+ */
+ template <typename appinfo,
++#if PILOT_LINK_IS(0,12,2)
++	/* There are additional consts introduced in 0.12.2 */
++	int(*unpack)(appinfo *, const unsigned char *, PI_SIZE_T),
++	int(*pack)(const appinfo *, unsigned char *, PI_SIZE_T)
++#else
+ 	int(*unpack)(appinfo *, unsigned char *, PI_SIZE_T),
+-	int(*pack)(appinfo *, unsigned char *, PI_SIZE_T)>
++	int(*pack)(appinfo *, unsigned char *, PI_SIZE_T)
++#endif
++	>
+ class PilotAppInfo : public PilotAppInfoBase
+ {
+ public:

Added: trunk/packages/kdepim/debian/patches/20_pilot-link0.12.2.pilotMemo.h.diff
===================================================================
--- trunk/packages/kdepim/debian/patches/20_pilot-link0.12.2.pilotMemo.h.diff	2007-03-14 08:49:02 UTC (rev 5756)
+++ trunk/packages/kdepim/debian/patches/20_pilot-link0.12.2.pilotMemo.h.diff	2007-03-16 12:29:31 UTC (rev 5757)
@@ -0,0 +1,10 @@
+--- kdepim-3.5.5+/kpilot/lib/pilotMemo.h	2007/01/02 23:13:27	619195
++++ kdepim-3.5.5+/kpilot/lib/pilotMemo.h	2007/02/14 15:21:51	633614
+@@ -99,6 +99,6 @@
+ 	QString fText;
+ };
+ 
+-typedef PilotAppInfo<MemoAppInfo,unpack_MemoAppInfo, pack_MemoAppInfo> PilotMemoInfo;
++typedef PilotAppInfo<struct MemoAppInfo,unpack_MemoAppInfo, pack_MemoAppInfo> PilotMemoInfo;
+ 
+ #endif




More information about the pkg-kde-commits mailing list