cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Solve conflicts between KDE4 baloo and kf5 baloo

Browse Source 
Remove org.kde.baloo.file.indexer.xml, which is not needed as we don't have
plasma-desktop,

Spotted by many, last in a bulk from ajacoutot@; Thanks!
This commit is contained in:
rsadowski 2019-03-13 21:28:22 +00:00
parent 4d05e9c3ba
commit 0e3d74508c
4 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devel/kf5/baloo/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.15 2019/03/08 20:00:44 cwen Exp $
# $OpenBSD: Makefile,v 1.16 2019/03/13 21:28:22 rsadowski Exp $
COMMENT = KDE file search and metadata handling framework
DISTNAME = baloo-${VERSION}
PKGNAME = kf5-${DISTNAME}
EPOCH = 0
REVISION = 0
REVISION = 1
SHARED_LIBS = KF5Baloo 2.1
SHARED_LIBS += KF5BalooXapian 2.1

16
devel/kf5/baloo/patches/patch-src_dbus_CMakeLists_txt Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-src_dbus_CMakeLists_txt,v 1.1 2019/03/13 21:28:22 rsadowski Exp $
This subdirectory only installs org.kde.baloo.file.indexer.xml, which is not
needed as we don't have plasma-desktop (see
https://github.com/KDE/baloo/commit/5cb3e97675370aab3d49c7b9b8381c3233177f0f)
and conflicts with kde4-baloo
Index: src/dbus/CMakeLists.txt
--- src/dbus/CMakeLists.txt.orig
+++ src/dbus/CMakeLists.txt
@@ -51,4 +51,4 @@ add_custom_target(
install(FILES ${dbus_interface_xmls} DESTINATION ${KDE_INSTALL_DBUSINTERFACEDIR})
-add_subdirectory(fake)
+#add_subdirectory(fake)

8
devel/kf5/baloo/pkg/PLIST
View File

@ -1,5 +1,4 @@
@comment $OpenBSD: PLIST,v 1.8 2018/10/22 20:30:41 rsadowski Exp $
@conflict baloo-*
@comment $OpenBSD: PLIST,v 1.9 2019/03/13 21:28:22 rsadowski Exp $
include/KF5/Baloo/
include/KF5/Baloo/Baloo/
include/KF5/Baloo/Baloo/File
@ -33,13 +32,11 @@ lib/qt5/qml/org/kde/baloo/experimental/libbaloomonitorplugin.so
lib/qt5/qml/org/kde/baloo/experimental/qmldir
lib/qt5/qml/org/kde/baloo/libbalooplugin.so
lib/qt5/qml/org/kde/baloo/qmldir
share/dbus-1/interfaces/org.kde.baloo.file.indexer.xml
share/dbus-1/interfaces/org.kde.baloo.fileindexer.xml
share/dbus-1/interfaces/org.kde.baloo.main.xml
share/dbus-1/interfaces/org.kde.baloo.scheduler.xml
share/examples/kf5-baloo/
share/examples/kf5-baloo/xdg/
@sample ${SYSCONFDIR}/xdg/
share/examples/kf5-baloo/xdg/baloo.categories
@sample ${SYSCONFDIR}/xdg/baloo.categories
share/icons/hicolor/128x128/apps/baloo.png
@ -230,6 +227,9 @@ share/locale/he/LC_MESSAGES/kio5_timeline.mo
share/locale/hu/LC_MESSAGES/baloo_file5.mo
share/locale/hu/LC_MESSAGES/baloo_file_extractor5.mo
share/locale/hu/LC_MESSAGES/balooctl5.mo
share/locale/hu/LC_MESSAGES/baloodb5.mo
share/locale/hu/LC_MESSAGES/balooengine5.mo
share/locale/hu/LC_MESSAGES/baloomonitorplugin.mo
share/locale/hu/LC_MESSAGES/baloosearch5.mo
share/locale/hu/LC_MESSAGES/balooshow5.mo
share/locale/hu/LC_MESSAGES/kio5_baloosearch.mo

3
x11/kde4/baloo/pkg/PLIST
View File

@ -1,6 +1,5 @@
@comment $OpenBSD: PLIST,v 1.5 2018/06/29 22:16:26 espie Exp $
@comment $OpenBSD: PLIST,v 1.6 2019/03/13 21:28:23 rsadowski Exp $
@conflict kde-runtime-<4.13
@conflict kf5-baloo-*
@bin bin/akonadi_baloo_indexer
@bin bin/baloo_file
@bin bin/baloo_file_cleaner