From 0ea52f99b465b681e2a4bf7c44a8f7093f40fc68 Mon Sep 17 00:00:00 2001 From: Max Brazhnikov Date: Sun, 19 Oct 2014 15:57:27 +0000 Subject: KDE/FreeBSD team presents KDE SC 4.14.2 and KDE Workspace 4.11.13! USE_KDE4=kdehier component has been deprecated, new components added: baloo - Baloo core libraries baloo-widgets - Baloo widgets library kfilemetadata - KDE library for extracting file metadata New ports: graphics/kqtquickcharts - QtQuick plugin to render interactive charts misc/artikulate - Pronunciation trainer for KDE (not usable currently, links to both GStreamer 1.x and 0.10.x via dependencies) sysutils/baloo[-widgets] - KDE framework for searching and managing user metadata sysutils/kfilemetadata - Library for extracting file metadata l10n ports: - Farsi (Persian) and Indonesian translations has been readded - Vietnamese didn't pass threshold for inclusion into release astro/kstars: - switch dependency from math/eigen2 to math/eigen3 - add PYKDE option for updating supernovae data deskutils/kdepim4: - update dependencies: add libkgapi and baloo, remove now needless clucene, link-grammar, strigi - add patch to fix build with gcc42 - update COMMENT and description for all KDE PIM ports devel/ruby-krossruby: - remove BROKEN, it builds with ruby 2.x now editors/kate: - add patch to disable memory-hungry build of the kate tests [1] graphics/okular: - add dependency on graphics/libkscreen math/cantor: - add optional dependency on lang/luajit for LuaJIT backend - fix gfortran detection [2] misc/kdehier4: - adapt to new pkg world. Now the purpose of kdehier4 only to link some stuff between KDE4_PREFIX and LOCALBASE. science/kalzium: - switch dependency from math/eigen2 to math/eigen3 - add dependence on science/chemical-mime-data x11-themes/kdeartwork4 - switch dependency from math/eigen2 to math/eigen3 among other changes: - drop deprecated USE_KDE4=kdehier - drop @dirrm from plist - clean up pkg-descr - convert to options helpers - other portlint fixes The area51 repository features commits by alonso, rakuco and myself. PR: 187150 [1] Reported by: pe.freethread@live.com Patch by: Tobias Berner PR: 180674 [2] Reported by: torsten.eichstaedt@web.de PR: 194316 Exp-run: antoine --- graphics/okular/Makefile | 4 ++-- graphics/okular/distinfo | 4 ++-- graphics/okular/files/patch-shell__shell.cpp | 29 ++++++++++++++++++++++++++++ graphics/okular/pkg-plist | 22 +++++---------------- 4 files changed, 38 insertions(+), 21 deletions(-) create mode 100644 graphics/okular/files/patch-shell__shell.cpp (limited to 'graphics/okular') 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(part)->openNewFilesInTabs() ++ if ( !qobject_cast(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(part)->openNewFilesInTabs(); ++ const bool allowTabs = qobject_cast(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(activePart)->openNewFilesInTabs() ) ++ if( qobject_cast(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 -- cgit v1.2.3