[pkgsrc/trunk]: pkgsrc From KDE CVS, KDE_3_3_BRANCH:

[kleink <kleink%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/5cb73bf0d516
branches:  trunk
changeset: 484648:5cb73bf0d516
user:      kleink <kleink%pkgsrc.org@localhost>
date:      Sun Nov 28 18:35:48 2004 +0000

description:
>From KDE CVS, KDE_3_3_BRANCH:

kdepim/korganizer/plugins/holidays/holidays.cpp 1.12.2.1:
Backport of bug fixes for #84979 (crash on AMD64) [...]

Bump version to kdepim-3.3.1nb2, and update the version required by
the kde3 meta package.

diffstat:

 meta-pkgs/kde3/Makefile       |   4 ++--
 misc/kdepim3/Makefile         |   4 ++--
 misc/kdepim3/distinfo         |   3 ++-
 misc/kdepim3/patches/patch-ac |  13 +++++++++++++
 4 files changed, 19 insertions(+), 5 deletions(-)

diffs (63 lines):

diff -r a23099ba84e9 -r 5cb73bf0d516 meta-pkgs/kde3/Makefile
--- a/meta-pkgs/kde3/Makefile   Sun Nov 28 18:24:24 2004 +0000
+++ b/meta-pkgs/kde3/Makefile   Sun Nov 28 18:35:48 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2004/11/11 21:02:08 tron Exp $
+# $NetBSD: Makefile,v 1.35 2004/11/28 18:35:48 kleink Exp $
 
 DISTNAME=      kde-3.3.1
 PKGREVISION=   1
@@ -19,7 +19,7 @@
 DEPENDS+=      kdegraphics-3.3.1nb1:../../graphics/kdegraphics3
 DEPENDS+=      kdemultimedia-3.3.1:../../multimedia/kdemultimedia3
 DEPENDS+=      kdenetwork-3.3.1:../../net/kdenetwork3
-DEPENDS+=      kdepim-3.3.1nb1:../../misc/kdepim3
+DEPENDS+=      kdepim-3.3.1nb2:../../misc/kdepim3
 DEPENDS+=      kdetoys-3.3.1:../../games/kdetoys3
 DEPENDS+=      kdeutils-3.3.1:../../misc/kdeutils3
 DEPENDS+=      kdewebdev-3.3.1:../../www/kdewebdev3
diff -r a23099ba84e9 -r 5cb73bf0d516 misc/kdepim3/Makefile
--- a/misc/kdepim3/Makefile     Sun Nov 28 18:24:24 2004 +0000
+++ b/misc/kdepim3/Makefile     Sun Nov 28 18:35:48 2004 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.34 2004/11/08 23:53:20 shannonjr Exp $
+# $NetBSD: Makefile,v 1.35 2004/11/28 18:35:48 kleink Exp $
 
 DISTNAME=      kdepim-${_KDE_VERSION}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    misc
 COMMENT=       Personal Information Management tools for the KDE desktop
 
diff -r a23099ba84e9 -r 5cb73bf0d516 misc/kdepim3/distinfo
--- a/misc/kdepim3/distinfo     Sun Nov 28 18:24:24 2004 +0000
+++ b/misc/kdepim3/distinfo     Sun Nov 28 18:35:48 2004 +0000
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.24 2004/11/08 23:53:20 shannonjr Exp $
+$NetBSD: distinfo,v 1.25 2004/11/28 18:35:48 kleink Exp $
 
 SHA1 (kdepim-3.3.1.tar.bz2) = b9928e5bceda7f871d02d861a589fdc133649565
 Size (kdepim-3.3.1.tar.bz2) = 10007944 bytes
 SHA1 (patch-aa) = d9eef6f9f0301cc19897e84d632ccb3127761a4f
 SHA1 (patch-ab) = 47280379fa8c570720dd1801f5da2e5c93685423
+SHA1 (patch-ac) = b89b09f13d22a3c7225dc8f458534df1e3a5e7a5
 SHA1 (patch-ba) = f524c671e3089a73c78cb0e5a8b6e19c0ddf360c
 SHA1 (patch-bb) = 9667cce7382544a40f91b7f62f594cfc52953661
 SHA1 (patch-bc) = fc1d54789656b670345fcfaa67d0f9b8e90ffbf4
diff -r a23099ba84e9 -r 5cb73bf0d516 misc/kdepim3/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/misc/kdepim3/patches/patch-ac     Sun Nov 28 18:35:48 2004 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.3 2004/11/28 18:35:48 kleink Exp $
+
+--- korganizer/plugins/holidays/holidays.cpp   2004/07/23 16:32:44     1.12
++++ korganizer/plugins/holidays/holidays.cpp   2004/10/03 18:33:19     1.12.2.1
+@@ -91,7 +91,7 @@
+   //static int lastYear = 0;
+   int lastYear = 0;
+ 
+-  if (mHolidayFile.isEmpty()) return QString::null;
++  if (mHolidayFile.isEmpty() || qd.isNull()) return QString::null;
+ 
+   //if ((lastYear == 0) || (qd.year() != lastYear)) {
+   if ((yearLast == 0) || (qd.year() != yearLast)) {