Fixes some api compile errors in bug #114311.

(Portage version: 2.0.53)

6 files changed, 206 insertions, 11 deletions

diff --git a/app-pda/syncekonnector/ChangeLog b/app-pda/syncekonnector/ChangeLog
index d4fa1063c360..42d09d60b082 100644
--- a/app-pda/syncekonnector/ChangeLog
+++ b/app-pda/syncekonnector/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-pda/syncekonnector
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/syncekonnector/ChangeLog,v 1.1 2005/12/01 04:25:23 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/syncekonnector/ChangeLog,v 1.2 2005/12/21 19:03:09 chriswhite Exp $
+
+*syncekonnector-0.2.1-r1 (21 Dec 2005)
+
+  21 Dec 2005; Chris White <chriswhite@gentoo.org>
+  +files/syncekonnector-0.2.1-kde3.5.patch, +files/kpimprefs.h,
+  +syncekonnector-0.2.1-r1.ebuild:
+  Fixes some api compile errors in bug #114311.
 
   01 Dec 2005; Chris White <chriswhite@gentoo.org> +metadata.xml:
   Initial commit.  Added for an upcomming change to my pda guide.
diff --git a/app-pda/syncekonnector/Manifest b/app-pda/syncekonnector/Manifest
index 513f0fea505c..a9fdc9eff910 100644
--- a/app-pda/syncekonnector/Manifest
+++ b/app-pda/syncekonnector/Manifest
@@ -1,15 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 7b06e552164f97bec2d102d3bc428243 ChangeLog 354
 MD5 eec13d229bb82896de30fe9113e9d787 files/digest-syncekonnector-0.2.1 72
+MD5 eec13d229bb82896de30fe9113e9d787 files/digest-syncekonnector-0.2.1-r1 72
+MD5 7d6ad97eacbd230faa55492dc0eff8d9 files/kpimprefs.h 2560
 MD5 194181682125a9331ab009c397137a35 files/syncekonnector-0.2.1-configure.in.in 251
+MD5 9ae9937872a01966f183fad5a8797416 files/syncekonnector-0.2.1-kde3.5.patch 2202
 MD5 3e8a9f3bc9a5c8aabcc8b7e4d41f7fb8 metadata.xml 249
+MD5 576ae06ce83c1a52d6b0dcc782ad64ee syncekonnector-0.2.1-r1.ebuild 975
 MD5 b8bc0a9574e150038216631527352813 syncekonnector-0.2.1.ebuild 804
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDnZaSI1lqEGTUzyQRAnt0AJ4q5leLAytigOUVgKZEM+dFcSw0cACffPvH
-MC3m84Q1EVy50w49alyMVK0=
-=z68U
------END PGP SIGNATURE-----
diff --git a/app-pda/syncekonnector/files/digest-syncekonnector-0.2.1-r1 b/app-pda/syncekonnector/files/digest-syncekonnector-0.2.1-r1
new file mode 100644
index 000000000000..c2c19965bca9
--- /dev/null
+++ b/app-pda/syncekonnector/files/digest-syncekonnector-0.2.1-r1
@@ -0,0 +1 @@
+MD5 63042acc5683291cf2b8f3f4f69de4f7 syncekonnector-0.2.1.tar.gz 635690
diff --git a/app-pda/syncekonnector/files/kpimprefs.h b/app-pda/syncekonnector/files/kpimprefs.h
new file mode 100644
index 000000000000..1956f80b5ae1
--- /dev/null
+++ b/app-pda/syncekonnector/files/kpimprefs.h
@@ -0,0 +1,86 @@
+/*
+    This file is part of libkdepim.
+
+    Copyright (c) 2002 Cornelius Schumacher <[EMAIL PROTECTED]>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Library General Public
+    License as published by the Free Software Foundation; either
+    version 2 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Library General Public License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to
+    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+    Boston, MA 02110-1301, USA.
+*/
+#ifndef KPIMPREFS_H
+#define KPIMPREFS_H
+
+#include <qstringlist.h>
+
+#include <kconfigskeleton.h>
+#include <kdepimmacros.h>
+
+class QString;
+
+class KDE_EXPORT KPimPrefs : public KConfigSkeleton
+{
+  public:
+    KPimPrefs( const QString &name = QString::null );
+
+    virtual ~KPimPrefs();
+
+    /** Set preferences to default values */
+    void usrSetDefaults();
+  
+    /** Read preferences from config file */
+    void usrReadConfig();
+
+    /** Write preferences to config file */
+    void usrWriteConfig();
+
+    /** 
+     * Get user's timezone.
+     *
+     * This will first look for whatever timezone is stored in KOrganizer's
+     * configuration file.  If no timezone is found there, it uses
+     * /etc/localtime.
+     *
+     * The value returned may be in various formats (for example,
+     * America/New_York or EST) so your program should be prepared to these
+     * formats.
+     *
+     * The Calendar class in libkcal says accepts all timezone codes that are
+     * listed in /usr/share/zoneinfo/zone.tab.
+     *
+     * @see Calendar
+     */
+    static const QString timezone();
+
+    /**
+      Convert time given in UTC to local time at timezone specified by given
+      timezone id.
+    */
+    static QDateTime utcToLocalTime( const QDateTime &dt,
+                                     const QString &timeZoneId );
+
+    /**
+      Convert time given in local time at timezone specified by given
+      timezone id to UTC.
+    */
+    static QDateTime localTimeToUtc( const QDateTime &dt,
+                                     const QString &timeZoneId );
+
+  public:
+    QStringList mCustomCategories;
+  
+  protected:
+    virtual void setCategoryDefaults() {};
+};
+
+#endif
diff --git a/app-pda/syncekonnector/files/syncekonnector-0.2.1-kde3.5.patch b/app-pda/syncekonnector/files/syncekonnector-0.2.1-kde3.5.patch
new file mode 100644
index 000000000000..6ea731a6953e
--- /dev/null
+++ b/app-pda/syncekonnector/files/syncekonnector-0.2.1-kde3.5.patch
@@ -0,0 +1,67 @@
+--- admin/acinclude.m4.in.old	2005-12-22 03:44:57.000000000 +0900
++++ admin/acinclude.m4.in	2005-12-22 03:45:33.000000000 +0900
+@@ -3339,7 +3339,7 @@
+    AC_CACHE_VAL(kde_cv_func_stpcpy,
+    [
+    kde_safe_cxxflags=$CXXFLAGS
+-   CXXFLAGS="-Werror"
++   CXXFLAGS=""
+    AC_LANG_SAVE
+    AC_LANG_CPLUSPLUS
+    AC_TRY_COMPILE([
+--- src/Makefile.am.old	2005-12-22 03:46:25.000000000 +0900
++++ src/Makefile.am	2005-12-22 03:46:44.000000000 +0900
+@@ -37,5 +37,5 @@
+ service_DATA = syncekonnector.desktop
+ libsyncekonnector_la_LIBADD = $(RRA_LIB) $(RAPI_LIB) $(SYNCE_LIB)\
+ 	$(LIB_KABC_FILE) $(LIB_KONNECTOR) $(LIB_KSYNC)
+-AM_CFLAGS = -Werror -pedantic-errors -Wall
+-AM_CXXFLAGS = -Werror -pedantic-errors -Wall
++AM_CFLAGS = -pedantic-errors -Wall
++AM_CXXFLAGS = -pedantic-errors -Wall
+--- src/PocketPCKonnector.cpp.old	2005-12-22 03:47:41.000000000 +0900
++++ src/PocketPCKonnector.cpp	2005-12-22 03:51:28.000000000 +0900
+@@ -31,6 +31,7 @@
+ #include <kitchensync/calendarsyncee.h>
+ #include <kitchensync/konnectorinfo.h>
+ 
++#include "libkdepim/kpimprefs.h"
+ 
+ class PocketPCKonnectorFactory : public KRES::PluginFactoryBase
+ {
+@@ -58,7 +59,8 @@
+ namespace KSync
+ {
+     PocketPCKonnector::PocketPCKonnector( const KConfig* p_config )
+-            : KSync::Konnector( p_config ), firstSync(false)
++            : KSync::Konnector( p_config ),
++	    					mCalendar( KPimPrefs::timezone() )
+     {
+         if ( p_config ) {
+             m_pdaName = p_config->readEntry( "PDAName" );
+@@ -284,6 +286,15 @@
+     }
+ 
+ 
++    QStringList PocketPCKonnector::supportedFilterTypes() const
++    {
++	    QStringList types;
++	    types << "addressbook" << "calendar";
++
++	    return types;
++    }
++
++    
+     void PocketPCKonnector::writeConfig( KConfig* p_config )
+     {
+         Konnector::writeConfig ( p_config );
+--- src/PocketPCKonnector.h.old	2005-12-22 03:51:57.000000000 +0900
++++ src/PocketPCKonnector.h	2005-12-22 03:52:27.000000000 +0900
+@@ -99,6 +99,7 @@
+      * @return just some information
+      */
+     virtual KonnectorInfo info() const;
++    virtual QStringList supportedFilterTypes() const;
+     /** Store the configuration for a specific instance.
+      * @see KSync::Konnector::writeConfig()
+      */
diff --git a/app-pda/syncekonnector/syncekonnector-0.2.1-r1.ebuild b/app-pda/syncekonnector/syncekonnector-0.2.1-r1.ebuild
new file mode 100644
index 000000000000..145025b1dce3
--- /dev/null
+++ b/app-pda/syncekonnector/syncekonnector-0.2.1-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-pda/syncekonnector/syncekonnector-0.2.1-r1.ebuild,v 1.1 2005/12/21 19:03:09 chriswhite Exp $
+
+inherit eutils kde autotools
+
+DESCRIPTION="Synchronize Windows CE devices with Linux.  KDE Konnector."
+HOMEPAGE="http://synce.sourceforge.net/synce/kde/"
+SRC_URI="mirror://sourceforge/synce/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86"
+IUSE=""
+
+DEPEND=">=app-pda/synce-libsynce-0.9
+	>=app-pda/synce-rra-0.9
+	>=app-pda/orange-0.2
+	>=app-arch/unshield-0.4
+	app-pda/dynamite
+	!app-pda/rapip"
+
+need-kde 3.5
+
+src_unpack() {
+	kde_src_unpack
+	cp "${FILESDIR}/${P}-configure.in.in" "${S}/src/configure.in.in"
+
+	# :/
+	mkdir -p ${S}/src/libkdepim
+	# >:/
+	cp ${FILESDIR}/kpimprefs.h ${S}/src/libkdepim
+	# lalala please fix this upstream~
+	epatch ${FILESDIR}/${P}-kde3.5.patch
+}
+
+src_compile() {
+	make -f Makefile.cvs
+	kde_src_compile
+}