ngraham added a comment.
I'm raid this patch no longer applies cleanly on `master`:
Created and checked out branch arcpatch-D12708.
Checking patch kstyle/config-breeze.h.cmake...
Checking patch kstyle/breezewindowmanager.h...
Checking patch kstyle/breezewindowmanager.cpp...
Checking patch kstyle/breezestyle.cpp...
Hunk #1 succeeded at 7158 (offset 74 lines).
Checking patch kstyle/CMakeLists.txt...
Hunk #1 succeeded at 25 (offset -15 lines).
Hunk #2 succeeded at 33 (offset -15 lines).
Hunk #3 succeeded at 41 (offset -15 lines).
error: while searching for:
kconfig_add_kcfg_files(breeze_PART_SRCS breezestyleconfigdata.kcfgc)
add_library(breeze MODULE ${breeze_PART_SRCS})
target_link_libraries(breeze Qt5::Core Qt5::Gui Qt5::Widgets Qt5::DBus
Qt5::Quick)
target_link_libraries(breeze KF5::ConfigCore KF5::ConfigWidgets
KF5::GuiAddons KF5::WindowSystem)
if( KF5FrameworkIntegration_FOUND )
error: patch failed: kstyle/CMakeLists.txt:166
Applied patch kstyle/config-breeze.h.cmake cleanly.
Applied patch kstyle/breezewindowmanager.h cleanly.
Applied patch kstyle/breezewindowmanager.cpp cleanly.
Applied patch kstyle/breezestyle.cpp cleanly.
Applying patch kstyle/CMakeLists.txt with 1 reject...
Hunk #1 applied cleanly.
Hunk #2 applied cleanly.
Hunk #3 applied cleanly.
Rejected hunk #4.
Patch Failed!
Usage Exception: Unable to apply patch!
Can you re-base it on master? (`git pull --rebase origin/master`). Thanks!
REPOSITORY
R31 Breeze
REVISION DETAIL
https://phabricator.kde.org/D12708
To: tundracomp, mart
Cc: ngraham, davidedmundson, plasma-devel, ragreen, Pitel, ZrenBot, lesliezhai,
ali-mohamed, jensreuterberg, abetts, sebas, apol, mart
