[26991] trunk/dports/kde/kdepim3
source_changes at macosforge.org
source_changes at macosforge.org
Sun Jul 15 07:28:10 PDT 2007
Revision: 26991
http://trac.macosforge.org/projects/macports/changeset/26991
Author: takanori at macports.org
Date: 2007-07-15 07:28:10 -0700 (Sun, 15 Jul 2007)
Log Message:
-----------
KDE 3.5.7.
Modified Paths:
--------------
trunk/dports/kde/kdepim3/Portfile
trunk/dports/kde/kdepim3/files/kdepim3.patch
Modified: trunk/dports/kde/kdepim3/Portfile
===================================================================
--- trunk/dports/kde/kdepim3/Portfile 2007-07-15 14:27:53 UTC (rev 26990)
+++ trunk/dports/kde/kdepim3/Portfile 2007-07-15 14:28:10 UTC (rev 26991)
@@ -1,11 +1,11 @@
# $Id$
-#Synced with Fink, Version 3.5.6-1021
+#Synced with Fink, Version 3.5.7-1021
PortSystem 1.0
name kdepim3
-version 3.5.6
-set kdeadmin kde-admindir-429
+version 3.5.7
+set kdeadmin kde-admindir-790
categories kde
maintainers nomaintainer at macports.org
description KDE personal information management tools. \
@@ -13,16 +13,16 @@
long_description ${description}
platforms darwin
homepage http://www.kde.org/
-master_sites kde:stable/${version}/src/:kde356 \
+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::kde356
+# opendarwin::kde357
# opendarwin::admin
use_bzip2 yes
distname kdepim-${version}
-distfiles ${distname}.tar.bz2:kde356 \
+distfiles ${distname}.tar.bz2:kde357 \
${kdeadmin}.tar.bz2:admin
depends_build port:autoconf \
port:unsermake
@@ -32,11 +32,12 @@
port:libgpg-error
# port:gnokii isn't detected :-(
# port:gtk1
+# port:opensync
# port:pilot-link
# port:gpgsm or port:gnupg2
-checksums ${distname}.tar.bz2 md5 e37e6173fe9fd7f242c9502a4ae1d7de \
- ${kdeadmin}.tar.bz2 md5 73186bf0bdabf96c9f7d559de56d3772
+checksums ${distname}.tar.bz2 md5 8571db6dcf4168614c96bb72c493f931 \
+ ${kdeadmin}.tar.bz2 md5 8a098eeb808331ddf5912f7a8a184dd5
extract.only ${distname}.tar.bz2
post-extract { system "cd ${worksrcpath} && bzcat -dc ${distpath}/${kdeadmin}.tar.bz2 | tar xf -" }
Modified: trunk/dports/kde/kdepim3/files/kdepim3.patch
===================================================================
--- trunk/dports/kde/kdepim3/files/kdepim3.patch 2007-07-15 14:27:53 UTC (rev 26990)
+++ trunk/dports/kde/kdepim3/files/kdepim3.patch 2007-07-15 14:28:10 UTC (rev 26991)
@@ -1,6 +1,6 @@
---- 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
+--- 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
@@ -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.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
+--- 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
@@ -85,7 +85,7 @@
} // namespace Akregator
@@ -39,8 +39,8 @@
{
Akregator::AboutData about;
KCmdLineArgs::init(argc, argv, &about);
---- 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
+--- 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
@@ -4,9 +4,11 @@
INCLUDES = -I$(srcdir)/lib -I$(top_srcdir)/libkdenetwork $(GPGME_CFLAGS) $(all_includes)
@@ -61,24 +61,24 @@
-kleopatra_LDFLAGS = $(all_libraries) $(KDE_RPATH)
-kleopatra_LDADD = conf/libconf.la lib/libkleopatra.la $(LIB_KUTILS) $(LIB_KABC)
-+kleopatra_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module
++kleopatra_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+kleopatra_la_LIBADD = conf/libconf.la lib/libkleopatra.la $(LIB_KUTILS) $(LIB_KABC)
rcdir = $(kde_datadir)/kleopatra
rc_DATA = kleopatraui.rc
---- 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
+--- 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
@@ -15,7 +15,7 @@
appearanceconfigwidget.cpp \
dnorderconfigpage.cpp
-kcm_kleopatra_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
-+kcm_kleopatra_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -no-undefined
++kcm_kleopatra_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
kcm_kleopatra_la_LIBADD = ../lib/libkleopatra.la $(LIB_KDEUI)
kde_services_DATA = \
---- 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
+--- 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
@@ -2,9 +2,11 @@
INCLUDES = -I$(top_srcdir)/certmanager/lib -I$(top_srcdir)/libkdenetwork $(GPGME_CFLAGS) $(all_includes)
@@ -99,13 +99,13 @@
-kwatchgnupg_LDFLAGS = $(all_libraries) $(KDE_RPATH)
-kwatchgnupg_LDADD = ../conf/libconf.la ../lib/libkleopatra.la $(LIB_KUTILS) $(LIB_KABC)
-+kwatchgnupg_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module
++kwatchgnupg_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+kwatchgnupg_la_LIBADD = ../conf/libconf.la ../lib/libkleopatra.la $(LIB_KUTILS) $(LIB_KABC)
rcdir = $(kde_datadir)/kwatchgnupg
rc_DATA = kwatchgnupgui.rc
---- 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
+--- 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
@@ -74,7 +74,7 @@
return KUniqueApplication::newInstance();
}
@@ -115,8 +115,8 @@
{
AboutData aboutData;
---- 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
+--- 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
@@ -46,7 +46,7 @@
#include <kglobal.h>
#include <kiconloader.h>
@@ -126,8 +126,8 @@
{
AboutData aboutData;
---- 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
+--- 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
@@ -2,9 +2,11 @@
METASOURCES = AUTO
@@ -140,12 +140,12 @@
-kabcfrontend_LDFLAGS = $(all_libraries) $(KDE_RPATH)
-kabcfrontend_LDADD = -lkabc $(LIB_KDECORE)
-kabcfrontend_SOURCES = main.cpp mainWindow.ui
-+kabcfrontend_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module
++kabcfrontend_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+kabcfrontend_la_LIBADD = -lkabc $(LIB_KDECORE)
+kabcfrontend_la_SOURCES = main.cpp mainWindow.ui
---- 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
+--- 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
@@ -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.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
+--- 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
@@ -2,11 +2,13 @@
METASOURCES = AUTO
@@ -169,14 +169,14 @@
-kabc2mutt_LDFLAGS = $(all_libraries) $(KDE_RPATH)
-kabc2mutt_LDADD = -lkabc $(LIB_KDECORE)
-kabc2mutt_SOURCES = kabc2mutt.cpp main.cpp
-+kabc2mutt_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module
++kabc2mutt_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version
+kabc2mutt_la_LIBADD = -lkabc $(LIB_KDECORE)
+kabc2mutt_la_SOURCES = kabc2mutt.cpp main.cpp
messages: rc.cpp
$(XGETTEXT) *.cpp -o $(podir)/kabc2mutt.pot
---- 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
+--- 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
@@ -41,7 +41,7 @@
};
@@ -186,10 +186,10 @@
{
KApplication::disableAutoDcopRegistration();
KCmdLineArgs::init( argc, argv, appName, programName, description, version );
---- 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 \
+--- 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
+@@ -14,11 +14,12 @@
+ -I$(top_buildir)/kaddressbook/editors \
$(all_includes)
-bin_PROGRAMS = kaddressbook
@@ -200,12 +200,12 @@
-kaddressbook_LDFLAGS = $(all_libraries) $(KDE_RPATH)
-kaddressbook_LDADD = libkaddressbook.la
+kaddressbook_la_SOURCES = main.cpp kaddressbookmain.cpp
-+kaddressbook_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module
++kaddressbook_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version
+kaddressbook_la_LIBADD = libkaddressbook.la
kde_module_LTLIBRARIES = libkaddressbookpart.la
-@@ -68,7 +69,7 @@
+@@ -66,7 +67,7 @@
viewconfigurefilterpage.h viewconfigurewidget.h viewmanager.h xxportmanager.h \
xxportselectdialog.h advancedcustomfields.h imeditwidget.h
@@ -214,8 +214,8 @@
rcdir = $(kde_datadir)/kaddressbook
rc_DATA = kaddressbookui.rc kaddressbook_part.rc
---- 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
+--- 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
@@ -109,7 +109,7 @@
return 0;
}
@@ -225,8 +225,8 @@
{
KLocale::setMainCatalogue( "kaddressbook" );
---- 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
+--- 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
@@ -1,10 +1,12 @@
-bin_PROGRAMS = kandy kandy_client
+bin_PROGRAMS =
@@ -238,7 +238,7 @@
-kandy_LDFLAGS = $(KDE_RPATH) $(all_libraries)
-kandy_LDADD = $(KANDY_LIBLOCKDEV) $(LIB_KFILE) -lkabc $(top_builddir)/libkdepim/libkdepim.la
-kandy_SOURCES = main.cpp kandy.cpp \
-+kandy_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -module
++kandy_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+kandy_la_LIBADD = $(KANDY_LIBLOCKDEV) $(LIB_KFILE) -lkabc $(top_builddir)/libkdepim/libkdepim.la
+kandy_la_SOURCES = main.cpp kandy.cpp \
cmdpropertiesdialog_base.ui cmdpropertiesdialog.cpp \
@@ -251,14 +251,14 @@
-kandy_client_LDFLAGS = $(KDE_RPATH) $(all_libraries)
-kandy_client_LDADD = $(LIB_KDECORE)
-kandy_client_SOURCES = kandy_client.cpp
-+kandy_client_la_LDFLAGS = $(KDE_RPATH) -module $(all_libraries)
++kandy_client_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+kandy_client_la_LIBADD = $(LIB_KDECORE)
+kandy_client_la_SOURCES = kandy_client.cpp
METASOURCES = AUTO
---- 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
+--- 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
@@ -27,7 +27,7 @@
#include <qdatastream.h>
#include <qstring.h>
@@ -268,8 +268,8 @@
{
KApplication app(argc, argv, "kandy_client", false);
---- 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
+--- 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
@@ -85,7 +85,7 @@
#endif
}
@@ -279,123 +279,38 @@
{
KAboutData about("kandy", I18N_NOOP("Kandy"), version, description,
KAboutData::License_GPL, "(C) 2001 Cornelius Schumacher",0,
---- 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 @@
+--- 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
+@@ -7,11 +7,13 @@
+ $(all_includes)
- METASOURCES = AUTO
-
+ # Application
-bin_PROGRAMS = kitchensync
+bin_PROGRAMS =
-+lib_LTLIBRARIES =
-+kdeinit_LTLIBRARIES = kitchensync.la
--kitchensync_SOURCES = main.cpp splash.cpp
-+kitchensync_la_SOURCES = main.cpp splash.cpp
-
--kitchensync_LDADD = ../libkonnector2/libkonnector.la ./lib/libkitchensyncui.la \
-+kitchensync_la_LIBADD = ../libkonnector2/libkonnector.la ./lib/libkitchensyncui.la \
- ../libksync/libksync2.la
+-kitchensync_SOURCES = main.cpp mainwindow.cpp
-kitchensync_LDFLAGS = $(KDE_RPATH) $(all_libraries)
-+kitchensync_la_LDFLAGS = $(KDE_RPATH) -module $(all_libraries)
+-kitchensync_LDADD = libkitchensync.la
++kdeinit_LTLIBRARIES = kitchensync.la
++
++kitchensync_la_SOURCES = main.cpp mainwindow.cpp
++kitchensync_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
++kitchensync_la_LIBADD = libkitchensync.la
- 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
- };
+ xdg_apps_DATA = kitchensync.desktop
--int main( int argc, char *argv[] )
-+extern "C" KDE_EXPORT int kdemain( int argc, char *argv[] )
- {
- KSync::AboutData aboutData;
+@@ -37,7 +39,7 @@
+ kde_module_LTLIBRARIES = libkitchensyncpart.la
---- 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
+ libkitchensyncpart_la_SOURCES = part.cpp
+-libkitchensyncpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined
++libkitchensyncpart_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries)
+ libkitchensyncpart_la_LIBADD = $(LIB_KPARTS) libkitchensync.la
- INCLUDES = -I$(top_srcdir)/ -I$(top_srcdir)/kitchensync/libksync -I$(top_srcdir)/kitchensync/libkonnector2 -I$(top_srcdir)/libkcal $(all_includes)
-
---- 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.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.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.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
-
--lib_LTLIBRARIES = libqtopiakonnector.la
-+kde_module_LTLIBRARIES = libqtopiakonnector.la
-
- INCLUDES = -I$(top_srcdir)/ -I$(top_srcdir)/kitchensync/libksync -I$(top_srcdir)/kitchensync/libkonnector2 -I$(top_srcdir)/libkcal \
- $(all_includes)
---- 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.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.
-
--lib_LTLIBRARIES = libthreadedkonnector.la
-+kde_module_LTLIBRARIES = libthreadedkonnector.la
-
- INCLUDES = -I$(top_srcdir)/ -I$(top_srcdir)/kitchensync/libksync -I$(top_srcdir)/kitchensync/libkonnector2 -I$(top_srcdir)/libkcal $(all_includes)
-
---- 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)
-
- # Application
--bin_PROGRAMS = multisynk
-+bin_PROGRAMS =
-+kdeinit_LTLIBRARIES = multisynk.la
-
--multisynk_SOURCES = main.cpp multisynk_main.cpp
--multisynk_LDFLAGS = $(KDE_RPATH) $(all_libraries)
--multisynk_LDADD = libmultisynk.la
-+multisynk_la_SOURCES = main.cpp multisynk_main.cpp
-+multisynk_la_LDFLAGS = $(KDE_RPATH) -module $(all_libraries)
-+multisynk_la_LIBADD = libmultisynk.la
-
- xdg_apps_DATA = multisynk.desktop
-
---- 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 @@
+ # 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
+@@ -32,7 +32,7 @@
KCmdLineLastOption
};
@@ -404,37 +319,39 @@
{
KAboutData *about = MainWidget::aboutData();
---- 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 @@
+--- 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
+@@ -24,32 +24,34 @@
endif
lib_LTLIBRARIES = libkmailprivate.la
-libkmailprivate_la_LDFLAGS = $(all_libraries) -avoid-version -no-undefined
+libkmailprivate_la_LDFLAGS = $(all_libraries) -no-undefined
- libkmailprivate_la_LIBADD = $(LIB_KHTML) $(LIB_KSPELL) $(LIB_KABC) \
+ libkmailprivate_la_LIBADD = \
../libkmime/libkmime.la ../libkpgp/libkpgp.la ../libkdepim/libkdepim.la \
../libkpimidentities/libkpimidentities.la ../mimelib/libmimelib.la \
../libksieve/libksieve.la ../libemailfunctions/libemailfunctions.la \
../certmanager/lib/libkleopatra.la $(INDEXLIB) \
-- ../libkcal/libkcal.la
-+ ../libkcal/libkcal.la $(LIBZ)
+ ../libkcal/libkcal.la \
+- $(LIB_KHTML) $(LIB_KSPELL) $(LIB_KABC)
++ $(LIB_KHTML) $(LIB_KSPELL) $(LIB_KABC) $(LIBZ)
kde_module_LTLIBRARIES = kcm_kmail.la libkmailpart.la libkmail_bodypartformatter_application_octetstream.la
-libkmailpart_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version -no-undefined
-libkmailpart_la_LIBADD = libkmailprivate.la
-+libkmailpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
++libkmailpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libkmailpart_la_LIBADD = libkmailprivate.la $(LIBZ)
kcm_kmail_la_SOURCES = kcm_kmail.cpp
-kcm_kmail_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
-kcm_kmail_la_LIBADD = libkmailprivate.la $(LIB_KDECORE)
-+kcm_kmail_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
-+kcm_kmail_la_LIBADD = libkmailprivate.la $(LIB_KDECORE) $(LIBZ)
++kcm_kmail_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
++kcm_kmail_la_LIBADD = libkmailprivate.la $(LIB_KDECORE) $(LIBZ)
libkmail_bodypartformatter_application_octetstream_la_SOURCES = app_octetstream.cpp
- libkmail_bodypartformatter_application_octetstream_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-@@ -45,9 +45,11 @@
+-libkmail_bodypartformatter_application_octetstream_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
++libkmail_bodypartformatter_application_octetstream_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+
linkdir = $(kde_datadir)/kmail/plugins/bodypartformatter
link_DATA = application_octetstream.desktop
@@ -444,57 +361,22 @@
+bin_PROGRAMS =
+kdeinit_LTLIBRARIES = kmail.la
+
-+kmail_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module $(LIBZ)
++kmail_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(LIBZ)
+kmail_la_LIBADD = libkmailprivate.la $(LIBZ)
libkmailprivate_la_SOURCES = kmmessage.cpp kmmainwin.cpp configuredialog.cpp \
configuredialog_p.cpp klistviewindexedsearchline.cpp \
-@@ -131,7 +133,7 @@
- templatesconfiguration_kfg.kcfgc \
- templateparser.cpp
+@@ -137,7 +139,7 @@
+ messagecopyhelper.cpp \
+ localsubscriptiondialog.cpp
-kmail_SOURCES = main.cpp
+kmail_la_SOURCES = main.cpp
libkmailpart_la_SOURCES = kmailpartIface.skel kmail_part.cpp
---- 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
+--- 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
@@ -64,7 +64,7 @@
return 0;
}
@@ -504,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.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
+--- 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
@@ -1,6 +1,9 @@
-bin_PROGRAMS = kmailcvt
@@ -536,12 +418,12 @@
# the library search path.
-kmailcvt_LDFLAGS = $(all_libraries) $(KDE_RPATH)
-+kmailcvt_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module
++kmailcvt_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
KDE_ICON=AUTO
---- 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
+--- 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
@@ -26,7 +26,7 @@
KCmdLineLastOption
};
@@ -551,8 +433,8 @@
{
KLocale::setMainCatalogue("kmailcvt");
---- 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
+--- 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
@@ -2,15 +2,16 @@
SUBDIRS = . devices # kioslave
@@ -568,14 +450,14 @@
-kmobile_LDFLAGS = $(KDE_RPATH) $(all_libraries)
-kmobile_LDADD = $(LIB_KFILE) $(LIB_KABC) libkmobiledevice.la
-kmobile_SOURCES = main.cpp kmobile.cpp kmobileview.cpp kmobileitem.cpp\
-+kmobile_la_LDFLAGS = $(KDE_RPATH) -module $(all_libraries)
++kmobile_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+kmobile_la_LIBADD = $(LIB_KFILE) $(LIB_KABC) libkmobiledevice.la
+kmobile_la_SOURCES = main.cpp kmobile.cpp kmobileview.cpp kmobileitem.cpp\
pref.cpp kmobileiface.skel kmobile_selectiondialog.ui \
systemtray.cpp
---- 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
+--- 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
@@ -35,7 +35,7 @@
KCmdLineLastOption
};
@@ -585,14 +467,14 @@
{
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.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
+--- 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
@@ -10,22 +10,23 @@
lib_LTLIBRARIES = libknodecommon.la
kde_module_LTLIBRARIES = kcm_knode.la libknodepart.la
-libknodepart_la_LDFLAGS = -module -avoid-version -no-undefined $(all_libraries) $(KDE_RPATH) $(KDE_PLUGIN)
-+libknodepart_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN)
++libknodepart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
libknodepart_la_LIBADD = libknodecommon.la
SUBDIRS = pics filters
@@ -603,18 +485,18 @@
-knode_LDFLAGS = $(all_libraries) $(KDE_RPATH)
-knode_LDADD = libknodecommon.la
-+knode_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module
++knode_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+knode_la_LIBADD = libknodecommon.la
kcm_knode_la_SOURCES = knconfigpages.cpp
-kcm_knode_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
-+kcm_knode_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
++kcm_knode_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
kcm_knode_la_LIBADD = libknodecommon.la $(LIB_KDECORE)
knconfigpages.lo: smtpaccountwidget_base.h
-libknodecommon_la_LDFLAGS = -avoid-version -no-undefined $(all_libraries)
+libknodecommon_la_LDFLAGS = -no-undefined $(all_libraries)
- libknodecommon_la_LIBADD = -lkdeprint -lkwalletclient $(top_builddir)/libkmime/libkmime.la $(top_builddir)/libkpgp/libkpgp.la $(top_builddir)/libkdepim/libkdepim.la $(LIB_KSPELL) $(LIB_KABC) $(LIB_KFILE) $(LIB_KUTILS) $(LIBRESOLV) $(LIB_KHTML)
+ libknodecommon_la_LIBADD = $(top_builddir)/libkmime/libkmime.la $(top_builddir)/libkpgp/libkpgp.la $(top_builddir)/libkdepim/libkdepim.la $(LIB_KSPELL) $(LIB_KABC) $(LIB_KFILE) $(LIB_KUTILS) $(LIBRESOLV) $(LIB_KHTML)
libknodecommon_la_SOURCES = knconfigmanager.cpp \
knconfig.cpp \
@@ -93,7 +94,7 @@
@@ -635,8 +517,8 @@
xdg_apps_DATA = KNode.desktop
---- 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
+--- 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
@@ -25,7 +25,7 @@
#include "knode_options.h"
using KNode::AboutData;
@@ -646,8 +528,8 @@
{
AboutData aboutData;
---- 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
+--- 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
@@ -2,7 +2,9 @@
SUBDIRS = . pics icons
@@ -659,7 +541,7 @@
include_HEADERS = KNotesIface.h KNotesAppIface.h
noinst_HEADERS = knotesapp.h knote.h knoteedit.h knotebutton.h \
-@@ -23,12 +25,12 @@
+@@ -23,16 +25,16 @@
libknote_la_SOURCES = knote.cpp knotebutton.cpp knoteconfigdlg.cpp knotehostdlg.cpp \
knotealarmdlg.cpp knotesalarm.cpp
@@ -671,13 +553,18 @@
$(top_builddir)/libkdepim/libkdepim.la $(LIB_KIO) -lkresources -lkdeprint -lkutils
-knotes_LDFLAGS = $(all_libraries) $(KDE_RPATH)
-knotes_COMPILE_FIRST = knoteconfig.h
-+knotes_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module
++knotes_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+knotes_la_COMPILE_FIRST = knoteconfig.h
kde_module_LTLIBRARIES = knotes_local.la
knotes_local_la_SOURCES = resourcelocal_plugin.cpp
---- 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
+-knotes_local_la_LDFLAGS = $(KDE_LDFLAGS) $(all_libraries) -module $(KDE_PLUGIN)
++knotes_local_la_LDFLAGS = $(KDE_LDFLAGS) $(all_libraries) $(KDE_PLUGIN)
+ 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
@@ -86,7 +86,7 @@
return KUniqueApplication::newInstance();
}
@@ -687,8 +574,8 @@
{
QString version = QString::number( KNOTES_VERSION );
---- 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
+--- 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
@@ -12,10 +12,11 @@
-version-info 1:0:0 -no-undefined
libkode_la_LIBADD = -lkdecore
@@ -700,13 +587,13 @@
-kode_LDFLAGS = $(all_libraries) $(KDE_RPATH)
-kode_LDADD = libkode.la -lkabc
-kode_SOURCES = kodemain.cpp
-+kode_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module
++kode_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+kode_la_LIBADD = libkode.la -lkabc
+kode_la_SOURCES = kodemain.cpp
METASOURCES = AUTO
---- 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
+--- 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
@@ -607,7 +607,7 @@
return 0;
}
@@ -716,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.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
+--- 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
@@ -1,9 +1,11 @@
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/libkdepim $(all_includes)
@@ -729,13 +616,13 @@
-kxml_compiler_LDFLAGS = $(all_libraries) $(KDE_RPATH)
-kxml_compiler_LDADD = ../libkode.la -lkdecore
-kxml_compiler_SOURCES = parser.cpp creator.cpp kxml_compiler.cpp
-+kxml_compiler_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module
++kxml_compiler_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+kxml_compiler_la_LIBADD = ../libkode.la -lkdecore
+kxml_compiler_la_SOURCES = parser.cpp creator.cpp kxml_compiler.cpp
METASOURCES = AUTO
---- 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
+--- 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
@@ -55,7 +55,7 @@
KCmdLineLastOption
};
@@ -745,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.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
+--- 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
@@ -6,14 +6,16 @@
METASOURCES = AUTO
@@ -764,12 +651,12 @@
-konsolekalendar_LDADD = $(top_builddir)/libkcal/libkcal.la $(top_builddir)/libkdepim/libkdepim.la
-konsolekalendar_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+konsolekalendar_la_LIBADD = $(top_builddir)/libkcal/libkcal.la $(top_builddir)/libkdepim/libkdepim.la
-+konsolekalendar_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module
++konsolekalendar_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
appsdir = $(kde_appsdir)/Utilities
xdg_apps_DATA = konsolekalendar.desktop
---- 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
+--- 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
@@ -165,7 +165,7 @@
KCmdLineLastOption
};
@@ -779,8 +666,8 @@
{
KAboutData aboutData(
progName, // internal program name
---- 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
+--- 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
@@ -5,23 +5,29 @@
lib_LTLIBRARIES = libkontact.la
libkontact_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -version-info 1:0
@@ -801,7 +688,7 @@
+kdeinit_LTLIBRARIES = kontact.la
+
+kontact_la_METASOURCES = AUTO
-+kontact_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module
++kontact_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+kontact_la_LIBADD = $(top_builddir)/libkdepim/libkdepim.la \
$(top_builddir)/kontact/interfaces/libkpinterfaces.la libkontact.la \
$(LIB_KPARTS) $(LIB_KUTILS) $(LIB_KHTML)
@@ -815,12 +702,12 @@
kcm_kontact_la_SOURCES = kcmkontact.cpp
-kcm_kontact_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
-+kcm_kontact_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
++kcm_kontact_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
kcm_kontact_la_LIBADD = libkontact.la $(top_builddir)/libkdepim/libkdepim.la
kcm_kontact_la_COMPILE_FIRST = prefs.h
---- 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
+--- 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
@@ -120,7 +120,7 @@
return KUniqueApplication::newInstance();
}
@@ -830,9 +717,9 @@
{
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.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 @@
+--- 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
+@@ -12,23 +12,24 @@
-I$(top_builddir) \
$(all_includes)
@@ -844,7 +731,7 @@
-korganizer_LDADD = libkorganizer.la
-korganizer_SOURCES = main.cpp korganizer.cpp koapp.cpp
-korganizer_COMPILE_FIRST = koprefs_base.h
-+korganizer_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module
++korganizer_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+korganizer_la_LIBADD = libkorganizer.la
+korganizer_la_SOURCES = main.cpp koapp.cpp
+korganizer_la_COMPILE_FIRST = koprefs_base.h
@@ -854,11 +741,17 @@
kcm_korganizer_la_SOURCES = koprefsdialog.cpp
-kcm_korganizer_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
-+kcm_korganizer_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
++kcm_korganizer_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
kcm_korganizer_la_LIBADD = libkorganizer.la $(top_builddir)/libkdepim/libkdepim.la \
$(LIB_KDECORE)
kcm_korganizer_la_COMPILE_FIRST = koprefs_base.h kogroupwareprefspage.h
-@@ -65,7 +66,7 @@
+
+-libkorganizerpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
++libkorganizerpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+ libkorganizerpart_la_LIBADD = libkorganizer.la
+ libkorganizerpart_la_SOURCES = korganizer_part.cpp
+ libkorganizerpart_la_COMPILE_FIRST = publishdialog_base.h koprefs_base.h
+@@ -67,7 +68,7 @@
libkorganizer_la_COMPILE_FIRST = \
kogroupwareprefspage.ui \
$(top_srcdir)/libkdepim/categoryselectdialog.h
@@ -867,8 +760,8 @@
koagendaview.cpp koagenda.cpp koagendaitem.cpp \
datenavigator.cpp kdatenavigator.cpp datenavigatorcontainer.cpp \
datechecker.cpp \
---- 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
+--- 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
@@ -1,11 +1,13 @@
INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/korganizer $(all_includes)
@@ -879,7 +772,7 @@
-korgac_LDFLAGS = $(all_libraries) $(KDE_RPATH)
-korgac_LDADD = $(LIB_KDEUI) \
-+korgac_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module
++korgac_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+korgac_la_LIBADD = $(LIB_KDEUI) \
$(top_builddir)/korganizer/libkorganizer_eventviewer.la
-korgac_SOURCES = korgacmain.cpp alarmdialog.cpp \
@@ -898,8 +791,8 @@
noinst_HEADERS = alarmclientiface.h alarmdialog.h \
alarmdockwindow.h koalarmclient.h
---- 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
+--- 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
@@ -59,7 +59,7 @@
{ 0, 0, 0 }
};
@@ -909,8 +802,8 @@
{
KLocale::setMainCatalogue( "korganizer" );
KAboutData aboutData( "korgac", I18N_NOOP("KOrganizer Reminder Daemon"),
---- 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
+--- 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
@@ -32,7 +32,7 @@
#include "kocore.h"
@@ -920,8 +813,8 @@
{
KAboutData aboutData("korgplugins",I18N_NOOP("KOrgPlugins"),"0.1");
KCmdLineArgs::init(argc,argv,&aboutData);
---- 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
+--- 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
@@ -35,7 +35,7 @@
#include "korganizer.h"
#include "korganizer_options.h"
@@ -931,8 +824,8 @@
{
KOrg::AboutData aboutData;
---- 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
+--- 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
@@ -34,7 +34,7 @@
#include "koprefs.h"
@@ -942,8 +835,8 @@
{
KAboutData aboutData("timezone",I18N_NOOP("KOrganizer Timezone Test"),"0.1");
KCmdLineArgs::init(argc,argv,&aboutData);
---- 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
+--- 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 @@
METASOURCES = AUTO
@@ -954,7 +847,7 @@
+bin_PROGRAMS =
+kdeinit_LTLIBRARIES = korn.la
+
-+korn_la_LDFLAGS = $(KDE_RPATH) -module
++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
@@ -963,8 +856,8 @@
accountmanager.cpp \
account_input.cpp \
boxcontainer.cpp \
---- 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
+--- 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
@@ -14,7 +14,7 @@
static const char version[] = "0.4";
@@ -974,27 +867,28 @@
{
KAboutData aboutData(argv[0], I18N_NOOP("Korn"),
version, description, KAboutData::License_GPL,
---- 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
+--- 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
+@@ -7,6 +7,8 @@
MAL_SUBDIR = malconduit
+ else
+ MAL_SUBDIR =
+else
+MAL_SUBDIR =
endif
SUBDIRS = \
- abbrowserconduit \
+@@ -14,6 +16,7 @@
docconduit \
knotes \
+ $(MAL_SUBDIR) \
+ $(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 @@
+--- 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
+@@ -14,20 +14,22 @@
noinst_LTLIBRARIES = libpalmdoc_shared.la
kde_module_LTLIBRARIES = conduit_doc.la
@@ -1005,7 +899,11 @@
libpalmdoc_shared_la_SOURCES = makedoc9.cc pilotDOCHead.cc pilotDOCEntry.cc pilotDOCBookmark.cc DOC-converter.cc
-@@ -25,9 +27,9 @@
+ conduit_doc_la_SOURCES = docconduitSettings.kcfgc doc-factory.cc doc-setup.cc doc-conduit.cc doc-setupdialog.ui doc-conflictdialog.cc
+-conduit_doc_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
++conduit_doc_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+ conduit_doc_la_LIBADD = ../../lib/libkpilot.la libpalmdoc_shared.la \
+ $(LIB_KDEUI) $(LIB_KFILE)
##libpalmdoc_shared.la
@@ -1013,13 +911,13 @@
-kpalmdoc_LDFLAGS = $(PISOCK_LDFLAGS) $(all_libraries) $(KDE_RPATH)
-kpalmdoc_LDADD = $(LIB_KFILE) $(PISOCK_LIB) ../../lib/libkpilot.la libpalmdoc_shared.la
+kpalmdoc_la_SOURCES = kpalmdocSettings.kcfgc kpalmdoc_dlgbase.ui kpalmdoc_dlg.cc kpalmdoc.cpp
-+kpalmdoc_la_LDFLAGS = $(PISOCK_LDFLAGS) $(all_libraries) $(KDE_RPATH) -module
++kpalmdoc_la_LDFLAGS = $(PISOCK_LDFLAGS) $(all_libraries) $(KDE_PLUGIN)
+kpalmdoc_la_LIBADD = $(LIB_KFILE) $(PISOCK_LIB) ../../lib/libkpilot.la libpalmdoc_shared.la
xdg_apps_DATA = kpalmdoc.desktop
servicetypedir = $(kde_servicetypesdir)
---- 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
+--- 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
@@ -36,7 +36,7 @@
@@ -1029,8 +927,8 @@
{
KAboutData about("converter", I18N_NOOP("KPalmDOC"), "-0.0.1",
---- 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
+--- 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
@@ -34,6 +34,7 @@
#include "options.h"
@@ -1039,8 +937,8 @@
#include <qregexp.h>
#include <kconfig.h>
#include <kdebug.h>
---- 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
+--- 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
@@ -9,9 +9,10 @@
SUBDIRS = Icons
@@ -1059,7 +957,7 @@
kpilotConfigWizard.cc \
dbSelectionDialog.cc dbSelection_base.ui
-kcm_kpilot_la_LDFLAGS = $(PISOCK_LDFLAGS) $(all_libraries) -module -avoid-version -no-undefined
-+kcm_kpilot_la_LDFLAGS = $(PISOCK_LDFLAGS) $(all_libraries) $(KDE_PLUGIN) -module
++kcm_kpilot_la_LDFLAGS = $(PISOCK_LDFLAGS) $(all_libraries) $(KDE_PLUGIN)
kcm_kpilot_la_LIBADD = $(LIB_KFILE) $(PISOCK_LIB) \
../lib/libkpilot.la \
libconfiguration.la
@@ -1070,7 +968,7 @@
pilotDaemonDCOP.stub kpilotDCOP.skel loggerDCOP.skel \
kpilot.cc \
pilotComponent.cc logWidget.cc memoWidget.cc \
-@@ -52,35 +53,26 @@
+@@ -52,10 +53,10 @@
todoWidget.cc todoEditor.cc todoEditor_base.ui \
fileInstaller.cc fileInstallWidget.cc \
listItems.cc
@@ -1082,22 +980,16 @@
+kpilotDaemon_la_SOURCES = \
pilotDaemonDCOP.skel kpilotDCOP.stub loggerDCOP.stub loggerDCOP.skel \
pilotDaemon.cc logFile.cc \
- hotSync.cc internalEditorAction.cc interactiveSync.cc syncStack.cc \
- fileInstaller.cc
+ hotSync.cc internalEditorAction.cc \
+@@ -68,16 +69,16 @@
+ main-test.cc
--kpilotTest_SOURCES = \
-- logWidget.cc pilotComponent.cc \
-- hotSync.cc internalEditorAction.cc interactiveSync.cc \
-- loggerDCOP.skel \
-- syncStack.cc \
-- main-test.cc
-
-kpilot_LDFLAGS = $(PISOCK_LDFLAGS) $(all_libraries) $(KDE_RPATH)
-kpilotDaemon_LDFLAGS = $(PISOCK_LDFLAGS) $(all_libraries) $(KDE_RPATH)
--kpilotTest_LDFLAGS = $(PISOCK_LDFLAGS) $(all_libraries) $(KDE_RPATH)
-+kpilot_la_LDFLAGS = $(PISOCK_LDFLAGS) $(all_libraries) $(KDE_RPATH) -module
-+kpilotDaemon_la_LDFLAGS = $(PISOCK_LDFLAGS) $(all_libraries) $(KDE_RPATH) -module
++kpilot_la_LDFLAGS = $(PISOCK_LDFLAGS) $(all_libraries) $(KDE_PLUGIN)
++kpilotDaemon_la_LDFLAGS = $(PISOCK_LDFLAGS) $(all_libraries) $(KDE_PLUGIN)
+ kpilotTest_LDFLAGS = $(PISOCK_LDFLAGS) $(all_libraries) $(KDE_RPATH)
# the libraries to link against. Be aware of the order. First the libraries,
@@ -1106,26 +998,24 @@
+kpilot_la_LIBADD = $(LIB_KFILE) $(PISOCK_LIB) -lkutils \
../lib/libkpilot.la libconfiguration.la
-kpilotDaemon_LDADD = $(LIB_KFILE) $(PISOCK_LIB) \
-- ../lib/libkpilot.la libconfiguration.la
--kpilotTest_LDADD = $(LIB_KFILE) $(PISOCK_LIB) \
+kpilotDaemon_la_LIBADD = $(LIB_KFILE) $(PISOCK_LIB) \
../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
+@@ -1008,7 +1008,7 @@
- xdg_apps_DATA = kpilot.desktop kpilotdaemon.desktop
---- 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 @@
-
-int main(int argc, char **argv)
+extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
{
FUNCTIONSETUP;
---- 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 @@
+--- 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
+@@ -1301,7 +1301,7 @@
} ;
@@ -1134,24 +1024,8 @@
{
FUNCTIONSETUP;
---- 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
+--- 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
@@ -67,7 +67,7 @@
}
}
@@ -1161,8 +1035,8 @@
{
KAboutData aboutData( "benchmarkfeaturelist",
"Benchmark for feature list XML parser",
---- 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
+--- 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
@@ -67,7 +67,7 @@
}
}
@@ -1172,8 +1046,8 @@
{
KAboutData aboutData( "dumpfeaturelist", "Dump XML feature list to stdout",
"0.1" );
---- 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
+--- 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
@@ -44,7 +44,7 @@
KCmdLineLastOption
};
@@ -1183,48 +1057,8 @@
{
KAboutData aboutData( "soapdebug", I18N_NOOP("Groupwise Soap Debug"), "0.1" );
aboutData.addAuthor( "Cornelius Schumacher", 0, "schumacher at kde.org" );
---- 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
--ksync_LDADD = ../lib/libksync.la $(LIB_KIO)
--ksync_LDFLAGS = $(all_libraries) $(KDE_RPATH)
-+bin_PROGRAMS =
-+lib_LTLIBRARIES =
-+kdeinit_LTLIBRARIES = ksync.la
-+
-+ksync_la_SOURCES = ksyncview.cpp ksync.cpp main.cpp
-+ksync_la_LIBADD = ../lib/libksync.la $(LIB_KIO)
-+ksync_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module
-
- 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.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
- };
-
--int main(int argc, char *argv[])
-+extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
- {
-
- KAboutData aboutData( "ksync", I18N_NOOP("KSync"),
---- 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
+--- 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
@@ -2,14 +2,16 @@
SUBDIRS = pics
@@ -1238,7 +1072,7 @@
+lib_LTLIBRARIES =
+kdeinit_LTLIBRARIES = ktnef.la
+
-+ktnef_la_LDFLAGS = $(KDE_RPATH) -module $(all_libraries)
++ktnef_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+ktnef_la_LIBADD = $(LIB_KFILE) $(top_builddir)/ktnef/lib/libktnef.la
+ktnef_la_SOURCES = ktnefmain.cpp ktnefview.cpp attachpropertydialogbase.ui \
attachpropertydialog.cpp messagepropertydialog.cpp \
@@ -1248,8 +1082,8 @@
noinst_HEADERS = ktnefmain.h ktnefview.h attachpropertydialog.h \
qwmf.h wmfstruct.h metafuncs.h
---- 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
+--- 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
@@ -33,7 +33,7 @@
// INSERT YOUR COMMANDLINE OPTIONS HERE
};
@@ -1259,8 +1093,8 @@
{
KAboutData aboutData( "ktnef", I18N_NOOP("KTnef"),
---- 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
+--- 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
@@ -48,7 +48,7 @@
KCmdLineLastOption
};
@@ -1270,8 +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.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
+--- 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
@@ -1282,8 +1116,8 @@
#include <stdio.h>
#include <stdlib.h>
#include <ctype.h>
---- 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
+--- 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
@@ -36,7 +36,7 @@
#include <qlabel.h>
@@ -1293,8 +1127,8 @@
{
KAboutData aboutData( "example", I18N_NOOP("autoconfig example"), "0.1" );
aboutData.addAuthor( "Cornelius Schumacher", 0, "schumacher at kde.org" );
---- 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
+--- 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
@@ -32,7 +32,7 @@
#include <libkdepim/kprefsdialog.h>
@@ -1304,8 +1138,8 @@
{
KAboutData aboutData( "example", I18N_NOOP("cfgc example"), "0.1" );
aboutData.addAuthor( "Cornelius Schumacher", 0, "schumacher at kde.org" );
---- 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
+--- 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
@@ -7,7 +7,7 @@
lib_LTLIBRARIES = libkholidays.la
@@ -1315,9 +1149,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.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 @@
+--- 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 @@
int year, int off, int length);
/*** Variables and structures ***/
static int m, d, y;
@@ -1328,20 +1162,20 @@
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.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 @@
+--- 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
+@@ -15,6 +15,8 @@
+ #define yyrestart kcalrestart
+ #define yytext kcaltext
- extern int kcallineno;
++int kcallineno;
++
+ #line 19 "scanholiday.c"
+ /* A lexical scanner generated by flex*/
--int kcallineno = 1;
-+kcallineno = 1;
-
- extern char *kcaltext;
- #define yytext_ptr kcaltext
---- 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 @@
+--- 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
+@@ -656,7 +656,7 @@
""
};
@@ -1350,9 +1184,9 @@
{
struct tm *ptms, tms1, tms2;
time_t tt;
---- 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 @@
+--- 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
+@@ -429,7 +429,7 @@
// Test harness for DwUudecode
@@ -1361,14 +1195,14 @@
{
srand(time(0));
DwString binStr;
---- 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
+--- 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
@@ -19,7 +19,7 @@
clientiface.skel serviceiface.skel network.cpp
#kclientiface.skel serviceiface.skel
kded_networkstatus_la_LIBADD = $(LIB_KDECORE) $(LIB_KIO) ./libnetworkstatus.la
-kded_networkstatus_la_LDFLAGS = $(all_libraries) -module -avoid-version
-+kded_networkstatus_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module
++kded_networkstatus_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version
servicesdir = $(kde_servicesdir)/kded
services_DATA = networkstatus.desktop
@@ -1383,13 +1217,13 @@
-networkstatustestservice_LDFLAGS = $(all_libraries)
-networkstatustestservice_LDADD = libnetworkstatus.la
-+networkstatustestservice_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module
++networkstatustestservice_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+networkstatustestservice_la_LIBADD = libnetworkstatus.la
-networkstatustestservice_SOURCES = testservice.cpp provideriface.skel serviceiface.stub
+networkstatustestservice_la_SOURCES = testservice.cpp provideriface.skel serviceiface.stub
---- 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
+--- 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
@@ -90,7 +90,7 @@
m_service->setNetworkStatus( "test_net", (int)m_status );
}
@@ -1399,8 +1233,8 @@
{
KApplication app(argc, argv, "testdcop");
TestService * test = new TestService;
---- 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
+--- 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
@@ -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/20070715/d11a5641/attachment.html
More information about the macports-changes
mailing list