dd9d4a1979
```sh
git grep -l '^patch_args=-Np0' "srcpkgs/$1*/template" |
while read template; do
for p in ${template%/template}/patches/*; do
sed -i '
\,^[+-][+-][+-] /dev/null,b
/^[*-]\+ [0-9]\+\(,[0-9]\+\)\? [*-]\+$/b
s,^[*][*][*] ,&a/,
/^--- /{
s,\(^--- \)\(./\)*,\1a/,
s,[.][Oo][Rr][Ii][Gg]\([ /]\),\1,
s/[.][Oo][Rr][Ii][Gg]$//
s/[.]patched[.]\([^.]\)/.\1/
h
}
/^+++ -/{
g
s/^--- a/+++ b/
b
}
s,\(^+++ \)\(./\)*,\1b/,
' "$p"
done
sed -i '/^patch_args=/d' $template
done
```
16 lines
650 B
Diff
16 lines
650 B
Diff
fix cmake code for cross-build usage.
|
|
Initial directive "command KF5::desktoptojson ..." points
|
|
the target's arch desktoptojson binary instead of the host's one.
|
|
|
|
--- a/KF5CoreAddonsMacros.cmake
|
|
+++ b/KF5CoreAddonsMacros.cmake
|
|
@@ -45,7 +45,8 @@
|
|
_desktop_to_json_cmake28(${desktop} ${json} ${DESKTOP_TO_JSON_COMPAT_MODE})
|
|
return()
|
|
endif()
|
|
- set(command KF5::desktoptojson -i ${desktop} -o ${json})
|
|
+ get_target_property(DESKTOPTOJSON_LOCATION KF5::desktoptojson LOCATION)
|
|
+ set(command ${DESKTOPTOJSON_LOCATION} -i ${desktop} -o ${json})
|
|
if(DESKTOP_TO_JSON_COMPAT_MODE)
|
|
list(APPEND command -c)
|
|
endif()
|