Hi, On Mon, Dec 10, 2018 at 04:51:31PM +0100, Rafael Sadowski wrote: > On Mon Dec 10, 2018 at 10:47:11AM +0100, Matthias Kilian wrote: > > x11/kde4/kfilemetadata > > x11/kde4/nepomuk-core > > Patches attached to disable poppler-qt4 support in kfilemetadata and > nepomuk-core. We are still far away to replace these two kde4 > applications with kde5
Those at least built without problems for me (on amd64). So ok from me. > > x11/kde4/okular > > > > KDE5 replacement here: > https://marc.info/?l=openbsd-ports&m=154300624119383&w=2 I don't use kde and can't comment on it (and your followup on it from december 12th). If it goes in, the diff I just sent for x11/kde4/okular is obsolete, right? Ciao, Kili > Index: Makefile > =================================================================== > RCS file: /cvs/ports/x11/kde4/nepomuk-core/Makefile,v > retrieving revision 1.13 > diff -u -p -u -p -r1.13 Makefile > --- Makefile 27 Jun 2018 21:04:19 -0000 1.13 > +++ Makefile 10 Dec 2018 10:28:25 -0000 > @@ -2,10 +2,9 @@ > > COMMENT = KDE Nepomuk core libraries > DISTNAME = nepomuk-core-${MODKDE4_VERSION} > -REVISION = 2 > +REVISION = 3 > > SHARED_LIBS = nepomukcore 53.0 # 4.9 > -#SHARED_LIBS += nepomuksync 0.0 # 4.9 > SHARED_LIBS += nepomukcommon 53.0 # 4.10 > SHARED_LIBS += kdeinit4_nepomukserver 53.0 # 4.10 > SHARED_LIBS += nepomukextractor 53.0 > @@ -19,7 +18,7 @@ WANTLIB += ${KDE4LIB}/baloocore ${KDE4LI > WANTLIB += ${KDE4LIB}/balooqueryparser > WANTLIB += ${KDE4LIB}/kdeui ${KDE4LIB}/kidletime ${KDE4LIB}/kio > WANTLIB += ${KDE4LIB}/solid > -WANTLIB += avcodec avformat avutil epub exiv2 poppler-qt4 soprano > +WANTLIB += avcodec avformat avutil epub exiv2 soprano > WANTLIB += sopranoserver tag > > MODKDE4_USE = libs > @@ -33,11 +32,11 @@ LIB_DEPENDS = audio/taglib \ > databases/soprano>=2.9.3 \ > graphics/exiv2 \ > graphics/ffmpeg \ > - print/poppler,,-qt4 \ > textproc/ebook-tools \ > ${MODKDE4_DEP_DIR}/baloo>=${MODKDE4_DEP_VERSION} > > CONFIGURE_ARGS = -DCMAKE_DISABLE_FIND_PACKAGE_QMobipocket=True \ > - -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen:Bool=Yes > + -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=True \ > + -DCMAKE_DISABLE_FIND_PACKAGE_PopplerQt4=True > > .include <bsd.port.mk> > Index: pkg/PLIST > =================================================================== > RCS file: /cvs/ports/x11/kde4/nepomuk-core/pkg/PLIST,v > retrieving revision 1.6 > diff -u -p -u -p -r1.6 PLIST > --- pkg/PLIST 27 Jun 2018 21:04:19 -0000 1.6 > +++ pkg/PLIST 10 Dec 2018 10:28:25 -0000 > @@ -140,7 +140,6 @@ lib/kde4/nepomukodfextractor.so > lib/kde4/nepomukoffice2007extractor.so > lib/kde4/nepomukofficeextractor.so > lib/kde4/nepomukplaintextextractor.so > -lib/kde4/nepomukpopplerextractor.so > lib/kde4/nepomuktaglibextractor.so > @lib lib/libkdeinit4_nepomukserver.so.${LIBkdeinit4_nepomukserver_VERSION} > @lib lib/libnepomukcleaner.so.${LIBnepomukcleaner_VERSION} > @@ -182,7 +181,6 @@ share/kde4/services/nepomukoffice2007ext > share/kde4/services/nepomukofficeextractor.desktop > share/kde4/services/nepomukontologyloader.desktop > share/kde4/services/nepomukplaintextextractor.desktop > -share/kde4/services/nepomukpopplerextractor.desktop > share/kde4/services/nepomukqueryservice.desktop > share/kde4/services/nepomukremovablestorageservice.desktop > share/kde4/services/nepomukstorage.desktop > Index: Makefile > =================================================================== > RCS file: /cvs/ports/x11/kde4/kfilemetadata/Makefile,v > retrieving revision 1.4 > diff -u -p -u -p -r1.4 Makefile > --- Makefile 27 Jul 2017 11:57:48 -0000 1.4 > +++ Makefile 10 Dec 2018 15:50:37 -0000 > @@ -2,28 +2,26 @@ > > COMMENT = file metadata extraction library for KDE > DISTNAME = kfilemetadata-${MODKDE4_VERSION} > -REVISION = 1 > +REVISION = 2 > > CATEGORIES = sysutils > + > HOMEPAGE = https://projects.kde.org/projects/kde/kdelibs/kfilemetadata > > SHARED_LIBS = kfilemetadata 1.0 > > -WANTLIB = m pthread > -WANTLIB += ${COMPILER_LIBCXX} > -WANTLIB += lib/qt4/QtDBus lib/qt4/QtGui lib/qt4/QtNetwork > -WANTLIB += lib/qt4/QtSvg lib/qt4/QtXml > -WANTLIB += ${KDE4LIB}/kdeui ${KDE4LIB}/kio > -WANTLIB += avcodec avformat avutil epub exiv2 poppler-qt4 tag > +WANTLIB += ${COMPILER_LIBCXX} lib/qt4/QtDBus lib/qt4/QtGui lib/qt4/QtNetwork > +WANTLIB += lib/qt4/QtSvg lib/qt4/QtXml avcodec avformat avutil epub exiv2 > +WANTLIB += ${KDE4LIB}/kdeui ${KDE4LIB}/kio m tag > > MODKDE4_USE = libs > > -CONFIGURE_ARGS = -DCMAKE_DISABLE_FIND_PACKAGE_QMobipocket=True > +CONFIGURE_ARGS = -DCMAKE_DISABLE_FIND_PACKAGE_QMobipocket=True \ > + -DCMAKE_DISABLE_FIND_PACKAGE_PopplerQt4=True > > LIB_DEPENDS = audio/taglib \ > graphics/exiv2 \ > graphics/ffmpeg \ > - print/poppler,,-qt4 \ > textproc/ebook-tools > > .include <bsd.port.mk> > Index: pkg/PLIST > =================================================================== > RCS file: /cvs/ports/x11/kde4/kfilemetadata/pkg/PLIST,v > retrieving revision 1.1.1.1 > diff -u -p -u -p -r1.1.1.1 PLIST > --- pkg/PLIST 9 Jul 2014 19:50:17 -0000 1.1.1.1 > +++ pkg/PLIST 10 Dec 2018 15:50:37 -0000 > @@ -19,10 +19,11 @@ lib/kde4/kfilemetadata_odfextractor.so > lib/kde4/kfilemetadata_office2007extractor.so > lib/kde4/kfilemetadata_officeextractor.so > lib/kde4/kfilemetadata_plaintextextractor.so > -lib/kde4/kfilemetadata_popplerextractor.so > lib/kde4/kfilemetadata_taglibextractor.so > @lib ${KDE4LIB}/libkfilemetadata.so.${LIBkfilemetadata_VERSION} > @lib lib/libkfilemetadata.so.${LIBkfilemetadata_VERSION} > +share/kde4/ > +share/kde4/services/ > share/kde4/services/kfilemetadata_epubextractor.desktop > share/kde4/services/kfilemetadata_exiv2extractor.desktop > share/kde4/services/kfilemetadata_ffmpegextractor.desktop > @@ -30,6 +31,5 @@ share/kde4/services/kfilemetadata_odfext > share/kde4/services/kfilemetadata_office2007extractor.desktop > share/kde4/services/kfilemetadata_officeextractor.desktop > share/kde4/services/kfilemetadata_plaintextextractor.desktop > -share/kde4/services/kfilemetadata_popplerextractor.desktop > share/kde4/services/kfilemetadata_taglibextractor.desktop > share/kde4/servicetypes/kfilemetadataextractor.desktop
