<pre style='margin:0'>
NicosPavlov pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/9f3c21f6681e0696a13f797b5abf1db5164dee90">https://github.com/macports/macports-ports/commit/9f3c21f6681e0696a13f797b5abf1db5164dee90</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 9f3c21f6681 kdepim4: fix pointer comparisons (see https://trac.macports.org/ticket/60690)
</span>9f3c21f6681 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 9f3c21f6681e0696a13f797b5abf1db5164dee90
</span>Author: Nicolas Pavillon <pavillon.nicolas@gmail.com>
AuthorDate: Tue Jun 23 11:56:31 2020 +0900
<span style='display:block; white-space:pre;color:#404040;'> kdepim4: fix pointer comparisons (see https://trac.macports.org/ticket/60690)
</span>---
kde/kdepim4/Portfile | 3 ++-
kde/kdepim4/files/patch-pointers.diff | 24 ++++++++++++++++++++++++
2 files changed, 26 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/kde/kdepim4/Portfile b/kde/kdepim4/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 28c7c7a73e8..3c0bf38819f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/kde/kdepim4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/kde/kdepim4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,7 +41,8 @@ patchfiles-append patch-ktimetracker.diff \
</span> patch-emulate-addTitle.diff \
patch-CMakeLists-disableKleo.diff \
patch-internal-gpgme.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-kdgant2-CMakeLists.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-kdgant2-CMakeLists.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-pointers.diff
</span>
#Disabling kleopatra which does not build with boost >= 1.57.
#See https://bugs.kde.org/show_bug.cgi?id=341355
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/kde/kdepim4/files/patch-pointers.diff b/kde/kdepim4/files/patch-pointers.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..e2dcf25ccb6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/kde/kdepim4/files/patch-pointers.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,24 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -ur ../kdepim-4.14.3-orig/knode/knfiltermanager.cpp ./knode/knfiltermanager.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ../kdepim-4.14.3-orig/knode/knfiltermanager.cpp 2014-11-06 17:45:47.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./knode/knfiltermanager.cpp 2020-04-15 18:23:03.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -201,7 +201,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach ( KNArticleFilter *filter, mFilterList )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ activeFilters << filter->id();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int newId = 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- while ( activeFilters.contains( newId ) > 0 )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ while ( activeFilters.contains( newId ) != NULL )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ newId++;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ f->setId( newId );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -ur ../kdepim-4.14.3-orig/korganizer/kodaymatrix.cpp ./korganizer/kodaymatrix.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ../kdepim-4.14.3-orig/korganizer/kodaymatrix.cpp 2014-11-06 17:45:47.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./korganizer/kodaymatrix.cpp 2020-04-15 18:02:07.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -862,7 +862,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ p.setPen( actcol );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // reset bold font to plain font
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if ( mEvents.contains( mDays[i] ) > 0 ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if ( mEvents.contains( mDays[i] ) != NULL ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QFont myFont = font();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ myFont.setBold( false );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ p.setFont( myFont );
</span></pre><pre style='margin:0'>
</pre>