head 1.4; access; symbols pkgsrc-2014Q3:1.3.0.34 pkgsrc-2014Q3-base:1.3 pkgsrc-2014Q2:1.3.0.32 pkgsrc-2014Q2-base:1.3 pkgsrc-2014Q1:1.3.0.30 pkgsrc-2014Q1-base:1.3 pkgsrc-2013Q4:1.3.0.28 pkgsrc-2013Q4-base:1.3 pkgsrc-2013Q3:1.3.0.26 pkgsrc-2013Q3-base:1.3 pkgsrc-2013Q2:1.3.0.24 pkgsrc-2013Q2-base:1.3 pkgsrc-2013Q1:1.3.0.22 pkgsrc-2013Q1-base:1.3 pkgsrc-2012Q4:1.3.0.20 pkgsrc-2012Q4-base:1.3 pkgsrc-2012Q3:1.3.0.18 pkgsrc-2012Q3-base:1.3 pkgsrc-2012Q2:1.3.0.16 pkgsrc-2012Q2-base:1.3 pkgsrc-2012Q1:1.3.0.14 pkgsrc-2012Q1-base:1.3 pkgsrc-2011Q4:1.3.0.12 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q3:1.3.0.10 pkgsrc-2011Q3-base:1.3 pkgsrc-2011Q2:1.3.0.8 pkgsrc-2011Q2-base:1.3 pkgsrc-2011Q1:1.3.0.6 pkgsrc-2011Q1-base:1.3 pkgsrc-2010Q4:1.3.0.4 pkgsrc-2010Q4-base:1.3 pkgsrc-2010Q3:1.3.0.2 pkgsrc-2010Q3-base:1.3 pkgsrc-2009Q4:1.2.0.2 pkgsrc-2009Q4-base:1.2 pkgsrc-2009Q3:1.1.1.1.0.2 pkgsrc-2009Q3-base:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.4 date 2014.11.13.19.19.08; author markd; state dead; branches; next 1.3; commitid BLxxtdelNTXOF3Yx; 1.3 date 2010.09.01.13.45.25; author wiz; state Exp; branches; next 1.2; 1.2 date 2009.10.11.08.13.39; author markd; state dead; branches; next 1.1; 1.1 date 2009.10.02.21.24.29; author markd; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2009.10.02.21.24.29; author markd; state Exp; branches; next ; desc @@ 1.4 log @Update to KDE SC 4.14.3 @ text @$NetBSD: patch-ag,v 1.3 2010/09/01 13:45:25 wiz Exp $ libassuan2 support from http://websvn.kde.org/?view=revision&revision=1078528 --- kleopatra/ConfigureChecks.cmake.orig 2008-05-15 18:37:21.000000000 +0000 +++ kleopatra/ConfigureChecks.cmake @@@@ -1,21 +1,18 @@@@ # assuan configure checks include(CheckFunctionExists) -macro_optional_find_package(Assuan) +macro_optional_find_package(Assuan2) set( USABLE_ASSUAN_FOUND false ) -if ( ASSUAN_FOUND ) +if ( ASSUAN2_FOUND ) - set( CMAKE_REQUIRED_INCLUDES ${ASSUAN_INCLUDES} ) + set( CMAKE_REQUIRED_INCLUDES ${ASSUAN2_INCLUDES} ) - if ( WIN32 AND ASSUAN_VANILLA_FOUND ) - set( CMAKE_REQUIRED_LIBRARIES ${ASSUAN_VANILLA_LIBRARIES} ) + if ( ASSUAN2_FOUND ) + set( CMAKE_REQUIRED_LIBRARIES ${ASSUAN2_LIBRARIES} ) set( USABLE_ASSUAN_FOUND true ) - elseif( NOT WIN32 AND ASSUAN_PTHREAD_FOUND ) - set( CMAKE_REQUIRED_LIBRARIES ${ASSUAN_PTHREAD_LIBRARIES} ) - set( USABLE_ASSUAN_FOUND true ) - endif( WIN32 AND ASSUAN_VANILLA_FOUND ) + endif( ASSUAN2_FOUND ) # TODO: this workaround will be removed as soon as we find better solution if(MINGW) @@@@ -24,7 +21,7 @@@@ if ( ASSUAN_FOUND ) set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${KDEWIN32_INCLUDE_DIR}/msvc) endif(MINGW) -endif( ASSUAN_FOUND ) +endif( ASSUAN2_FOUND ) if ( USABLE_ASSUAN_FOUND ) # check if assuan.h can be compiled standalone (it couldn't, on @@@@ -48,40 +45,6 @@@@ endif( USABLE_ASSUAN_FOUND ) if ( USABLE_ASSUAN_FOUND ) - # check if assuan has assuan_fd_t - check_cxx_source_compiles(" - #include - int main() { - assuan_fd_t fd = ASSUAN_INVALID_FD; - return fd ? 1 : 0 ; - } - " - HAVE_ASSUAN_FD_T ) - - if ( WIN32 AND NOT HAVE_ASSUAN_FD_T ) - set( USABLE_ASSUAN_FOUND false ) - endif ( WIN32 AND NOT HAVE_ASSUAN_FD_T ) - - # check if assuan has assuan_inquire_ext, old style - check_function_exists( "assuan_inquire_ext" HAVE_ASSUAN_INQUIRE_EXT ) - - if ( NOT HAVE_ASSUAN_INQUIRE_EXT ) - set( USABLE_ASSUAN_FOUND false ) - endif( NOT HAVE_ASSUAN_INQUIRE_EXT ) - - # check if assuan has new-style assuan_inquire_ext: - check_cxx_source_compiles(" - #include - static int handler( void *, int, unsigned char*, size_t ) { return 0; } - int main() { - assuan_context_t ctx = 0; - const size_t maxSize = 0U; - assuan_error_t err = assuan_inquire_ext( ctx, \"FOO\", maxSize, handler, (void*)0 ); - return err ? 1 : 0 ; - } - " - HAVE_NEW_STYLE_ASSUAN_INQUIRE_EXT ) - # check if gpg-error already has GPG_ERR_SOURCE_KLEO check_cxx_source_compiles(" #include @@@@ -90,21 +53,6 @@@@ if ( USABLE_ASSUAN_FOUND ) " HAVE_GPG_ERR_SOURCE_KLEO ) - # check if assuan has assuan_sock_get_nonce (via assuan_sock_nonce_t) - # function_exists runs into linking errors - libassuan is static, - # and assuan_sock_get_nonce drags in stuff that needs linking - # against winsock2. - check_cxx_source_compiles(" - #include - static assuan_sock_nonce_t nonce; - int main() { return 0; } - " - HAVE_ASSUAN_SOCK_GET_NONCE ) - - if ( WIN32 AND NOT HAVE_ASSUAN_SOCK_GET_NONCE ) - set( USABLE_ASSUAN_FOUND false ) - endif ( WIN32 AND NOT HAVE_ASSUAN_SOCK_GET_NONCE ) - endif ( USABLE_ASSUAN_FOUND ) if ( USABLE_ASSUAN_FOUND ) @@@@ -113,45 +61,14 @@@@ else ( USABLE_ASSUAN_FOUND ) message( STATUS "NO usable assuan found for Kleopatra" ) endif ( USABLE_ASSUAN_FOUND ) -# -# Check that libassuan (which is built statically) can be linked into a DSO -# (e.g. on amd64, this requires it to be compiled with -fPIC). -# - -set ( ASSUAN_LINKABLE_TO_DSO false ) - OPTION( BUILD_libkleopatraclient "Build directory kleopatra/libkleopatraclient" ${USABLE_ASSUAN_FOUND} ) if ( NOT USABLE_ASSUAN_FOUND ) set( BUILD_libkleopatraclient false ) endif ( NOT USABLE_ASSUAN_FOUND ) -if ( BUILD_libkleopatraclient ) - - message( STATUS "Checking whether libassuan can be linked against from DSO's" ) - - set ( YUP TRUE ) - if ( YUP ) - set ( ASSUAN_LINKABLE_TO_DSO true ) - message( STATUS "--> Assuming that it can. If compilation of libkleopatraclient fails on AMD64, check that libassuan is compiled with -fPIC and try again. Otherwise, pass -DBUILD_libkleopatraclient=OFF." ) - else ( YUP ) - # TODO: make this one executed at configure time, so the check below works: - add_library( dso_with_assuan_check SHARED ${CMAKE_SOURCE_DIR}/kleopatra/dso_with_assuan_check.c ) - - set( CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} dso_with_assuan_check ) - check_cxx_source_compiles( "int main() { return 0; }" ASSUAN_LINKABLE_TO_DSO ) - - if ( ASSUAN_LINKABLE_TO_DSO ) - message( STATUS "Usable assuan found for libkleopatraclient" ) - else ( ASSUAN_LINKABLE_TO_DSO ) - message( STATUS "NO usable assuan found for libkleopatraclient - if this is AMD64, check that libassuan is compiled with -fPIC" ) - endif ( ASSUAN_LINKABLE_TO_DSO ) - endif ( YUP ) - -endif ( BUILD_libkleopatraclient ) - macro_bool_to_01( USABLE_ASSUAN_FOUND HAVE_USABLE_ASSUAN ) -macro_bool_to_01( ASSUAN_LINKABLE_TO_DSO HAVE_KLEOPATRACLIENT_LIBRARY ) +macro_bool_to_01( USABLE_ASSUAN_FOUND HAVE_KLEOPATRACLIENT_LIBRARY ) set(CMAKE_REQUIRED_INCLUDES) set(CMAKE_REQUIRED_LIBRARIES) @ 1.3 log @Switch to libassuan2, based on KDE SVN http://websvn.kde.org/?view=revision&revision=1078528 Suitable SVN commit found by drochner@@ ok markd@@ Bump PKGREVISION. @ text @d1 1 a1 1 $NetBSD$ @ 1.2 log @Update KDE4 to 4.3.2 KDE 4.3.2 brings a nice number of bugfixes, some critical, some just fixing small annoyances: * Many crashers have been fixed in KDE's core libraries, bringing more stability to all applications * KWin's window compositing effects have been further stabilized by fixing a number of bugs in effect plugins such as the famous coverswitch window switcher * The biggest number of bugs for this release has been fixed in KMail, KDE's email client, making it more reliable and usable by correcting a number of display issues * Saving files over themselves works again in Okular, KDE's document viewer @ text @d1 1 a1 1 $NetBSD: patch-ag,v 1.1 2009/10/02 21:24:29 markd Exp $ d3 2 a4 1 KDE svn 1022963 d6 5 a10 27 --- kmail/kmfoldercachedimap.h.orig 2009-05-28 07:54:17.000000000 +1200 +++ kmail/kmfoldercachedimap.h @@@@ -228,10 +228,23 @@@@ class KMFolderCachedImap : public KMFold /** Reimplemented from KMFolder. Moving is not supported, so aParent must be 0. */ virtual int rename( const QString &aName, KMFolderDir *aParent = 0 ); - /** Reimplemented from KMFolderMaildir */ - virtual KMMessage *take( int idx ); bool canDeleteMessages() const; + /** + * Reimplemented from KMFolderMaildir + * This deletes the message permanently, also from the server. For this, + * rememberDeletion() is called, so that the message can be deleted from + * the server on the next sync. + */ + virtual KMMessage* take( int idx ); + + /** + * Like take(), only that the deletion is not remembered, i.e. the + * message will not be deleted from the server. Calling this can cause + * inconsistencies, so make sure you re-add the message later! + */ + void takeTemporarily( int idx ); + /** Reimplemented from KMFolderMaildir */ virtual int addMsg( KMMessage *msg, int *index_return = 0 ); d12 143 @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD$ @ 1.1.1.1 log @Import KDE4.3.1 from wip OKed during freeze by wiz and agc @ text @@