- fix compilation with latest pilot-link (patch from KDE CVS)

noticed by viq <vicviq at gmail dot com>

ok espie@
This commit is contained in:
ajacoutot 2007-03-24 12:41:52 +00:00
parent cf0c6165b7
commit 1c41c592dd
2 changed files with 22 additions and 2 deletions

View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.46 2007/02/02 12:19:52 espie Exp $
# $OpenBSD: Makefile,v 1.47 2007/03/24 12:41:52 ajacoutot Exp $
COMMENT= "KDE personal information applications"
COMMENT-kpilot= "KDE interface to sync with Palm Pilot"
CATEGORIES= x11 x11/kde productivity
VERSION= 3.5.6
DISTNAME= kdepim-${VERSION}
PKGNAME= ${DISTNAME}p2
PKGNAME= ${DISTNAME}p3
MODKDE_VERSION= 3.5.3
SHARED_LIBS += index 1.0 # .0.0
SHARED_LIBS += kgantt 1.0 # .0.2

View File

@ -0,0 +1,20 @@
$OpenBSD: patch-kpilot_lib_pilotAppInfo_h,v 1.1 2007/03/24 12:41:52 ajacoutot Exp $
--- kpilot/lib/pilotAppInfo.h.orig Sat Mar 24 11:09:11 2007
+++ kpilot/lib/pilotAppInfo.h Sat Mar 24 11:13:08 2007
@@ -136,8 +136,15 @@ protected:
* (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: