From b83f8133538e997585c86a51d32d197f891c00c8 Mon Sep 17 00:00:00 2001
From: Fabian Kosmale <0inkane@googlemail.com>
Date: Sat, 11 Apr 2015 21:51:02 +0000
Subject: [PATCH] file conflict was resolved upstream

---
 bluedevil-kf5/PKGBUILD | 3 ++-
 kio-extras/PKGBUILD    | 4 ----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/bluedevil-kf5/PKGBUILD b/bluedevil-kf5/PKGBUILD
index eb60b5ef1..c974217e8 100644
--- a/bluedevil-kf5/PKGBUILD
+++ b/bluedevil-kf5/PKGBUILD
@@ -9,7 +9,8 @@ pkgdesc="Integrate the Bluetooth technology within KDE workspace and application
 arch=('x86_64')
 url='https://projects.kde.org/projects/kde/workspace/bluedevil'
 license=('LGPL')
-depends=('kio' 'bluez-qt5')
+depends=('qt5-base' 'qt5-declarative' 'kcoreaddons' 'kwidgetsaddons' 'kdbusaddons' 'knotifications'
+         'kiconthemes' 'plasma-framework' 'ki18n' 'bluez-qt' 'shared-mime-info' 'kded')
 makedepends=('extra-cmake-modules')
 groups=('plasma')
 options=("debug")
diff --git a/kio-extras/PKGBUILD b/kio-extras/PKGBUILD
index 5360862f7..9b0ea7a59 100644
--- a/kio-extras/PKGBUILD
+++ b/kio-extras/PKGBUILD
@@ -33,8 +33,4 @@ build() {
 package() {
   cd build
   make DESTDIR="${pkgdir}" install
-
-  # conflicts with kde-runtime
-  mv "$pkgdir"/usr/share/config.kcfg/jpegcreatorsettings{,5}.kcfg
-
 }