Hi,
maybe totally useless. Let's move forward with KDE5 okular:
https://sizeofvoid.org/pub/OpenBSD/kde-applications/graphics/okular-18.12.0.tar.gz
We can solve two problems with one move.
Rafael Sadowski
On Sat Dec 29, 2018 at 01:08:54PM +0100, Matthias Kilian wrote:
> Hi,
>
> the diff below removes the poppler-qt4 dependency from x11/kde4/okular.
> I've no idea how useful okular will be without poppler-qt4, but at
> least it still builds for me.
>
> ok?
>
> Ciao,
> Kili
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/x11/kde4/okular/Makefile,v
> retrieving revision 1.24
> diff -u -p -r1.24 Makefile
> --- Makefile 29 Jun 2018 22:16:32 -0000 1.24
> +++ Makefile 29 Dec 2018 12:03:53 -0000
> @@ -2,7 +2,7 @@
>
> COMMENT = KDE document viewer
> DISTNAME = okular-${MODKDE4_VERSION}
> -REVISION = 8
> +REVISION = 9
>
> SHARED_LIBS = okularcore 51.0 # 1.7
>
> @@ -16,7 +16,7 @@ WANTLIB += ${KDE4LIB}/kio ${KDE4LIB}/kjs
> WANTLIB += ${KDE4LIB}/kparts ${KDE4LIB}/kprintutils ${KDE4LIB}/kpty
> WANTLIB += ${KDE4LIB}/nepomuk ${KDE4LIB}/nepomukutils
> WANTLIB += ${KDE4LIB}/qmobipocket
> -WANTLIB += chm djvulibre epub freetype jpeg kscreen poppler-qt4 qca qimageblitz
> +WANTLIB += chm djvulibre epub freetype jpeg kscreen qca qimageblitz
> WANTLIB += qjson soprano solid spectre threadweaver tiff
>
> MODULES = multimedia/phonon
> @@ -30,7 +30,6 @@ LIB_DEPENDS = devel/chmlib \
> graphics/qimageblitz \
> graphics/tiff \
> print/libspectre \
> - print/poppler,,-qt4 \
> security/qca \
> textproc/ebook-tools \
> x11/libkscreen<5 \
> @@ -39,7 +38,8 @@ LIB_DEPENDS = devel/chmlib \
> ${MODKDE4_DEP_DIR}/libkexiv2>=${MODKDE4_DEP_VERSION}
>
> # Not ported yet, extragear stuff
> -CONFIGURE_ARGS = -DWITH_ActiveApp=No
> +CONFIGURE_ARGS = -DWITH_ActiveApp=No \
> + -DCMAKE_DISABLE_FIND_PACKAGE_Poppler=True
>
> TEST_IS_INTERACTIVE = X11
>
> Index: patches/patch-cmake_modules_FindPoppler_cmake
> ===================================================================
> RCS file: patches/patch-cmake_modules_FindPoppler_cmake
> diff -N patches/patch-cmake_modules_FindPoppler_cmake
> --- patches/patch-cmake_modules_FindPoppler_cmake 24 Apr 2013 18:34:39 -0000 1.1.1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,14 +0,0 @@
> -$OpenBSD: patch-cmake_modules_FindPoppler_cmake,v 1.1.1.1 2013/04/24 18:34:39 zhuk Exp $
> ---- cmake/modules/FindPoppler.cmake.orig Tue Oct 11 04:18:26 2011
> -+++ cmake/modules/FindPoppler.cmake Tue Oct 11 04:19:22 2011
> -@@ -57,6 +57,10 @@ endif(NOT _poppler_version_bad)
> - if (POPPLER_FOUND)
> - include(CheckCXXSourceCompiles)
> -
> -+ # Unbreak Qt4 linking after QT_USE_IMPORTED_TARGETS set in KDE config
> -+ set(QT_USE_IMPORTED_TARGETS FALSE)
> -+ find_package(Qt4)
> -+
> - # check whether we're using poppler 0.6
> - set(CMAKE_REQUIRED_INCLUDES ${POPPLER_INCLUDE_DIR} ${QT_INCLUDE_DIR})
> - set(CMAKE_REQUIRED_LIBRARIES ${POPPLER_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTXML_LIBRARY})
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/x11/kde4/okular/pkg/PLIST,v
> retrieving revision 1.7
> diff -u -p -r1.7 PLIST
> --- pkg/PLIST 29 Jun 2018 22:16:32 -0000 1.7
> +++ pkg/PLIST 29 Dec 2018 12:03:53 -0000
> @@ -52,7 +52,6 @@ lib/kde4/okularGenerator_kimgio.so
> lib/kde4/okularGenerator_mobi.so
> lib/kde4/okularGenerator_ooo.so
> lib/kde4/okularGenerator_plucker.so
> -lib/kde4/okularGenerator_poppler.so
> lib/kde4/okularGenerator_tiff.so
> lib/kde4/okularGenerator_txt.so
> lib/kde4/okularGenerator_xps.so
> @@ -69,7 +68,6 @@ share/applications/kde4/active-documentv
> share/applications/kde4/active-documentviewer_ghostview.desktop
> share/applications/kde4/active-documentviewer_kimgio.desktop
> share/applications/kde4/active-documentviewer_ooo.desktop
> -share/applications/kde4/active-documentviewer_pdf.desktop
> share/applications/kde4/active-documentviewer_plucker.desktop
> share/applications/kde4/active-documentviewer_tiff.desktop
> share/applications/kde4/active-documentviewer_txt.desktop
> @@ -86,7 +84,6 @@ share/applications/kde4/okularApplicatio
> share/applications/kde4/okularApplication_kimgio.desktop
> share/applications/kde4/okularApplication_mobi.desktop
> share/applications/kde4/okularApplication_ooo.desktop
> -share/applications/kde4/okularApplication_pdf.desktop
> share/applications/kde4/okularApplication_plucker.desktop
> share/applications/kde4/okularApplication_tiff.desktop
> share/applications/kde4/okularApplication_txt.desktop
> @@ -141,7 +138,6 @@ share/apps/okular/tools.xml
> share/config.kcfg/gssettings.kcfg
> share/config.kcfg/okular.kcfg
> share/config.kcfg/okular_core.kcfg
> -share/config.kcfg/pdfsettings.kcfg
> share/doc/HTML/en/okular/
> share/doc/HTML/en/okular/annotation-properties.png
> share/doc/HTML/en/okular/annotations.png
> @@ -191,7 +187,6 @@ share/kde4/services/libokularGenerator_k
> share/kde4/services/libokularGenerator_mobi.desktop
> share/kde4/services/libokularGenerator_ooo.desktop
> share/kde4/services/libokularGenerator_plucker.desktop
> -share/kde4/services/libokularGenerator_poppler.desktop
> share/kde4/services/libokularGenerator_tiff.desktop
> share/kde4/services/libokularGenerator_txt.desktop
> share/kde4/services/libokularGenerator_xps.desktop
> @@ -208,7 +203,6 @@ share/kde4/services/okularKimgio.desktop
> share/kde4/services/okularMobi.desktop
> share/kde4/services/okularOoo.desktop
> share/kde4/services/okularPlucker.desktop
> -share/kde4/services/okularPoppler.desktop
> share/kde4/services/okularTiff.desktop
> share/kde4/services/okularTxt.desktop
> share/kde4/services/okularXps.desktop
>
No comments:
Post a Comment