4 files changed, 38 insertions, 21 deletions

diff --git a/graphics/okular/Makefile b/graphics/okular/Makefile
index 678bbe10ef0a..e377887e1055 100644
--- a/graphics/okular/Makefile
+++ b/graphics/okular/Makefile
@@ -2,7 +2,6 @@
 
 PORTNAME=	okular
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	3
 CATEGORIES=	graphics kde
 MASTER_SITES=	KDE/${KDE4_BRANCH}/${PORTVERSION}/src
 DIST_SUBDIR=	KDE/${PORTVERSION}
@@ -12,6 +11,7 @@ COMMENT=	KDE 4 universal document viewer
 
 LIB_DEPENDS=	libdjvulibre.so:${PORTSDIR}/graphics/djvulibre \
 		libjpeg.so:${PORTSDIR}/graphics/jpeg \
+		libkscreen.so:${PORTSDIR}/graphics/libkscreen \
 		libqca.so:${PORTSDIR}/devel/qca \
 		libtiff.so:${PORTSDIR}/graphics/tiff \
 		libpoppler-qt4.so:${PORTSDIR}/graphics/poppler-qt4 \
@@ -21,7 +21,7 @@ LIB_DEPENDS=	libdjvulibre.so:${PORTSDIR}/graphics/djvulibre \
 		libepub.so:${PORTSDIR}/textproc/ebook-tools \
 		libqmobipocket.so:${PORTSDIR}/graphics/kdegraphics4-mobipocket
 
-USE_KDE4=	kdehier kdelibs kdeprefix automoc4 qimageblitz kactivities \
+USE_KDE4=	kdelibs kdeprefix automoc4 qimageblitz kactivities \
 		libkexiv2
 USE_QT4=	corelib declarative gui opengl xml \
 		qmake_build moc_build uic_build rcc_build
diff --git a/graphics/okular/distinfo b/graphics/okular/distinfo
index e404c43b4cfb..e07665990820 100644
--- a/graphics/okular/distinfo
+++ b/graphics/okular/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/4.12.5/okular-4.12.5.tar.xz) = 15eb67735f7d7dba48246fa1f5a5907d5e6d5b683b1c7020c01c9d401dc1395e
-SIZE (KDE/4.12.5/okular-4.12.5.tar.xz) = 1579464
+SHA256 (KDE/4.14.2/okular-4.14.2.tar.xz) = 01d8704a72ff6ece4d1cee73926f7c5ff7e77fa98733fe0b37e8a824ff965019
+SIZE (KDE/4.14.2/okular-4.14.2.tar.xz) = 1574328
diff --git a/graphics/okular/files/patch-shell__shell.cpp b/graphics/okular/files/patch-shell__shell.cpp
new file mode 100644
index 000000000000..9fb4366c96d2
--- /dev/null
+++ b/graphics/okular/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 );
+                 }
diff --git a/graphics/okular/pkg-plist b/graphics/okular/pkg-plist
index e401195a27d8..ea1fabcf93df 100644
--- a/graphics/okular/pkg-plist
+++ b/graphics/okular/pkg-plist
@@ -50,8 +50,8 @@ lib/kde4/okularGenerator_txt.so
 lib/kde4/okularGenerator_xps.so
 lib/kde4/okularpart.so
 lib/libokularcore.so
-lib/libokularcore.so.3
-lib/libokularcore.so.3.0.0
+lib/libokularcore.so.5
+lib/libokularcore.so.5.0.0
 man/man1/okular.1.gz
 share/applications/kde4/active-documentviewer_chm.desktop
 share/applications/kde4/active-documentviewer_comicbook.desktop
@@ -86,8 +86,11 @@ share/applications/kde4/okularApplication_tiff.desktop
 share/applications/kde4/okularApplication_txt.desktop
 share/applications/kde4/okularApplication_xps.desktop
 share/apps/kconf_update/okular.upd
+share/apps/okular/icons/hicolor/16x16/apps/okular-fb2.png
 share/apps/okular/icons/hicolor/16x16/apps/okular-gv.png
+share/apps/okular/icons/hicolor/32x32/apps/okular-fb2.png
 share/apps/okular/icons/hicolor/32x32/apps/okular-gv.png
+share/apps/okular/icons/hicolor/48x48/apps/okular-fb2.png
 share/apps/okular/part-viewermode.rc
 share/apps/okular/part.rc
 share/apps/okular/pics/checkmark.png
@@ -194,18 +197,3 @@ share/kde4/services/okularTxt.desktop
 share/kde4/services/okularXps.desktop
 share/kde4/services/okular_part.desktop
 share/kde4/servicetypes/okularGenerator.desktop
-@dirrm share/doc/HTML/en/okular
-@dirrm share/apps/okular/pics
-@dirrm share/apps/okular/icons/hicolor/32x32/apps
-@dirrm share/apps/okular/icons/hicolor/32x32
-@dirrm share/apps/okular/icons/hicolor/16x16/apps
-@dirrm share/apps/okular/icons/hicolor/16x16
-@dirrm share/apps/okular/icons/hicolor
-@dirrm share/apps/okular/icons
-@dirrm share/apps/okular
-@dirrmtry lib/kde4/imports/org/kde/okular
-@dirrm lib/cmake/Okular
-@dirrmtry lib/cmake
-@dirrm include/okular/interfaces
-@dirrm include/okular/core
-@dirrm include/okular