635e9da391
* par is kept at -Np0
```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
```
30 lines
1.3 KiB
Diff
30 lines
1.3 KiB
Diff
diff --git qtbase/mkspecs/features/qt_build_config.prf qtbase/mkspecs/features/qt_build_config.prf
|
|
index 8273ba3fe1..b674f42109 100644
|
|
--- a/qtbase/mkspecs/features/qt_build_config.prf
|
|
+++ b/qtbase/mkspecs/features/qt_build_config.prf
|
|
@@ -11,6 +11,10 @@
|
|
|
|
!contains(QMAKE_INTERNAL_INCLUDED_FILES, .*qmodule\\.pri) {
|
|
QMAKE_QT_MODULE = $$[QT_HOST_DATA/get]/mkspecs/qmodule.pri
|
|
+ defined(QMAKE_TARGET_MODULE,var):exists($$QMAKE_TARGET_MODULE) {
|
|
+ QMAKE_QT_MODULE = $$QMAKE_TARGET_MODULE
|
|
+ message("Trying .qmodule.pri from ($$QMAKE_QT_CONFIG)")
|
|
+ }
|
|
!exists($$QMAKE_QT_MODULE)|!include($$QMAKE_QT_MODULE, "", true) {
|
|
debug(1, "Cannot load qmodule.pri!")
|
|
} else {
|
|
diff --git qtbase/mkspecs/features/qt_config.prf qtbase/mkspecs/features/qt_config.prf
|
|
index 93c54e3010..aaff26b52a 100644
|
|
--- a/qtbase/mkspecs/features/qt_config.prf
|
|
+++ b/qtbase/mkspecs/features/qt_config.prf
|
|
@@ -1,6 +1,10 @@
|
|
# This file is loaded as one of the last things by all qmakespecs.
|
|
|
|
QMAKE_QT_CONFIG = $$[QT_HOST_DATA/get]/mkspecs/qconfig.pri
|
|
+defined(QMAKE_TARGET_CONFIG,var):exists($$QMAKE_TARGET_CONFIG) {
|
|
+ QMAKE_QT_CONFIG = $$QMAKE_TARGET_CONFIG
|
|
+ message("Trying .qconfig.pri from ($$QMAKE_QT_CONFIG)")
|
|
+}
|
|
!exists($$QMAKE_QT_CONFIG)|!include($$QMAKE_QT_CONFIG, "", true) {
|
|
debug(1, "Cannot load qconfig.pri!")
|
|
} else {
|