kde: update kde release service to 20.04.1

changes unknown

4 files changed, 7 insertions, 33 deletions

diff --git a/print/okular/Makefile b/print/okular/Makefile
index ecb438cf590..2845170dd87 100644
--- a/print/okular/Makefile
+++ b/print/okular/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.100 2020/06/05 12:49:15 jperkin Exp $
+# $NetBSD: Makefile,v 1.101 2020/06/09 11:56:17 markd Exp $
 
 DISTNAME=	okular-${KAPPSVER}
-PKGREVISION=	9
 CATEGORIES=	print
 
 HOMEPAGE=	https://kde.org/applications/graphics/okular/
diff --git a/print/okular/PLIST b/print/okular/PLIST
index 32e40972af6..dfae17655da 100644
--- a/print/okular/PLIST
+++ b/print/okular/PLIST
@@ -1,6 +1,5 @@
-@comment $NetBSD: PLIST,v 1.10 2020/02/02 03:02:05 markd Exp $
+@comment $NetBSD: PLIST,v 1.11 2020/06/09 11:56:17 markd Exp $
 bin/okular
-bin/okularkirigami
 include/okular/core/action.h
 include/okular/core/annotations.h
 include/okular/core/area.h
@@ -70,10 +69,6 @@ qt5/plugins/okular/generators/okularGenerator_tiff.so
 qt5/plugins/okular/generators/okularGenerator_txt.so
 qt5/plugins/okular/generators/okularGenerator_xps.so
 qt5/plugins/okularpart.so
-qt5/qml/org/kde/okular/DocumentView.qml
-qt5/qml/org/kde/okular/libokularplugin.so
-qt5/qml/org/kde/okular/private/PageView.qml
-qt5/qml/org/kde/okular/qmldir
 share/applications/okularApplication_chm.desktop
 share/applications/okularApplication_comicbook.desktop
 share/applications/okularApplication_djvu.desktop
@@ -109,7 +104,6 @@ share/applications/org.kde.mobile.okular_tiff.desktop
 share/applications/org.kde.mobile.okular_txt.desktop
 share/applications/org.kde.mobile.okular_xps.desktop
 share/applications/org.kde.okular.desktop
-share/applications/org.kde.okular.kirigami.desktop
 share/config.kcfg/gssettings.kcfg
 share/config.kcfg/okular.kcfg
 share/config.kcfg/okular_core.kcfg
@@ -1211,7 +1205,6 @@ share/metainfo/org.kde.okular-tiff.metainfo.xml
 share/metainfo/org.kde.okular-txt.metainfo.xml
 share/metainfo/org.kde.okular-xps.metainfo.xml
 share/metainfo/org.kde.okular.appdata.xml
-share/metainfo/org.kde.okular.kirigami.appdata.xml
 share/okular/drawingtools.xml
 share/okular/icons/hicolor/16x16/apps/okular-fb2.png
 share/okular/icons/hicolor/16x16/apps/okular-gv.png
diff --git a/print/okular/distinfo b/print/okular/distinfo
index 451bef9dabb..ea0b9e2b84b 100644
--- a/print/okular/distinfo
+++ b/print/okular/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.16 2020/03/29 20:43:52 markd Exp $
+$NetBSD: distinfo,v 1.17 2020/06/09 11:56:17 markd Exp $
 
-SHA1 (okular-19.12.1.tar.xz) = 915f2886079aa5adac5b3505fc8e10589d0b7e18
-RMD160 (okular-19.12.1.tar.xz) = 24fc29a4a1f0ea795dc8923b5b5b63e1d59d930b
-SHA512 (okular-19.12.1.tar.xz) = 6da6f870cd7e3060ca108c630e082fe20e7ecb702ffe7da2892450ca8401d25cd135d1039e883303000ad46b1d98c9bd6707c5eae54e03a225fcdf3f706465ec
-Size (okular-19.12.1.tar.xz) = 7203952 bytes
-SHA1 (patch-core_document.cpp) = f2849a3e73a141eed38f110fb5edb0bdcc1db7a1
+SHA1 (okular-20.04.1.tar.xz) = 2ae88cab0028614d308496eb4f3eacfedefa7f59
+RMD160 (okular-20.04.1.tar.xz) = 71b05a433925286a852869a641e097420439758f
+SHA512 (okular-20.04.1.tar.xz) = c2414c16d938d06b9bf78956741a3b1f97dab1930a47ba1c822909062e0efc6c5e2faf841d045552d455dc20b2e200213906ff8a5fa888d09c881846a55316bc
+Size (okular-20.04.1.tar.xz) = 7236580 bytes
diff --git a/print/okular/patches/patch-core_document.cpp b/print/okular/patches/patch-core_document.cpp
deleted file mode 100644
index 494a419eb46..00000000000
--- a/print/okular/patches/patch-core_document.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-core_document.cpp,v 1.1 2020/03/29 20:43:53 markd Exp $
-
-https://nvd.nist.gov/vuln/detail/CVE-2020-9359
-https://kde.org/info/security/advisory-20200312-1.txt
-
---- core/document.cpp.orig	2020-01-06 13:55:05.000000000 +0000
-+++ core/document.cpp
-@@ -4352,7 +4352,8 @@ void Document::processAction( const Acti
-                 {
-                     const QUrl realUrl = KIO::upUrl(d->m_url).resolved(url);
-                     // KRun autodeletes
--                    new KRun( realUrl, d->m_widget );
-+                    KRun *r = new KRun( realUrl, d->m_widget );
-+		    r->setRunExecutables(false);
-                 }
-             }
-             } break;