Index: head/security/kleopatra/files/patch-D26393 =================================================================== --- head/security/kleopatra/files/patch-D26393 (revision 561467) +++ head/security/kleopatra/files/patch-D26393 (nonexistent) @@ -1,47 +0,0 @@ -Submitted upstream as D26393, see also - https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=242670 - https://bugs.kde.org/show_bug.cgi?id=415168 - -diff --git src/commands/command_p.h src/commands/command_p.h -index d9acbaae..0a16161e 100644 ---- src/commands/command_p.h -+++ src/commands/command_p.h -@@ -37,6 +37,7 @@ - #include "view/keylistcontroller.h" - - #include -+#include - - #include - -@@ -73,7 +74,7 @@ public: - } - KeyListModelInterface *model() const - { -- return view_ ? dynamic_cast(view_->model()) : nullptr; -+ return view_ ? dynamic_cast(dynamic_cast(view_->model())) : nullptr; - } - KeyListController *controller() const - { -diff --git src/dialogs/lookupcertificatesdialog.cpp src/dialogs/lookupcertificatesdialog.cpp -index 4f7b0246..313c4f9f 100644 ---- src/dialogs/lookupcertificatesdialog.cpp -+++ src/dialogs/lookupcertificatesdialog.cpp -@@ -37,6 +37,8 @@ - #include "ui_lookupcertificatesdialog.h" - - #include -+#include -+ - #include - #include - -@@ -99,7 +101,7 @@ private: - if (!view) { - return std::vector(); - } -- const auto *const model = dynamic_cast(view->model()); -+ const auto *const model = dynamic_cast(dynamic_cast(view->model())); - Q_ASSERT(model); - const QItemSelectionModel *const sm = view->selectionModel(); - Q_ASSERT(sm); Property changes on: head/security/kleopatra/files/patch-D26393 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/kleopatra/Makefile =================================================================== --- head/security/kleopatra/Makefile (revision 561467) +++ head/security/kleopatra/Makefile (revision 561468) @@ -1,27 +1,28 @@ # $FreeBSD$ PORTNAME= kleopatra DISTVERSION= ${KDE_APPLICATIONS_VERSION} +PORTREVISION= 1 CATEGORIES= security kde kde-applications MAINTAINER= kde@FreeBSD.org COMMENT= Certificate manager for KDE LIB_DEPENDS= libassuan.so:security/libassuan \ libboost_thread.so:devel/boost-libs \ libgpgme.so:security/gpgme \ libgpg-error.so:security/libgpg-error \ libgpgmepp.so:security/gpgme-cpp \ libqgpgme.so:security/gpgme-qt5 USES= cmake compiler:c++11-lang desktop-file-utils gettext kde:5 qt:5 tar:xz USE_KDE= auth codecs config configwidgets coreaddons crash dbusaddons \ doctools ecm i18n iconthemes itemmodels kcmutils notifications \ service sonnet textwidgets widgetsaddons windowsystem xmlgui \ libkleo mime USE_QT= core dbus gui network printsupport testlib widgets xml \ buildtools_build qmake_build OPTIONS_DEFINE= DOCS .include Index: head/security/libkleo/Makefile =================================================================== --- head/security/libkleo/Makefile (revision 561467) +++ head/security/libkleo/Makefile (revision 561468) @@ -1,37 +1,38 @@ # $FreeBSD$ PORTNAME= libkleo DISTVERSION= ${KDE_APPLICATIONS_VERSION} +PORTREVISION= 1 CATEGORIES= security kde kde-applications MAINTAINER= kde@FreeBSD.org COMMENT= Certificate manager for KDE LIB_DEPENDS= libassuan.so:security/libassuan \ libgpg-error.so:security/libgpg-error \ libgpgme.so:security/gpgme \ libqgpgme.so:security/gpgme-qt5 \ libgpgmepp.so:security/gpgme-cpp RUN_DEPENDS= ${LOCALBASE}/bin/gmd5sum:sysutils/coreutils USES= cmake compiler:c++11-lang gettext kde:5 qt:5 tar:xz USE_KDE= codecs completion config coreaddons i18n itemmodels \ widgetsaddons windowsystem \ pimtextedit USE_QT= core gui widgets \ buildtools_build qmake_build _CORETOOLS= md5sum sha1sum sha256sum sha512sum OPTIONS_DEFINE= DOCS post-extract: # use the binaries of coreutils . for ct in ${_CORETOOLS} ${REINPLACE_CMD} -e '/create-command/ s#${ct}#g${ct}#' \ -e '/verify-command/ s#${ct}#g${ct}#' \ ${PATCH_WRKSRC}/src/libkleopatrarc.desktop . endfor .include Index: head/security/libkleo/files/patch-BR415168 =================================================================== --- head/security/libkleo/files/patch-BR415168 (nonexistent) +++ head/security/libkleo/files/patch-BR415168 (revision 561468) @@ -0,0 +1,98 @@ +From 54ef30823adb3d4c9b6c66494142980f5cc9e35b Mon Sep 17 00:00:00 2001 +From: Andre Heinecke +Date: Wed, 12 Feb 2020 12:11:32 +0100 +Subject: [PATCH] De inline keylistmodelinterface virtual dtor + +This attempts to fix a crash on FreeBSD. See: D26393 for +more info. + +BUG: 415168 +--- + src/CMakeLists.txt | 1 + + src/models/keylistmodelinterface.cpp | 35 ++++++++++++++++++++++++++++ + src/models/keylistmodelinterface.h | 6 +++-- + 3 files changed, 40 insertions(+), 2 deletions(-) + create mode 100644 src/models/keylistmodelinterface.cpp + +diff --git src/CMakeLists.txt src/CMakeLists.txt +index dc30079..056d33b 100644 +--- src/CMakeLists.txt ++++ src/CMakeLists.txt +@@ -29,6 +29,7 @@ set(libkleo_core_SRCS + kleo/keyresolver.cpp + models/keycache.cpp + models/keylistmodel.cpp ++ models/keylistmodelinterface.cpp + models/keylistsortfilterproxymodel.cpp + models/keyrearrangecolumnsproxymodel.cpp + models/subkeylistmodel.cpp +diff --git src/models/keylistmodelinterface.cpp src/models/keylistmodelinterface.cpp +new file mode 100644 +index 0000000..77fc1e2 +--- /dev/null ++++ src/models/keylistmodelinterface.cpp +@@ -0,0 +1,35 @@ ++/* -*- mode: c++; c-basic-offset:4 -*- ++ models/keylistmodelinterface.cpp ++ ++ Copyright (c) 2020 g10 Code GmbH ++ ++ Kleopatra is free software; you can redistribute it and/or modify ++ it under the terms of the GNU General Public License as published by ++ the Free Software Foundation; either version 2 of the License, or ++ (at your option) any later version. ++ ++ Kleopatra is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ++ ++ In addition, as a special exception, the copyright holders give ++ permission to link the code of this program with any edition of ++ the Qt library by Trolltech AS, Norway (or with modified versions ++ of Qt that use the same license as Qt), and distribute linked ++ combinations including the two. You must obey the GNU General ++ Public License in all respects for all of the code used other than ++ Qt. If you modify this file, you may extend this exception to ++ your version of the file, but you are not obligated to do so. If ++ you do not wish to do so, delete this exception statement from ++ your version. ++*/ ++#include "keylistmodelinterface.h" ++ ++Kleo::KeyListModelInterface::~KeyListModelInterface() ++{ ++} +diff --git src/models/keylistmodelinterface.h src/models/keylistmodelinterface.h +index 3090017..4de3fec 100644 +--- src/models/keylistmodelinterface.h ++++ src/models/keylistmodelinterface.h +@@ -35,6 +35,8 @@ + + #include + ++#include ++ + namespace GpgME + { + class Key; +@@ -46,10 +48,10 @@ template class QList; + namespace Kleo + { + +-class KeyListModelInterface ++class KLEO_EXPORT KeyListModelInterface + { + public: +- virtual ~KeyListModelInterface() {} ++ virtual ~KeyListModelInterface(); + + static const int FingerprintRole = 0xF1; + static const int KeyRole = 0xF2; +-- +2.20.1 + Property changes on: head/security/libkleo/files/patch-BR415168 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property