head	1.6;
access;
symbols
	pkgsrc-2014Q3:1.5.0.22
	pkgsrc-2014Q3-base:1.5
	pkgsrc-2014Q2:1.5.0.20
	pkgsrc-2014Q2-base:1.5
	pkgsrc-2014Q1:1.5.0.18
	pkgsrc-2014Q1-base:1.5
	pkgsrc-2013Q4:1.5.0.16
	pkgsrc-2013Q4-base:1.5
	pkgsrc-2013Q3:1.5.0.14
	pkgsrc-2013Q3-base:1.5
	pkgsrc-2013Q2:1.5.0.12
	pkgsrc-2013Q2-base:1.5
	pkgsrc-2013Q1:1.5.0.10
	pkgsrc-2013Q1-base:1.5
	pkgsrc-2012Q4:1.5.0.8
	pkgsrc-2012Q4-base:1.5
	pkgsrc-2012Q3:1.5.0.6
	pkgsrc-2012Q3-base:1.5
	pkgsrc-2012Q2:1.5.0.4
	pkgsrc-2012Q2-base:1.5
	pkgsrc-2012Q1:1.5.0.2
	pkgsrc-2012Q1-base:1.5
	pkgsrc-2011Q4:1.4.0.4
	pkgsrc-2011Q4-base:1.4
	pkgsrc-2011Q3:1.4.0.2
	pkgsrc-2011Q3-base:1.4
	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.6
date	2014.11.13.19.19.08;	author markd;	state dead;
branches;
next	1.5;
commitid	BLxxtdelNTXOF3Yx;

1.5
date	2012.03.19.21.01.28;	author markd;	state Exp;
branches;
next	1.4;

1.4
date	2011.10.02.04.35.03;	author markd;	state Exp;
branches;
next	1.3;

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.6
log
@Update to KDE SC 4.14.3
@
text
@$NetBSD: patch-af,v 1.5 2012/03/19 21:01:28 markd Exp $

libassuan2 support from
http://websvn.kde.org/?view=revision&revision=1078528

--- kleopatra/CMakeLists.txt.orig	2009-11-02 12:02:09.000000000 +0000
+++ kleopatra/CMakeLists.txt
@@@@ -2,7 +2,7 @@@@ project(kleopatra)
 
 include(MacroOptionalAddSubdirectory)
 
-set( kleopatra_version 2.0.12 )
+set( kleopatra_version 2.1.0 )
 set( kleopatra_release FALSE )
 
 if (NOT kleopatra_release)
@@@@ -28,7 +28,7 @@@@ include_directories(
   ${QGPGME_INCLUDES}
   ${GPGME_INCLUDES} )
 if (USABLE_ASSUAN_FOUND)
-   include_directories(${ASSUAN_INCLUDES})
+   include_directories(${ASSUAN2_INCLUDES})
 endif(USABLE_ASSUAN_FOUND)
 add_definitions ( -DQT3_SUPPORT -DQT3_SUPPORT_WARNINGS -D_ASSUAN_ONLY_GPG_ERRORS -DQT_STL )
 remove_definitions ( -DQT_NO_STL )
@@@@ -84,11 +84,7 @@@@ if ( USABLE_ASSUAN_FOUND )
     selftest/uiservercheck.cpp
     )
 
-  if ( WIN32 )
-    set( _kleopatra_uiserver_extra_libs ${ASSUAN_VANILLA_LIBRARIES} )
-  else ( WIN32 )
-    set( _kleopatra_uiserver_extra_libs ${ASSUAN_PTHREAD_LIBRARIES} )
-  endif( WIN32 )
+  set( _kleopatra_uiserver_extra_libs ${ASSUAN2_LIBRARIES} )
 
   if ( HAVE_GPG_ERR_SOURCE_KLEO )
     add_definitions( -DGPG_ERR_SOURCE_DEFAULT=GPG_ERR_SOURCE_KLEO )
@


1.5
log
@Update to 4.4.11.1 (to use with KDE SC 4.8.0)
@
text
@d1 1
a1 1
$NetBSD: patch-af,v 1.3 2010/09/01 13:45:25 wiz Exp $
@


1.4
log
@Fix build with gcc45 and current boost libs.
@
text
@d6 1
a6 3
-DBOOST_NO_0X_HDR_INITIALIZER_LIST for gcc45 and recent boost

--- kleopatra/CMakeLists.txt.orig	2010-12-22 17:51:56.000000000 +0000
d17 1
a17 1
@@@@ -28,10 +28,11 @@@@ include_directories(
d26 1
a26 5
+add_definitions( -DBOOST_NO_0X_HDR_INITIALIZER_LIST )
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}")
 
@@@@ -84,11 +85,7 @@@@ if ( USABLE_ASSUAN_FOUND )
@


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$
d6 3
a8 1
--- kleopatra/CMakeLists.txt.orig	2009-11-02 12:02:09.000000000 +0000
d19 1
a19 1
@@@@ -28,7 +28,7 @@@@ include_directories(
d28 5
a32 1
@@@@ -84,11 +84,7 @@@@ if ( USABLE_ASSUAN_FOUND )
@


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-af,v 1.1 2009/10/02 21:24:29 markd Exp $
d3 2
a4 1
KDE svn 1022963
d6 3
a8 5
--- kmail/cachedimapjob.cpp.orig	2009-05-28 07:54:17.000000000 +1200
+++ kmail/cachedimapjob.cpp
@@@@ -510,7 +510,7 @@@@ void CachedImapJob::slotPutMessageResult
         bool b = kmkernel->iCalIface().isResourceQuiet();
         kmkernel->iCalIface().setResourceQuiet( true );
d10 1
a10 4
-        mFolder->take( i );
+        mFolder->takeTemporarily( i );
         mFolder->addMsgKeepUID( mMsg );
         mMsg->setTransferInProgress( false );
d12 27
@


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
@@