49cb564d14
* 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
```
46 lines
1.5 KiB
Diff
46 lines
1.5 KiB
Diff
don't install these symlinks, it's not pyside2-tools business:
|
|
* /usr/bin/designer -> /usr/bin/qtchooser
|
|
* /usr/bin/rcc -> /usr/bin/qtchooser
|
|
* /usr/bin/uic -> /usr/bin/qtchooser
|
|
|
|
--- a/sources/pyside2-tools/CMakeLists.txt
|
|
+++ b/sources/pyside2-tools/CMakeLists.txt
|
|
@@ -55,38 +55,6 @@
|
|
set(DESIGNER_PATH "${TOOLS_PATH}/designer${EXE_EXT}")
|
|
endif()
|
|
|
|
-install(FILES "${UIC_PATH}"
|
|
- DESTINATION bin
|
|
- PERMISSIONS
|
|
- OWNER_EXECUTE OWNER_WRITE OWNER_READ
|
|
- GROUP_EXECUTE GROUP_READ
|
|
- WORLD_EXECUTE WORLD_READ)
|
|
-
|
|
-install(FILES "${RCC_PATH}"
|
|
- DESTINATION bin
|
|
- PERMISSIONS
|
|
- OWNER_EXECUTE OWNER_WRITE OWNER_READ
|
|
- GROUP_EXECUTE GROUP_READ
|
|
- WORLD_EXECUTE WORLD_READ)
|
|
-
|
|
-if (EXISTS ${DESIGNER_PATH})
|
|
- if (APPLE)
|
|
- install(DIRECTORY "${DESIGNER_PATH}"
|
|
- DESTINATION bin
|
|
- FILE_PERMISSIONS
|
|
- OWNER_EXECUTE OWNER_WRITE OWNER_READ
|
|
- GROUP_EXECUTE GROUP_READ
|
|
- WORLD_EXECUTE WORLD_READ)
|
|
- else()
|
|
- install(FILES "${DESIGNER_PATH}"
|
|
- DESTINATION bin
|
|
- PERMISSIONS
|
|
- OWNER_EXECUTE OWNER_WRITE OWNER_READ
|
|
- GROUP_EXECUTE GROUP_READ
|
|
- WORLD_EXECUTE WORLD_READ)
|
|
- endif()
|
|
-endif()
|
|
-
|
|
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake"
|
|
"${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
|
|
IMMEDIATE @ONLY)
|