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 ```
15 lines
534 B
Diff
15 lines
534 B
Diff
--- a/qtbase/src/gui/Qt5GuiConfigExtras.cmake.in 2020-09-19 13:27:22.130997854 +0200
|
|
+++ b/qtbase/src/gui/Qt5GuiConfigExtras.cmake.in 2020-09-19 13:27:22.130997854 +0200
|
|
@@ -106,12 +106,6 @@
|
|
set(Qt5Gui_${_cmake_lib_name}_LIBRARY ${_lib})
|
|
else()
|
|
find_library(Qt5Gui_${_cmake_lib_name}_LIBRARY ${_lib}
|
|
-!!IF !isEmpty(CROSS_COMPILE)
|
|
- PATHS \"${LibDir}\"
|
|
-!!IF !mac
|
|
- NO_DEFAULT_PATH
|
|
-!!ENDIF
|
|
-!!ENDIF
|
|
)
|
|
endif()
|
|
!!IF mac
|