diff options
| -rwxr-xr-x | misc/patch-update-for-r14-1-x | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/misc/patch-update-for-r14-1-x b/misc/patch-update-for-r14-1-x new file mode 100755 index 0000000..ad5dea7 --- /dev/null +++ b/misc/patch-update-for-r14-1-x @@ -0,0 +1,39 @@ +#!/bin/bash + +# Due to the ongoing API renaming in master, backporting commits from master +# to r14.1.x could potentially lead to conflicts, and the probability of that +# happening will keep increasing over time. +# This script is intented to reduce/eliminate those conflicts by undoing the +# API changes done in master. +# +# Usage: +# 1. save the changes of the commit to backport to a file +# git format-patch -1 <commit hash> -o <output_folder> +# 2. run this script on the saved file +# ./patch-update-for-r14-1-x <output_folder>/<patch_filename> +# 3. apply changes to r14.1.x branch +# git am <output_folder>/<patch_filename> +# 4. edit commit message to add cherry pick note under signed off clause +# git commit --amend --no-edit -S +# and add: +# (cherry picked from commit hash>) + + +# TDEUniqueApplication --> KUniqueApplication +sed -i "$1" \ + -e "s|TDEUniqueApplication|KUniqueApplication|g" \ + -e "s|\btdeuniqueapp|kuniqueapp|g" \ + -e "s|\btdeunique_|kunique_|g" \ + -e "s|TDEUNIQUEAPP|KUNIQUEAPP|g" \ + +# TDEAppDCOPInterface --> KAppDCOPInterface +sed -i "$1" \ + -e "s|TDEAppDCOPInterface|KAppDCOPInterface|g" \ + -e "s|tdeappdcopinterface|kappdcopiface|g" \ + -e "s|tdeappdcopiface|kappdcopiface|g" \ + -e "s|m_TDEAppDCOPInterface|m_KAppDCOPInterface|g" \ + -e "s|TDEAPPDCOP_INTERFACE_H|KAPPDCOP_INTERFACE_H|g" + +# tdeprocess --> kprocess +sed -i "$1" \ + -e "s|tdeprocess|kprocess|g" |