summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <[email protected]>2025-03-07 12:16:25 +0900
committerMichele Calgaro <[email protected]>2025-03-07 12:16:25 +0900
commitc806662ee453b5049bc559584d9bbb7b90593456 (patch)
tree8d8ec74a42373568a357aa60c0124a07fc4c74b0
parent97eb9ff3aecbc86ab674cd5d1f2bfe273a9e368e (diff)
downloadscripts-c806662ee453b5049bc559584d9bbb7b90593456.tar.gz
scripts-c806662ee453b5049bc559584d9bbb7b90593456.zip
Add kstandarddirs --> tdestandarddirs to conversion scripts and to r14.1.x backporting scriptHEADmaster
Signed-off-by: Michele Calgaro <[email protected]>
-rwxr-xr-xconversions/kde-tde/convert_existing_kde3_app_to_tde2
-rwxr-xr-xmisc/patch-update-for-r14-1-x4
2 files changed, 6 insertions, 0 deletions
diff --git a/conversions/kde-tde/convert_existing_kde3_app_to_tde b/conversions/kde-tde/convert_existing_kde3_app_to_tde
index 2c72783..7cd3029 100755
--- a/conversions/kde-tde/convert_existing_kde3_app_to_tde
+++ b/conversions/kde-tde/convert_existing_kde3_app_to_tde
@@ -260,6 +260,7 @@ tdevelop\.org|\
tdewebdev\.org|\
\<tdelistr|\
kde toolbar widget\
+kstandarddirs\.|\
)" |
tr "\n" "\0" |
xargs -r0 sed -ri \
@@ -516,6 +517,7 @@ xargs -r0 sed -ri \
-e "s|([^a-zA-Z0-9]\|^)kdewidgets|\1tdewidgets|g" \
-e "s|([^a-zA-Z0-9]\|^)Categories=Qt;KDE|\1Categories=Qt;TDE|g" \
-e "s|([^a-zA-Z0-9]\|^)X-KDE-|\1X-TDE-|g" \
+ -e "s|([^a-zA-Z0-9]\|^)kstandarddirs\.|\1tdestandarddirs.|g" \
\
\
-e "s|kde\.org/tdehotnewstuff|kde.org/khotnewstuff|g" \
diff --git a/misc/patch-update-for-r14-1-x b/misc/patch-update-for-r14-1-x
index e324a61..851efaf 100755
--- a/misc/patch-update-for-r14-1-x
+++ b/misc/patch-update-for-r14-1-x
@@ -68,3 +68,7 @@ sed -i "$@" \
sed -i "$@" \
-e "s|\btdeglobalaccel\.h\b|kglobalaccel.h|g" "$1" \
+# tdestandarddirs.h --> kstandarddirs.h
+sed -i "$@" \
+ -e "s|\btdestandarddirs\.h\b|kstandarddirs.h|g" "$1" \
+