Thu Apr 28 07:01:13 2016 UTC ()
Split baloo libraries out into separate package.


(markd)
diff -r1.5 -r1.6 pkgsrc/sysutils/baloo/Makefile
diff -r1.2 -r1.3 pkgsrc/sysutils/baloo/PLIST
diff -r1.5 -r0 pkgsrc/sysutils/baloo/distinfo
diff -r1.1 -r0 pkgsrc/sysutils/baloo/patches/patch-ConfigureChecks.cmake
diff -r1.1 -r0 pkgsrc/sysutils/baloo/patches/patch-src__file__lib__baloo_xattr_p.h
diff -r0 -r1.1 pkgsrc/sysutils/libbaloo4/DESCR
diff -r0 -r1.1 pkgsrc/sysutils/libbaloo4/Makefile
diff -r0 -r1.1 pkgsrc/sysutils/libbaloo4/PLIST
diff -r0 -r1.1 pkgsrc/sysutils/libbaloo4/buildlink3.mk
diff -r0 -r1.1 pkgsrc/sysutils/libbaloo4/distinfo
diff -r0 -r1.1 pkgsrc/sysutils/libbaloo4/patches/patch-ConfigureChecks.cmake
diff -r0 -r1.1 pkgsrc/sysutils/libbaloo4/patches/patch-src__file__lib__baloo_xattr_p.h

cvs diff -r1.5 -r1.6 pkgsrc/sysutils/baloo/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/baloo/Makefile 2016/03/23 15:40:36 1.5
+++ pkgsrc/sysutils/baloo/Makefile 2016/04/28 07:01:13 1.6
@@ -1,29 +1,36 @@ @@ -1,29 +1,36 @@
1# $NetBSD: Makefile,v 1.5 2016/03/23 15:40:36 jperkin Exp $ 1# $NetBSD: Makefile,v 1.6 2016/04/28 07:01:13 markd Exp $
2 2
3DISTNAME= baloo-${_KDE_VERSION} 3DISTNAME= baloo-${_KDE_VERSION}
4PKGREVISION= 3 4PKGREVISION= 4
5CATEGORIES= sysutils 5CATEGORIES= sysutils
6COMMENT= KDE framework for searching and managing user metadata 6COMMENT= KDE framework for searching and managing user metadata
7LICENSE= gnu-gpl-v3 7LICENSE= gnu-gpl-v3
8 8
9.include "../../meta-pkgs/kde4/Makefile.kde4" 9.include "../../meta-pkgs/kde4/Makefile.kde4"
10 10
11USE_TOOLS+= gmake 11USE_TOOLS+= gmake
12 12
13.include "../../meta-pkgs/kde4/kde4.mk" 13.include "../../meta-pkgs/kde4/kde4.mk"
14 14
15.include "../../mk/bsd.prefs.mk" 15.include "../../mk/bsd.prefs.mk"
16 16
17PLIST_VARS+= polkit 17PLIST_VARS+= polkit
18.if ${OPSYS} != "Darwin" 18.if ${OPSYS} != "Darwin"
19PLIST.polkit= yes 19PLIST.polkit= yes
20.endif 20.endif
21 21
 22DEPENDS+= libbaloo4-[0-9]*:../../sysutils/libbaloo4
 23
 24PATCHDIR= ${.CURDIR}/../../sysutils/libbaloo4/patches
 25DISTINFO_FILE= ${.CURDIR}/../../sysutils/libbaloo4/distinfo
 26
 27INSTALL_DIRS= _KDE_build/icons _KDE_build/src/tools _KDE_build/src/file _KDE_build/src/pim
 28
22.include "../../devel/qjson/buildlink3.mk" 29.include "../../devel/qjson/buildlink3.mk"
23.include "../../mail/akonadi/buildlink3.mk" 30.include "../../mail/akonadi/buildlink3.mk"
24.include "../../misc/kdepimlibs4/buildlink3.mk" 31.include "../../misc/kdepimlibs4/buildlink3.mk"
25.include "../../sysutils/kfilemetadata/buildlink3.mk" 32.include "../../sysutils/kfilemetadata/buildlink3.mk"
26.include "../../textproc/xapian/buildlink3.mk" 33.include "../../textproc/xapian/buildlink3.mk"
27.include "../../x11/kdelibs4/buildlink3.mk" 34.include "../../x11/kdelibs4/buildlink3.mk"
28 35
29.include "../../mk/bsd.pkg.mk" 36.include "../../mk/bsd.pkg.mk"

cvs diff -r1.2 -r1.3 pkgsrc/sysutils/baloo/PLIST (expand / switch to unified diff)

--- pkgsrc/sysutils/baloo/PLIST 2016/03/23 15:40:36 1.2
+++ pkgsrc/sysutils/baloo/PLIST 2016/04/28 07:01:13 1.3
@@ -1,82 +1,13 @@ @@ -1,82 +1,13 @@
1@comment $NetBSD: PLIST,v 1.2 2016/03/23 15:40:36 jperkin Exp $ 1@comment $NetBSD: PLIST,v 1.3 2016/04/28 07:01:13 markd Exp $
2bin/akonadi_baloo_indexer 2bin/akonadi_baloo_indexer
3bin/baloo_file 3bin/baloo_file
4bin/baloo_file_cleaner 4bin/baloo_file_cleaner
5bin/baloo_file_extractor 5bin/baloo_file_extractor
6bin/balooctl 6bin/balooctl
7bin/baloosearch 7bin/baloosearch
8bin/balooshow 8bin/balooshow
9include/baloo/completionproposal.h 
10include/baloo/core_export.h 
11include/baloo/file.h 
12include/baloo/file_export.h 
13include/baloo/filefetchjob.h 
14include/baloo/filemodifyjob.h 
15include/baloo/filemonitor.h 
16include/baloo/indexerconfig.h 
17include/baloo/pim/contactcompleter.h 
18include/baloo/pim/contactquery.h 
19include/baloo/pim/emailquery.h 
20include/baloo/pim/notequery.h 
21include/baloo/pim/pim_export.h 
22include/baloo/pim/query.h 
23include/baloo/pim/resultiterator.h 
24include/baloo/query.h 
25include/baloo/queryparser.h 
26include/baloo/queryparser_export.h 
27include/baloo/queryrunnable.h 
28include/baloo/result.h 
29include/baloo/resultiterator.h 
30include/baloo/searchstore.h 
31include/baloo/taglistjob.h 
32include/baloo/term.h 
33lib/cmake/Baloo/BalooConfig.cmake 
34lib/cmake/Baloo/BalooConfigVersion.cmake 
35lib/cmake/Baloo/BalooTargetsWithPrefix-relwithdebinfo.cmake 
36lib/cmake/Baloo/BalooTargetsWithPrefix.cmake 
37lib/kde4/akonadi/akonadi_baloo_searchplugin.so 
38lib/kde4/akonadi/akonadibaloosearchplugin.desktop 
39lib/kde4/baloo_calendarsearchstore.so 
40lib/kde4/baloo_contactsearchstore.so 
41lib/kde4/baloo_emailsearchstore.so 
42lib/kde4/baloo_filesearchstore.so 
43lib/kde4/baloo_notesearchstore.so 
44lib/kde4/kcm_baloofile.so 
45lib/kde4/kio_baloosearch.so 
46lib/kde4/kio_tags.so 
47lib/kde4/kio_timeline.so 
48lib/kde4/krunner_baloosearchrunner.so 
49lib/kde4/libexec/kde_baloo_filewatch_raiselimit 
50lib/libbaloocore.so 
51lib/libbaloocore.so.4 
52lib/libbaloocore.so.${PKGVERSION} 
53lib/libbaloofiles.so 
54lib/libbaloofiles.so.4 
55lib/libbaloofiles.so.${PKGVERSION} 
56lib/libbaloopim.so 
57lib/libbaloopim.so.4 
58lib/libbaloopim.so.${PKGVERSION} 
59lib/libbalooqueryparser.so 
60lib/libbalooqueryparser.so.4 
61lib/libbalooqueryparser.so.${PKGVERSION} 
62lib/libbalooxapian.so 
63lib/libbalooxapian.so.4 
64lib/libbalooxapian.so.${PKGVERSION} 
65${PLIST.polkit}share/PolicyKit/policy/org.kde.baloo.filewatch.policy 9${PLIST.polkit}share/PolicyKit/policy/org.kde.baloo.filewatch.policy
66share/akonadi/agents/akonadibalooindexingagent.desktop 10share/akonadi/agents/akonadibalooindexingagent.desktop
67share/dbus-1/interfaces/org.kde.baloo.file.indexer.xml 11share/dbus-1/interfaces/org.kde.baloo.file.indexer.xml
68share/dbus-1/system-services/org.kde.baloo.filewatch.service 12share/dbus-1/system-services/org.kde.baloo.filewatch.service
69share/examples/kde4-dbus/org.kde.baloo.filewatch.conf 
70share/icons/hicolor/128x128/apps/baloo.png 13share/icons/hicolor/128x128/apps/baloo.png
71share/kde/autostart/baloo_file.desktop 
72share/kde4/services/baloo_calendarsearchstore.desktop 
73share/kde4/services/baloo_contactsearchstore.desktop 
74share/kde4/services/baloo_emailsearchstore.desktop 
75share/kde4/services/baloo_filesearchstore.desktop 
76share/kde4/services/baloo_notesearchstore.desktop 
77share/kde4/services/baloosearch.protocol 
78share/kde4/services/kcm_baloofile.desktop 
79share/kde4/services/plasma-runner-baloosearch.desktop 
80share/kde4/services/tags.protocol 
81share/kde4/services/timeline.protocol 
82share/kde4/servicetypes/baloosearchstore.desktop 

File Deleted: pkgsrc/sysutils/baloo/Attic/distinfo

File Deleted: pkgsrc/sysutils/baloo/patches/Attic/patch-ConfigureChecks.cmake

File Deleted: pkgsrc/sysutils/baloo/patches/Attic/patch-src__file__lib__baloo_xattr_p.h

File Added: pkgsrc/sysutils/libbaloo4/DESCR
Baloo is the next generation of the Nepomuk project.  It's responsible
for handling user metadata such as tags, rating and comments.  It
also handles indexing and searching for files, emails, contacts, etc.

File Added: pkgsrc/sysutils/libbaloo4/Makefile
# $NetBSD: Makefile,v 1.1 2016/04/28 07:01:13 markd Exp $

DISTNAME=	baloo-${_KDE_VERSION}
PKGNAME=	libbaloo4-${_KDE_VERSION}
CATEGORIES=	sysutils
COMMENT=	KDE framework for searching and managing user metadata
LICENSE=	gnu-gpl-v3

.include "../../meta-pkgs/kde4/Makefile.kde4"

CONFLICTS+=	baloo<4.14.3nb4

USE_TOOLS+=	gmake

.include "../../meta-pkgs/kde4/kde4.mk"

.include "../../mk/bsd.prefs.mk"

post-install:
	rm -rf ${DESTDIR}${PREFIX}/bin
	rm -rf ${DESTDIR}${PREFIX}/share/PolicyKit
	rm -rf ${DESTDIR}${PREFIX}/share/akonadi
	rm -rf ${DESTDIR}${PREFIX}/share/dbus-1
	rm -rf ${DESTDIR}${PREFIX}/share/icons

.include "../../devel/qjson/buildlink3.mk"
.include "../../mail/akonadi/buildlink3.mk"
.include "../../misc/kdepimlibs4/buildlink3.mk"
.include "../../sysutils/kfilemetadata/buildlink3.mk"
.include "../../textproc/xapian/buildlink3.mk"
.include "../../x11/kdelibs4/buildlink3.mk"

.include "../../mk/bsd.pkg.mk"

File Added: pkgsrc/sysutils/libbaloo4/PLIST
@comment $NetBSD: PLIST,v 1.1 2016/04/28 07:01:13 markd Exp $
include/baloo/completionproposal.h
include/baloo/core_export.h
include/baloo/file.h
include/baloo/file_export.h
include/baloo/filefetchjob.h
include/baloo/filemodifyjob.h
include/baloo/filemonitor.h
include/baloo/indexerconfig.h
include/baloo/pim/contactcompleter.h
include/baloo/pim/contactquery.h
include/baloo/pim/emailquery.h
include/baloo/pim/notequery.h
include/baloo/pim/pim_export.h
include/baloo/pim/query.h
include/baloo/pim/resultiterator.h
include/baloo/query.h
include/baloo/queryparser.h
include/baloo/queryparser_export.h
include/baloo/queryrunnable.h
include/baloo/result.h
include/baloo/resultiterator.h
include/baloo/searchstore.h
include/baloo/taglistjob.h
include/baloo/term.h
lib/cmake/Baloo/BalooConfig.cmake
lib/cmake/Baloo/BalooConfigVersion.cmake
lib/cmake/Baloo/BalooTargetsWithPrefix-relwithdebinfo.cmake
lib/cmake/Baloo/BalooTargetsWithPrefix.cmake
lib/kde4/akonadi/akonadi_baloo_searchplugin.so
lib/kde4/akonadi/akonadibaloosearchplugin.desktop
lib/kde4/baloo_calendarsearchstore.so
lib/kde4/baloo_contactsearchstore.so
lib/kde4/baloo_emailsearchstore.so
lib/kde4/baloo_filesearchstore.so
lib/kde4/baloo_notesearchstore.so
lib/kde4/kcm_baloofile.so
lib/kde4/kio_baloosearch.so
lib/kde4/kio_tags.so
lib/kde4/kio_timeline.so
lib/kde4/krunner_baloosearchrunner.so
lib/kde4/libexec/kde_baloo_filewatch_raiselimit
lib/libbaloocore.so
lib/libbaloocore.so.4
lib/libbaloocore.so.${PKGVERSION}
lib/libbaloofiles.so
lib/libbaloofiles.so.4
lib/libbaloofiles.so.${PKGVERSION}
lib/libbaloopim.so
lib/libbaloopim.so.4
lib/libbaloopim.so.${PKGVERSION}
lib/libbalooqueryparser.so
lib/libbalooqueryparser.so.4
lib/libbalooqueryparser.so.${PKGVERSION}
lib/libbalooxapian.so
lib/libbalooxapian.so.4
lib/libbalooxapian.so.${PKGVERSION}
share/examples/kde4-dbus/org.kde.baloo.filewatch.conf
share/kde/autostart/baloo_file.desktop
share/kde4/services/baloo_calendarsearchstore.desktop
share/kde4/services/baloo_contactsearchstore.desktop
share/kde4/services/baloo_emailsearchstore.desktop
share/kde4/services/baloo_filesearchstore.desktop
share/kde4/services/baloo_notesearchstore.desktop
share/kde4/services/baloosearch.protocol
share/kde4/services/kcm_baloofile.desktop
share/kde4/services/plasma-runner-baloosearch.desktop
share/kde4/services/tags.protocol
share/kde4/services/timeline.protocol
share/kde4/servicetypes/baloosearchstore.desktop

File Added: pkgsrc/sysutils/libbaloo4/buildlink3.mk
# $NetBSD: buildlink3.mk,v 1.1 2016/04/28 07:01:13 markd Exp $

BUILDLINK_TREE+=	libbaloo4

.if !defined(LIBBALOO4_BUILDLINK3_MK)
LIBBALOO4_BUILDLINK3_MK:=

BUILDLINK_API_DEPENDS.libbaloo4+=	libbaloo4>=4.14.3
BUILDLINK_PKGSRCDIR.libbaloo4?=	../../sysutils/libbaloo4

.include "../../sysutils/kfilemetadata/buildlink3.mk"
.endif	# LIBBALOO4_BUILDLINK3_MK

BUILDLINK_TREE+=	-libbaloo4

File Added: pkgsrc/sysutils/libbaloo4/distinfo
$NetBSD: distinfo,v 1.1 2016/04/28 07:01:13 markd Exp $

SHA1 (baloo-4.14.3.tar.xz) = bf90846545c5b5a0b0badab25dc3e839dc0c6574
RMD160 (baloo-4.14.3.tar.xz) = 50743535e905339ac48481dd9b8b40ad3217422d
SHA512 (baloo-4.14.3.tar.xz) = ce46abee6edfea333fe2b361418ee92e1e7e4b252c4cb9a48f302ff906b3dc49d78c4e55c69de09b0085e03fe87e978b90c2896f7492b940550fda9766679218
Size (baloo-4.14.3.tar.xz) = 145604 bytes
SHA1 (patch-ConfigureChecks.cmake) = 4119eb59dbe0022fd312bcf2f637c2e7fcf9f469
SHA1 (patch-src__file__lib__baloo_xattr_p.h) = 2c361f9422e0d45b5500a4a0fa82bdc5c187fd01

File Added: pkgsrc/sysutils/libbaloo4/patches/patch-ConfigureChecks.cmake
$NetBSD: patch-ConfigureChecks.cmake,v 1.1 2016/04/28 07:01:13 markd Exp $

Ignore xattr header check on SunOS.

--- ConfigureChecks.cmake.orig	2014-11-06 12:03:28.000000000 +0000
+++ ConfigureChecks.cmake
@@ -13,7 +13,7 @@ check_include_files("sys/types.h;sys/xat
 # DragonFly BSD, FreeBSD and NetBSD.
 check_include_files("sys/types.h;sys/extattr.h" HAVE_SYS_EXTATTR_H)
 
-if (NOT (HAVE_SYS_XATTR_H OR HAVE_SYS_EXTATTR_H))
+if (NOT (HAVE_SYS_XATTR_H OR HAVE_SYS_EXTATTR_H) AND NOT CMAKE_SYSTEM MATCHES "SunOS.*")
     message(FATAL_ERROR "Baloo requires extended attributes support in the operating system, but no headers have been found.")
 endif ()
 

File Added: pkgsrc/sysutils/libbaloo4/patches/patch-src__file__lib__baloo_xattr_p.h
$NetBSD: patch-src__file__lib__baloo_xattr_p.h,v 1.1 2016/04/28 07:01:13 markd Exp $

--- src/file/lib/baloo_xattr_p.h.orig	2014-11-06 12:03:28.000000000 +0000
+++ src/file/lib/baloo_xattr_p.h
@@ -117,7 +117,7 @@ inline int baloo_removexattr(const QStri
     #elif defined(Q_OS_MAC)
         return removexattr(encodedPath, attributeName, XATTR_NOFOLLOW );
     #elif defined(Q_OS_FREEBSD) || defined(Q_OS_NETBSD)
-        return removexattr (encodedPath, attributeName);
+        return extattr_delete_file (encodedPath, EXTATTR_NAMESPACE_USER, attributeName);
     #else
         return -1;
     #endif