Update to KDE 3.4.2

Changes:
* KAlarm: Minimise KMix window if KMix is started by KAlarm when
  displaying a message.
* KAlarm: Prevent session restoration displaying main windows which
  should be hidden.
* KAlarm: Prevent alarm message windows being too large for screen.
* KAlarm: Change --volume command line option short form from -v to -V
  to avoid clash with --version.
* KNode: Fix %NAME and %EMAIL custom header macros
* KNode: Support news server that don't understand the LIST OVERVIEW.FMT
  command
* KNode: Fix subject field cursor regression
* Akregator: Improve rendering speed of the article list drastically (by
  about factor 10)
* Akregator: Fix opening of non-HTML files in external applications

7 files changed, 7 insertions, 155 deletions

diff --git a/misc/kdepim3/PLIST b/misc/kdepim3/PLIST
index 2dbb7d33a56..1d6eed833eb 100644
--- a/misc/kdepim3/PLIST
+++ b/misc/kdepim3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.19 2005/05/31 14:48:24 markd Exp $
+@comment $NetBSD: PLIST,v 1.20 2005/07/30 11:33:15 markd Exp $
 bin/akregator
 bin/egroupwarewizard
 bin/exchangewizard
@@ -1109,6 +1109,7 @@ share/kde/apps/libkholidays/holiday_il
 share/kde/apps/libkholidays/holiday_is
 share/kde/apps/libkholidays/holiday_it
 share/kde/apps/libkholidays/holiday_ja
+share/kde/apps/libkholidays/holiday_lt
 share/kde/apps/libkholidays/holiday_mx
 share/kde/apps/libkholidays/holiday_nl
 share/kde/apps/libkholidays/holiday_no
@@ -1122,6 +1123,7 @@ share/kde/apps/libkholidays/holiday_se
 share/kde/apps/libkholidays/holiday_si
 share/kde/apps/libkholidays/holiday_th
 share/kde/apps/libkholidays/holiday_us
+share/kde/apps/libkholidays/holiday_uy
 share/kde/apps/libkleopatra/pics/key.png
 share/kde/apps/libkleopatra/pics/key_bad.png
 share/kde/apps/libkleopatra/pics/key_ok.png
diff --git a/misc/kdepim3/distinfo b/misc/kdepim3/distinfo
index aa8c57d630c..ebcaf1d7c51 100644
--- a/misc/kdepim3/distinfo
+++ b/misc/kdepim3/distinfo
@@ -1,18 +1,9 @@
-$NetBSD: distinfo,v 1.31 2005/06/19 11:02:41 markd Exp $
+$NetBSD: distinfo,v 1.32 2005/07/30 11:33:15 markd Exp $
 
-SHA1 (kdepim-3.4.1.tar.bz2) = 42c8fb59809cd77ce9f843bf0ef661c45da0a251
-RMD160 (kdepim-3.4.1.tar.bz2) = f3dd526ca3094f42eb825ece30d0b84c047a6050
-Size (kdepim-3.4.1.tar.bz2) = 11345538 bytes
+SHA1 (kdepim-3.4.2.tar.bz2) = 7e5eb8d3ab31a490839e33d048e78f583f8a7fe4
+RMD160 (kdepim-3.4.2.tar.bz2) = c149409d447c5108348d24bdb973979e4c31e80d
+Size (kdepim-3.4.2.tar.bz2) = 11368492 bytes
 SHA1 (patch-aa) = d9eef6f9f0301cc19897e84d632ccb3127761a4f
 SHA1 (patch-ab) = bc6a6bf4dd389cb3c1ae95c2a95ec9e54509e51c
 SHA1 (patch-ac) = b8c3bc23469cd0caa59ee181cbc83063ab676777
 SHA1 (patch-ad) = b22d413d80fd14ec09e1f00612cb57bf9a43e8cc
-SHA1 (patch-ba) = f524c671e3089a73c78cb0e5a8b6e19c0ddf360c
-SHA1 (patch-bb) = 9667cce7382544a40f91b7f62f594cfc52953661
-SHA1 (patch-bc) = fc1d54789656b670345fcfaa67d0f9b8e90ffbf4
-SHA1 (patch-bd) = 7b72ab4fe60f5a4b46b8a60def67ffe4c7befe9f
-SHA1 (patch-bf) = 4523c843d7395f28bd5ed79313a463c381f846c3
-SHA1 (patch-bg) = 19c6ab47b9cbf97ea1db1237d2f32fe620e02050
-SHA1 (patch-bh) = bbd9f3ba67f0bba1f559aed4a9b4b37a1422021a
-SHA1 (patch-bi) = f669e42e4d8106ee1043a798c9ed9728acdb762a
-SHA1 (patch-bj) = cbaadf9ce9ec79580e3863a7744df3d2e0acfd9a
diff --git a/misc/kdepim3/patches/patch-bf b/misc/kdepim3/patches/patch-bf
deleted file mode 100644
index 6212f034e99..00000000000
--- a/misc/kdepim3/patches/patch-bf
+++ /dev/null
@@ -1,72 +0,0 @@
-$NetBSD: patch-bf,v 1.1 2005/05/31 14:48:24 markd Exp $
-
---- kpilot/conduits/memofileconduit/memofile-conduit.cc.orig	2005-05-24 00:12:37.000000000 +1200
-+++ kpilot/conduits/memofileconduit/memofile-conduit.cc
-@@ -114,7 +114,7 @@ MemofileConduit::~MemofileConduit()
- 	setFirstSync( _memofiles->isFirstSync() );
- 	addSyncLogEntry(i18n(" Syncing with %1.").arg(_memo_directory));
- 
--	if ( (syncMode() == SyncAction::SyncMode::eCopyHHToPC) || isFirstSync() ) {
-+	if ( (syncMode() == SyncAction::SyncMode::eCopyHHToPC) || _memofiles->isFirstSync() ) {
- 		addSyncLogEntry(i18n(" Copying Pilot to PC..."));
- #ifdef DEBUG
- 		DEBUGCONDUIT << fname << ": copying Pilot to PC." << endl;
-@@ -474,17 +474,11 @@ bool MemofileConduit::copyPCToHH()
- 	// Note: This will reset both fCategories and fMemoAppInfo, so
- 	//       after this, we need to reinitialize our memofiles object...
- 	setAppInfo();
--	cleanup();
- 
- 	// re-create our memofiles helper...
- 	delete _memofiles;
- 	_memofiles = new Memofiles(fCategories, *fMemoAppInfo, _memo_directory);
- 
--	// make sure we are starting with a clean database on both ends...
--	fDatabase->deleteRecord(0, true);
--	fLocalDatabase->deleteRecord(0, true);
--	cleanup();
--
- 	_memofiles->load(true);
- 
- 	QPtrList<Memofile> memofiles = _memofiles->getAll();
-@@ -496,11 +490,39 @@ bool MemofileConduit::copyPCToHH()
- 	}
- 
- 	_memofiles->save();
--
-+	
-+	// now that we've copied from the PC to our handheld, remove anything extra from the
-+	// handheld...
-+	deleteUnsyncedHHRecords();
-+	
- 	return true;
- 
- }
- 
-+void MemofileConduit::deleteUnsyncedHHRecords()
-+{
-+	FUNCTIONSETUP;
-+	if ( syncMode()==SyncMode::eCopyPCToHH )
-+	{
-+		RecordIDList ids=fDatabase->idList();
-+		RecordIDList::iterator it;
-+		for ( it = ids.begin(); it != ids.end(); ++it )
-+		{
-+			if (!_memofiles->find(*it))
-+			{
-+#ifdef DEBUG
-+				DEBUGCONDUIT << fname
-+				<< "Deleting record with ID "<<*it <<" from handheld "
-+				<< "(is not on PC, and syncing with PC->HH direction)"
-+				<< endl;
-+#endif
-+				fDatabase->deleteRecord(*it);
-+				fLocalDatabase->deleteRecord(*it);
-+			}
-+		}
-+	}
-+}
-+
- int MemofileConduit::writeToPilot(Memofile * memofile)
- {
- 	FUNCTIONSETUP;
diff --git a/misc/kdepim3/patches/patch-bg b/misc/kdepim3/patches/patch-bg
deleted file mode 100644
index c22ee86d8de..00000000000
--- a/misc/kdepim3/patches/patch-bg
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-bg,v 1.1 2005/05/31 14:48:24 markd Exp $
-
---- kpilot/conduits/memofileconduit/memofile-conduit.h.orig	2005-05-24 00:12:37.000000000 +1200
-+++ kpilot/conduits/memofileconduit/memofile-conduit.h
-@@ -88,6 +88,7 @@ private:
- 
- 	bool	copyHHToPC();
- 	bool	copyPCToHH();
-+	void	deleteUnsyncedHHRecords();
- 	bool	sync();
- 
- 	int 	writeToPilot(Memofile * memofile);
diff --git a/misc/kdepim3/patches/patch-bh b/misc/kdepim3/patches/patch-bh
deleted file mode 100644
index 032b1f8d9e5..00000000000
--- a/misc/kdepim3/patches/patch-bh
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-bh,v 1.1 2005/05/31 14:48:24 markd Exp $
-
---- kpilot/lib/pilotDatabase.cc.orig	2005-05-24 00:12:43.000000000 +1200
-+++ kpilot/lib/pilotDatabase.cc
-@@ -185,7 +185,7 @@ bool PilotAppInfoBase::setCategory(unsig
- 	int len = CATEGORY_NAME_SIZE - 1;
- 	QCString t = PilotAppCategory::codec()->fromUnicode(s,len);
- 	memset(categoryInfo()->name[i],0,CATEGORY_NAME_SIZE);
--	qstrncpy(categoryInfo()->name[i],t,kMin(len,(int)CATEGORY_NAME_SIZE));
-+	qstrncpy(categoryInfo()->name[i],t,CATEGORY_NAME_SIZE);
- 	return true;
- }
- 
diff --git a/misc/kdepim3/patches/patch-bi b/misc/kdepim3/patches/patch-bi
deleted file mode 100644
index 8656c43368a..00000000000
--- a/misc/kdepim3/patches/patch-bi
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-bi,v 1.1 2005/05/31 14:48:24 markd Exp $
-
---- kpilot/lib/pilotLocalDatabase.cc.orig	2005-05-24 00:12:43.000000000 +1200
-+++ kpilot/lib/pilotLocalDatabase.cc
-@@ -618,7 +618,7 @@ void PilotLocalDatabase::openDatabase()
- 
- 	int count;
- 	pi_file_get_entries(dbFile, &count);
--	if (count > 0)
-+	if (count >= 0)
- 	{
- 		KPILOT_DELETE(d);
- 		d = new Private(count);
diff --git a/misc/kdepim3/patches/patch-bj b/misc/kdepim3/patches/patch-bj
deleted file mode 100644
index 8cb92ff0976..00000000000
--- a/misc/kdepim3/patches/patch-bj
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-bj,v 1.1 2005/05/31 14:48:24 markd Exp $
-
---- kpilot/lib/pilotDatabase.h.orig	2005-05-24 00:12:43.000000000 +1200
-+++ kpilot/lib/pilotDatabase.h
-@@ -279,9 +279,12 @@ public:
- 		int appLen = MAX_APPINFO_SIZE;
- 		unsigned char buffer[MAX_APPINFO_SIZE];
- 
--		appLen = d->readAppBlock(buffer,appLen);
--
--		(*unpack)(&fInfo, buffer, appLen);
-+		if (d && d->isDBOpen())
-+		{
-+			appLen = d->readAppBlock(buffer,appLen);
-+			(*unpack)(&fInfo, buffer, appLen);
-+		}
-+		// fInfo is just a struct, so we can point to it anyway.
- 		init(&fInfo.category,appLen);
- 	} ;
- 
-@@ -289,6 +292,10 @@ public:
- 	{
- 		FUNCTIONSETUP;
- 		unsigned char buffer[MAX_APPINFO_SIZE];
-+		if (!d || !d->isDBOpen())
-+		{
-+			return -1;
-+		}
- 		int appLen = (*pack)(&fInfo, buffer, length());
- 		if (appLen > 0)
- 		{