Date: Sat, 12 May 2018 16:35:56 +0000 (UTC) From: Tijl Coosemans <tijl@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r469738 - in head/graphics/okular: . files Message-ID: <201805121635.w4CGZuQH062486@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tijl Date: Sat May 12 16:35:56 2018 New Revision: 469738 URL: https://svnweb.freebsd.org/changeset/ports/469738 Log: Add a patch from okular-kde4 that is still needed to fix crashes. PR: 228199 Approved by: kde (tcberner) Added: head/graphics/okular/files/ head/graphics/okular/files/patch-shell_shell.cpp - copied unchanged from r469620, head/graphics/okular-kde4/files/patch-shell__shell.cpp Modified: head/graphics/okular/Makefile Modified: head/graphics/okular/Makefile ============================================================================== --- head/graphics/okular/Makefile Sat May 12 16:35:27 2018 (r469737) +++ head/graphics/okular/Makefile Sat May 12 16:35:56 2018 (r469738) @@ -2,6 +2,7 @@ PORTNAME= okular DISTVERSION= ${KDE_APPLICATIONS_VERSION} +PORTREVISION= 1 CATEGORIES= graphics kde kde-applications MAINTAINER= kde@FreeBSD.org Copied: head/graphics/okular/files/patch-shell_shell.cpp (from r469620, head/graphics/okular-kde4/files/patch-shell__shell.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/okular/files/patch-shell_shell.cpp Sat May 12 16:35:56 2018 (r469738, copy of r469620, head/graphics/okular-kde4/files/patch-shell__shell.cpp) @@ -0,0 +1,29 @@ +--- shell/shell.cpp ++++ shell/shell.cpp +@@ -163,7 +163,7 @@ bool Shell::openDocument( const QString& url, const QString &serializedOptions ) + KParts::ReadWritePart* const part = m_tabs[0].part; + + // Return false if we can't open new tabs and the only part is occupied +- if ( !dynamic_cast<Okular::ViewerInterface*>(part)->openNewFilesInTabs() ++ if ( !qobject_cast<Okular::ViewerInterface*>(part)->openNewFilesInTabs() + && !part->url().isEmpty() + && !ShellUtils::unique(serializedOptions)) + { +@@ -181,7 +181,7 @@ bool Shell::canOpenDocs( int numDocs, int desktop ) + return false; + + KParts::ReadWritePart* const part = m_tabs[0].part; +- const bool allowTabs = dynamic_cast<Okular::ViewerInterface*>(part)->openNewFilesInTabs(); ++ const bool allowTabs = qobject_cast<Okular::ViewerInterface*>(part)->openNewFilesInTabs(); + + if( !allowTabs && (numDocs > 1 || !part->url().isEmpty()) ) + return false; +@@ -208,7 +208,7 @@ void Shell::openUrl( const KUrl & url, const QString &serializedOptions ) + } + else + { +- if( dynamic_cast<Okular::ViewerInterface *>(activePart)->openNewFilesInTabs() ) ++ if( qobject_cast<Okular::ViewerInterface *>(activePart)->openNewFilesInTabs() ) + { + openNewTab( url, serializedOptions ); + }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201805121635.w4CGZuQH062486>