diff -uNr kdepim-3.3.2/admin/ltmain.sh kdepim-3.3.2-new/admin/ltmain.sh --- kdepim-3.3.2/admin/ltmain.sh Tue Jun 15 12:47:06 2004 +++ kdepim-3.3.2-new/admin/ltmain.sh Thu Dec 16 09:47:29 2004 @@ -4397,6 +4397,7 @@ # We should set the shlibpath_var rpath= for dir in $temp_rpath; do + if test "$dir" != "@FINKPREFIX@/lib"; then case $dir in [\\/]* | [A-Za-z]:[\\/]*) # Absolute path. @@ -4407,6 +4408,7 @@ rpath="$rpath\$thisdir/$dir:" ;; esac + fi done temp_rpath="$rpath" fi diff -uNr kdepim-3.3.2/configure kdepim-3.3.2-new/configure --- kdepim-3.3.2/configure Mon Nov 29 10:36:39 2004 +++ kdepim-3.3.2-new/configure Thu Dec 16 09:47:29 2004 @@ -7986,6 +7986,19 @@ lt_cv_sys_max_cmd_len=8192; ;; + netbsd* | freebsd* | openbsd* | darwin* ) + # This has been around since 386BSD, at least. Likely further. + if test -x /sbin/sysctl; then + lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` + elif test -x /usr/sbin/sysctl; then + lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` + else + lt_cv_sys_max_cmd_len=65536 # usable default for *BSD + fi + # And add a safety zone + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` + ;; + *) # If test is not a shell built-in, we'll probably end up computing a # maximum length that is only half of the actual maximum length, but @@ -9629,10 +9642,21 @@ archive_cmds_need_lc=no case "$host_os" in rhapsody* | darwin1.[012]) - allow_undefined_flag='-undefined suppress' + allow_undefined_flag='-Wl,-undefined -Wl,suppress' ;; *) # Darwin 1.3 on - test -z ${LD_TWOLEVEL_NAMESPACE} && allow_undefined_flag='-flat_namespace -undefined suppress' + if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then + allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress' + else + case ${MACOSX_DEPLOYMENT_TARGET} in + 10.[012]) + allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress' + ;; + 10.*) + allow_undefined_flag='-Wl,-undefined -Wl,dynamic_lookup' + ;; + esac + fi ;; esac lt_int_apple_cc_single_mod=no @@ -11482,7 +11506,18 @@ allow_undefined_flag='-undefined suppress' ;; *) # Darwin 1.3 on - test -z ${LD_TWOLEVEL_NAMESPACE} && allow_undefined_flag='-flat_namespace -undefined suppress' + if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then + allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress' + else + case ${MACOSX_DEPLOYMENT_TARGET} in + 10.[012]) + allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress' + ;; + 10.*) + allow_undefined_flag='-Wl,-undefined -Wl,dynamic_lookup' + ;; + esac + fi ;; esac output_verbose_link_cmd='echo' @@ -12533,7 +12568,18 @@ allow_undefined_flag_CXX='-undefined suppress' ;; *) # Darwin 1.3 on - test -z ${LD_TWOLEVEL_NAMESPACE} && allow_undefined_flag_CXX='-flat_namespace -undefined suppress' + if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then + allow_undefined_flag_CXX='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress' + else + case ${MACOSX_DEPLOYMENT_TARGET} in + 10.[012]) + allow_undefined_flag_CXX='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress' + ;; + 10.*) + allow_undefined_flag_CXX='-Wl,-undefined -Wl,dynamic_lookup' + ;; + esac + fi ;; esac lt_int_apple_cc_single_mod=no @@ -16356,7 +16402,18 @@ allow_undefined_flag_F77='-undefined suppress' ;; *) # Darwin 1.3 on - test -z ${LD_TWOLEVEL_NAMESPACE} && allow_undefined_flag_F77='-flat_namespace -undefined suppress' + if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then + allow_undefined_flag_F77='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress' + else + case ${MACOSX_DEPLOYMENT_TARGET} in + 10.[012]) + allow_undefined_flag_F77='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress' + ;; + 10.*) + allow_undefined_flag_F77='-Wl,-undefined -Wl,dynamic_lookup' + ;; + esac + fi ;; esac lt_int_apple_cc_single_mod=no @@ -18638,7 +18695,18 @@ allow_undefined_flag_GCJ='-undefined suppress' ;; *) # Darwin 1.3 on - test -z ${LD_TWOLEVEL_NAMESPACE} && allow_undefined_flag_GCJ='-flat_namespace -undefined suppress' + if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then + allow_undefined_flag_GCJ='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress' + else + case ${MACOSX_DEPLOYMENT_TARGET} in + 10.[012]) + allow_undefined_flag_GCJ='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress' + ;; + 10.*) + allow_undefined_flag_GCJ='-Wl,-undefined -Wl,dynamic_lookup' + ;; + esac + fi ;; esac lt_int_apple_cc_single_mod=no diff -uNr kdepim-3.3.2/kontact/src/Makefile.in kdepim-3.3.2-new/kontact/src/Makefile.in --- kdepim-3.3.2/kontact/src/Makefile.in Mon Nov 29 10:36:34 2004 +++ kdepim-3.3.2-new/kontact/src/Makefile.in Thu Dec 16 09:50:11 2004 @@ -506,6 +506,7 @@ #>- libkontact_la_SOURCES = prefs.kcfgc #>+ 1 libkontact_la_SOURCES= prefs.cpp + #>- kontact_METASOURCES = AUTO kontact_LDFLAGS = $(all_libraries) $(KDE_RPATH) -lkutils kontact_LDADD = $(LIB_KPARTS) $(top_builddir)/libkdepim/libkdepim.la \ diff -uNr kdepim-3.3.2/korganizer/Makefile.in kdepim-3.3.2-new/korganizer/Makefile.in --- kdepim-3.3.2/korganizer/Makefile.in Mon Nov 29 10:36:34 2004 +++ kdepim-3.3.2-new/korganizer/Makefile.in Thu Dec 16 09:47:29 2004 @@ -622,7 +622,7 @@ korganizer_LDFLAGS = $(all_libraries) $(KDE_RPATH) korganizer_LDADD = libkorganizer.la -korganizer_SOURCES = main.cpp korganizer.cpp koapp.cpp +korganizer_SOURCES = main.cpp koapp.cpp korganizer_COMPILE_FIRST = koprefs_base.h kde_module_LTLIBRARIES = kcm_korganizer.la libkorganizerpart.la kcm_korganizer_la_SOURCES = koprefsdialog.cpp @@ -712,7 +712,7 @@ #>- freebusymanager.cpp freebusyurldialog.cpp \ #>- eventarchiver.cpp koidentitymanager.cpp #>+ 45 -libkorganizer_la_SOURCES= \ +libkorganizer_la_SOURCES= korganizer.cpp \ koagendaview.cpp koagenda.cpp koagendaitem.cpp \ datenavigator.cpp kdatenavigator.cpp datenavigatorcontainer.cpp \ datechecker.cpp \ diff -uNr kdepim-3.3.2/kpilot/conduits/malconduit/mal-conduit.cc kdepim-3.3.2-new/kpilot/conduits/malconduit/mal-conduit.cc --- kdepim-3.3.2/kpilot/conduits/malconduit/mal-conduit.cc Fri Jun 25 04:57:51 2004 +++ kdepim-3.3.2-new/kpilot/conduits/malconduit/mal-conduit.cc Thu Dec 16 09:47:29 2004 @@ -34,6 +34,7 @@ #include "options.h" +#include #include #include #include diff -uNr kdepim-3.3.2/libkdenetwork/kmime_codec_qp.cpp kdepim-3.3.2-new/libkdenetwork/kmime_codec_qp.cpp --- kdepim-3.3.2/libkdenetwork/kmime_codec_qp.cpp Sun Nov 30 04:49:29 2003 +++ kdepim-3.3.2-new/libkdenetwork/kmime_codec_qp.cpp Thu Dec 16 09:47:29 2004 @@ -125,11 +125,11 @@ @li @p insideHexChar == @p true, @p mAccu != 0: saw the first nibble '=X' */ - const bool mQEncoding : 1; - bool mInsideHexChar : 1; - bool mFlushing : 1; - bool mExpectLF : 1; - bool mHaveAccu : 1; + const bool mQEncoding; + bool mInsideHexChar; + bool mFlushing; + bool mExpectLF; + bool mHaveAccu; protected: friend class QuotedPrintableCodec; friend class Rfc2047QEncodingCodec; @@ -144,7 +144,10 @@ mInsideHexChar(false), mFlushing(false), mExpectLF(false), - mHaveAccu(false) {} + mHaveAccu(false) { + assert(mAccu == 0); + } + public: virtual ~QuotedPrintableDecoder() {} diff -uNr kdepim-3.3.2/libkdenetwork/libgpgme-copy/assuan/assuan.h kdepim-3.3.2-new/libkdenetwork/libgpgme-copy/assuan/assuan.h --- kdepim-3.3.2/libkdenetwork/libgpgme-copy/assuan/assuan.h Tue Feb 10 16:11:07 2004 +++ kdepim-3.3.2-new/libkdenetwork/libgpgme-copy/assuan/assuan.h Thu Dec 16 09:47:29 2004 @@ -21,6 +21,10 @@ #ifndef ASSUAN_H #define ASSUAN_H +#ifdef HAVE_CONFIG_H +#include +#endif + #include #include #include @@ -37,8 +41,8 @@ ssize_t _gpgme_ath_select (int nfd, fd_set *rset, fd_set *wset, fd_set *eset, struct timeval *timeout); ssize_t _gpgme_ath_waitpid (pid_t pid, int *status, int options); -int _gpgme_ath_accept (int s, struct sockaddr *addr, socklen_t *length_ptr); -int _gpgme_ath_connect (int s, struct sockaddr *addr, socklen_t length); +int _gpgme_ath_accept (int s, struct sockaddr *addr, kde_socklen_t *length_ptr); +int _gpgme_ath_connect (int s, struct sockaddr *addr, kde_socklen_t length); int _gpgme_ath_sendmsg (int s, const struct msghdr *msg, int flags); int _gpgme_ath_recvmsg (int s, struct msghdr *msg, int flags); diff -uNr kdepim-3.3.2/libkdenetwork/libgpgme-copy/gpgme/ath-compat.c kdepim-3.3.2-new/libkdenetwork/libgpgme-copy/gpgme/ath-compat.c --- kdepim-3.3.2/libkdenetwork/libgpgme-copy/gpgme/ath-compat.c Fri Jun 25 04:57:52 2004 +++ kdepim-3.3.2-new/libkdenetwork/libgpgme-copy/gpgme/ath-compat.c Thu Dec 16 09:47:29 2004 @@ -18,10 +18,6 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ -#ifdef HAVE_CONFIG_H -#include -#endif - #include #ifdef HAVE_SYS_SELECT_H # include @@ -146,7 +142,7 @@ int -ath_accept (int s, struct sockaddr *addr, socklen_t *length_ptr) +ath_accept (int s, struct sockaddr *addr, kde_socklen_t *length_ptr) { if (ath_ops && ath_ops->accept) return ath_ops->accept (s, addr, length_ptr); @@ -156,7 +152,7 @@ int -ath_connect (int s, const struct sockaddr *addr, socklen_t length) +ath_connect (int s, const struct sockaddr *addr, kde_socklen_t length) { if (ath_ops && ath_ops->connect) return ath_ops->connect (s, addr, length); diff -uNr kdepim-3.3.2/libkdenetwork/libgpgme-copy/gpgme/ath-pth.c kdepim-3.3.2-new/libkdenetwork/libgpgme-copy/gpgme/ath-pth.c --- kdepim-3.3.2/libkdenetwork/libgpgme-copy/gpgme/ath-pth.c Tue Feb 10 16:11:07 2004 +++ kdepim-3.3.2-new/libkdenetwork/libgpgme-copy/gpgme/ath-pth.c Thu Dec 16 09:47:29 2004 @@ -148,14 +148,14 @@ int -ath_accept (int s, struct sockaddr *addr, socklen_t *length_ptr) +ath_accept (int s, struct sockaddr *addr, kde_socklen_t *length_ptr) { return pth_accept (s, addr, length_ptr); } int -ath_connect (int s, const struct sockaddr *addr, socklen_t length) +ath_connect (int s, const struct sockaddr *addr, kde_socklen_t length) { return pth_connect (s, addr, length); } diff -uNr kdepim-3.3.2/libkdenetwork/libgpgme-copy/gpgme/ath-pthread.c kdepim-3.3.2-new/libkdenetwork/libgpgme-copy/gpgme/ath-pthread.c --- kdepim-3.3.2/libkdenetwork/libgpgme-copy/gpgme/ath-pthread.c Tue Feb 10 16:11:07 2004 +++ kdepim-3.3.2-new/libkdenetwork/libgpgme-copy/gpgme/ath-pthread.c Thu Dec 16 09:47:29 2004 @@ -149,14 +149,14 @@ int -ath_accept (int s, struct sockaddr *addr, socklen_t *length_ptr) +ath_accept (int s, struct sockaddr *addr, kde_socklen_t *length_ptr) { return accept (s, addr, length_ptr); } int -ath_connect (int s, const struct sockaddr *addr, socklen_t length) +ath_connect (int s, const struct sockaddr *addr, kde_socklen_t length) { return connect (s, addr, length); } diff -uNr kdepim-3.3.2/libkdenetwork/libgpgme-copy/gpgme/ath.h kdepim-3.3.2-new/libkdenetwork/libgpgme-copy/gpgme/ath.h --- kdepim-3.3.2/libkdenetwork/libgpgme-copy/gpgme/ath.h Tue Feb 10 16:11:07 2004 +++ kdepim-3.3.2-new/libkdenetwork/libgpgme-copy/gpgme/ath.h Thu Dec 16 09:47:29 2004 @@ -20,6 +20,10 @@ #ifndef ATH_H #define ATH_H +#ifdef HAVE_CONFIG_H +#include +#endif + #ifdef HAVE_SYS_SELECT_H # include #else @@ -68,8 +72,8 @@ ssize_t ath_select (int nfd, fd_set *rset, fd_set *wset, fd_set *eset, struct timeval *timeout); ssize_t ath_waitpid (pid_t pid, int *status, int options); -int ath_accept (int s, struct sockaddr *addr, socklen_t *length_ptr); -int ath_connect (int s, const struct sockaddr *addr, socklen_t length); +int ath_accept (int s, struct sockaddr *addr, kde_socklen_t *length_ptr); +int ath_connect (int s, const struct sockaddr *addr, kde_socklen_t length); int ath_sendmsg (int s, const struct msghdr *msg, int flags); int ath_recvmsg (int s, struct msghdr *msg, int flags); @@ -86,8 +90,8 @@ ssize_t (*select) (int nfd, fd_set *rset, fd_set *wset, fd_set *eset, struct timeval *timeout); ssize_t (*waitpid) (pid_t pid, int *status, int options); - int (*accept) (int s, struct sockaddr *addr, socklen_t *length_ptr); - int (*connect) (int s, const struct sockaddr *addr, socklen_t length); + int (*accept) (int s, struct sockaddr *addr, kde_socklen_t *length_ptr); + int (*connect) (int s, const struct sockaddr *addr, kde_socklen_t length); int (*sendmsg) (int s, const struct msghdr *msg, int flags); int (*recvmsg) (int s, struct msghdr *msg, int flags); }; diff -uNr kdepim-3.3.2/libkdenetwork/libgpgme-copy/gpgme/engine-gpgsm.c kdepim-3.3.2-new/libkdenetwork/libgpgme-copy/gpgme/engine-gpgsm.c --- kdepim-3.3.2/libkdenetwork/libgpgme-copy/gpgme/engine-gpgsm.c Fri Jun 25 04:57:52 2004 +++ kdepim-3.3.2-new/libkdenetwork/libgpgme-copy/gpgme/engine-gpgsm.c Thu Dec 16 09:47:29 2004 @@ -22,6 +22,14 @@ #include #endif +#ifdef __APPLE__ +#include +#ifndef MAC_OS_X_VERSION_10_3 +// not threadsafe, but better than nothing ;) +#define NON_THREADSAFE_TTYNAME +#endif +#endif + #include #include #include @@ -448,7 +456,12 @@ if (isatty (1)) { +#ifdef NON_THREADSAFE_TTYNAME + *dft_ttyname = ttyname(1); + if (dft_ttyname) +#else if (ttyname_r (1, dft_ttyname, sizeof (dft_ttyname))) +#endif { err = gpg_error_from_errno (errno); goto leave;