diff -Nru fcitx-4.2.8.5/debian/changelog fcitx-4.2.8.5/debian/changelog --- fcitx-4.2.8.5/debian/changelog 2015-03-14 01:28:32.000000000 +0000 +++ fcitx-4.2.8.5/debian/changelog 2015-03-25 20:39:04.000000000 +0000 @@ -1,3 +1,10 @@ +fcitx (1:4.2.8.5-6ubuntu3) vivid; urgency=medium + + * debian/patches/add-kf5-kcm-support.patch: + - Upstream patch for KF5 KCM support + + -- Aron Xu Thu, 26 Mar 2015 04:38:24 +0800 + fcitx (1:4.2.8.5-6ubuntu2) vivid; urgency=medium * Add conffile handling for LP: #1431257. diff -Nru fcitx-4.2.8.5/debian/patches/add-kf5-kcm-support.patch fcitx-4.2.8.5/debian/patches/add-kf5-kcm-support.patch --- fcitx-4.2.8.5/debian/patches/add-kf5-kcm-support.patch 1970-01-01 00:00:00.000000000 +0000 +++ fcitx-4.2.8.5/debian/patches/add-kf5-kcm-support.patch 2015-03-25 20:38:16.000000000 +0000 @@ -0,0 +1,25 @@ +From: Weng Xuetian +Subject: [script] add kf5 kcm support +Origin: upstream +Index: fcitx-4.2.8.5/data/script/fcitx-configtool.sh +=================================================================== +--- fcitx-4.2.8.5.orig/data/script/fcitx-configtool.sh ++++ fcitx-4.2.8.5/data/script/fcitx-configtool.sh +@@ -106,6 +106,17 @@ detectDE() { + } + + run_kde() { ++ if xprop -root KDE_SESSION_VERSION 2>&1 | grep -q "= 5"; then ++ if (kcmshell5 --list 2>/dev/null | grep ^kcm_fcitx > /dev/null 2>&1); then ++ if [ x"$1" != x ]; then ++ exec kcmshell5 kcm_fcitx --args "$1" ++ else ++ exec kcmshell5 kcm_fcitx ++ fi ++ fi ++ fi ++ ++ # not harm to also check kde4 version on kf5 + if (kcmshell4 --list 2>/dev/null | grep ^kcm_fcitx > /dev/null 2>&1); then + if [ x"$1" != x ]; then + exec kcmshell4 kcm_fcitx --args "$1" diff -Nru fcitx-4.2.8.5/debian/patches/series fcitx-4.2.8.5/debian/patches/series --- fcitx-4.2.8.5/debian/patches/series 2015-02-08 15:00:27.000000000 +0000 +++ fcitx-4.2.8.5/debian/patches/series 2015-03-25 20:35:51.000000000 +0000 @@ -1,2 +1,3 @@ 0001-try-to-avoid-rpath.patch 0002-wait-dbus-up-to-20-times.patch +add-kf5-kcm-support.patch