CVS commit: pkgsrc/misc/kdepim4

["Joerg Sonnenberger" <joerg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   joerg
Date:           Thu May 14 19:19:56 UTC 2020

Modified Files:
        pkgsrc/misc/kdepim4: distinfo
Added Files:
        pkgsrc/misc/kdepim4/patches: patch-knode_knfiltermanager.cpp
            patch-korganizer_kodaymatrix.cpp

Log Message:
Don't order pointers relative to 0.


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 pkgsrc/misc/kdepim4/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/misc/kdepim4/patches/patch-knode_knfiltermanager.cpp \
    pkgsrc/misc/kdepim4/patches/patch-korganizer_kodaymatrix.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/misc/kdepim4/distinfo
diff -u pkgsrc/misc/kdepim4/distinfo:1.22 pkgsrc/misc/kdepim4/distinfo:1.23
--- pkgsrc/misc/kdepim4/distinfo:1.22   Sun Jan 10 19:33:43 2016
+++ pkgsrc/misc/kdepim4/distinfo        Thu May 14 19:19:56 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.22 2016/01/10 19:33:43 markd Exp $
+$NetBSD: distinfo,v 1.23 2020/05/14 19:19:56 joerg Exp $
 
 SHA1 (kdepim-4.14.10.tar.xz) = 6f74763dda68dbb44394e807eab9204777bddf0a
 RMD160 (kdepim-4.14.10.tar.xz) = a9ba786e76ad0fe44bff5298a413aca514dbca82
@@ -7,4 +7,6 @@ Size (kdepim-4.14.10.tar.xz) = 14585020 
 SHA1 (patch-ad) = 9c7fbc7223b74cafc30626a024b0177d9e80ad8f
 SHA1 (patch-kleopatra_newcertificatewizard_newcertificatewizard.cpp) = 9769a802e6900f37d2720df35a5c9bc2beb0de79
 SHA1 (patch-kleopatra_smartcard_readerstatus.cpp) = a1e60b97f75f3490873df0dd53bed7d5302eba48
+SHA1 (patch-knode_knfiltermanager.cpp) = 417c1486fd25acc206ec977effeb48ed0f1b4703
+SHA1 (patch-korganizer_kodaymatrix.cpp) = 904cf60aace38ba618f33ab609b4bffa09fec1c2
 SHA1 (patch-libkleo_kleo_stl_util.h) = 3ea5fdeab6a323ca63ccbb7791f3020db04d9dfd

Added files:

Index: pkgsrc/misc/kdepim4/patches/patch-knode_knfiltermanager.cpp
diff -u /dev/null pkgsrc/misc/kdepim4/patches/patch-knode_knfiltermanager.cpp:1.1
--- /dev/null   Thu May 14 19:19:56 2020
+++ pkgsrc/misc/kdepim4/patches/patch-knode_knfiltermanager.cpp Thu May 14 19:19:56 2020
@@ -0,0 +1,13 @@
+$NetBSD: patch-knode_knfiltermanager.cpp,v 1.1 2020/05/14 19:19:56 joerg Exp $
+
+--- knode/knfiltermanager.cpp.orig     2020-05-12 20:24:40.606084249 +0000
++++ knode/knfiltermanager.cpp
+@@ -201,7 +201,7 @@ void KNFilterManager::addFilter(KNArticl
+     foreach ( KNArticleFilter *filter, mFilterList )
+       activeFilters << filter->id();
+     int newId = 1;
+-    while ( activeFilters.contains( newId ) > 0 )
++    while ( activeFilters.contains( newId ) )
+       newId++;
+     f->setId( newId );
+   }
Index: pkgsrc/misc/kdepim4/patches/patch-korganizer_kodaymatrix.cpp
diff -u /dev/null pkgsrc/misc/kdepim4/patches/patch-korganizer_kodaymatrix.cpp:1.1
--- /dev/null   Thu May 14 19:19:56 2020
+++ pkgsrc/misc/kdepim4/patches/patch-korganizer_kodaymatrix.cpp        Thu May 14 19:19:56 2020
@@ -0,0 +1,13 @@
+$NetBSD: patch-korganizer_kodaymatrix.cpp,v 1.1 2020/05/14 19:19:56 joerg Exp $
+
+--- korganizer/kodaymatrix.cpp.orig    2020-05-12 20:03:31.118147634 +0000
++++ korganizer/kodaymatrix.cpp
+@@ -862,7 +862,7 @@ void KODayMatrix::paintEvent( QPaintEven
+       p.setPen( actcol );
+     }
+     // reset bold font to plain font
+-    if ( mEvents.contains( mDays[i] ) > 0 ) {
++    if ( mEvents.contains( mDays[i] ) ) {
+       QFont myFont = font();
+       myFont.setBold( false );
+       p.setFont( myFont );