[30070] trunk/dports/kde/kdepim3
source_changes at macosforge.org
source_changes at macosforge.org
Fri Oct 19 00:16:09 PDT 2007
Revision: 30070
http://trac.macosforge.org/projects/macports/changeset/30070
Author: takanori at macports.org
Date: 2007-10-19 00:16:09 -0700 (Fri, 19 Oct 2007)
Log Message:
-----------
KDE 3.5.8.
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-10-19 07:15:52 UTC (rev 30069)
+++ trunk/dports/kde/kdepim3/Portfile 2007-10-19 07:16:09 UTC (rev 30070)
@@ -1,11 +1,11 @@
# $Id$
-#Synced with Fink, Version 3.5.7-1021
+#Synced with Fink, Version 3.5.8-1021
PortSystem 1.0
name kdepim3
-version 3.5.7
-set kdeadmin kde-admindir-790
+version 3.5.8
+set kdeadmin kde-admindir-1009
categories kde
maintainers nomaintainer at macports.org
description KDE personal information management tools. \
@@ -13,16 +13,14 @@
long_description ${description}
platforms darwin
homepage http://www.kde.org/
-master_sites kde:stable/${version}/src/:kde357 \
- 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::kde357
-# opendarwin::admin
+master_sites kde:stable/${version}/src/:kde358 \
+ http://ranger.users.finkproject.org/distfiles/kde-admindir/:admin \
+ http://ranger.befunk.com/fink/kde-admindir/:admin \
+ http://astrange.ithinksw.net/~astrange/ranger-fink/kde-admindir/:admin \
+ http://www.southofheaven.net/befunk/kde-admindir/:admin
use_bzip2 yes
distname kdepim-${version}
-distfiles ${distname}.tar.bz2:kde357 \
+distfiles ${distname}.tar.bz2:kde358 \
${kdeadmin}.tar.bz2:admin
depends_build port:autoconf \
port:unsermake
@@ -36,8 +34,8 @@
# port:pilot-link
# port:gpgsm or port:gnupg2
-checksums ${distname}.tar.bz2 md5 8571db6dcf4168614c96bb72c493f931 \
- ${kdeadmin}.tar.bz2 md5 8a098eeb808331ddf5912f7a8a184dd5
+checksums ${distname}.tar.bz2 md5 a1ffff553f1d6739c7791891028b176b \
+ ${kdeadmin}.tar.bz2 md5 d03f14acde189186fbac313f35316572
extract.only ${distname}.tar.bz2
post-extract { system "cd ${worksrcpath} && bzcat -dc ${distpath}/${kdeadmin}.tar.bz2 | tar xf -" }
Modified: trunk/dports/kde/kdepim3/files/CompileScript.sh
===================================================================
--- trunk/dports/kde/kdepim3/files/CompileScript.sh 2007-10-19 07:15:52 UTC (rev 30069)
+++ trunk/dports/kde/kdepim3/files/CompileScript.sh 2007-10-19 07:16:09 UTC (rev 30070)
@@ -1,23 +1,23 @@
#!/bin/sh -ev
- export PREFIX="%p" USE_UNSERMAKE=1
- . ./environment-helper.sh
- export ac_cv_path_GPGME_CONFIG="%p/bin/gpgme-config --thread=pthread"
+ export PREFIX="%p" USE_UNSERMAKE=1
+ . ./environment-helper.sh
+ export ac_cv_path_GPGME_CONFIG="%p/bin/gpgme-config --thread=pthread"
- export CC=gcc CXX=g++
+ export CC=gcc CXX=g++
#fink
-# export PKG_CONFIG_PATH="%p/lib/pilot-link10/lib/pkgconfig:$PKG_CONFIG_PATH"
-# export CPPFLAGS="-I%p/lib/pilot-link10/include $CPPFLAGS"
-# export LDFLAGS="-L%p/lib/pilot-link10/lib $LDFLAGS"
+# export PKG_CONFIG_PATH="%p/lib/pilot-link10/lib/pkgconfig:$PKG_CONFIG_PATH"
+# export CPPFLAGS="-I%p/lib/pilot-link10/include $CPPFLAGS"
+# export LDFLAGS="-L%p/lib/pilot-link10/lib $LDFLAGS"
#macports
#
- ranlib %p/lib/libgpg*.a >/dev/null 2>&1
- ./build-helper.sh cvs %N %v %r make -f admin/Makefile.common cvs
- ./build-helper.sh configure %N %v %r ./configure %c $CONFIGURE_PARAMS
+ ranlib %p/lib/libgpg*.a >/dev/null 2>&1
+ ./build-helper.sh cvs %N %v %r make -f admin/Makefile.common cvs
+ ./build-helper.sh configure %N %v %r ./configure %c $CONFIGURE_PARAMS
# perl -pi -e 's,yytext_ptr,libical_ptr,g' libical/src/libical/icallexer.c
# perl -pi -e 's,yytext_ptr,libicalss_ptr,g' libical/src/libicalss/icalsslexer.c
# perl -pi -e 's, holidays , ,g' korganizer/plugins/Makefile
- ./build-helper.sh make %N %v %r unsermake $UNSERMAKEFLAGS
+ ./build-helper.sh make %N %v %r unsermake $UNSERMAKEFLAGS
Modified: trunk/dports/kde/kdepim3/files/InstallScript.sh
===================================================================
--- trunk/dports/kde/kdepim3/files/InstallScript.sh 2007-10-19 07:15:52 UTC (rev 30069)
+++ trunk/dports/kde/kdepim3/files/InstallScript.sh 2007-10-19 07:16:09 UTC (rev 30070)
@@ -1,10 +1,10 @@
#!/bin/sh -ev
- export PREFIX="%p" USE_UNSERMAKE=1
- . ./environment-helper.sh
+ export PREFIX="%p" USE_UNSERMAKE=1
+ . ./environment-helper.sh
- ./build-helper.sh install %N %v %r unsermake -p -j1 install DESTDIR=%d
+ ./build-helper.sh install %N %v %r unsermake -p -j1 install DESTDIR=%d
- mkdir -p %i/share/doc/installed-packages
- touch %i/share/doc/installed-packages/%N
- touch %i/share/doc/installed-packages/%N-base
+ mkdir -p %i/share/doc/installed-packages
+ touch %i/share/doc/installed-packages/%N
+ touch %i/share/doc/installed-packages/%N-base
Modified: trunk/dports/kde/kdepim3/files/kdepim3.patch
===================================================================
--- trunk/dports/kde/kdepim3/files/kdepim3.patch 2007-10-19 07:15:52 UTC (rev 30069)
+++ trunk/dports/kde/kdepim3/files/kdepim3.patch 2007-10-19 07:16:09 UTC (rev 30070)
@@ -1,6 +1,6 @@
---- kdepim-3.5.7/akregator/src/Makefile.am 2006-10-01 13:30:25.000000000 -0400
-+++ kdepim-3.5.7-new/akregator/src/Makefile.am 2007-05-29 15:04:19.000000000 -0400
+--- kdepim-3.5.8/akregator/src/Makefile.am 2006-10-01 13:30:25.000000000 -0400
++++ kdepim-3.5.8-new/akregator/src/Makefile.am 2007-10-15 10:32:27.000000000 -0400
@@ -16,12 +16,13 @@
#########################################################################
# this is the program that gets installed. it's name is used for all
@@ -28,8 +28,8 @@
libakregatorprivate_la_LIBADD = $(top_builddir)/libkdepim/libkdepim.la \
$(top_builddir)/akregator/src/librss/librsslocal.la $(LIB_KHTML)
---- kdepim-3.5.7/akregator/src/main.cpp 2007-01-15 06:28:31.000000000 -0500
-+++ kdepim-3.5.7-new/akregator/src/main.cpp 2007-05-29 15:04:19.000000000 -0400
+--- kdepim-3.5.8/akregator/src/main.cpp 2007-01-15 06:28:31.000000000 -0500
++++ kdepim-3.5.8-new/akregator/src/main.cpp 2007-10-15 10:32:27.000000000 -0400
@@ -85,7 +85,7 @@
} // namespace Akregator
@@ -39,8 +39,8 @@
{
Akregator::AboutData about;
KCmdLineArgs::init(argc, argv, &about);
---- kdepim-3.5.7/certmanager/Makefile.am 2005-09-10 04:23:51.000000000 -0400
-+++ kdepim-3.5.7-new/certmanager/Makefile.am 2007-05-29 15:07:21.000000000 -0400
+--- kdepim-3.5.8/certmanager/Makefile.am 2005-09-10 04:23:51.000000000 -0400
++++ kdepim-3.5.8-new/certmanager/Makefile.am 2007-10-15 10:32:27.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.7/certmanager/conf/Makefile.am 2005-10-10 11:02:19.000000000 -0400
-+++ kdepim-3.5.7-new/certmanager/conf/Makefile.am 2007-05-29 15:07:34.000000000 -0400
+--- kdepim-3.5.8/certmanager/conf/Makefile.am 2005-10-10 11:02:19.000000000 -0400
++++ kdepim-3.5.8-new/certmanager/conf/Makefile.am 2007-10-15 10:32:27.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.7/certmanager/kwatchgnupg/Makefile.am 2005-09-10 04:23:49.000000000 -0400
-+++ kdepim-3.5.7-new/certmanager/kwatchgnupg/Makefile.am 2007-05-29 15:07:40.000000000 -0400
+--- kdepim-3.5.8/certmanager/kwatchgnupg/Makefile.am 2005-09-10 04:23:49.000000000 -0400
++++ kdepim-3.5.8-new/certmanager/kwatchgnupg/Makefile.am 2007-10-15 10:32:27.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.7/certmanager/kwatchgnupg/main.cpp 2005-09-10 04:23:49.000000000 -0400
-+++ kdepim-3.5.7-new/certmanager/kwatchgnupg/main.cpp 2007-05-29 15:04:19.000000000 -0400
+--- kdepim-3.5.8/certmanager/kwatchgnupg/main.cpp 2005-09-10 04:23:49.000000000 -0400
++++ kdepim-3.5.8-new/certmanager/kwatchgnupg/main.cpp 2007-10-15 10:32:27.000000000 -0400
@@ -74,7 +74,7 @@
return KUniqueApplication::newInstance();
}
@@ -115,8 +115,8 @@
{
AboutData aboutData;
---- kdepim-3.5.7/certmanager/main.cpp 2005-09-10 04:23:51.000000000 -0400
-+++ kdepim-3.5.7-new/certmanager/main.cpp 2007-05-29 15:04:19.000000000 -0400
+--- kdepim-3.5.8/certmanager/main.cpp 2005-09-10 04:23:51.000000000 -0400
++++ kdepim-3.5.8-new/certmanager/main.cpp 2007-10-15 10:32:27.000000000 -0400
@@ -46,7 +46,7 @@
#include <kglobal.h>
#include <kiconloader.h>
@@ -126,8 +126,8 @@
{
AboutData aboutData;
---- kdepim-3.5.7/kabc/frontend/Makefile.am 2005-09-10 04:24:24.000000000 -0400
-+++ kdepim-3.5.7-new/kabc/frontend/Makefile.am 2007-05-29 15:07:44.000000000 -0400
+--- kdepim-3.5.8/kabc/frontend/Makefile.am 2005-09-10 04:24:24.000000000 -0400
++++ kdepim-3.5.8-new/kabc/frontend/Makefile.am 2007-10-15 10:32:27.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.7/kabc/frontend/main.cpp 2005-09-10 04:24:24.000000000 -0400
-+++ kdepim-3.5.7-new/kabc/frontend/main.cpp 2007-05-29 15:04:19.000000000 -0400
+--- kdepim-3.5.8/kabc/frontend/main.cpp 2005-09-10 04:24:24.000000000 -0400
++++ kdepim-3.5.8-new/kabc/frontend/main.cpp 2007-10-15 10:32:27.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.7/kabc/kabc2mutt/Makefile.am 2005-09-10 04:24:24.000000000 -0400
-+++ kdepim-3.5.7-new/kabc/kabc2mutt/Makefile.am 2007-05-29 15:05:30.000000000 -0400
+--- kdepim-3.5.8/kabc/kabc2mutt/Makefile.am 2005-09-10 04:24:24.000000000 -0400
++++ kdepim-3.5.8-new/kabc/kabc2mutt/Makefile.am 2007-10-15 10:32:27.000000000 -0400
@@ -2,11 +2,13 @@
METASOURCES = AUTO
@@ -175,8 +175,8 @@
messages: rc.cpp
$(XGETTEXT) *.cpp -o $(podir)/kabc2mutt.pot
---- kdepim-3.5.7/kabc/kabc2mutt/main.cpp 2005-09-10 04:24:24.000000000 -0400
-+++ kdepim-3.5.7-new/kabc/kabc2mutt/main.cpp 2007-05-29 15:04:19.000000000 -0400
+--- kdepim-3.5.8/kabc/kabc2mutt/main.cpp 2005-09-10 04:24:24.000000000 -0400
++++ kdepim-3.5.8-new/kabc/kabc2mutt/main.cpp 2007-10-15 10:32:27.000000000 -0400
@@ -41,7 +41,7 @@
};
@@ -186,8 +186,8 @@
{
KApplication::disableAutoDcopRegistration();
KCmdLineArgs::init( argc, argv, appName, programName, description, version );
---- kdepim-3.5.7/kaddressbook/Makefile.am 2007-05-14 03:54:44.000000000 -0400
-+++ kdepim-3.5.7-new/kaddressbook/Makefile.am 2007-05-29 15:06:13.000000000 -0400
+--- kdepim-3.5.8/kaddressbook/Makefile.am 2007-05-14 03:54:44.000000000 -0400
++++ kdepim-3.5.8-new/kaddressbook/Makefile.am 2007-10-15 10:32:27.000000000 -0400
@@ -14,11 +14,12 @@
-I$(top_buildir)/kaddressbook/editors \
$(all_includes)
@@ -214,8 +214,8 @@
rcdir = $(kde_datadir)/kaddressbook
rc_DATA = kaddressbookui.rc kaddressbook_part.rc
---- kdepim-3.5.7/kaddressbook/main.cpp 2005-11-08 17:33:33.000000000 -0500
-+++ kdepim-3.5.7-new/kaddressbook/main.cpp 2007-05-29 15:04:20.000000000 -0400
+--- kdepim-3.5.8/kaddressbook/main.cpp 2005-11-08 17:33:33.000000000 -0500
++++ kdepim-3.5.8-new/kaddressbook/main.cpp 2007-10-15 10:32:27.000000000 -0400
@@ -109,7 +109,7 @@
return 0;
}
@@ -225,8 +225,8 @@
{
KLocale::setMainCatalogue( "kaddressbook" );
---- kdepim-3.5.7/kandy/src/Makefile.am 2005-09-10 04:24:42.000000000 -0400
-+++ kdepim-3.5.7-new/kandy/src/Makefile.am 2007-05-29 15:08:03.000000000 -0400
+--- kdepim-3.5.8/kandy/src/Makefile.am 2005-09-10 04:24:42.000000000 -0400
++++ kdepim-3.5.8-new/kandy/src/Makefile.am 2007-10-15 10:32:27.000000000 -0400
@@ -1,10 +1,12 @@
-bin_PROGRAMS = kandy kandy_client
+bin_PROGRAMS =
@@ -257,8 +257,8 @@
METASOURCES = AUTO
---- kdepim-3.5.7/kandy/src/kandy_client.cpp 2005-09-10 04:24:42.000000000 -0400
-+++ kdepim-3.5.7-new/kandy/src/kandy_client.cpp 2007-05-29 15:04:20.000000000 -0400
+--- kdepim-3.5.8/kandy/src/kandy_client.cpp 2005-09-10 04:24:42.000000000 -0400
++++ kdepim-3.5.8-new/kandy/src/kandy_client.cpp 2007-10-15 10:32:27.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.7/kandy/src/main.cpp 2005-09-10 04:24:42.000000000 -0400
-+++ kdepim-3.5.7-new/kandy/src/main.cpp 2007-05-29 15:04:20.000000000 -0400
+--- kdepim-3.5.8/kandy/src/main.cpp 2005-09-10 04:24:42.000000000 -0400
++++ kdepim-3.5.8-new/kandy/src/main.cpp 2007-10-15 10:32:27.000000000 -0400
@@ -85,7 +85,7 @@
#endif
}
@@ -279,8 +279,8 @@
{
KAboutData about("kandy", I18N_NOOP("Kandy"), version, description,
KAboutData::License_GPL, "(C) 2001 Cornelius Schumacher",0,
---- kdepim-3.5.7/kitchensync/src/Makefile.am 2007-05-14 03:54:46.000000000 -0400
-+++ kdepim-3.5.7-new/kitchensync/src/Makefile.am 2007-05-29 15:09:03.000000000 -0400
+--- kdepim-3.5.8/kitchensync/src/Makefile.am 2007-10-08 05:50:47.000000000 -0400
++++ kdepim-3.5.8-new/kitchensync/src/Makefile.am 2007-10-15 10:32:27.000000000 -0400
@@ -7,11 +7,13 @@
$(all_includes)
@@ -299,7 +299,7 @@
xdg_apps_DATA = kitchensync.desktop
-@@ -37,7 +39,7 @@
+@@ -39,7 +41,7 @@
kde_module_LTLIBRARIES = libkitchensyncpart.la
libkitchensyncpart_la_SOURCES = part.cpp
@@ -308,8 +308,8 @@
libkitchensyncpart_la_LIBADD = $(LIB_KPARTS) libkitchensync.la
# Resources
---- kdepim-3.5.7/kitchensync/src/main.cpp 2007-05-14 03:54:46.000000000 -0400
-+++ kdepim-3.5.7-new/kitchensync/src/main.cpp 2007-05-29 15:04:20.000000000 -0400
+--- kdepim-3.5.8/kitchensync/src/main.cpp 2007-05-14 03:54:46.000000000 -0400
++++ kdepim-3.5.8-new/kitchensync/src/main.cpp 2007-10-15 10:32:27.000000000 -0400
@@ -32,7 +32,7 @@
KCmdLineLastOption
};
@@ -319,8 +319,8 @@
{
KAboutData *about = MainWidget::aboutData();
---- kdepim-3.5.7/kmail/Makefile.am 2007-05-14 03:54:39.000000000 -0400
-+++ kdepim-3.5.7-new/kmail/Makefile.am 2007-05-29 15:09:31.000000000 -0400
+--- kdepim-3.5.8/kmail/Makefile.am 2007-10-08 05:50:38.000000000 -0400
++++ kdepim-3.5.8-new/kmail/Makefile.am 2007-10-15 10:32:27.000000000 -0400
@@ -24,32 +24,34 @@
endif
@@ -366,17 +366,17 @@
libkmailprivate_la_SOURCES = kmmessage.cpp kmmainwin.cpp configuredialog.cpp \
configuredialog_p.cpp klistviewindexedsearchline.cpp \
-@@ -137,7 +139,7 @@
- messagecopyhelper.cpp \
- localsubscriptiondialog.cpp
+@@ -139,7 +141,7 @@
+ libkmailprivate_la_COMPILE_FIRST = globalsettings_base.h customtemplates_base.h templatesconfiguration_base.h
+
-kmail_SOURCES = main.cpp
+kmail_la_SOURCES = main.cpp
- libkmailpart_la_SOURCES = kmailpartIface.skel kmail_part.cpp
+ kmail_COMPILE_FIRST = globalsettings_base.h customtemplates_base.h templatesconfiguration_base.h
---- kdepim-3.5.7/kmail/main.cpp 2005-09-10 04:24:02.000000000 -0400
-+++ kdepim-3.5.7-new/kmail/main.cpp 2007-05-29 15:04:20.000000000 -0400
+--- kdepim-3.5.8/kmail/main.cpp 2005-09-10 04:24:02.000000000 -0400
++++ kdepim-3.5.8-new/kmail/main.cpp 2007-10-15 10:32:27.000000000 -0400
@@ -64,7 +64,7 @@
return 0;
}
@@ -386,8 +386,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.7/kmailcvt/Makefile.am 2005-09-10 04:24:16.000000000 -0400
-+++ kdepim-3.5.7-new/kmailcvt/Makefile.am 2007-05-29 15:10:01.000000000 -0400
+--- kdepim-3.5.8/kmailcvt/Makefile.am 2005-09-10 04:24:16.000000000 -0400
++++ kdepim-3.5.8-new/kmailcvt/Makefile.am 2007-10-15 10:32:27.000000000 -0400
@@ -1,6 +1,9 @@
-bin_PROGRAMS = kmailcvt
@@ -422,8 +422,8 @@
KDE_ICON=AUTO
---- kdepim-3.5.7/kmailcvt/main.cpp 2005-09-10 04:24:16.000000000 -0400
-+++ kdepim-3.5.7-new/kmailcvt/main.cpp 2007-05-29 15:04:20.000000000 -0400
+--- kdepim-3.5.8/kmailcvt/main.cpp 2005-09-10 04:24:16.000000000 -0400
++++ kdepim-3.5.8-new/kmailcvt/main.cpp 2007-10-15 10:32:27.000000000 -0400
@@ -26,7 +26,7 @@
KCmdLineLastOption
};
@@ -433,8 +433,8 @@
{
KLocale::setMainCatalogue("kmailcvt");
---- kdepim-3.5.7/kmobile/Makefile.am 2005-09-10 04:23:39.000000000 -0400
-+++ kdepim-3.5.7-new/kmobile/Makefile.am 2007-05-29 15:10:09.000000000 -0400
+--- kdepim-3.5.8/kmobile/Makefile.am 2005-09-10 04:23:39.000000000 -0400
++++ kdepim-3.5.8-new/kmobile/Makefile.am 2007-10-15 10:32:27.000000000 -0400
@@ -2,15 +2,16 @@
SUBDIRS = . devices # kioslave
@@ -456,8 +456,8 @@
pref.cpp kmobileiface.skel kmobile_selectiondialog.ui \
systemtray.cpp
---- kdepim-3.5.7/kmobile/main.cpp 2005-09-10 04:23:39.000000000 -0400
-+++ kdepim-3.5.7-new/kmobile/main.cpp 2007-05-29 15:04:20.000000000 -0400
+--- kdepim-3.5.8/kmobile/main.cpp 2005-09-10 04:23:39.000000000 -0400
++++ kdepim-3.5.8-new/kmobile/main.cpp 2007-10-15 10:32:27.000000000 -0400
@@ -35,7 +35,7 @@
KCmdLineLastOption
};
@@ -467,8 +467,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.7/knode/Makefile.am 2007-05-14 03:54:39.000000000 -0400
-+++ kdepim-3.5.7-new/knode/Makefile.am 2007-05-29 15:10:18.000000000 -0400
+--- kdepim-3.5.8/knode/Makefile.am 2007-05-14 03:54:39.000000000 -0400
++++ kdepim-3.5.8-new/knode/Makefile.am 2007-10-15 10:32:27.000000000 -0400
@@ -10,22 +10,23 @@
lib_LTLIBRARIES = libknodecommon.la
@@ -517,8 +517,8 @@
xdg_apps_DATA = KNode.desktop
---- kdepim-3.5.7/knode/main.cpp 2006-01-19 11:55:48.000000000 -0500
-+++ kdepim-3.5.7-new/knode/main.cpp 2007-05-29 15:04:20.000000000 -0400
+--- kdepim-3.5.8/knode/main.cpp 2006-01-19 11:55:48.000000000 -0500
++++ kdepim-3.5.8-new/knode/main.cpp 2007-10-15 10:32:27.000000000 -0400
@@ -25,7 +25,7 @@
#include "knode_options.h"
using KNode::AboutData;
@@ -528,8 +528,8 @@
{
AboutData aboutData;
---- kdepim-3.5.7/knotes/Makefile.am 2005-10-10 11:02:28.000000000 -0400
-+++ kdepim-3.5.7-new/knotes/Makefile.am 2007-05-29 15:10:47.000000000 -0400
+--- kdepim-3.5.8/knotes/Makefile.am 2007-10-08 05:50:51.000000000 -0400
++++ kdepim-3.5.8-new/knotes/Makefile.am 2007-10-15 10:32:27.000000000 -0400
@@ -2,7 +2,9 @@
SUBDIRS = . pics icons
@@ -563,8 +563,8 @@
knotes_local_la_LIBADD = libknotesresources.la libknotesconfig.la \
$(top_builddir)/libkcal/libkcal.la -lkdeprint
---- kdepim-3.5.7/knotes/main.cpp 2006-03-17 05:16:01.000000000 -0500
-+++ kdepim-3.5.7-new/knotes/main.cpp 2007-05-29 15:04:20.000000000 -0400
+--- kdepim-3.5.8/knotes/main.cpp 2006-03-17 05:16:01.000000000 -0500
++++ kdepim-3.5.8-new/knotes/main.cpp 2007-10-15 10:32:27.000000000 -0400
@@ -86,7 +86,7 @@
return KUniqueApplication::newInstance();
}
@@ -574,8 +574,8 @@
{
QString version = QString::number( KNOTES_VERSION );
---- kdepim-3.5.7/kode/Makefile.am 2005-09-10 04:23:43.000000000 -0400
-+++ kdepim-3.5.7-new/kode/Makefile.am 2007-05-29 15:11:15.000000000 -0400
+--- kdepim-3.5.8/kode/Makefile.am 2005-09-10 04:23:43.000000000 -0400
++++ kdepim-3.5.8-new/kode/Makefile.am 2007-10-15 10:32:27.000000000 -0400
@@ -12,10 +12,11 @@
-version-info 1:0:0 -no-undefined
libkode_la_LIBADD = -lkdecore
@@ -592,8 +592,8 @@
+kode_la_SOURCES = kodemain.cpp
METASOURCES = AUTO
---- kdepim-3.5.7/kode/kodemain.cpp 2005-09-10 04:23:43.000000000 -0400
-+++ kdepim-3.5.7-new/kode/kodemain.cpp 2007-05-29 15:04:20.000000000 -0400
+--- kdepim-3.5.8/kode/kodemain.cpp 2005-09-10 04:23:43.000000000 -0400
++++ kdepim-3.5.8-new/kode/kodemain.cpp 2007-10-15 10:32:28.000000000 -0400
@@ -607,7 +607,7 @@
return 0;
}
@@ -603,8 +603,8 @@
{
KAboutData aboutData( "kode", I18N_NOOP("KDE Code Generator"), "0.1" );
aboutData.addAuthor( "Cornelius Schumacher", 0, "schumacher at kde.org" );
---- kdepim-3.5.7/kode/kxml_compiler/Makefile.am 2005-09-10 04:23:43.000000000 -0400
-+++ kdepim-3.5.7-new/kode/kxml_compiler/Makefile.am 2007-05-29 15:11:20.000000000 -0400
+--- kdepim-3.5.8/kode/kxml_compiler/Makefile.am 2005-09-10 04:23:43.000000000 -0400
++++ kdepim-3.5.8-new/kode/kxml_compiler/Makefile.am 2007-10-15 10:32:28.000000000 -0400
@@ -1,9 +1,11 @@
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/libkdepim $(all_includes)
@@ -621,8 +621,8 @@
+kxml_compiler_la_SOURCES = parser.cpp creator.cpp kxml_compiler.cpp
METASOURCES = AUTO
---- kdepim-3.5.7/kode/kxml_compiler/kxml_compiler.cpp 2005-09-10 04:23:43.000000000 -0400
-+++ kdepim-3.5.7-new/kode/kxml_compiler/kxml_compiler.cpp 2007-05-29 15:04:20.000000000 -0400
+--- kdepim-3.5.8/kode/kxml_compiler/kxml_compiler.cpp 2005-09-10 04:23:43.000000000 -0400
++++ kdepim-3.5.8-new/kode/kxml_compiler/kxml_compiler.cpp 2007-10-15 10:32:28.000000000 -0400
@@ -55,7 +55,7 @@
KCmdLineLastOption
};
@@ -632,8 +632,8 @@
{
KAboutData aboutData( "kxml_compiler", I18N_NOOP("KDE xml compiler"), "0.1",
I18N_NOOP("KDE XML Compiler") , KAboutData::License_LGPL );
---- kdepim-3.5.7/konsolekalendar/Makefile.am 2005-11-08 17:33:45.000000000 -0500
-+++ kdepim-3.5.7-new/konsolekalendar/Makefile.am 2007-05-29 15:11:24.000000000 -0400
+--- kdepim-3.5.8/konsolekalendar/Makefile.am 2005-11-08 17:33:45.000000000 -0500
++++ kdepim-3.5.8-new/konsolekalendar/Makefile.am 2007-10-15 10:32:28.000000000 -0400
@@ -6,14 +6,16 @@
METASOURCES = AUTO
@@ -655,8 +655,8 @@
appsdir = $(kde_appsdir)/Utilities
xdg_apps_DATA = konsolekalendar.desktop
---- kdepim-3.5.7/konsolekalendar/main.cpp 2006-07-22 04:14:27.000000000 -0400
-+++ kdepim-3.5.7-new/konsolekalendar/main.cpp 2007-05-29 15:04:20.000000000 -0400
+--- kdepim-3.5.8/konsolekalendar/main.cpp 2006-07-22 04:14:27.000000000 -0400
++++ kdepim-3.5.8-new/konsolekalendar/main.cpp 2007-10-15 10:32:28.000000000 -0400
@@ -165,7 +165,7 @@
KCmdLineLastOption
};
@@ -666,8 +666,8 @@
{
KAboutData aboutData(
progName, // internal program name
---- kdepim-3.5.7/kontact/src/Makefile.am 2005-09-10 04:24:42.000000000 -0400
-+++ kdepim-3.5.7-new/kontact/src/Makefile.am 2007-05-29 15:11:47.000000000 -0400
+--- kdepim-3.5.8/kontact/src/Makefile.am 2005-09-10 04:24:42.000000000 -0400
++++ kdepim-3.5.8-new/kontact/src/Makefile.am 2007-10-15 10:32:28.000000000 -0400
@@ -5,23 +5,29 @@
lib_LTLIBRARIES = libkontact.la
libkontact_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -version-info 1:0
@@ -706,8 +706,8 @@
kcm_kontact_la_LIBADD = libkontact.la $(top_builddir)/libkdepim/libkdepim.la
kcm_kontact_la_COMPILE_FIRST = prefs.h
---- kdepim-3.5.7/kontact/src/main.cpp 2007-05-14 03:54:53.000000000 -0400
-+++ kdepim-3.5.7-new/kontact/src/main.cpp 2007-05-29 15:04:20.000000000 -0400
+--- kdepim-3.5.8/kontact/src/main.cpp 2007-05-14 03:54:53.000000000 -0400
++++ kdepim-3.5.8-new/kontact/src/main.cpp 2007-10-15 10:32:28.000000000 -0400
@@ -120,7 +120,7 @@
return KUniqueApplication::newInstance();
}
@@ -717,8 +717,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.7/korganizer/Makefile.am 2007-05-14 03:54:31.000000000 -0400
-+++ kdepim-3.5.7-new/korganizer/Makefile.am 2007-05-29 15:12:14.000000000 -0400
+--- kdepim-3.5.8/korganizer/Makefile.am 2007-05-14 03:54:31.000000000 -0400
++++ kdepim-3.5.8-new/korganizer/Makefile.am 2007-10-15 10:32:28.000000000 -0400
@@ -12,23 +12,24 @@
-I$(top_builddir) \
$(all_includes)
@@ -760,8 +760,8 @@
koagendaview.cpp koagenda.cpp koagendaitem.cpp \
datenavigator.cpp kdatenavigator.cpp datenavigatorcontainer.cpp \
datechecker.cpp \
---- kdepim-3.5.7/korganizer/korgac/Makefile.am 2005-09-10 04:24:44.000000000 -0400
-+++ kdepim-3.5.7-new/korganizer/korgac/Makefile.am 2007-05-29 15:12:25.000000000 -0400
+--- kdepim-3.5.8/korganizer/korgac/Makefile.am 2005-09-10 04:24:44.000000000 -0400
++++ kdepim-3.5.8-new/korganizer/korgac/Makefile.am 2007-10-15 10:32:28.000000000 -0400
@@ -1,11 +1,13 @@
INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/korganizer $(all_includes)
@@ -791,8 +791,8 @@
noinst_HEADERS = alarmclientiface.h alarmdialog.h \
alarmdockwindow.h koalarmclient.h
---- kdepim-3.5.7/korganizer/korgac/korgacmain.cpp 2006-01-19 11:56:25.000000000 -0500
-+++ kdepim-3.5.7-new/korganizer/korgac/korgacmain.cpp 2007-05-29 15:04:20.000000000 -0400
+--- kdepim-3.5.8/korganizer/korgac/korgacmain.cpp 2006-01-19 11:56:25.000000000 -0500
++++ kdepim-3.5.8-new/korganizer/korgac/korgacmain.cpp 2007-10-15 10:32:28.000000000 -0400
@@ -59,7 +59,7 @@
{ 0, 0, 0 }
};
@@ -802,8 +802,8 @@
{
KLocale::setMainCatalogue( "korganizer" );
KAboutData aboutData( "korgac", I18N_NOOP("KOrganizer Reminder Daemon"),
---- kdepim-3.5.7/korganizer/korgplugins.cpp 2005-09-10 04:24:47.000000000 -0400
-+++ kdepim-3.5.7-new/korganizer/korgplugins.cpp 2007-05-29 15:04:20.000000000 -0400
+--- kdepim-3.5.8/korganizer/korgplugins.cpp 2005-09-10 04:24:47.000000000 -0400
++++ kdepim-3.5.8-new/korganizer/korgplugins.cpp 2007-10-15 10:32:28.000000000 -0400
@@ -32,7 +32,7 @@
#include "kocore.h"
@@ -813,8 +813,8 @@
{
KAboutData aboutData("korgplugins",I18N_NOOP("KOrgPlugins"),"0.1");
KCmdLineArgs::init(argc,argv,&aboutData);
---- kdepim-3.5.7/korganizer/main.cpp 2005-09-10 04:24:47.000000000 -0400
-+++ kdepim-3.5.7-new/korganizer/main.cpp 2007-05-29 15:04:21.000000000 -0400
+--- kdepim-3.5.8/korganizer/main.cpp 2005-09-10 04:24:47.000000000 -0400
++++ kdepim-3.5.8-new/korganizer/main.cpp 2007-10-15 10:32:28.000000000 -0400
@@ -35,7 +35,7 @@
#include "korganizer.h"
#include "korganizer_options.h"
@@ -824,8 +824,8 @@
{
KOrg::AboutData aboutData;
---- kdepim-3.5.7/korganizer/timezone.cpp 2005-09-10 04:24:47.000000000 -0400
-+++ kdepim-3.5.7-new/korganizer/timezone.cpp 2007-05-29 15:04:21.000000000 -0400
+--- kdepim-3.5.8/korganizer/timezone.cpp 2005-09-10 04:24:47.000000000 -0400
++++ kdepim-3.5.8-new/korganizer/timezone.cpp 2007-10-15 10:32:28.000000000 -0400
@@ -34,7 +34,7 @@
#include "koprefs.h"
@@ -835,29 +835,29 @@
{
KAboutData aboutData("timezone",I18N_NOOP("KOrganizer Timezone Test"),"0.1");
KCmdLineArgs::init(argc,argv,&aboutData);
---- kdepim-3.5.7/korn/Makefile.am 2007-05-14 03:54:42.000000000 -0400
-+++ kdepim-3.5.7-new/korn/Makefile.am 2007-05-29 15:12:36.000000000 -0400
-@@ -6,11 +6,15 @@
+--- kdepim-3.5.8/korn/Makefile.am 2007-10-08 05:50:45.000000000 -0400
++++ kdepim-3.5.8-new/korn/Makefile.am 2007-10-15 10:35:09.000000000 -0400
+@@ -7,11 +7,14 @@
METASOURCES = AUTO
-bin_PROGRAMS = korn
--korn_LDADD = $(LIB_KIO)
+-korn_LDADD = $(LIB_KIO) $(top_builddir)/libkmime/libkmime.la
+-#korn_LDADD = $(top_builddir)/mimelib/libmimelib.la $(LIB_KFILE) $(LIBSOCKET) $(top_builddir)/libkmime/libkmime.la
+lib_LTLIBRARIES =
+bin_PROGRAMS =
+kdeinit_LTLIBRARIES = korn.la
-+
-+korn_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-+korn_la_LIBADD = $(LIB_KIO)
- #korn_LDADD = $(top_builddir)/mimelib/libmimelib.la $(LIB_KFILE) $(LIBSOCKET) $(top_builddir)/libkmime/libkmime.la
-korn_SOURCES = \
++korn_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
++korn_la_LIBADD = $(LIB_KIO) $(top_builddir)/libkmime/libkmime.la
++
+korn_la_SOURCES = \
accountmanager.cpp \
account_input.cpp \
boxcontainer.cpp \
---- kdepim-3.5.7/korn/main.cpp 2006-07-22 04:14:20.000000000 -0400
-+++ kdepim-3.5.7-new/korn/main.cpp 2007-05-29 15:04:21.000000000 -0400
+--- kdepim-3.5.8/korn/main.cpp 2006-07-22 04:14:20.000000000 -0400
++++ kdepim-3.5.8-new/korn/main.cpp 2007-10-15 10:32:28.000000000 -0400
@@ -14,7 +14,7 @@
static const char version[] = "0.4";
@@ -867,8 +867,8 @@
{
KAboutData aboutData(argv[0], I18N_NOOP("Korn"),
version, description, KAboutData::License_GPL,
---- kdepim-3.5.7/kpilot/conduits/Makefile.am 2007-05-14 03:54:52.000000000 -0400
-+++ kdepim-3.5.7-new/kpilot/conduits/Makefile.am 2007-05-29 15:04:21.000000000 -0400
+--- kdepim-3.5.8/kpilot/conduits/Makefile.am 2007-05-14 03:54:52.000000000 -0400
++++ kdepim-3.5.8-new/kpilot/conduits/Makefile.am 2007-10-15 10:32:28.000000000 -0400
@@ -7,6 +7,8 @@
MAL_SUBDIR = malconduit
else
@@ -886,8 +886,8 @@
memofileconduit \
notepadconduit \
popmail \
---- kdepim-3.5.7/kpilot/conduits/docconduit/Makefile.am 2005-11-08 17:33:38.000000000 -0500
-+++ kdepim-3.5.7-new/kpilot/conduits/docconduit/Makefile.am 2007-05-29 15:13:01.000000000 -0400
+--- kdepim-3.5.8/kpilot/conduits/docconduit/Makefile.am 2005-11-08 17:33:38.000000000 -0500
++++ kdepim-3.5.8-new/kpilot/conduits/docconduit/Makefile.am 2007-10-15 10:32:28.000000000 -0400
@@ -14,20 +14,22 @@
noinst_LTLIBRARIES = libpalmdoc_shared.la
@@ -916,8 +916,8 @@
xdg_apps_DATA = kpalmdoc.desktop
servicetypedir = $(kde_servicetypesdir)
---- kdepim-3.5.7/kpilot/conduits/docconduit/kpalmdoc.cpp 2005-09-10 04:24:37.000000000 -0400
-+++ kdepim-3.5.7-new/kpilot/conduits/docconduit/kpalmdoc.cpp 2007-05-29 15:04:21.000000000 -0400
+--- kdepim-3.5.8/kpilot/conduits/docconduit/kpalmdoc.cpp 2005-09-10 04:24:37.000000000 -0400
++++ kdepim-3.5.8-new/kpilot/conduits/docconduit/kpalmdoc.cpp 2007-10-15 10:32:28.000000000 -0400
@@ -36,7 +36,7 @@
@@ -927,8 +927,8 @@
{
KAboutData about("converter", I18N_NOOP("KPalmDOC"), "-0.0.1",
---- kdepim-3.5.7/kpilot/conduits/malconduit/mal-conduit.cc 2007-05-14 03:54:51.000000000 -0400
-+++ kdepim-3.5.7-new/kpilot/conduits/malconduit/mal-conduit.cc 2007-05-29 15:04:21.000000000 -0400
+--- kdepim-3.5.8/kpilot/conduits/malconduit/mal-conduit.cc 2007-05-14 03:54:51.000000000 -0400
++++ kdepim-3.5.8-new/kpilot/conduits/malconduit/mal-conduit.cc 2007-10-15 10:32:28.000000000 -0400
@@ -34,6 +34,7 @@
#include "options.h"
@@ -937,8 +937,8 @@
#include <qregexp.h>
#include <kconfig.h>
#include <kdebug.h>
---- kdepim-3.5.7/kpilot/kpilot/Makefile.am 2007-05-14 03:54:52.000000000 -0400
-+++ kdepim-3.5.7-new/kpilot/kpilot/Makefile.am 2007-05-29 15:13:18.000000000 -0400
+--- kdepim-3.5.8/kpilot/kpilot/Makefile.am 2007-05-14 03:54:52.000000000 -0400
++++ kdepim-3.5.8-new/kpilot/kpilot/Makefile.am 2007-10-15 10:32:28.000000000 -0400
@@ -9,9 +9,10 @@
SUBDIRS = Icons
@@ -1002,8 +1002,8 @@
../lib/libkpilot.la libconfiguration.la
kpilotTest_LDADD = $(LIB_KFILE) $(PISOCK_LIB) \
../lib/libkpilot.la libconfiguration.la
---- kdepim-3.5.7/kpilot/kpilot/kpilot.cc 2007-05-14 03:54:52.000000000 -0400
-+++ kdepim-3.5.7-new/kpilot/kpilot/kpilot.cc 2007-05-29 15:04:21.000000000 -0400
+--- kdepim-3.5.8/kpilot/kpilot/kpilot.cc 2007-05-14 03:54:52.000000000 -0400
++++ kdepim-3.5.8-new/kpilot/kpilot/kpilot.cc 2007-10-15 10:32:28.000000000 -0400
@@ -1008,7 +1008,7 @@
@@ -1013,8 +1013,8 @@
{
FUNCTIONSETUP;
---- kdepim-3.5.7/kpilot/kpilot/pilotDaemon.cc 2007-05-14 03:54:52.000000000 -0400
-+++ kdepim-3.5.7-new/kpilot/kpilot/pilotDaemon.cc 2007-05-29 15:04:21.000000000 -0400
+--- kdepim-3.5.8/kpilot/kpilot/pilotDaemon.cc 2007-05-14 03:54:52.000000000 -0400
++++ kdepim-3.5.8-new/kpilot/kpilot/pilotDaemon.cc 2007-10-15 10:32:28.000000000 -0400
@@ -1301,7 +1301,7 @@
} ;
@@ -1024,8 +1024,8 @@
{
FUNCTIONSETUP;
---- kdepim-3.5.7/kresources/featureplan/benchmarkfeaturelist.cpp 2005-09-10 04:23:46.000000000 -0400
-+++ kdepim-3.5.7-new/kresources/featureplan/benchmarkfeaturelist.cpp 2007-05-29 15:04:21.000000000 -0400
+--- kdepim-3.5.8/kresources/featureplan/benchmarkfeaturelist.cpp 2005-09-10 04:23:46.000000000 -0400
++++ kdepim-3.5.8-new/kresources/featureplan/benchmarkfeaturelist.cpp 2007-10-15 10:32:28.000000000 -0400
@@ -67,7 +67,7 @@
}
}
@@ -1035,8 +1035,8 @@
{
KAboutData aboutData( "benchmarkfeaturelist",
"Benchmark for feature list XML parser",
---- kdepim-3.5.7/kresources/featureplan/dumpfeaturelist.cpp 2006-05-22 14:10:46.000000000 -0400
-+++ kdepim-3.5.7-new/kresources/featureplan/dumpfeaturelist.cpp 2007-05-29 15:04:21.000000000 -0400
+--- kdepim-3.5.8/kresources/featureplan/dumpfeaturelist.cpp 2006-05-22 14:10:46.000000000 -0400
++++ kdepim-3.5.8-new/kresources/featureplan/dumpfeaturelist.cpp 2007-10-15 10:32:28.000000000 -0400
@@ -67,7 +67,7 @@
}
}
@@ -1046,8 +1046,8 @@
{
KAboutData aboutData( "dumpfeaturelist", "Dump XML feature list to stdout",
"0.1" );
---- kdepim-3.5.7/kresources/groupwise/soap/soapdebug.cpp 2005-09-10 04:23:46.000000000 -0400
-+++ kdepim-3.5.7-new/kresources/groupwise/soap/soapdebug.cpp 2007-05-29 15:04:21.000000000 -0400
+--- kdepim-3.5.8/kresources/groupwise/soap/soapdebug.cpp 2005-09-10 04:23:46.000000000 -0400
++++ kdepim-3.5.8-new/kresources/groupwise/soap/soapdebug.cpp 2007-10-15 10:32:28.000000000 -0400
@@ -44,7 +44,7 @@
KCmdLineLastOption
};
@@ -1057,8 +1057,8 @@
{
KAboutData aboutData( "soapdebug", I18N_NOOP("Groupwise Soap Debug"), "0.1" );
aboutData.addAuthor( "Cornelius Schumacher", 0, "schumacher at kde.org" );
---- kdepim-3.5.7/ktnef/gui/Makefile.am 2005-09-10 04:24:43.000000000 -0400
-+++ kdepim-3.5.7-new/ktnef/gui/Makefile.am 2007-05-29 15:13:41.000000000 -0400
+--- kdepim-3.5.8/ktnef/gui/Makefile.am 2005-09-10 04:24:43.000000000 -0400
++++ kdepim-3.5.8-new/ktnef/gui/Makefile.am 2007-10-15 10:32:28.000000000 -0400
@@ -2,14 +2,16 @@
SUBDIRS = pics
@@ -1082,8 +1082,8 @@
noinst_HEADERS = ktnefmain.h ktnefview.h attachpropertydialog.h \
qwmf.h wmfstruct.h metafuncs.h
---- kdepim-3.5.7/ktnef/gui/main.cpp 2005-09-10 04:24:43.000000000 -0400
-+++ kdepim-3.5.7-new/ktnef/gui/main.cpp 2007-05-29 15:04:21.000000000 -0400
+--- kdepim-3.5.8/ktnef/gui/main.cpp 2005-09-10 04:24:43.000000000 -0400
++++ kdepim-3.5.8-new/ktnef/gui/main.cpp 2007-10-15 10:32:28.000000000 -0400
@@ -33,7 +33,7 @@
// INSERT YOUR COMMANDLINE OPTIONS HERE
};
@@ -1093,8 +1093,8 @@
{
KAboutData aboutData( "ktnef", I18N_NOOP("KTnef"),
---- kdepim-3.5.7/libkcal/convertqtopia.cpp 2005-09-10 04:24:36.000000000 -0400
-+++ kdepim-3.5.7-new/libkcal/convertqtopia.cpp 2007-05-29 15:04:21.000000000 -0400
+--- kdepim-3.5.8/libkcal/convertqtopia.cpp 2005-09-10 04:24:36.000000000 -0400
++++ kdepim-3.5.8-new/libkcal/convertqtopia.cpp 2007-10-15 10:32:28.000000000 -0400
@@ -48,7 +48,7 @@
KCmdLineLastOption
};
@@ -1104,20 +1104,8 @@
{
KAboutData aboutData("convertqtopia",I18N_NOOP("Qtopia calendar file converter"),"0.1");
aboutData.addAuthor("Cornelius Schumacher", 0, "schumacher at kde.org");
---- kdepim-3.5.7/libkcal/versit/vcc.c 2005-09-10 04:24:36.000000000 -0400
-+++ kdepim-3.5.7-new/libkcal/versit/vcc.c 2007-05-29 15:04:21.000000000 -0400
-@@ -198,9 +198,6 @@
- #endif
-
- #include <string.h>
--#if !defined(__FreeBSD__) && !defined(__APPLE__)
--#include <malloc.h>
--#endif
- #include <stdio.h>
- #include <stdlib.h>
- #include <ctype.h>
---- kdepim-3.5.7/libkdepim/cfgc/autoexample.cpp 2005-09-10 04:24:24.000000000 -0400
-+++ kdepim-3.5.7-new/libkdepim/cfgc/autoexample.cpp 2007-05-29 15:04:21.000000000 -0400
+--- kdepim-3.5.8/libkdepim/cfgc/autoexample.cpp 2005-09-10 04:24:24.000000000 -0400
++++ kdepim-3.5.8-new/libkdepim/cfgc/autoexample.cpp 2007-10-15 10:32:31.000000000 -0400
@@ -36,7 +36,7 @@
#include <qlabel.h>
@@ -1127,8 +1115,8 @@
{
KAboutData aboutData( "example", I18N_NOOP("autoconfig example"), "0.1" );
aboutData.addAuthor( "Cornelius Schumacher", 0, "schumacher at kde.org" );
---- kdepim-3.5.7/libkdepim/cfgc/example.cpp 2005-09-10 04:24:24.000000000 -0400
-+++ kdepim-3.5.7-new/libkdepim/cfgc/example.cpp 2007-05-29 15:04:21.000000000 -0400
+--- kdepim-3.5.8/libkdepim/cfgc/example.cpp 2005-09-10 04:24:24.000000000 -0400
++++ kdepim-3.5.8-new/libkdepim/cfgc/example.cpp 2007-10-15 10:32:31.000000000 -0400
@@ -32,7 +32,7 @@
#include <libkdepim/kprefsdialog.h>
@@ -1138,8 +1126,8 @@
{
KAboutData aboutData( "example", I18N_NOOP("cfgc example"), "0.1" );
aboutData.addAuthor( "Cornelius Schumacher", 0, "schumacher at kde.org" );
---- kdepim-3.5.7/libkholidays/Makefile.am 2006-07-22 04:14:21.000000000 -0400
-+++ kdepim-3.5.7-new/libkholidays/Makefile.am 2007-05-29 15:04:21.000000000 -0400
+--- kdepim-3.5.8/libkholidays/Makefile.am 2006-07-22 04:14:21.000000000 -0400
++++ kdepim-3.5.8-new/libkholidays/Makefile.am 2007-10-15 10:32:31.000000000 -0400
@@ -7,7 +7,7 @@
lib_LTLIBRARIES = libkholidays.la
@@ -1149,9 +1137,9 @@
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.7/libkholidays/parseholiday.c 2007-05-14 03:54:44.000000000 -0400
-+++ kdepim-3.5.7-new/libkholidays/parseholiday.c 2007-05-29 15:04:21.000000000 -0400
-@@ -208,8 +208,8 @@
+--- kdepim-3.5.8/libkholidays/parseholiday.c 2007-10-08 05:50:46.000000000 -0400
++++ kdepim-3.5.8-new/libkholidays/parseholiday.c 2007-10-15 10:32:31.000000000 -0400
+@@ -204,8 +204,8 @@
int year, int off, int length);
/*** Variables and structures ***/
static int m, d, y;
@@ -1162,8 +1150,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.7/libkholidays/scanholiday.c 2007-05-14 03:54:44.000000000 -0400
-+++ kdepim-3.5.7-new/libkholidays/scanholiday.c 2007-05-29 15:04:21.000000000 -0400
+--- kdepim-3.5.8/libkholidays/scanholiday.c 2007-05-14 03:54:44.000000000 -0400
++++ kdepim-3.5.8-new/libkholidays/scanholiday.c 2007-10-15 10:32:31.000000000 -0400
@@ -15,6 +15,8 @@
#define yyrestart kcalrestart
#define yytext kcaltext
@@ -1173,8 +1161,8 @@
#line 19 "scanholiday.c"
/* A lexical scanner generated by flex*/
---- kdepim-3.5.7/mimelib/dw_date.cpp 2007-05-14 03:54:54.000000000 -0400
-+++ kdepim-3.5.7-new/mimelib/dw_date.cpp 2007-05-29 15:04:21.000000000 -0400
+--- kdepim-3.5.8/mimelib/dw_date.cpp 2007-05-14 03:54:54.000000000 -0400
++++ kdepim-3.5.8-new/mimelib/dw_date.cpp 2007-10-15 10:32:31.000000000 -0400
@@ -656,7 +656,7 @@
""
};
@@ -1184,8 +1172,8 @@
{
struct tm *ptms, tms1, tms2;
time_t tt;
---- kdepim-3.5.7/mimelib/uuencode.cpp 2007-05-14 03:54:54.000000000 -0400
-+++ kdepim-3.5.7-new/mimelib/uuencode.cpp 2007-05-29 15:04:21.000000000 -0400
+--- kdepim-3.5.8/mimelib/uuencode.cpp 2007-05-14 03:54:54.000000000 -0400
++++ kdepim-3.5.8-new/mimelib/uuencode.cpp 2007-10-15 10:32:31.000000000 -0400
@@ -429,7 +429,7 @@
// Test harness for DwUudecode
@@ -1195,8 +1183,8 @@
{
srand(time(0));
DwString binStr;
---- kdepim-3.5.7/networkstatus/Makefile.am 2005-09-10 04:24:02.000000000 -0400
-+++ kdepim-3.5.7-new/networkstatus/Makefile.am 2007-05-29 15:14:15.000000000 -0400
+--- kdepim-3.5.8/networkstatus/Makefile.am 2005-09-10 04:24:02.000000000 -0400
++++ kdepim-3.5.8-new/networkstatus/Makefile.am 2007-10-15 10:32:31.000000000 -0400
@@ -19,7 +19,7 @@
clientiface.skel serviceiface.skel network.cpp
#kclientiface.skel serviceiface.skel
@@ -1222,8 +1210,8 @@
-networkstatustestservice_SOURCES = testservice.cpp provideriface.skel serviceiface.stub
+networkstatustestservice_la_SOURCES = testservice.cpp provideriface.skel serviceiface.stub
---- kdepim-3.5.7/networkstatus/testservice.cpp 2005-09-10 04:24:02.000000000 -0400
-+++ kdepim-3.5.7-new/networkstatus/testservice.cpp 2007-05-29 15:04:21.000000000 -0400
+--- kdepim-3.5.8/networkstatus/testservice.cpp 2005-09-10 04:24:02.000000000 -0400
++++ kdepim-3.5.8-new/networkstatus/testservice.cpp 2007-10-15 10:32:31.000000000 -0400
@@ -90,7 +90,7 @@
m_service->setNetworkStatus( "test_net", (int)m_status );
}
@@ -1233,8 +1221,8 @@
{
KApplication app(argc, argv, "testdcop");
TestService * test = new TestService;
---- kdepim-3.5.7/wizards/Makefile.am 2005-09-10 04:23:44.000000000 -0400
-+++ kdepim-3.5.7-new/wizards/Makefile.am 2007-05-29 15:04:21.000000000 -0400
+--- kdepim-3.5.8/wizards/Makefile.am 2005-09-10 04:23:44.000000000 -0400
++++ kdepim-3.5.8-new/wizards/Makefile.am 2007-10-15 10:32:31.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/20071019/36f6e130/attachment-0001.html
More information about the macports-changes
mailing list