ngraham added a comment.
This patch doesn't apply on top of KDeclarative for me:
This diff is against commit 3d8757d5dfea2360304e2c8e7d0d575d04b00735,
but
the commit is nowhere in the working copy. Try to apply it against the
current working copy state? (a1282da765c1b909d03d6c94eb77fd99e4374d74)
[Y/n] y
Checking patch src/qmlcontrols/kcmcontrols/settingstateproxy.h...
Checking patch src/qmlcontrols/kcmcontrols/settingstateproxy.cpp...
Checking patch src/qmlcontrols/kcmcontrols/qml/qmldir...
Checking patch src/qmlcontrols/kcmcontrols/qml/SettingStateIndicator.qml...
Checking patch src/qmlcontrols/kcmcontrols/qml/SettingStateBinding.qml...
Checking patch src/qmlcontrols/kcmcontrols/kcmcontrolsplugin.cpp...
Checking patch src/qmlcontrols/kcmcontrols/CMakeLists.txt...
error: while searching for:
set(kcmcontrols_SRCS
kcmcontrolsplugin.cpp
)
add_library(kcmcontrolsplugin SHARED ${kcmcontrols_SRCS})
error: patch failed: src/qmlcontrols/kcmcontrols/CMakeLists.txt:2
Hunk #2 succeeded at 12 (offset -1 lines).
Applied patch src/qmlcontrols/kcmcontrols/settingstateproxy.h cleanly.
Applied patch src/qmlcontrols/kcmcontrols/settingstateproxy.cpp cleanly.
Applied patch src/qmlcontrols/kcmcontrols/qml/qmldir cleanly.
Applied patch src/qmlcontrols/kcmcontrols/qml/SettingStateIndicator.qml
cleanly.
Applied patch src/qmlcontrols/kcmcontrols/qml/SettingStateBinding.qml
cleanly.
Applied patch src/qmlcontrols/kcmcontrols/kcmcontrolsplugin.cpp cleanly.
Applying patch src/qmlcontrols/kcmcontrols/CMakeLists.txt with 1 reject...
Rejected hunk #1.
Hunk #2 applied cleanly.
Patch Failed!
REPOSITORY
R296 KDeclarative
REVISION DETAIL
https://phabricator.kde.org/D27840
To: ervin, crossi, hchain, meven, bport, davidedmundson, mart, ngraham,
#frameworks, #plasma
Cc: kde-frameworks-devel, LeGast00n, cblack, GB_2, michaelh, ngraham, bruns
