Information for inst:okular-18.08.2
Comment:
KDE document viewer
Description:
Okular is a universal document viewer based on KPDF for KDE 4.
It combines the excellent functionalities of KPDF with the
versatility of supporting different kind of documents, like PDF,
Postscript, DjVu, CHM, XPS, ePub and others.
Maintainer: KDE porting team <openbsd-kde@googlegroups.com>
Please find attached KDE5 okular to replace KDE4 okular with the
following diff. It will zap all KDE4 bits in x11/KDE4 (expect meta/kde4
and x11/kde4/Makefile)
Ok to bring okular to KDE5?
Rafael.
Index: korundum/Makefile
===================================================================
RCS file: /cvs/ports/x11/kde4/korundum/Makefile,v
retrieving revision 1.23
diff -u -p -u -p -r1.23 Makefile
--- korundum/Makefile 26 Oct 2018 16:16:24 -0000 1.23
+++ korundum/Makefile 23 Nov 2018 20:45:56 -0000
@@ -2,7 +2,7 @@
COMMENT = KDE bindings for Ruby
DISTNAME = korundum-${MODKDE4_VERSION}
-REVISION = 9
+REVISION = 10
WANTLIB = ${MODRUBY_WANTLIB}
WANTLIB += ${COMPILER_LIBCXX}
@@ -13,7 +13,7 @@ WANTLIB += ${KDE4LIB}/kcmutils ${KDE4LIB
WANTLIB += ${KDE4LIB}/kidletime ${KDE4LIB}/kio ${KDE4LIB}/knewstuff2
WANTLIB += ${KDE4LIB}/kprintutils ${KDE4LIB}/kpty ${KDE4LIB}/kutils
WANTLIB += ${KDE4LIB}/nepomuk
-WANTLIB += ${KDE4LIB}/okularcore ${KDE4LIB}/solid
+WANTLIB += ${KDE4LIB}/solid
WANTLIB += ${KDE4LIB}/smokeakonadi
WANTLIB += ${KDE4LIB}/smokebase
WANTLIB += ${KDE4LIB}/smokekdecore ${KDE4LIB}/smokekdeui
@@ -21,7 +21,7 @@ WANTLIB += ${KDE4LIB}/smokekfile ${KDE4L
WANTLIB += ${KDE4LIB}/smokeknewstuff2 ${KDE4LIB}/smokeknewstuff3
WANTLIB += ${KDE4LIB}/smokekparts ${KDE4LIB}/smokektexteditor
WANTLIB += ${KDE4LIB}/smokekutils ${KDE4LIB}/smokenepomuk
-WANTLIB += ${KDE4LIB}/smokeokular ${KDE4LIB}/smokeplasma
+WANTLIB += ${KDE4LIB}/smokeplasma
WANTLIB += ${KDE4LIB}/smokeqtcore ${KDE4LIB}/smokeqtdbus
WANTLIB += ${KDE4LIB}/smokeqtgui ${KDE4LIB}/smokeqtnetwork
WANTLIB += ${KDE4LIB}/smokeqtopengl ${KDE4LIB}/smokeqtsql
Index: korundum/patches/patch-CMakeLists_txt
===================================================================
RCS file: /cvs/ports/x11/kde4/korundum/patches/patch-CMakeLists_txt,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-CMakeLists_txt
--- korundum/patches/patch-CMakeLists_txt 24 Apr 2013 12:18:23 -0000 1.1.1.1
+++ korundum/patches/patch-CMakeLists_txt 23 Nov 2018 20:45:56 -0000
@@ -2,8 +2,9 @@ $OpenBSD: patch-CMakeLists_txt,v 1.1.1.1
insert after searching for kde + qtruby
---- CMakeLists.txt.orig Thu Oct 25 10:24:34 2012
-+++ CMakeLists.txt Thu Oct 25 10:25:23 2012
+Index: CMakeLists.txt
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
@@ -5,6 +5,9 @@ set(COMPILE_RUBY FALSE CACHE INTERNAL "")
find_package(Ruby REQUIRED)
find_package(KDE4 REQUIRED)
@@ -12,5 +13,14 @@ insert after searching for kde + qtruby
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}")
+
find_package(Smoke REQUIRED
- COMPONENTS KdeCore
+ COMPONENTS KdeCore
KdeUi
+@@ -20,7 +23,7 @@ find_package(Smoke REQUIRED
+ Plasma
+ QtCore
+ Solid )
+-find_package(Smoke COMPONENTS Akonadi Okular Kate Soprano SopranoClient SopranoServer Nepomuk )
++find_package(Smoke COMPONENTS Akonadi Kate Soprano SopranoClient SopranoServer Nepomuk )
+ include(KDE4Defaults)
+ include_directories( ${KDE4_INCLUDES} ${SMOKE_INCLUDE_DIR} ${QTRUBY_INCLUDE_DIR} ${SMOKE_QTCORE_INCLUDE_DIR} ${SMOKE_KDECORE_INCLUDE_DIR} )
+
Index: korundum/pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/kde4/korundum/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 PLIST
--- korundum/pkg/PLIST 27 Jun 2018 21:04:17 -0000 1.3
+++ korundum/pkg/PLIST 23 Nov 2018 20:45:56 -0000
@@ -15,8 +15,6 @@ ${MODRUBY_SITEDIR}/ktexteditor/
${MODRUBY_SITEDIR}/ktexteditor/ktexteditor.rb
${MODRUBY_SITEDIR}/nepomuk/
${MODRUBY_SITEDIR}/nepomuk/nepomuk.rb
-${MODRUBY_SITEDIR}/okular/
-${MODRUBY_SITEDIR}/okular/okular.rb
${MODRUBY_SITEDIR}/solid/
${MODRUBY_SITEDIR}/solid/solid.rb
${MODRUBY_SITEDIR}/soprano/
@@ -27,7 +25,6 @@ ${MODRUBY_SITEARCHDIR}/kio.so
${MODRUBY_SITEARCHDIR}/korundum4.so
${MODRUBY_SITEARCHDIR}/ktexteditor.so
${MODRUBY_SITEARCHDIR}/nepomuk.so
-${MODRUBY_SITEARCHDIR}/okular.so
${MODRUBY_SITEARCHDIR}/plasma_applet.so
${MODRUBY_SITEARCHDIR}/solid.so
${MODRUBY_SITEARCHDIR}/soprano.so
@@ -44,6 +41,8 @@ share/apps/plasma_ruby_digital_clock/
share/apps/plasma_ruby_digital_clock/calendar.rb
share/apps/plasma_ruby_digital_clock/clock.rb
share/apps/plasma_ruby_digital_clock/digital_clock_config.rb
+share/kde4/
+share/kde4/services/
share/kde4/services/plasma-applet-ruby-analogclock.desktop
share/kde4/services/plasma-ruby-digital-clock-default.desktop
@tag update-desktop-database
Index: p5-kde/Makefile
===================================================================
RCS file: /cvs/ports/x11/kde4/p5-kde/Makefile,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 Makefile
--- p5-kde/Makefile 2 May 2018 20:03:09 -0000 1.12
+++ p5-kde/Makefile 23 Nov 2018 20:45:56 -0000
@@ -3,7 +3,7 @@
COMMENT = KDE bindings for Perl
DISTNAME = perlkde-${MODKDE4_VERSION}
PKGNAME = p5-kde-${MODKDE4_VERSION}
-REVISION = 2
+REVISION = 3
WANTLIB = c m perl pthread util
WANTLIB += ${COMPILER_LIBCXX}
@@ -15,7 +15,7 @@ WANTLIB += ${KDE4LIB}/smokekfile ${KDE4L
WANTLIB += ${KDE4LIB}/smokeknewstuff2 ${KDE4LIB}/smokeknewstuff3
WANTLIB += ${KDE4LIB}/smokekparts ${KDE4LIB}/smokektexteditor
WANTLIB += ${KDE4LIB}/smokekutils ${KDE4LIB}/smokenepomuk
-WANTLIB += ${KDE4LIB}/smokenepomukquery ${KDE4LIB}/smokeokular
+WANTLIB += ${KDE4LIB}/smokenepomukquery
WANTLIB += ${KDE4LIB}/smokeplasma ${KDE4LIB}/smokeqtcore
WANTLIB += ${KDE4LIB}/smokeqtgui ${KDE4LIB}/smokeqtnetwork
WANTLIB += ${KDE4LIB}/smokesolid ${KDE4LIB}/smokesoprano
@@ -25,8 +25,7 @@ WANTLIB += ${KDE4LIB}/smokeakonadi ${KDE
MODULES = perl
MODKDE4_USE = libs
-BUILD_DEPENDS = ${MODKDE4_DEP_DIR}/okular>=${MODKDE4_DEP_VERSION} \
- ${MODKDE4_DEP_DIR}/p5-qt>=${MODKDE4_DEP_VERSION} \
+BUILD_DEPENDS = ${MODKDE4_DEP_DIR}/p5-qt>=${MODKDE4_DEP_VERSION} \
${MODKDE4_DEP_DIR}/pimlibs>=${MODKDE4_DEP_VERSION}
RUN_DEPENDS = ${MODKDE4_DEP_DIR}/p5-qt>=${MODKDE4_DEP_VERSION}
Index: p5-kde/pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/kde4/p5-kde/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 PLIST
--- p5-kde/pkg/PLIST 2 May 2018 20:03:09 -0000 1.5
+++ p5-kde/pkg/PLIST 23 Nov 2018 20:45:56 -0000
@@ -14,7 +14,6 @@ ${P5ARCH}/KTextEditor.pm
${P5ARCH}/KUtils.pm
${P5ARCH}/Nepomuk.pm
${P5ARCH}/NepomukQuery.pm
-${P5ARCH}/Okular.pm
${P5ARCH}/Plasma4.pm
${P5ARCH}/Solid.pm
${P5ARCH}/Soprano.pm
@@ -48,8 +47,6 @@ ${P5ARCH}/auto/Nepomuk/
${P5ARCH}/auto/Nepomuk/Nepomuk.so
${P5ARCH}/auto/NepomukQuery/
${P5ARCH}/auto/NepomukQuery/NepomukQuery.so
-${P5ARCH}/auto/Okular/
-${P5ARCH}/auto/Okular/Okular.so
${P5ARCH}/auto/Plasma4/
${P5ARCH}/auto/Plasma4/Plasma4.so
${P5ARCH}/auto/Solid/
Index: smokekde/Makefile
===================================================================
RCS file: /cvs/ports/x11/kde4/smokekde/Makefile,v
retrieving revision 1.17
diff -u -p -u -p -r1.17 Makefile
--- smokekde/Makefile 4 May 2018 07:50:26 -0000 1.17
+++ smokekde/Makefile 23 Nov 2018 20:45:56 -0000
@@ -3,7 +3,7 @@
CATEGORIES = devel
COMMENT = introspective wrappers around KDE
DISTNAME = smokekde-${MODKDE4_VERSION}
-REVISION = 2
+REVISION = 3
SHARED_LIBS = smokeakonadi 52.0 # 3.0
SHARED_LIBS += smokeattica 51.0 # 3.0
@@ -19,7 +19,6 @@ SHARED_LIBS += smokektexteditor 52.0 # 3
SHARED_LIBS += smokekutils 52.0 # 3.0
SHARED_LIBS += smokenepomuk 52.0 # 3.0
SHARED_LIBS += smokenepomukquery 52.0 # 3.0
-SHARED_LIBS += smokeokular 52.0 # 3.0
SHARED_LIBS += smokeplasma 52.0 # 3.0
SHARED_LIBS += smokesolid 52.0 # 3.0
SHARED_LIBS += smokesoprano 52.0 # 3.0
@@ -38,7 +37,7 @@ WANTLIB += ${KDE4LIB}/kio ${KDE4LIB}/kjs
WANTLIB += ${KDE4LIB}/knewstuff3 ${KDE4LIB}/kparts ${KDE4LIB}/kprintutils
WANTLIB += ${KDE4LIB}/ktexteditor ${KDE4LIB}/nepomuk
WANTLIB += ${KDE4LIB}/nepomukquery ${KDE4LIB}/nepomukutils
-WANTLIB += ${KDE4LIB}/okularcore ${KDE4LIB}/phonon_s ${KDE4LIB}/plasma
+WANTLIB += ${KDE4LIB}/phonon_s ${KDE4LIB}/plasma
WANTLIB += ${KDE4LIB}/smokebase ${KDE4LIB}/smokeqtcore ${KDE4LIB}/smokeqtdbus
WANTLIB += ${KDE4LIB}/smokeqtgui ${KDE4LIB}/smokeqtnetwork
WANTLIB += ${KDE4LIB}/smokeqtsvg ${KDE4LIB}/smokeqtxml ${KDE4LIB}/solid
@@ -51,7 +50,6 @@ WANTLIB += attica soprano sopranoclient
MODKDE4_USE = pim libs
LIB_DEPENDS = databases/soprano \
- ${MODKDE4_DEP_DIR}/okular>=${MODKDE4_DEP_VERSION} \
${MODKDE4_DEP_DIR}/smokegen>=${MODKDE4_DEP_VERSION} \
${MODKDE4_DEP_DIR}/smokeqt>=${MODKDE4_DEP_VERSION}
Index: smokekde/patches/patch-CMakeLists_txt
===================================================================
RCS file: /cvs/ports/x11/kde4/smokekde/patches/patch-CMakeLists_txt,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-CMakeLists_txt
--- smokekde/patches/patch-CMakeLists_txt 14 Oct 2013 13:42:52 -0000 1.2
+++ smokekde/patches/patch-CMakeLists_txt 23 Nov 2018 20:45:56 -0000
@@ -1,6 +1,7 @@
$OpenBSD: patch-CMakeLists_txt,v 1.2 2013/10/14 13:42:52 zhuk Exp $
---- CMakeLists.txt.orig Fri Jun 28 21:15:08 2013
-+++ CMakeLists.txt Sun Oct 13 18:45:41 2013
+Index: CMakeLists.txt
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
@@ -23,6 +23,7 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${SMOK
add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS} -DQT3_SUPPORT)
@@ -9,3 +10,12 @@ $OpenBSD: patch-CMakeLists_txt,v 1.2 201
## disable deprecation waringins
if(CMAKE_COMPILER_IS_GNUCXX)
+@@ -72,8 +73,6 @@ macro_optional_add_bindings(BUILD_Akonadi "Akonadi" ak
+ macro_optional_add_bindings(LIBATTICA_FOUND "Attica" attica)
+
+ macro_optional_add_bindings(Nepomuk_FOUND "Nepomuk" nepomuk nepomukquery)
+-
+-macro_optional_add_bindings(OKULAR_FOUND "Okular" okular)
+
+ find_library(KATEINTERFACES_LIBRARY kateinterfaces HINTS ${KDE4_LIB_DIR})
+ find_path(KATE_INCLUDE_DIR kate/plugin.h HINTS ${KDE4_INCLUDE_DIR})
Index: smokekde/pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/kde4/smokekde/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 PLIST
--- smokekde/pkg/PLIST 2 May 2018 17:49:27 -0000 1.4
+++ smokekde/pkg/PLIST 23 Nov 2018 20:45:56 -0000
@@ -13,7 +13,6 @@ include/smoke/ktexteditor_smoke.h
include/smoke/kutils_smoke.h
include/smoke/nepomuk_smoke.h
include/smoke/nepomukquery_smoke.h
-include/smoke/okular_smoke.h
include/smoke/plasma_smoke.h
include/smoke/solid_smoke.h
include/smoke/soprano_smoke.h
@@ -33,7 +32,6 @@ include/smoke/sopranoserver_smoke.h
@lib ${KDE4LIB}/libsmokekutils.so.${LIBsmokekutils_VERSION}
@lib ${KDE4LIB}/libsmokenepomuk.so.${LIBsmokenepomuk_VERSION}
@lib ${KDE4LIB}/libsmokenepomukquery.so.${LIBsmokenepomukquery_VERSION}
-@lib ${KDE4LIB}/libsmokeokular.so.${LIBsmokeokular_VERSION}
@lib ${KDE4LIB}/libsmokeplasma.so.${LIBsmokeplasma_VERSION}
@lib ${KDE4LIB}/libsmokesolid.so.${LIBsmokesolid_VERSION}
@lib ${KDE4LIB}/libsmokesoprano.so.${LIBsmokesoprano_VERSION}
@@ -53,7 +51,6 @@ include/smoke/sopranoserver_smoke.h
@lib lib/libsmokekutils.so.${LIBsmokekutils_VERSION}
@lib lib/libsmokenepomuk.so.${LIBsmokenepomuk_VERSION}
@lib lib/libsmokenepomukquery.so.${LIBsmokenepomukquery_VERSION}
-@lib lib/libsmokeokular.so.${LIBsmokeokular_VERSION}
@lib lib/libsmokeplasma.so.${LIBsmokeplasma_VERSION}
@lib lib/libsmokesolid.so.${LIBsmokesolid_VERSION}
@lib lib/libsmokesoprano.so.${LIBsmokesoprano_VERSION}
No comments:
Post a Comment