<pre style='margin:0'>
Kurt Hindenburg (kurthindenburg) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/fcd5b9c67f5603123dd1a0612150293df4247d50">https://github.com/macports/macports-ports/commit/fcd5b9c67f5603123dd1a0612150293df4247d50</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 fcd5b9c krusader: add patch to fix meinproc4 crash for -doc
</span>fcd5b9c is described below
<span style='display:block; white-space:pre;color:#808000;'>commit fcd5b9c67f5603123dd1a0612150293df4247d50
</span>Author: Kurt Hindenburg <khindenburg@macports.org>
AuthorDate: Mon Feb 27 21:07:18 2017 -0500
<span style='display:block; white-space:pre;color:#404040;'> krusader: add patch to fix meinproc4 crash for -doc
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Unless +doc is given, remove doc subfolders to avoid meinproc4 crash.
</span><span style='display:block; white-space:pre;color:#404040;'> This copies what Konsole does.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> However, it will still crash on +doc, meinproc4 has had issues for a
</span><span style='display:block; white-space:pre;color:#404040;'> long time on the Mac.
</span><span style='display:block; white-space:pre;color:#404040;'> fixes https://trac.macports.org/ticket/53556
</span>---
kde/krusader/Portfile | 4 ++++
.../000feab199d06f0dcd816d958aae01f0ebf2631c.patch | 22 ------------------
.../7429ec2e1a43a5d2d0c883311b181a8d3ea53dc6.patch | 24 --------------------
kde/krusader/files/app-install-bug.patch | 11 ---------
kde/krusader/files/patch-CMakeLists.diff | 26 +++++++++++++---------
5 files changed, 19 insertions(+), 68 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/kde/krusader/Portfile b/kde/krusader/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 49ec879..ac47f08 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/kde/krusader/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/kde/krusader/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,6 +25,10 @@ use_bzip2 yes
</span> checksums rmd160 569cf99ab8d2f23d888e922dc4c996d16ef1f0bc \
sha256 ca43ddeef91e2821142b723d13c0be4bf0d138a9718cccd914cecb675cc97dae
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset docs]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-CMakeLists.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_lib-append port:kdelibs4 \
port:kde4-runtime
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/kde/krusader/files/000feab199d06f0dcd816d958aae01f0ebf2631c.patch b/kde/krusader/files/000feab199d06f0dcd816d958aae01f0ebf2631c.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index ea19d28..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/kde/krusader/files/000feab199d06f0dcd816d958aae01f0ebf2631c.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,22 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Christoph Feck <christoph@maxiom.de>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Fri, 12 Mar 2010 19:34:01 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: SVN_SILENT compile with Qt 4.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-X-Git-Tag: v2.2.0-beta1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-X-Git-Url: http://quickgit.kde.org/?p=krusader.git&a=commitdiff&h=000feab199d06f0dcd816d958aae01f0ebf2631c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-SVN_SILENT compile with Qt 4.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- krusader/Search/krsearchdialog.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ krusader/Search/krsearchdialog.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -62,7 +62,7 @@ class KrSearchDialog : public QDialog
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- class KrSearchDialog : public QDialog {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Q_OBJECT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- public:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- KrSearchDialog(QString profile = 0, QWidget* parent = 0 );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ KrSearchDialog(QString profile = QString(), QWidget* parent = 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void prepareGUI();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/kde/krusader/files/7429ec2e1a43a5d2d0c883311b181a8d3ea53dc6.patch b/kde/krusader/files/7429ec2e1a43a5d2d0c883311b181a8d3ea53dc6.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 5ef5db4..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/kde/krusader/files/7429ec2e1a43a5d2d0c883311b181a8d3ea53dc6.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,24 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Christoph Feck <christoph@maxiom.de>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Fri, 12 Mar 2010 16:54:01 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: SVN_SILENT compile with Qt 4.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-X-Git-Tag: v2.2.0-beta1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-X-Git-Url: http://quickgit.kde.org/?p=krusader.git&a=commitdiff&h=7429ec2e1a43a5d2d0c883311b181a8d3ea53dc6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-SVN_SILENT compile with Qt 4.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-There is no QString(int) constructor
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- krusader/MountMan/kmountmangui.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ krusader/MountMan/kmountmangui.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -112,7 +112,7 @@ private:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /////////////////////////////////////////////////////////////////
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- class fsData {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- public:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fsData() : Name( 0 ), Type( 0 ), MntPoint( 0 ), TotalBlks( 0 ),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ fsData() : Name(), Type(), MntPoint(), TotalBlks( 0 ),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FreeBlks( 0 ), Mounted( false ) {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // get information
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/kde/krusader/files/app-install-bug.patch b/kde/krusader/files/app-install-bug.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 63f2251..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/kde/krusader/files/app-install-bug.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- krusader/CMakeLists.txt.orig 2010-01-02 00:37:03.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ krusader/CMakeLists.txt 2010-01-02 00:38:05.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -46,7 +46,7 @@ kde4_add_executable(krusader ${krusader_
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- target_link_libraries(krusader BookMan Dialogs DiskUsage GUI Konfigurator KViewer MountMan Panel Queue VFS Search Splitter Synchronizer UserMenu Locate UserAction ActionMan KViewer Filter Dialogs GUI ${KDE4_KPARTS_LIBS} ${KDE4_KHTML_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_KFILE_LIBS} ${QT_QT3SUPPORT_LIBRARY} ${KDE4_KDE3SUPPORT_LIBS} ${KDE4_KDECORE_LIBS} )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--install(TARGETS krusader DESTINATION ${BIN_INSTALL_DIR})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+install(TARGETS krusader ${INSTALL_TARGETS_DEFAULT_ARGS})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ########### install files ###############
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/kde/krusader/files/patch-CMakeLists.diff b/kde/krusader/files/patch-CMakeLists.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 6a8a019..4ca4ad7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/kde/krusader/files/patch-CMakeLists.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/kde/krusader/files/patch-CMakeLists.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +1,15 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- krusader/CMakeLists.txt.orig 2012-09-04 11:18:47.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ krusader/CMakeLists.txt 2012-09-04 11:19:51.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -44,7 +44,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- kde4_add_executable(krusader ${krusader_SRCS})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--target_link_libraries(krusader BookMan Dialogs DiskUsage GUI Konfigurator KViewer MountMan Panel Queue VFS Search Splitter Synchronizer UserMenu Locate UserAction ActionMan KViewer Filter Dialogs GUI ${KDE4_KPARTS_LIBS} ${KDE4_KHTML_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_KFILE_LIBS} ${QT_QT3SUPPORT_LIBRARY} ${KDE4_KDE3SUPPORT_LIBS} ${KDE4_KDECORE_LIBS} )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+target_link_libraries(krusader BookMan Dialogs DiskUsage GUI Konfigurator KViewer MountMan Panel Queue VFS Search Splitter Synchronizer UserMenu Locate UserAction ActionMan KViewer Filter Dialogs GUI ${KDE4_KPARTS_LIBS} ${KDE4_KHTML_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_KFILE_LIBS} ${QT_QT3SUPPORT_LIBRARY} ${KDE4_KDE3SUPPORT_LIBS} ${KDE4_KDECORE_LIBS} ${KDE4_SOLID_LIBS} )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- install(TARGETS krusader ${INSTALL_TARGETS_DEFAULT_ARGS})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt 2012-10-21 06:59:02.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt 2017-02-27 20:47:53.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -24,10 +24,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_subdirectory(krusader)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_subdirectory(pics)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-add_subdirectory(doc-extras)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#add_subdirectory(doc-extras)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_subdirectory(krArc)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_subdirectory(iso)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-add_subdirectory(doc)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#add_subdirectory(doc)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #add_subdirectory(krfiledialog) - not used
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #add_subdirectory(virt) - not used
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #add_subdirectory(tar) - not used
</span></pre><pre style='margin:0'>
</pre>