CVS commit: pkgsrc/sysutils/kfilemetadata

["Mark Davies" <markd%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   markd
Date:           Thu Jan 11 10:34:33 UTC 2018

Modified Files:
        pkgsrc/sysutils/kfilemetadata: Makefile PLIST distinfo
Added Files:
        pkgsrc/sysutils/kfilemetadata/patches: patch-CMakeLists.txt

Log Message:
kfilemetadata: disable poppler support


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 pkgsrc/sysutils/kfilemetadata/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/sysutils/kfilemetadata/PLIST
cvs rdiff -u -r1.3 -r1.4 pkgsrc/sysutils/kfilemetadata/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/sysutils/kfilemetadata/patches/patch-CMakeLists.txt

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/kfilemetadata/Makefile
diff -u pkgsrc/sysutils/kfilemetadata/Makefile:1.35 pkgsrc/sysutils/kfilemetadata/Makefile:1.36
--- pkgsrc/sysutils/kfilemetadata/Makefile:1.35 Thu Jan 11 08:12:50 2018
+++ pkgsrc/sysutils/kfilemetadata/Makefile      Thu Jan 11 10:34:32 2018
@@ -1,13 +1,11 @@
-# $NetBSD: Makefile,v 1.35 2018/01/11 08:12:50 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2018/01/11 10:34:32 markd Exp $
 
 DISTNAME=      kfilemetadata-${_KDE_VERSION}
-PKGREVISION=   33
+PKGREVISION=   34
 CATEGORIES=    sysutils
 COMMENT=       Library for extracting file metadata
 LICENSE=       gnu-gpl-v3
 
-BROKEN=                Needs poppler with qt4 support.
-
 .include "../../meta-pkgs/kde4/Makefile.kde4"
 
 .include "../../meta-pkgs/kde4/kde4.mk"

Index: pkgsrc/sysutils/kfilemetadata/PLIST
diff -u pkgsrc/sysutils/kfilemetadata/PLIST:1.2 pkgsrc/sysutils/kfilemetadata/PLIST:1.3
--- pkgsrc/sysutils/kfilemetadata/PLIST:1.2     Sun Jan 10 19:12:13 2016
+++ pkgsrc/sysutils/kfilemetadata/PLIST Thu Jan 11 10:34:32 2018
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2016/01/10 19:12:13 markd Exp $
+@comment $NetBSD: PLIST,v 1.3 2018/01/11 10:34:32 markd Exp $
 include/kfilemetadata/extractionresult.h
 include/kfilemetadata/extractorplugin.h
 include/kfilemetadata/extractorpluginmanager.h
@@ -18,7 +18,6 @@ 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/libkfilemetadata.so
 lib/libkfilemetadata.so.4
@@ -31,6 +30,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

Index: pkgsrc/sysutils/kfilemetadata/distinfo
diff -u pkgsrc/sysutils/kfilemetadata/distinfo:1.3 pkgsrc/sysutils/kfilemetadata/distinfo:1.4
--- pkgsrc/sysutils/kfilemetadata/distinfo:1.3  Wed Nov  4 01:32:18 2015
+++ pkgsrc/sysutils/kfilemetadata/distinfo      Thu Jan 11 10:34:32 2018
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.3 2015/11/04 01:32:18 agc Exp $
+$NetBSD: distinfo,v 1.4 2018/01/11 10:34:32 markd Exp $
 
 SHA1 (kfilemetadata-4.14.3.tar.xz) = 6b106223b3d4ab9ba0516b8301e564af2416eaa9
 RMD160 (kfilemetadata-4.14.3.tar.xz) = 221b22cf55f0119326cc21645fb5e290506381df
 SHA512 (kfilemetadata-4.14.3.tar.xz) = d7321b7e1ad755c0dc267b236a33a011377ba309d94c1497c081edad82171452595ce113428048e455b8b71f3ea480e4e76e797e31a74edd24bcf42617c59acb
 Size (kfilemetadata-4.14.3.tar.xz) = 35908 bytes
+SHA1 (patch-CMakeLists.txt) = 5315fab780edfbcfa43808b2adf38dbcef94935d
 SHA1 (patch-src_extractors_ffmpegextractor.cpp) = 9578c637c2babb1e6c640aea12431b9621b0174c

Added files:

Index: pkgsrc/sysutils/kfilemetadata/patches/patch-CMakeLists.txt
diff -u /dev/null pkgsrc/sysutils/kfilemetadata/patches/patch-CMakeLists.txt:1.1
--- /dev/null   Thu Jan 11 10:34:33 2018
+++ pkgsrc/sysutils/kfilemetadata/patches/patch-CMakeLists.txt  Thu Jan 11 10:34:33 2018
@@ -0,0 +1,14 @@
+$NetBSD: patch-CMakeLists.txt,v 1.1 2018/01/11 10:34:33 markd Exp $
+
+Switch PopplerQt4 support off - its not in latest poppler.
+
+--- CMakeLists.txt.orig        2014-07-18 08:06:55.000000000 +0000
++++ CMakeLists.txt
+@@ -11,6 +11,7 @@ find_package(PopplerQt4 0.12.1)
+ set_package_properties(PopplerQt4 PROPERTIES DESCRIPTION "A PDF rendering library"
+                        URL "http://poppler.freedesktop.org"; TYPE OPTIONAL
+                        PURPOSE "Support for PDF files")
++set(POPPLER_QT4_FOUND FALSE)
+ 
+ find_package(Taglib)
+ set_package_properties(Taglib PROPERTIES DESCRIPTION "Id3 tag reader"