Update to KDE SC 4.10.2

bugfixes, other quality improvements, new and improved KDE Applications

7 files changed, 21 insertions, 56 deletions

diff --git a/print/okular/Makefile b/print/okular/Makefile
index ecc0524a4e5..8232890a3de 100644
--- a/print/okular/Makefile
+++ b/print/okular/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.15 2013/04/01 16:03:49 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2013/04/03 10:52:10 markd Exp $
 
 DISTNAME=	okular-${_KDE_VERSION}
-PKGREVISION=	11
 CATEGORIES=	print
 COMMENT=	KDE universal document viewer
 
@@ -19,6 +18,7 @@ COMMENT=	KDE universal document viewer
 .include "../../security/qca2/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../textproc/ebook-tools/buildlink3.mk"
+.include "../../x11/kactivities/buildlink3.mk"
 .include "../../x11/kdelibs4/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/okular/PLIST b/print/okular/PLIST
index 36247a5dbf4..3afbd12a84c 100644
--- a/print/okular/PLIST
+++ b/print/okular/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2012/03/20 00:34:54 markd Exp $
+@comment $NetBSD: PLIST,v 1.2 2013/04/03 10:52:10 markd Exp $
 bin/okular
 include/okular/core/action.h
 include/okular/core/annotations.h
@@ -13,18 +13,23 @@ include/okular/core/okular_export.h
 include/okular/core/page.h
 include/okular/core/pagesize.h
 include/okular/core/pagetransition.h
+include/okular/core/settings_core.h
 include/okular/core/sound.h
 include/okular/core/sourcereference.h
 include/okular/core/textdocumentgenerator.h
 include/okular/core/textpage.h
+include/okular/core/tile.h
 include/okular/core/utils.h
 include/okular/core/version.h
 include/okular/interfaces/configinterface.h
 include/okular/interfaces/guiinterface.h
 include/okular/interfaces/printinterface.h
+include/okular/interfaces/saveinterface.h
 include/okular/interfaces/viewerinterface.h
 lib/cmake/Okular/OkularConfig.cmake
 lib/cmake/Okular/OkularConfigVersion.cmake
+lib/kde4/imports/org/kde/okular/libokularplugin.so
+lib/kde4/imports/org/kde/okular/qmldir
 lib/kde4/kio_msits.so
 lib/kde4/okularGenerator_chmlib.so
 lib/kde4/okularGenerator_comicbook.so
@@ -42,8 +47,9 @@ lib/kde4/okularGenerator_tiff.so
 lib/kde4/okularGenerator_xps.so
 lib/kde4/okularpart.so
 lib/libokularcore.so
-lib/libokularcore.so.1
-lib/libokularcore.so.1.8.0
+lib/libokularcore.so.2
+lib/libokularcore.so.2.0.0
+man/man1/okular.1
 share/applications/kde4/okular.desktop
 share/applications/kde4/okularApplication_chm.desktop
 share/applications/kde4/okularApplication_comicbook.desktop
@@ -61,14 +67,18 @@ share/applications/kde4/okularApplication_tiff.desktop
 share/applications/kde4/okularApplication_xps.desktop
 share/doc/kde/HTML/en/okular/annotation-properties.png
 share/doc/kde/HTML/en/okular/annotations.png
+share/doc/kde/HTML/en/okular/bookmark-management.png
 share/doc/kde/HTML/en/okular/common
+share/doc/kde/HTML/en/okular/configure-editor.png
 share/doc/kde/HTML/en/okular/configure.png
 share/doc/kde/HTML/en/okular/embedded-files-bar.png
 share/doc/kde/HTML/en/okular/forms-bar.png
 share/doc/kde/HTML/en/okular/index.cache.bz2
 share/doc/kde/HTML/en/okular/index.docbook
 share/doc/kde/HTML/en/okular/mainwindow.png
+share/doc/kde/HTML/en/okular/man-okular.1.docbook
 share/doc/kde/HTML/en/okular/presentation.png
+share/doc/kde/HTML/en/okular/rating.png
 share/icons/hicolor/128x128/apps/okular.png
 share/icons/hicolor/16x16/apps/okular.png
 share/icons/hicolor/22x22/apps/okular.png
@@ -76,6 +86,7 @@ share/icons/hicolor/32x32/apps/okular.png
 share/icons/hicolor/48x48/apps/okular.png
 share/icons/hicolor/64x64/apps/okular.png
 share/icons/hicolor/scalable/apps/okular.svgz
+share/kde/apps/kconf_update/okular.upd
 share/kde/apps/okular/icons/hicolor/16x16/apps/okular-gv.png
 share/kde/apps/okular/icons/hicolor/32x32/apps/okular-gv.png
 share/kde/apps/okular/part-viewermode.rc
@@ -113,6 +124,7 @@ share/kde/apps/okular/shell.rc
 share/kde/apps/okular/tools.xml
 share/kde/config.kcfg/gssettings.kcfg
 share/kde/config.kcfg/okular.kcfg
+share/kde/config.kcfg/okular_core.kcfg
 share/kde4/services/libokularGenerator_chmlib.desktop
 share/kde4/services/libokularGenerator_comicbook.desktop
 share/kde4/services/libokularGenerator_djvu.desktop
diff --git a/print/okular/distinfo b/print/okular/distinfo
index a1e71c302de..943692443d0 100644
--- a/print/okular/distinfo
+++ b/print/okular/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2012/06/16 04:45:37 markd Exp $
+$NetBSD: distinfo,v 1.4 2013/04/03 10:52:10 markd Exp $
 
-SHA1 (okular-4.8.4.tar.xz) = 34ff243a4fa77400631aa44b31cbe54910f8091e
-RMD160 (okular-4.8.4.tar.xz) = f210df71bb8021cf26a942ea21d4929eeb533417
-Size (okular-4.8.4.tar.xz) = 1114648 bytes
+SHA1 (okular-4.10.2.tar.xz) = fcd0c725300c50ea04ec8e05b7d7035bf26afc79
+RMD160 (okular-4.10.2.tar.xz) = 43ebeed8a0e26bac373044976e7046bf2f0acecf
+Size (okular-4.10.2.tar.xz) = 1383348 bytes
diff --git a/print/printer-applet/DESCR b/print/printer-applet/DESCR
deleted file mode 100644
index fb8c801beef..00000000000
--- a/print/printer-applet/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-Printer Applet is a system tray utility that shows current print jobs,
-shows printer warnings and errors and shows when printers that have been
-plugged in for the first time are being auto-configured by hal-cups-utils.
-It is a port of the applet from Red Hat's system-config-printer to KDE.
diff --git a/print/printer-applet/Makefile b/print/printer-applet/Makefile
deleted file mode 100644
index e9283fff693..00000000000
--- a/print/printer-applet/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-# $NetBSD: Makefile,v 1.11 2013/02/16 11:24:13 wiz Exp $
-
-DISTNAME=	printer-applet-${_KDE_VERSION}
-PKGREVISION=	7
-CATEGORIES=	print
-COMMENT=	KDE printer applet
-
-.include "../../meta-pkgs/kde4/Makefile.kde4"
-
-#make sure cmake picks up the same Python version as pkgsrc
-CMAKE_ARGS+=	-DPYTHON_EXECUTABLE:FILEPATH=${PYTHONBIN}
-
-REPLACE_PYTHON+=	*.py
-
-.include "../../meta-pkgs/kde4/kde4.mk"
-
-.include "../../lang/python/application.mk"
-.include "../../print/py-cups/buildlink3.mk"
-.include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../x11/kdelibs4/buildlink3.mk"
-.include "../../x11/py-kde4/buildlink3.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/print/printer-applet/PLIST b/print/printer-applet/PLIST
deleted file mode 100644
index dac9e8baa74..00000000000
--- a/print/printer-applet/PLIST
+++ /dev/null
@@ -1,15 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2012/03/20 06:21:42 markd Exp $
-bin/printer-applet
-share/doc/kde/HTML/en/printer-applet/common
-share/doc/kde/HTML/en/printer-applet/index.cache.bz2
-share/doc/kde/HTML/en/printer-applet/index.docbook
-share/kde/apps/printer-applet/authconn.py
-share/kde/apps/printer-applet/debug.py
-share/kde/apps/printer-applet/monitor.py
-share/kde/apps/printer-applet/printer-applet-printers.ui
-share/kde/apps/printer-applet/printer-applet.notifyrc
-share/kde/apps/printer-applet/printer-applet.py
-share/kde/apps/printer-applet/printer-applet.ui
-share/kde/apps/printer-applet/printer-appletui.rc
-share/kde/apps/printer-applet/statereason.py
-share/kde/autostart/printer-applet.desktop
diff --git a/print/printer-applet/distinfo b/print/printer-applet/distinfo
deleted file mode 100644
index 543d6870310..00000000000
--- a/print/printer-applet/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.3 2012/06/16 04:45:37 markd Exp $
-
-SHA1 (printer-applet-4.8.4.tar.xz) = 451bb3d658a447c454918ea5b0299f1e85b8cfd2
-RMD160 (printer-applet-4.8.4.tar.xz) = 4684c2eb7a5956c09cd6d670b9366fa31dd119ae
-Size (printer-applet-4.8.4.tar.xz) = 37072 bytes