[23273] trunk/dports/kde/kdepim3
source_changes at macosforge.org
source_changes at macosforge.org
Wed Mar 28 01:29:54 PDT 2007
Revision: 23273
http://trac.macosforge.org/projects/macports/changeset/23273
Author: takanori at macports.org
Date: 2007-03-28 01:29:53 -0700 (Wed, 28 Mar 2007)
Log Message:
-----------
Version 3.5.6
Modified Paths:
--------------
trunk/dports/kde/kdepim3/Portfile
trunk/dports/kde/kdepim3/files/CompileScript.sh
trunk/dports/kde/kdepim3/files/InstallScript.sh
trunk/dports/kde/kdepim3/files/kdepim3.patch
Modified: trunk/dports/kde/kdepim3/Portfile
===================================================================
--- trunk/dports/kde/kdepim3/Portfile 2007-03-28 08:29:34 UTC (rev 23272)
+++ trunk/dports/kde/kdepim3/Portfile 2007-03-28 08:29:53 UTC (rev 23273)
@@ -1,10 +1,10 @@
# $Id$
-#Synced with Fink, Version 3.5.5-1021
+#Synced with Fink, Version 3.5.6-1021
PortSystem 1.0
name kdepim3
-version 3.5.5
+version 3.5.6
set kdeadmin kde-admindir-429
categories kde
maintainers nomaintainer at macports.org
@@ -13,16 +13,16 @@
long_description ${description}
platforms darwin
homepage http://www.kde.org/
-master_sites kde:stable/${version}/src/:kde355 \
+master_sites kde:stable/${version}/src/:kde356 \
http://ranger.users.finkproject.org/distfiles/:admin \
http://ranger.befunk.com/fink/:admin \
http://astrange.ithinksw.net/~astrange/ranger-fink/:admin \
http://www.southofheaven.net/befunk/:admin
-# opendarwin::kde355
+# opendarwin::kde356
# opendarwin::admin
use_bzip2 yes
distname kdepim-${version}
-distfiles ${distname}.tar.bz2:kde355 \
+distfiles ${distname}.tar.bz2:kde356 \
${kdeadmin}.tar.bz2:admin
depends_build port:autoconf \
port:unsermake
@@ -35,7 +35,7 @@
# port:pilot-link
# port:gpgsm or port:gnupg2
-checksums ${distname}.tar.bz2 md5 3f2127f74cb496899bb3f1f6f702353b \
+checksums ${distname}.tar.bz2 md5 e37e6173fe9fd7f242c9502a4ae1d7de \
${kdeadmin}.tar.bz2 md5 73186bf0bdabf96c9f7d559de56d3772
extract.only ${distname}.tar.bz2
Modified: trunk/dports/kde/kdepim3/files/CompileScript.sh
===================================================================
--- trunk/dports/kde/kdepim3/files/CompileScript.sh 2007-03-28 08:29:34 UTC (rev 23272)
+++ trunk/dports/kde/kdepim3/files/CompileScript.sh 2007-03-28 08:29:53 UTC (rev 23273)
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/sh -ev
export PREFIX="%p" USE_UNSERMAKE=1
. ./environment-helper.sh
Modified: trunk/dports/kde/kdepim3/files/InstallScript.sh
===================================================================
--- trunk/dports/kde/kdepim3/files/InstallScript.sh 2007-03-28 08:29:34 UTC (rev 23272)
+++ trunk/dports/kde/kdepim3/files/InstallScript.sh 2007-03-28 08:29:53 UTC (rev 23273)
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/sh -ev
export PREFIX="%p" USE_UNSERMAKE=1
. ./environment-helper.sh
Modified: trunk/dports/kde/kdepim3/files/kdepim3.patch
===================================================================
--- trunk/dports/kde/kdepim3/files/kdepim3.patch 2007-03-28 08:29:34 UTC (rev 23272)
+++ trunk/dports/kde/kdepim3/files/kdepim3.patch 2007-03-28 08:29:53 UTC (rev 23273)
@@ -1,6 +1,6 @@
---- kdepim-3.5.4/akregator/src/Makefile.am 2006-05-22 14:10:40.000000000 -0400
-+++ kdepim-3.5.4-new/akregator/src/Makefile.am 2006-07-30 12:26:42.000000000 -0400
+--- kdepim-3.5.6/akregator/src/Makefile.am 2006-10-01 13:30:25.000000000 -0400
++++ kdepim-3.5.6-new/akregator/src/Makefile.am 2007-03-16 18:15:50.000000000 -0400
@@ -16,12 +16,13 @@
#########################################################################
# this is the program that gets installed. it's name is used for all
@@ -19,7 +19,7 @@
#akregator_LDADD = $(LIB_KPARTS) libakregatorprivate.la $(top_builddir)/libkdepim/libkdepim.la
# this is where the desktop file will go
-@@ -75,7 +76,7 @@
+@@ -76,7 +77,7 @@
dragobjects.cpp \
utils.cpp
@@ -28,9 +28,9 @@
libakregatorprivate_la_LIBADD = $(top_builddir)/libkdepim/libkdepim.la \
$(top_builddir)/akregator/src/librss/librsslocal.la $(LIB_KHTML)
---- kdepim-3.5.4/akregator/src/main.cpp 2005-09-10 04:23:38.000000000 -0400
-+++ kdepim-3.5.4-new/akregator/src/main.cpp 2006-07-30 12:26:42.000000000 -0400
-@@ -83,7 +83,7 @@
+--- kdepim-3.5.6/akregator/src/main.cpp 2007-01-15 06:28:31.000000000 -0500
++++ kdepim-3.5.6-new/akregator/src/main.cpp 2007-03-16 18:15:50.000000000 -0400
+@@ -85,7 +85,7 @@
} // namespace Akregator
@@ -39,8 +39,8 @@
{
Akregator::AboutData about;
KCmdLineArgs::init(argc, argv, &about);
---- kdepim-3.5.4/certmanager/Makefile.am 2005-09-10 04:23:51.000000000 -0400
-+++ kdepim-3.5.4-new/certmanager/Makefile.am 2006-07-30 12:26:42.000000000 -0400
+--- kdepim-3.5.6/certmanager/Makefile.am 2005-09-10 04:23:51.000000000 -0400
++++ kdepim-3.5.6-new/certmanager/Makefile.am 2007-03-16 18:15:50.000000000 -0400
@@ -4,9 +4,11 @@
INCLUDES = -I$(srcdir)/lib -I$(top_srcdir)/libkdenetwork $(GPGME_CFLAGS) $(all_includes)
@@ -66,8 +66,8 @@
rcdir = $(kde_datadir)/kleopatra
rc_DATA = kleopatraui.rc
---- kdepim-3.5.4/certmanager/conf/Makefile.am 2005-10-10 11:02:19.000000000 -0400
-+++ kdepim-3.5.4-new/certmanager/conf/Makefile.am 2006-07-30 12:26:42.000000000 -0400
+--- kdepim-3.5.6/certmanager/conf/Makefile.am 2005-10-10 11:02:19.000000000 -0400
++++ kdepim-3.5.6-new/certmanager/conf/Makefile.am 2007-03-16 18:15:50.000000000 -0400
@@ -15,7 +15,7 @@
appearanceconfigwidget.cpp \
dnorderconfigpage.cpp
@@ -77,8 +77,8 @@
kcm_kleopatra_la_LIBADD = ../lib/libkleopatra.la $(LIB_KDEUI)
kde_services_DATA = \
---- kdepim-3.5.4/certmanager/kwatchgnupg/Makefile.am 2005-09-10 04:23:49.000000000 -0400
-+++ kdepim-3.5.4-new/certmanager/kwatchgnupg/Makefile.am 2006-07-30 12:26:42.000000000 -0400
+--- kdepim-3.5.6/certmanager/kwatchgnupg/Makefile.am 2005-09-10 04:23:49.000000000 -0400
++++ kdepim-3.5.6-new/certmanager/kwatchgnupg/Makefile.am 2007-03-16 18:15:50.000000000 -0400
@@ -2,9 +2,11 @@
INCLUDES = -I$(top_srcdir)/certmanager/lib -I$(top_srcdir)/libkdenetwork $(GPGME_CFLAGS) $(all_includes)
@@ -104,8 +104,8 @@
rcdir = $(kde_datadir)/kwatchgnupg
rc_DATA = kwatchgnupgui.rc
---- kdepim-3.5.4/certmanager/kwatchgnupg/main.cpp 2005-09-10 04:23:49.000000000 -0400
-+++ kdepim-3.5.4-new/certmanager/kwatchgnupg/main.cpp 2006-07-30 12:26:42.000000000 -0400
+--- kdepim-3.5.6/certmanager/kwatchgnupg/main.cpp 2005-09-10 04:23:49.000000000 -0400
++++ kdepim-3.5.6-new/certmanager/kwatchgnupg/main.cpp 2007-03-16 18:15:50.000000000 -0400
@@ -74,7 +74,7 @@
return KUniqueApplication::newInstance();
}
@@ -115,8 +115,8 @@
{
AboutData aboutData;
---- kdepim-3.5.4/certmanager/main.cpp 2005-09-10 04:23:51.000000000 -0400
-+++ kdepim-3.5.4-new/certmanager/main.cpp 2006-07-30 12:26:42.000000000 -0400
+--- kdepim-3.5.6/certmanager/main.cpp 2005-09-10 04:23:51.000000000 -0400
++++ kdepim-3.5.6-new/certmanager/main.cpp 2007-03-16 18:15:50.000000000 -0400
@@ -46,7 +46,7 @@
#include <kglobal.h>
#include <kiconloader.h>
@@ -126,8 +126,8 @@
{
AboutData aboutData;
---- kdepim-3.5.4/kabc/frontend/Makefile.am 2005-09-10 04:24:24.000000000 -0400
-+++ kdepim-3.5.4-new/kabc/frontend/Makefile.am 2006-07-30 12:26:42.000000000 -0400
+--- kdepim-3.5.6/kabc/frontend/Makefile.am 2005-09-10 04:24:24.000000000 -0400
++++ kdepim-3.5.6-new/kabc/frontend/Makefile.am 2007-03-16 18:15:50.000000000 -0400
@@ -2,9 +2,11 @@
METASOURCES = AUTO
@@ -144,8 +144,8 @@
+kabcfrontend_la_LIBADD = -lkabc $(LIB_KDECORE)
+kabcfrontend_la_SOURCES = main.cpp mainWindow.ui
---- kdepim-3.5.4/kabc/frontend/main.cpp 2005-09-10 04:24:24.000000000 -0400
-+++ kdepim-3.5.4-new/kabc/frontend/main.cpp 2006-07-30 12:26:42.000000000 -0400
+--- kdepim-3.5.6/kabc/frontend/main.cpp 2005-09-10 04:24:24.000000000 -0400
++++ kdepim-3.5.6-new/kabc/frontend/main.cpp 2007-03-16 18:15:50.000000000 -0400
@@ -6,7 +6,7 @@
#include "mainWindow.h"
@@ -155,8 +155,8 @@
{
KAboutData aboutData("testkabc",I18N_NOOP("TestKabc"),"0.1");
KCmdLineArgs::init(argc,argv,&aboutData);
---- kdepim-3.5.4/kabc/kabc2mutt/Makefile.am 2005-09-10 04:24:24.000000000 -0400
-+++ kdepim-3.5.4-new/kabc/kabc2mutt/Makefile.am 2006-07-30 12:26:42.000000000 -0400
+--- kdepim-3.5.6/kabc/kabc2mutt/Makefile.am 2005-09-10 04:24:24.000000000 -0400
++++ kdepim-3.5.6-new/kabc/kabc2mutt/Makefile.am 2007-03-16 18:15:50.000000000 -0400
@@ -2,11 +2,13 @@
METASOURCES = AUTO
@@ -175,8 +175,8 @@
messages: rc.cpp
$(XGETTEXT) *.cpp -o $(podir)/kabc2mutt.pot
---- kdepim-3.5.4/kabc/kabc2mutt/main.cpp 2005-09-10 04:24:24.000000000 -0400
-+++ kdepim-3.5.4-new/kabc/kabc2mutt/main.cpp 2006-07-30 12:26:42.000000000 -0400
+--- kdepim-3.5.6/kabc/kabc2mutt/main.cpp 2005-09-10 04:24:24.000000000 -0400
++++ kdepim-3.5.6-new/kabc/kabc2mutt/main.cpp 2007-03-16 18:15:50.000000000 -0400
@@ -41,7 +41,7 @@
};
@@ -186,8 +186,8 @@
{
KApplication::disableAutoDcopRegistration();
KCmdLineArgs::init( argc, argv, appName, programName, description, version );
---- kdepim-3.5.4/kaddressbook/Makefile.am 2005-10-10 11:02:25.000000000 -0400
-+++ kdepim-3.5.4-new/kaddressbook/Makefile.am 2006-07-30 12:26:43.000000000 -0400
+--- kdepim-3.5.6/kaddressbook/Makefile.am 2005-10-10 11:02:25.000000000 -0400
++++ kdepim-3.5.6-new/kaddressbook/Makefile.am 2007-03-16 18:15:50.000000000 -0400
@@ -15,11 +15,12 @@
-I$(top_srcdir)/akregator/src \
$(all_includes)
@@ -214,8 +214,8 @@
rcdir = $(kde_datadir)/kaddressbook
rc_DATA = kaddressbookui.rc kaddressbook_part.rc
---- kdepim-3.5.4/kaddressbook/main.cpp 2005-11-08 17:33:33.000000000 -0500
-+++ kdepim-3.5.4-new/kaddressbook/main.cpp 2006-07-30 12:26:43.000000000 -0400
+--- kdepim-3.5.6/kaddressbook/main.cpp 2005-11-08 17:33:33.000000000 -0500
++++ kdepim-3.5.6-new/kaddressbook/main.cpp 2007-03-16 18:15:50.000000000 -0400
@@ -109,7 +109,7 @@
return 0;
}
@@ -225,8 +225,8 @@
{
KLocale::setMainCatalogue( "kaddressbook" );
---- kdepim-3.5.4/kandy/src/Makefile.am 2005-09-10 04:24:42.000000000 -0400
-+++ kdepim-3.5.4-new/kandy/src/Makefile.am 2006-07-30 12:26:43.000000000 -0400
+--- kdepim-3.5.6/kandy/src/Makefile.am 2005-09-10 04:24:42.000000000 -0400
++++ kdepim-3.5.6-new/kandy/src/Makefile.am 2007-03-16 18:15:50.000000000 -0400
@@ -1,10 +1,12 @@
-bin_PROGRAMS = kandy kandy_client
+bin_PROGRAMS =
@@ -257,8 +257,8 @@
METASOURCES = AUTO
---- kdepim-3.5.4/kandy/src/kandy_client.cpp 2005-09-10 04:24:42.000000000 -0400
-+++ kdepim-3.5.4-new/kandy/src/kandy_client.cpp 2006-07-30 12:26:43.000000000 -0400
+--- kdepim-3.5.6/kandy/src/kandy_client.cpp 2005-09-10 04:24:42.000000000 -0400
++++ kdepim-3.5.6-new/kandy/src/kandy_client.cpp 2007-03-16 18:15:50.000000000 -0400
@@ -27,7 +27,7 @@
#include <qdatastream.h>
#include <qstring.h>
@@ -268,8 +268,8 @@
{
KApplication app(argc, argv, "kandy_client", false);
---- kdepim-3.5.4/kandy/src/main.cpp 2005-09-10 04:24:42.000000000 -0400
-+++ kdepim-3.5.4-new/kandy/src/main.cpp 2006-07-30 12:26:43.000000000 -0400
+--- kdepim-3.5.6/kandy/src/main.cpp 2005-09-10 04:24:42.000000000 -0400
++++ kdepim-3.5.6-new/kandy/src/main.cpp 2007-03-16 18:15:50.000000000 -0400
@@ -85,7 +85,7 @@
#endif
}
@@ -279,9 +279,9 @@
{
KAboutData about("kandy", I18N_NOOP("Kandy"), version, description,
KAboutData::License_GPL, "(C) 2001 Cornelius Schumacher",0,
---- kdepim-3.5.4/kitchensync/kitchensync/Makefile.am 2005-09-10 04:24:23.000000000 -0400
-+++ kdepim-3.5.4-new/kitchensync/kitchensync/Makefile.am 2006-07-30 12:26:43.000000000 -0400
-@@ -8,10 +8,12 @@
+--- kdepim-3.5.6/kitchensync/kitchensync/Makefile.am 2007-01-15 06:28:57.000000000 -0500
++++ kdepim-3.5.6-new/kitchensync/kitchensync/Makefile.am 2007-03-16 18:15:50.000000000 -0400
+@@ -8,13 +8,15 @@
METASOURCES = AUTO
@@ -298,8 +298,11 @@
../libksync/libksync2.la
-kitchensync_LDFLAGS = $(KDE_RPATH) $(all_libraries)
+kitchensync_la_LDFLAGS = $(KDE_RPATH) -module $(all_libraries)
---- kdepim-3.5.4/kitchensync/kitchensync/main.cpp 2005-09-10 04:24:23.000000000 -0400
-+++ kdepim-3.5.4-new/kitchensync/kitchensync/main.cpp 2006-07-30 12:26:43.000000000 -0400
+
+ messages: rc.cpp
+ $(EXTRACTRC) plucker/kspluckerconfigwidget.ui >> rc.cpp
+--- kdepim-3.5.6/kitchensync/kitchensync/main.cpp 2005-09-10 04:24:23.000000000 -0400
++++ kdepim-3.5.6-new/kitchensync/kitchensync/main.cpp 2007-03-16 18:15:50.000000000 -0400
@@ -37,7 +37,7 @@
KCmdLineLastOption
};
@@ -309,40 +312,40 @@
{
KSync::AboutData aboutData;
---- kdepim-3.5.4/kitchensync/libkonnector2/plugins/dummy/Makefile.am 2005-09-10 04:24:23.000000000 -0400
-+++ kdepim-3.5.4-new/kitchensync/libkonnector2/plugins/dummy/Makefile.am 2006-07-30 12:26:43.000000000 -0400
+--- kdepim-3.5.6/kitchensync/libkonnector2/plugins/dummy/Makefile.am 2005-09-10 04:24:23.000000000 -0400
++++ kdepim-3.5.6-new/kitchensync/libkonnector2/plugins/dummy/Makefile.am 2007-03-16 18:15:50.000000000 -0400
@@ -1,4 +1,4 @@
-lib_LTLIBRARIES = libdummykonnector.la
+kde_module_LTLIBRARIES = libdummykonnector.la
INCLUDES = -I$(top_srcdir)/ -I$(top_srcdir)/kitchensync/libksync -I$(top_srcdir)/kitchensync/libkonnector2 -I$(top_srcdir)/libkcal $(all_includes)
---- kdepim-3.5.4/kitchensync/libkonnector2/plugins/kabc/Makefile.am 2005-09-10 04:24:23.000000000 -0400
-+++ kdepim-3.5.4-new/kitchensync/libkonnector2/plugins/kabc/Makefile.am 2006-07-30 12:26:43.000000000 -0400
+--- kdepim-3.5.6/kitchensync/libkonnector2/plugins/kabc/Makefile.am 2005-09-10 04:24:23.000000000 -0400
++++ kdepim-3.5.6-new/kitchensync/libkonnector2/plugins/kabc/Makefile.am 2007-03-16 18:15:50.000000000 -0400
@@ -1,4 +1,4 @@
-lib_LTLIBRARIES = libkabckonnector.la
+kde_module_LTLIBRARIES = libkabckonnector.la
INCLUDES = -I$(top_srcdir)/ -I$(top_srcdir)/kitchensync/libksync \
-I$(top_srcdir)/kitchensync/libkonnector2 $(all_includes)
---- kdepim-3.5.4/kitchensync/libkonnector2/plugins/kcal/Makefile.am 2005-09-10 04:24:23.000000000 -0400
-+++ kdepim-3.5.4-new/kitchensync/libkonnector2/plugins/kcal/Makefile.am 2006-07-30 12:26:43.000000000 -0400
+--- kdepim-3.5.6/kitchensync/libkonnector2/plugins/kcal/Makefile.am 2005-09-10 04:24:23.000000000 -0400
++++ kdepim-3.5.6-new/kitchensync/libkonnector2/plugins/kcal/Makefile.am 2007-03-16 18:15:50.000000000 -0400
@@ -1,4 +1,4 @@
-lib_LTLIBRARIES = libkcalkonnector.la
+kde_module_LTLIBRARIES = libkcalkonnector.la
INCLUDES = -I$(top_srcdir)/ -I$(top_srcdir)/kitchensync/libksync \
-I$(top_srcdir)/kitchensync/libkonnector2 $(all_includes)
---- kdepim-3.5.4/kitchensync/libkonnector2/plugins/local/Makefile.am 2005-09-10 04:24:23.000000000 -0400
-+++ kdepim-3.5.4-new/kitchensync/libkonnector2/plugins/local/Makefile.am 2006-07-30 12:26:43.000000000 -0400
+--- kdepim-3.5.6/kitchensync/libkonnector2/plugins/local/Makefile.am 2005-09-10 04:24:23.000000000 -0400
++++ kdepim-3.5.6-new/kitchensync/libkonnector2/plugins/local/Makefile.am 2007-03-16 18:15:50.000000000 -0400
@@ -1,4 +1,4 @@
-lib_LTLIBRARIES = liblocalkonnector.la
+kde_module_LTLIBRARIES = liblocalkonnector.la
INCLUDES = -I$(top_srcdir)/ -I$(top_srcdir)/kitchensync/libksync -I$(top_srcdir)/kitchensync/libkonnector2 \
-I$(top_srcdir)/libkcal $(all_includes)
---- kdepim-3.5.4/kitchensync/libkonnector2/plugins/qtopia/Makefile.am 2005-09-10 04:24:23.000000000 -0400
-+++ kdepim-3.5.4-new/kitchensync/libkonnector2/plugins/qtopia/Makefile.am 2006-07-30 12:26:43.000000000 -0400
+--- kdepim-3.5.6/kitchensync/libkonnector2/plugins/qtopia/Makefile.am 2005-09-10 04:24:23.000000000 -0400
++++ kdepim-3.5.6-new/kitchensync/libkonnector2/plugins/qtopia/Makefile.am 2007-03-16 18:15:50.000000000 -0400
@@ -18,7 +18,7 @@
#SUBDIRS = tests
@@ -352,16 +355,16 @@
INCLUDES = -I$(top_srcdir)/ -I$(top_srcdir)/kitchensync/libksync -I$(top_srcdir)/kitchensync/libkonnector2 -I$(top_srcdir)/libkcal \
$(all_includes)
---- kdepim-3.5.4/kitchensync/libkonnector2/plugins/remote/Makefile.am 2005-09-10 04:24:23.000000000 -0400
-+++ kdepim-3.5.4-new/kitchensync/libkonnector2/plugins/remote/Makefile.am 2006-07-30 12:26:43.000000000 -0400
+--- kdepim-3.5.6/kitchensync/libkonnector2/plugins/remote/Makefile.am 2005-09-10 04:24:23.000000000 -0400
++++ kdepim-3.5.6-new/kitchensync/libkonnector2/plugins/remote/Makefile.am 2007-03-16 18:15:50.000000000 -0400
@@ -1,4 +1,4 @@
-lib_LTLIBRARIES = libremotekonnector.la
+kde_module_LTLIBRARIES = libremotekonnector.la
INCLUDES = -I$(top_srcdir)/ -I$(top_srcdir)/kitchensync/libksync -I$(top_srcdir)/kitchensync/libkonnector2 \
-I$(top_srcdir)/libkcal $(all_includes)
---- kdepim-3.5.4/kitchensync/libkonnector2/plugins/threadedkonnector/Makefile.am 2005-09-10 04:24:23.000000000 -0400
-+++ kdepim-3.5.4-new/kitchensync/libkonnector2/plugins/threadedkonnector/Makefile.am 2006-07-30 12:26:43.000000000 -0400
+--- kdepim-3.5.6/kitchensync/libkonnector2/plugins/threadedkonnector/Makefile.am 2005-09-10 04:24:23.000000000 -0400
++++ kdepim-3.5.6-new/kitchensync/libkonnector2/plugins/threadedkonnector/Makefile.am 2007-03-16 18:15:50.000000000 -0400
@@ -16,7 +16,7 @@
# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
# Boston, MA 02110-1301, USA.
@@ -371,8 +374,8 @@
INCLUDES = -I$(top_srcdir)/ -I$(top_srcdir)/kitchensync/libksync -I$(top_srcdir)/kitchensync/libkonnector2 -I$(top_srcdir)/libkcal $(all_includes)
---- kdepim-3.5.4/kitchensync/multisynk/Makefile.am 2005-09-10 04:24:19.000000000 -0400
-+++ kdepim-3.5.4-new/kitchensync/multisynk/Makefile.am 2006-07-30 12:26:43.000000000 -0400
+--- kdepim-3.5.6/kitchensync/multisynk/Makefile.am 2005-09-10 04:24:19.000000000 -0400
++++ kdepim-3.5.6-new/kitchensync/multisynk/Makefile.am 2007-03-16 18:15:50.000000000 -0400
@@ -7,11 +7,12 @@
$(all_includes)
@@ -390,8 +393,8 @@
xdg_apps_DATA = multisynk.desktop
---- kdepim-3.5.4/kitchensync/multisynk/main.cpp 2005-09-10 04:24:19.000000000 -0400
-+++ kdepim-3.5.4-new/kitchensync/multisynk/main.cpp 2006-07-30 12:26:43.000000000 -0400
+--- kdepim-3.5.6/kitchensync/multisynk/main.cpp 2005-09-10 04:24:19.000000000 -0400
++++ kdepim-3.5.6-new/kitchensync/multisynk/main.cpp 2007-03-16 18:15:50.000000000 -0400
@@ -34,7 +34,7 @@
KCmdLineLastOption
};
@@ -401,8 +404,8 @@
{
KAboutData *about = MainWidget::aboutData();
---- kdepim-3.5.4/kmail/Makefile.am 2005-11-08 17:33:29.000000000 -0500
-+++ kdepim-3.5.4-new/kmail/Makefile.am 2006-07-30 12:26:43.000000000 -0400
+--- kdepim-3.5.6/kmail/Makefile.am 2007-01-15 06:28:46.000000000 -0500
++++ kdepim-3.5.6-new/kmail/Makefile.am 2007-03-16 18:15:50.000000000 -0400
@@ -23,21 +23,21 @@
endif
@@ -446,17 +449,52 @@
libkmailprivate_la_SOURCES = kmmessage.cpp kmmainwin.cpp configuredialog.cpp \
configuredialog_p.cpp klistviewindexedsearchline.cpp \
-@@ -126,7 +128,7 @@
- managesievescriptsdialog.cpp chiasmuskeyselector.cpp \
- util.cpp
+@@ -131,7 +133,7 @@
+ templatesconfiguration_kfg.kcfgc \
+ templateparser.cpp
-kmail_SOURCES = main.cpp
+kmail_la_SOURCES = main.cpp
libkmailpart_la_SOURCES = kmailpartIface.skel kmail_part.cpp
---- kdepim-3.5.4/kmail/main.cpp 2005-09-10 04:24:02.000000000 -0400
-+++ kdepim-3.5.4-new/kmail/main.cpp 2006-07-30 12:26:43.000000000 -0400
+--- kdepim-3.5.6/kmail/kmfolder.cpp 2007-01-15 06:28:47.000000000 -0500
++++ kdepim-3.5.6-new/kmail/kmfolder.cpp 2007-03-16 18:15:50.000000000 -0400
+@@ -426,12 +426,12 @@
+
+ int KMFolder::find( const KMMsgBase* msg ) const
+ {
+- return mStorage->find( msg );
++ return mStorage ? mStorage->find( msg ) : 0;
+ }
+
+ int KMFolder::find( const KMMessage* msg ) const
+ {
+- return mStorage->find( msg );
++ return mStorage ? mStorage->find( msg ) : 0;
+ }
+
+ int KMFolder::count( bool cache ) const
+@@ -631,11 +631,13 @@
+ mWhoField = "From";
+ if ( this == kmkernel->outboxFolder() ||
+ this == kmkernel->sentFolder() ||
+- this == kmkernel->draftsFolder() )
++ this == kmkernel->draftsFolder() ||
++ this == kmkernel->templatesFolder() )
+ mWhoField = "To";
+- } else if ( identity.drafts() == idString()
+- || identity.fcc() == idString() )
+- // drafts or sent of the identity
++ } else if ( identity.drafts() == idString() ||
++ identity.templates() == idString() ||
++ identity.fcc() == idString() )
++ // drafts, templates or sent of the identity
+ mWhoField = "To";
+ else
+ mWhoField = "From";
+--- kdepim-3.5.6/kmail/main.cpp 2005-09-10 04:24:02.000000000 -0400
++++ kdepim-3.5.6-new/kmail/main.cpp 2007-03-16 18:15:50.000000000 -0400
@@ -64,7 +64,7 @@
return 0;
}
@@ -466,8 +504,8 @@
{
// WABA: KMail is a KUniqueApplication. Unfortunately this makes debugging
// a bit harder: You should pass --nofork as commandline argument when using
---- kdepim-3.5.4/kmailcvt/Makefile.am 2005-09-10 04:24:16.000000000 -0400
-+++ kdepim-3.5.4-new/kmailcvt/Makefile.am 2006-07-30 12:26:43.000000000 -0400
+--- kdepim-3.5.6/kmailcvt/Makefile.am 2005-09-10 04:24:16.000000000 -0400
++++ kdepim-3.5.6-new/kmailcvt/Makefile.am 2007-03-16 18:15:50.000000000 -0400
@@ -1,6 +1,9 @@
-bin_PROGRAMS = kmailcvt
@@ -502,8 +540,8 @@
KDE_ICON=AUTO
---- kdepim-3.5.4/kmailcvt/main.cpp 2005-09-10 04:24:16.000000000 -0400
-+++ kdepim-3.5.4-new/kmailcvt/main.cpp 2006-07-30 12:26:43.000000000 -0400
+--- kdepim-3.5.6/kmailcvt/main.cpp 2005-09-10 04:24:16.000000000 -0400
++++ kdepim-3.5.6-new/kmailcvt/main.cpp 2007-03-16 18:15:50.000000000 -0400
@@ -26,7 +26,7 @@
KCmdLineLastOption
};
@@ -513,8 +551,8 @@
{
KLocale::setMainCatalogue("kmailcvt");
---- kdepim-3.5.4/kmobile/Makefile.am 2005-09-10 04:23:39.000000000 -0400
-+++ kdepim-3.5.4-new/kmobile/Makefile.am 2006-07-30 12:26:43.000000000 -0400
+--- kdepim-3.5.6/kmobile/Makefile.am 2005-09-10 04:23:39.000000000 -0400
++++ kdepim-3.5.6-new/kmobile/Makefile.am 2007-03-16 18:15:50.000000000 -0400
@@ -2,15 +2,16 @@
SUBDIRS = . devices # kioslave
@@ -536,8 +574,8 @@
pref.cpp kmobileiface.skel kmobile_selectiondialog.ui \
systemtray.cpp
---- kdepim-3.5.4/kmobile/main.cpp 2005-09-10 04:23:39.000000000 -0400
-+++ kdepim-3.5.4-new/kmobile/main.cpp 2006-07-30 12:26:43.000000000 -0400
+--- kdepim-3.5.6/kmobile/main.cpp 2005-09-10 04:23:39.000000000 -0400
++++ kdepim-3.5.6-new/kmobile/main.cpp 2007-03-16 18:15:50.000000000 -0400
@@ -35,7 +35,7 @@
KCmdLineLastOption
};
@@ -547,8 +585,8 @@
{
KAboutData about("kmobile", I18N_NOOP("KMobile"), version, description,
KAboutData::License_GPL, "(C) 2003-2005 Helge Deller", 0, 0, "deller at kde.org");
---- kdepim-3.5.4/knode/Makefile.am 2005-09-10 04:24:04.000000000 -0400
-+++ kdepim-3.5.4-new/knode/Makefile.am 2006-07-30 12:26:43.000000000 -0400
+--- kdepim-3.5.6/knode/Makefile.am 2005-09-10 04:24:04.000000000 -0400
++++ kdepim-3.5.6-new/knode/Makefile.am 2007-03-16 18:15:50.000000000 -0400
@@ -10,22 +10,23 @@
lib_LTLIBRARIES = libknodecommon.la
@@ -597,8 +635,8 @@
xdg_apps_DATA = KNode.desktop
---- kdepim-3.5.4/knode/main.cpp 2006-01-19 11:55:48.000000000 -0500
-+++ kdepim-3.5.4-new/knode/main.cpp 2006-07-30 12:26:43.000000000 -0400
+--- kdepim-3.5.6/knode/main.cpp 2006-01-19 11:55:48.000000000 -0500
++++ kdepim-3.5.6-new/knode/main.cpp 2007-03-16 18:15:50.000000000 -0400
@@ -25,7 +25,7 @@
#include "knode_options.h"
using KNode::AboutData;
@@ -608,8 +646,8 @@
{
AboutData aboutData;
---- kdepim-3.5.4/knotes/Makefile.am 2005-10-10 11:02:28.000000000 -0400
-+++ kdepim-3.5.4-new/knotes/Makefile.am 2006-07-30 12:26:43.000000000 -0400
+--- kdepim-3.5.6/knotes/Makefile.am 2005-10-10 11:02:28.000000000 -0400
++++ kdepim-3.5.6-new/knotes/Makefile.am 2007-03-16 18:15:50.000000000 -0400
@@ -2,7 +2,9 @@
SUBDIRS = . pics icons
@@ -638,8 +676,8 @@
kde_module_LTLIBRARIES = knotes_local.la
knotes_local_la_SOURCES = resourcelocal_plugin.cpp
---- kdepim-3.5.4/knotes/main.cpp 2006-03-17 05:16:01.000000000 -0500
-+++ kdepim-3.5.4-new/knotes/main.cpp 2006-07-30 12:26:43.000000000 -0400
+--- kdepim-3.5.6/knotes/main.cpp 2006-03-17 05:16:01.000000000 -0500
++++ kdepim-3.5.6-new/knotes/main.cpp 2007-03-16 18:15:50.000000000 -0400
@@ -86,7 +86,7 @@
return KUniqueApplication::newInstance();
}
@@ -649,8 +687,8 @@
{
QString version = QString::number( KNOTES_VERSION );
---- kdepim-3.5.4/kode/Makefile.am 2005-09-10 04:23:43.000000000 -0400
-+++ kdepim-3.5.4-new/kode/Makefile.am 2006-07-30 12:26:43.000000000 -0400
+--- kdepim-3.5.6/kode/Makefile.am 2005-09-10 04:23:43.000000000 -0400
++++ kdepim-3.5.6-new/kode/Makefile.am 2007-03-16 18:15:50.000000000 -0400
@@ -12,10 +12,11 @@
-version-info 1:0:0 -no-undefined
libkode_la_LIBADD = -lkdecore
@@ -667,8 +705,8 @@
+kode_la_SOURCES = kodemain.cpp
METASOURCES = AUTO
---- kdepim-3.5.4/kode/kodemain.cpp 2005-09-10 04:23:43.000000000 -0400
-+++ kdepim-3.5.4-new/kode/kodemain.cpp 2006-07-30 12:26:43.000000000 -0400
+--- kdepim-3.5.6/kode/kodemain.cpp 2005-09-10 04:23:43.000000000 -0400
++++ kdepim-3.5.6-new/kode/kodemain.cpp 2007-03-16 18:15:50.000000000 -0400
@@ -607,7 +607,7 @@
return 0;
}
@@ -678,8 +716,8 @@
{
KAboutData aboutData( "kode", I18N_NOOP("KDE Code Generator"), "0.1" );
aboutData.addAuthor( "Cornelius Schumacher", 0, "schumacher at kde.org" );
---- kdepim-3.5.4/kode/kxml_compiler/Makefile.am 2005-09-10 04:23:43.000000000 -0400
-+++ kdepim-3.5.4-new/kode/kxml_compiler/Makefile.am 2006-07-30 12:26:43.000000000 -0400
+--- kdepim-3.5.6/kode/kxml_compiler/Makefile.am 2005-09-10 04:23:43.000000000 -0400
++++ kdepim-3.5.6-new/kode/kxml_compiler/Makefile.am 2007-03-16 18:15:50.000000000 -0400
@@ -1,9 +1,11 @@
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/libkdepim $(all_includes)
@@ -696,8 +734,8 @@
+kxml_compiler_la_SOURCES = parser.cpp creator.cpp kxml_compiler.cpp
METASOURCES = AUTO
---- kdepim-3.5.4/kode/kxml_compiler/kxml_compiler.cpp 2005-09-10 04:23:43.000000000 -0400
-+++ kdepim-3.5.4-new/kode/kxml_compiler/kxml_compiler.cpp 2006-07-30 12:26:43.000000000 -0400
+--- kdepim-3.5.6/kode/kxml_compiler/kxml_compiler.cpp 2005-09-10 04:23:43.000000000 -0400
++++ kdepim-3.5.6-new/kode/kxml_compiler/kxml_compiler.cpp 2007-03-16 18:15:50.000000000 -0400
@@ -55,7 +55,7 @@
KCmdLineLastOption
};
@@ -707,8 +745,8 @@
{
KAboutData aboutData( "kxml_compiler", I18N_NOOP("KDE xml compiler"), "0.1",
I18N_NOOP("KDE XML Compiler") , KAboutData::License_LGPL );
---- kdepim-3.5.4/konsolekalendar/Makefile.am 2005-11-08 17:33:45.000000000 -0500
-+++ kdepim-3.5.4-new/konsolekalendar/Makefile.am 2006-07-30 12:26:43.000000000 -0400
+--- kdepim-3.5.6/konsolekalendar/Makefile.am 2005-11-08 17:33:45.000000000 -0500
++++ kdepim-3.5.6-new/konsolekalendar/Makefile.am 2007-03-16 18:15:50.000000000 -0400
@@ -6,14 +6,16 @@
METASOURCES = AUTO
@@ -730,8 +768,8 @@
appsdir = $(kde_appsdir)/Utilities
xdg_apps_DATA = konsolekalendar.desktop
---- kdepim-3.5.4/konsolekalendar/main.cpp 2006-07-22 04:14:27.000000000 -0400
-+++ kdepim-3.5.4-new/konsolekalendar/main.cpp 2006-07-30 12:26:43.000000000 -0400
+--- kdepim-3.5.6/konsolekalendar/main.cpp 2006-07-22 04:14:27.000000000 -0400
++++ kdepim-3.5.6-new/konsolekalendar/main.cpp 2007-03-16 18:15:50.000000000 -0400
@@ -165,7 +165,7 @@
KCmdLineLastOption
};
@@ -741,8 +779,8 @@
{
KAboutData aboutData(
progName, // internal program name
---- kdepim-3.5.4/kontact/src/Makefile.am 2005-09-10 04:24:42.000000000 -0400
-+++ kdepim-3.5.4-new/kontact/src/Makefile.am 2006-07-30 12:26:43.000000000 -0400
+--- kdepim-3.5.6/kontact/src/Makefile.am 2005-09-10 04:24:42.000000000 -0400
++++ kdepim-3.5.6-new/kontact/src/Makefile.am 2007-03-16 18:15:50.000000000 -0400
@@ -5,23 +5,29 @@
lib_LTLIBRARIES = libkontact.la
libkontact_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -version-info 1:0
@@ -781,9 +819,9 @@
kcm_kontact_la_LIBADD = libkontact.la $(top_builddir)/libkdepim/libkdepim.la
kcm_kontact_la_COMPILE_FIRST = prefs.h
---- kdepim-3.5.4/kontact/src/main.cpp 2006-05-23 07:31:20.000000000 -0400
-+++ kdepim-3.5.4-new/kontact/src/main.cpp 2006-07-30 12:26:43.000000000 -0400
-@@ -127,7 +127,7 @@
+--- kdepim-3.5.6/kontact/src/main.cpp 2007-01-15 18:23:11.000000000 -0500
++++ kdepim-3.5.6-new/kontact/src/main.cpp 2007-03-16 18:15:50.000000000 -0400
+@@ -120,7 +120,7 @@
return KUniqueApplication::newInstance();
}
@@ -792,8 +830,8 @@
{
KAboutData about( "kontact", I18N_NOOP( "Kontact" ), version, description,
KAboutData::License_GPL, I18N_NOOP("(C) 2001-2004 The Kontact developers"), 0, "http://kontact.org" );
---- kdepim-3.5.4/korganizer/Makefile.am 2006-05-22 14:11:16.000000000 -0400
-+++ kdepim-3.5.4-new/korganizer/Makefile.am 2006-07-30 12:26:43.000000000 -0400
+--- kdepim-3.5.6/korganizer/Makefile.am 2007-01-15 06:29:21.000000000 -0500
++++ kdepim-3.5.6-new/korganizer/Makefile.am 2007-03-16 18:15:50.000000000 -0400
@@ -12,18 +12,19 @@
-I$(top_builddir) \
$(all_includes)
@@ -829,8 +867,8 @@
koagendaview.cpp koagenda.cpp koagendaitem.cpp \
datenavigator.cpp kdatenavigator.cpp datenavigatorcontainer.cpp \
datechecker.cpp \
---- kdepim-3.5.4/korganizer/korgac/Makefile.am 2005-09-10 04:24:44.000000000 -0400
-+++ kdepim-3.5.4-new/korganizer/korgac/Makefile.am 2006-07-30 12:26:43.000000000 -0400
+--- kdepim-3.5.6/korganizer/korgac/Makefile.am 2005-09-10 04:24:44.000000000 -0400
++++ kdepim-3.5.6-new/korganizer/korgac/Makefile.am 2007-03-16 18:15:50.000000000 -0400
@@ -1,11 +1,13 @@
INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/korganizer $(all_includes)
@@ -860,8 +898,8 @@
noinst_HEADERS = alarmclientiface.h alarmdialog.h \
alarmdockwindow.h koalarmclient.h
---- kdepim-3.5.4/korganizer/korgac/korgacmain.cpp 2006-01-19 11:56:25.000000000 -0500
-+++ kdepim-3.5.4-new/korganizer/korgac/korgacmain.cpp 2006-07-30 12:26:43.000000000 -0400
+--- kdepim-3.5.6/korganizer/korgac/korgacmain.cpp 2006-01-19 11:56:25.000000000 -0500
++++ kdepim-3.5.6-new/korganizer/korgac/korgacmain.cpp 2007-03-16 18:15:50.000000000 -0400
@@ -59,7 +59,7 @@
{ 0, 0, 0 }
};
@@ -871,8 +909,8 @@
{
KLocale::setMainCatalogue( "korganizer" );
KAboutData aboutData( "korgac", I18N_NOOP("KOrganizer Reminder Daemon"),
---- kdepim-3.5.4/korganizer/korgplugins.cpp 2005-09-10 04:24:47.000000000 -0400
-+++ kdepim-3.5.4-new/korganizer/korgplugins.cpp 2006-07-30 12:26:43.000000000 -0400
+--- kdepim-3.5.6/korganizer/korgplugins.cpp 2005-09-10 04:24:47.000000000 -0400
++++ kdepim-3.5.6-new/korganizer/korgplugins.cpp 2007-03-16 18:15:50.000000000 -0400
@@ -32,7 +32,7 @@
#include "kocore.h"
@@ -882,8 +920,8 @@
{
KAboutData aboutData("korgplugins",I18N_NOOP("KOrgPlugins"),"0.1");
KCmdLineArgs::init(argc,argv,&aboutData);
---- kdepim-3.5.4/korganizer/main.cpp 2005-09-10 04:24:47.000000000 -0400
-+++ kdepim-3.5.4-new/korganizer/main.cpp 2006-07-30 12:26:43.000000000 -0400
+--- kdepim-3.5.6/korganizer/main.cpp 2005-09-10 04:24:47.000000000 -0400
++++ kdepim-3.5.6-new/korganizer/main.cpp 2007-03-16 18:15:50.000000000 -0400
@@ -35,7 +35,7 @@
#include "korganizer.h"
#include "korganizer_options.h"
@@ -893,8 +931,8 @@
{
KOrg::AboutData aboutData;
---- kdepim-3.5.4/korganizer/timezone.cpp 2005-09-10 04:24:47.000000000 -0400
-+++ kdepim-3.5.4-new/korganizer/timezone.cpp 2006-07-30 12:26:43.000000000 -0400
+--- kdepim-3.5.6/korganizer/timezone.cpp 2005-09-10 04:24:47.000000000 -0400
++++ kdepim-3.5.6-new/korganizer/timezone.cpp 2007-03-16 18:15:50.000000000 -0400
@@ -34,7 +34,7 @@
#include "koprefs.h"
@@ -904,8 +942,8 @@
{
KAboutData aboutData("timezone",I18N_NOOP("KOrganizer Timezone Test"),"0.1");
KCmdLineArgs::init(argc,argv,&aboutData);
---- kdepim-3.5.4/korn/Makefile.am 2005-11-08 17:33:32.000000000 -0500
-+++ kdepim-3.5.4-new/korn/Makefile.am 2006-07-30 12:26:44.000000000 -0400
+--- kdepim-3.5.6/korn/Makefile.am 2005-11-08 17:33:32.000000000 -0500
++++ kdepim-3.5.6-new/korn/Makefile.am 2007-03-16 18:15:50.000000000 -0400
@@ -6,11 +6,15 @@
METASOURCES = AUTO
@@ -925,8 +963,8 @@
accountmanager.cpp \
account_input.cpp \
boxcontainer.cpp \
---- kdepim-3.5.4/korn/main.cpp 2006-07-22 04:14:20.000000000 -0400
-+++ kdepim-3.5.4-new/korn/main.cpp 2006-07-30 12:26:44.000000000 -0400
+--- kdepim-3.5.6/korn/main.cpp 2006-07-22 04:14:20.000000000 -0400
++++ kdepim-3.5.6-new/korn/main.cpp 2007-03-16 18:15:50.000000000 -0400
@@ -14,7 +14,7 @@
static const char version[] = "0.4";
@@ -936,8 +974,26 @@
{
KAboutData aboutData(argv[0], I18N_NOOP("Korn"),
version, description, KAboutData::License_GPL,
---- kdepim-3.5.4/kpilot/conduits/docconduit/Makefile.am 2005-11-08 17:33:38.000000000 -0500
-+++ kdepim-3.5.4-new/kpilot/conduits/docconduit/Makefile.am 2006-07-30 12:26:44.000000000 -0400
+--- kdepim-3.5.6/kpilot/conduits/Makefile.am 2007-01-15 06:29:05.000000000 -0500
++++ kdepim-3.5.6-new/kpilot/conduits/Makefile.am 2007-03-16 18:15:50.000000000 -0400
+@@ -5,12 +5,15 @@
+
+ if include_malconduit
+ MAL_SUBDIR = malconduit
++else
++MAL_SUBDIR =
+ endif
+
+ SUBDIRS = \
+ abbrowserconduit \
+ docconduit \
+ knotes \
++ $(MAL_SUBDIR) \
+ memofileconduit \
+ notepadconduit \
+ popmail \
+--- kdepim-3.5.6/kpilot/conduits/docconduit/Makefile.am 2005-11-08 17:33:38.000000000 -0500
++++ kdepim-3.5.6-new/kpilot/conduits/docconduit/Makefile.am 2007-03-16 18:15:51.000000000 -0400
@@ -14,7 +14,9 @@
noinst_LTLIBRARIES = libpalmdoc_shared.la
@@ -962,8 +1018,8 @@
xdg_apps_DATA = kpalmdoc.desktop
servicetypedir = $(kde_servicetypesdir)
---- kdepim-3.5.4/kpilot/conduits/docconduit/kpalmdoc.cpp 2005-09-10 04:24:37.000000000 -0400
-+++ kdepim-3.5.4-new/kpilot/conduits/docconduit/kpalmdoc.cpp 2006-07-30 12:26:44.000000000 -0400
+--- kdepim-3.5.6/kpilot/conduits/docconduit/kpalmdoc.cpp 2005-09-10 04:24:37.000000000 -0400
++++ kdepim-3.5.6-new/kpilot/conduits/docconduit/kpalmdoc.cpp 2007-03-16 18:15:51.000000000 -0400
@@ -36,7 +36,7 @@
@@ -973,8 +1029,8 @@
{
KAboutData about("converter", I18N_NOOP("KPalmDOC"), "-0.0.1",
---- kdepim-3.5.4/kpilot/conduits/malconduit/mal-conduit.cc 2005-09-10 04:24:37.000000000 -0400
-+++ kdepim-3.5.4-new/kpilot/conduits/malconduit/mal-conduit.cc 2006-07-30 12:26:44.000000000 -0400
+--- kdepim-3.5.6/kpilot/conduits/malconduit/mal-conduit.cc 2007-01-15 06:29:02.000000000 -0500
++++ kdepim-3.5.6-new/kpilot/conduits/malconduit/mal-conduit.cc 2007-03-16 18:15:51.000000000 -0400
@@ -34,6 +34,7 @@
#include "options.h"
@@ -983,8 +1039,8 @@
#include <qregexp.h>
#include <kconfig.h>
#include <kdebug.h>
---- kdepim-3.5.4/kpilot/kpilot/Makefile.am 2005-09-10 04:24:40.000000000 -0400
-+++ kdepim-3.5.4-new/kpilot/kpilot/Makefile.am 2006-07-30 12:26:44.000000000 -0400
+--- kdepim-3.5.6/kpilot/kpilot/Makefile.am 2005-09-10 04:24:40.000000000 -0400
++++ kdepim-3.5.6-new/kpilot/kpilot/Makefile.am 2007-03-16 18:15:51.000000000 -0400
@@ -9,9 +9,10 @@
SUBDIRS = Icons
@@ -1056,9 +1112,9 @@
../lib/libkpilot.la libconfiguration.la
xdg_apps_DATA = kpilot.desktop kpilotdaemon.desktop
---- kdepim-3.5.4/kpilot/kpilot/kpilot.cc 2005-09-10 04:24:39.000000000 -0400
-+++ kdepim-3.5.4-new/kpilot/kpilot/kpilot.cc 2006-07-30 12:26:44.000000000 -0400
-@@ -1102,7 +1102,7 @@
+--- kdepim-3.5.6/kpilot/kpilot/kpilot.cc 2007-01-15 06:29:06.000000000 -0500
++++ kdepim-3.5.6-new/kpilot/kpilot/kpilot.cc 2007-03-16 18:15:51.000000000 -0400
+@@ -1082,7 +1082,7 @@
@@ -1067,9 +1123,9 @@
{
FUNCTIONSETUP;
---- kdepim-3.5.4/kpilot/kpilot/pilotDaemon.cc 2005-09-10 04:24:39.000000000 -0400
-+++ kdepim-3.5.4-new/kpilot/kpilot/pilotDaemon.cc 2006-07-30 12:26:44.000000000 -0400
-@@ -1265,7 +1265,7 @@
+--- kdepim-3.5.6/kpilot/kpilot/pilotDaemon.cc 2007-01-15 06:29:05.000000000 -0500
++++ kdepim-3.5.6-new/kpilot/kpilot/pilotDaemon.cc 2007-03-16 18:15:51.000000000 -0400
+@@ -1307,7 +1307,7 @@
} ;
@@ -1078,8 +1134,24 @@
{
FUNCTIONSETUP;
---- kdepim-3.5.4/kresources/featureplan/benchmarkfeaturelist.cpp 2005-09-10 04:23:46.000000000 -0400
-+++ kdepim-3.5.4-new/kresources/featureplan/benchmarkfeaturelist.cpp 2006-07-30 12:26:44.000000000 -0400
+--- kdepim-3.5.6/kpilot/lib/pilotAppInfo.h 2007-01-15 06:29:07.000000000 -0500
++++ kdepim-3.5.6-new/kpilot/lib/pilotAppInfo.h 2007-03-16 18:16:06.000000000 -0400
+@@ -136,8 +136,13 @@
+ * (again, from pilot-link).
+ */
+ template <typename appinfo,
++#if PILOT_LINK_IS(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)>
++#endif
+ class PilotAppInfo : public PilotAppInfoBase
+ {
+ public:
+--- kdepim-3.5.6/kresources/featureplan/benchmarkfeaturelist.cpp 2005-09-10 04:23:46.000000000 -0400
++++ kdepim-3.5.6-new/kresources/featureplan/benchmarkfeaturelist.cpp 2007-03-16 18:15:51.000000000 -0400
@@ -67,7 +67,7 @@
}
}
@@ -1089,8 +1161,8 @@
{
KAboutData aboutData( "benchmarkfeaturelist",
"Benchmark for feature list XML parser",
---- kdepim-3.5.4/kresources/featureplan/dumpfeaturelist.cpp 2006-05-22 14:10:46.000000000 -0400
-+++ kdepim-3.5.4-new/kresources/featureplan/dumpfeaturelist.cpp 2006-07-30 12:26:44.000000000 -0400
+--- kdepim-3.5.6/kresources/featureplan/dumpfeaturelist.cpp 2006-05-22 14:10:46.000000000 -0400
++++ kdepim-3.5.6-new/kresources/featureplan/dumpfeaturelist.cpp 2007-03-16 18:15:51.000000000 -0400
@@ -67,7 +67,7 @@
}
}
@@ -1100,8 +1172,8 @@
{
KAboutData aboutData( "dumpfeaturelist", "Dump XML feature list to stdout",
"0.1" );
---- kdepim-3.5.4/kresources/groupwise/soap/soapdebug.cpp 2005-09-10 04:23:46.000000000 -0400
-+++ kdepim-3.5.4-new/kresources/groupwise/soap/soapdebug.cpp 2006-07-30 12:26:44.000000000 -0400
+--- kdepim-3.5.6/kresources/groupwise/soap/soapdebug.cpp 2005-09-10 04:23:46.000000000 -0400
++++ kdepim-3.5.6-new/kresources/groupwise/soap/soapdebug.cpp 2007-03-16 18:15:51.000000000 -0400
@@ -44,7 +44,7 @@
KCmdLineLastOption
};
@@ -1111,8 +1183,20 @@
{
KAboutData aboutData( "soapdebug", I18N_NOOP("Groupwise Soap Debug"), "0.1" );
aboutData.addAuthor( "Cornelius Schumacher", 0, "schumacher at kde.org" );
---- kdepim-3.5.4/ksync/src/Makefile.am 2005-09-10 04:23:48.000000000 -0400
-+++ kdepim-3.5.4-new/ksync/src/Makefile.am 2006-07-30 12:26:44.000000000 -0400
+--- kdepim-3.5.6/kresources/groupwise/soap/stdsoap2.h 2007-01-15 06:28:37.000000000 -0500
++++ kdepim-3.5.6-new/kresources/groupwise/soap/stdsoap2.h 2007-03-16 18:15:51.000000000 -0400
+@@ -507,7 +507,9 @@
+ # endif
+ #endif
+
++#ifdef I_KNOW_WHAT_IM_DOING
+ #define DEBUG /* Uncomment to debug sending (in file SENT.log) receiving (in file RECV.log) and messages (in file TEST.log) */
++#endif
+
+ #ifdef __cplusplus
+ extern "C" {
+--- kdepim-3.5.6/ksync/src/Makefile.am 2005-09-10 04:23:48.000000000 -0400
++++ kdepim-3.5.6-new/ksync/src/Makefile.am 2007-03-16 18:15:51.000000000 -0400
@@ -1,7 +1,10 @@
-bin_PROGRAMS = ksync
-ksync_SOURCES = ksyncview.cpp ksync.cpp main.cpp
@@ -1128,8 +1212,8 @@
EXTRA_DIST = main.cpp ksync.cpp ksync.h ksyncdoc.cpp ksyncdoc.h ksyncview.cpp ksyncview.h ksyncui.rc ksync.desktop lo32-app-ksync.png lo16-app-ksync.png
---- kdepim-3.5.4/ksync/src/main.cpp 2005-09-10 04:23:48.000000000 -0400
-+++ kdepim-3.5.4-new/ksync/src/main.cpp 2006-07-30 12:26:44.000000000 -0400
+--- kdepim-3.5.6/ksync/src/main.cpp 2005-09-10 04:23:48.000000000 -0400
++++ kdepim-3.5.6-new/ksync/src/main.cpp 2007-03-16 18:15:51.000000000 -0400
@@ -37,7 +37,7 @@
// INSERT YOUR COMMANDLINE OPTIONS HERE
};
@@ -1139,8 +1223,8 @@
{
KAboutData aboutData( "ksync", I18N_NOOP("KSync"),
---- kdepim-3.5.4/ktnef/gui/Makefile.am 2005-09-10 04:24:43.000000000 -0400
-+++ kdepim-3.5.4-new/ktnef/gui/Makefile.am 2006-07-30 12:26:44.000000000 -0400
+--- kdepim-3.5.6/ktnef/gui/Makefile.am 2005-09-10 04:24:43.000000000 -0400
++++ kdepim-3.5.6-new/ktnef/gui/Makefile.am 2007-03-16 18:15:51.000000000 -0400
@@ -2,14 +2,16 @@
SUBDIRS = pics
@@ -1164,8 +1248,8 @@
noinst_HEADERS = ktnefmain.h ktnefview.h attachpropertydialog.h \
qwmf.h wmfstruct.h metafuncs.h
---- kdepim-3.5.4/ktnef/gui/main.cpp 2005-09-10 04:24:43.000000000 -0400
-+++ kdepim-3.5.4-new/ktnef/gui/main.cpp 2006-07-30 12:26:44.000000000 -0400
+--- kdepim-3.5.6/ktnef/gui/main.cpp 2005-09-10 04:24:43.000000000 -0400
++++ kdepim-3.5.6-new/ktnef/gui/main.cpp 2007-03-16 18:15:51.000000000 -0400
@@ -33,7 +33,7 @@
// INSERT YOUR COMMANDLINE OPTIONS HERE
};
@@ -1175,8 +1259,8 @@
{
KAboutData aboutData( "ktnef", I18N_NOOP("KTnef"),
---- kdepim-3.5.4/libkcal/convertqtopia.cpp 2005-09-10 04:24:36.000000000 -0400
-+++ kdepim-3.5.4-new/libkcal/convertqtopia.cpp 2006-07-30 12:26:44.000000000 -0400
+--- kdepim-3.5.6/libkcal/convertqtopia.cpp 2005-09-10 04:24:36.000000000 -0400
++++ kdepim-3.5.6-new/libkcal/convertqtopia.cpp 2007-03-16 18:15:51.000000000 -0400
@@ -48,7 +48,7 @@
KCmdLineLastOption
};
@@ -1186,8 +1270,8 @@
{
KAboutData aboutData("convertqtopia",I18N_NOOP("Qtopia calendar file converter"),"0.1");
aboutData.addAuthor("Cornelius Schumacher", 0, "schumacher at kde.org");
---- kdepim-3.5.4/libkcal/versit/vcc.c 2005-09-10 04:24:36.000000000 -0400
-+++ kdepim-3.5.4-new/libkcal/versit/vcc.c 2006-07-30 12:26:44.000000000 -0400
+--- kdepim-3.5.6/libkcal/versit/vcc.c 2005-09-10 04:24:36.000000000 -0400
++++ kdepim-3.5.6-new/libkcal/versit/vcc.c 2007-03-16 18:15:51.000000000 -0400
@@ -198,9 +198,6 @@
#endif
@@ -1198,8 +1282,8 @@
#include <stdio.h>
#include <stdlib.h>
#include <ctype.h>
---- kdepim-3.5.4/libkdepim/cfgc/autoexample.cpp 2005-09-10 04:24:24.000000000 -0400
-+++ kdepim-3.5.4-new/libkdepim/cfgc/autoexample.cpp 2006-07-30 12:26:44.000000000 -0400
+--- kdepim-3.5.6/libkdepim/cfgc/autoexample.cpp 2005-09-10 04:24:24.000000000 -0400
++++ kdepim-3.5.6-new/libkdepim/cfgc/autoexample.cpp 2007-03-16 18:15:51.000000000 -0400
@@ -36,7 +36,7 @@
#include <qlabel.h>
@@ -1209,8 +1293,8 @@
{
KAboutData aboutData( "example", I18N_NOOP("autoconfig example"), "0.1" );
aboutData.addAuthor( "Cornelius Schumacher", 0, "schumacher at kde.org" );
---- kdepim-3.5.4/libkdepim/cfgc/example.cpp 2005-09-10 04:24:24.000000000 -0400
-+++ kdepim-3.5.4-new/libkdepim/cfgc/example.cpp 2006-07-30 12:26:44.000000000 -0400
+--- kdepim-3.5.6/libkdepim/cfgc/example.cpp 2005-09-10 04:24:24.000000000 -0400
++++ kdepim-3.5.6-new/libkdepim/cfgc/example.cpp 2007-03-16 18:15:51.000000000 -0400
@@ -32,7 +32,7 @@
#include <libkdepim/kprefsdialog.h>
@@ -1220,8 +1304,8 @@
{
KAboutData aboutData( "example", I18N_NOOP("cfgc example"), "0.1" );
aboutData.addAuthor( "Cornelius Schumacher", 0, "schumacher at kde.org" );
---- kdepim-3.5.4/libkholidays/Makefile.am 2006-07-22 04:14:21.000000000 -0400
-+++ kdepim-3.5.4-new/libkholidays/Makefile.am 2006-07-30 12:26:44.000000000 -0400
+--- kdepim-3.5.6/libkholidays/Makefile.am 2006-07-22 04:14:21.000000000 -0400
++++ kdepim-3.5.6-new/libkholidays/Makefile.am 2007-03-16 18:15:51.000000000 -0400
@@ -7,7 +7,7 @@
lib_LTLIBRARIES = libkholidays.la
@@ -1231,8 +1315,8 @@
libkholidays_la_SOURCES = kholidays.cpp scanholiday.c parseholiday.h parseholiday.c lunarphase.cpp
#the lex/flex and yacc/bison files are in CVS and NOT generated
---- kdepim-3.5.4/libkholidays/parseholiday.c 2006-07-22 04:14:21.000000000 -0400
-+++ kdepim-3.5.4-new/libkholidays/parseholiday.c 2006-07-30 12:27:25.000000000 -0400
+--- kdepim-3.5.6/libkholidays/parseholiday.c 2007-01-15 06:28:30.000000000 -0500
++++ kdepim-3.5.6-new/libkholidays/parseholiday.c 2007-03-16 18:15:51.000000000 -0400
@@ -111,8 +111,8 @@
int year, int off, int length);
/*** Variables and structures ***/
@@ -1244,8 +1328,8 @@
int yacc_small; /* small string or on its own line? */
int yacc_stringcolor; /* color of holiday name text, 1..8 */
char *yacc_string; /* holiday name text */
---- kdepim-3.5.4/libkholidays/scanholiday.c 2006-07-22 04:14:21.000000000 -0400
-+++ kdepim-3.5.4-new/libkholidays/scanholiday.c 2006-07-30 12:27:35.000000000 -0400
+--- kdepim-3.5.6/libkholidays/scanholiday.c 2006-07-22 04:14:21.000000000 -0400
++++ kdepim-3.5.6-new/libkholidays/scanholiday.c 2007-03-16 18:15:51.000000000 -0400
@@ -347,7 +347,7 @@
extern int kcallineno;
@@ -1255,8 +1339,8 @@
extern char *kcaltext;
#define yytext_ptr kcaltext
---- kdepim-3.5.4/mimelib/dw_date.cpp 2006-01-19 11:56:38.000000000 -0500
-+++ kdepim-3.5.4-new/mimelib/dw_date.cpp 2006-07-30 12:26:44.000000000 -0400
+--- kdepim-3.5.6/mimelib/dw_date.cpp 2006-01-19 11:56:38.000000000 -0500
++++ kdepim-3.5.6-new/mimelib/dw_date.cpp 2007-03-16 18:15:51.000000000 -0400
@@ -658,7 +658,7 @@
""
};
@@ -1266,8 +1350,8 @@
{
struct tm *ptms, tms1, tms2;
time_t tt;
---- kdepim-3.5.4/mimelib/uuencode.cpp 2005-09-10 04:24:49.000000000 -0400
-+++ kdepim-3.5.4-new/mimelib/uuencode.cpp 2006-07-30 12:26:44.000000000 -0400
+--- kdepim-3.5.6/mimelib/uuencode.cpp 2005-09-10 04:24:49.000000000 -0400
++++ kdepim-3.5.6-new/mimelib/uuencode.cpp 2007-03-16 18:15:51.000000000 -0400
@@ -431,7 +431,7 @@
// Test harness for DwUudecode
@@ -1277,8 +1361,8 @@
{
srand(time(0));
DwString binStr;
---- kdepim-3.5.4/networkstatus/Makefile.am 2005-09-10 04:24:02.000000000 -0400
-+++ kdepim-3.5.4-new/networkstatus/Makefile.am 2006-07-30 12:26:44.000000000 -0400
+--- kdepim-3.5.6/networkstatus/Makefile.am 2005-09-10 04:24:02.000000000 -0400
++++ kdepim-3.5.6-new/networkstatus/Makefile.am 2007-03-16 18:15:51.000000000 -0400
@@ -19,7 +19,7 @@
clientiface.skel serviceiface.skel network.cpp
#kclientiface.skel serviceiface.skel
@@ -1304,8 +1388,8 @@
-networkstatustestservice_SOURCES = testservice.cpp provideriface.skel serviceiface.stub
+networkstatustestservice_la_SOURCES = testservice.cpp provideriface.skel serviceiface.stub
---- kdepim-3.5.4/networkstatus/testservice.cpp 2005-09-10 04:24:02.000000000 -0400
-+++ kdepim-3.5.4-new/networkstatus/testservice.cpp 2006-07-30 12:26:44.000000000 -0400
+--- kdepim-3.5.6/networkstatus/testservice.cpp 2005-09-10 04:24:02.000000000 -0400
++++ kdepim-3.5.6-new/networkstatus/testservice.cpp 2007-03-16 18:15:51.000000000 -0400
@@ -90,7 +90,7 @@
m_service->setNetworkStatus( "test_net", (int)m_status );
}
@@ -1315,8 +1399,8 @@
{
KApplication app(argc, argv, "testdcop");
TestService * test = new TestService;
---- kdepim-3.5.4/wizards/Makefile.am 2005-09-10 04:23:44.000000000 -0400
-+++ kdepim-3.5.4-new/wizards/Makefile.am 2006-07-30 12:26:44.000000000 -0400
+--- kdepim-3.5.6/wizards/Makefile.am 2005-09-10 04:23:44.000000000 -0400
++++ kdepim-3.5.6-new/wizards/Makefile.am 2007-03-16 18:15:51.000000000 -0400
@@ -12,7 +12,7 @@
bin_PROGRAMS = groupwarewizard egroupwarewizard sloxwizard kolabwizard \
groupwisewizard exchangewizard
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070328/ceb97ea2/attachment.html
More information about the macports-changes
mailing list