srcpkgs/s*: convert patches to -Np1
```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
```
2021-06-19 03:03:21 +00:00
|
|
|
--- a/CMakeLists.txt 2021-05-05 02:53:34.000000000 +0400
|
|
|
|
|
+++ b/CMakeLists.txt 2021-05-24 13:49:21.551706280 +0400
|
2021-05-24 10:16:20 +00:00
|
|
|
@@ -287,17 +286,0 @@ if(SNAPPY_BUILD_TESTS)
|
|
|
|
|
- # Prevent overriding the parent project's compiler/linker settings on Windows.
|
|
|
|
|
- set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
|
|
|
|
|
- set(install_gtest OFF)
|
|
|
|
|
- set(install_gmock OFF)
|
|
|
|
|
- set(build_gmock ON)
|
|
|
|
|
-
|
|
|
|
|
- # This project is tested using GoogleTest.
|
|
|
|
|
- add_subdirectory("third_party/googletest")
|
|
|
|
|
-
|
|
|
|
|
- # GoogleTest triggers a missing field initializers warning.
|
|
|
|
|
- if(SNAPPY_HAVE_NO_MISSING_FIELD_INITIALIZERS)
|
|
|
|
|
- set_property(TARGET gtest
|
|
|
|
|
- APPEND PROPERTY COMPILE_OPTIONS -Wno-missing-field-initializers)
|
|
|
|
|
- set_property(TARGET gmock
|
|
|
|
|
- APPEND PROPERTY COMPILE_OPTIONS -Wno-missing-field-initializers)
|
|
|
|
|
- endif(SNAPPY_HAVE_NO_MISSING_FIELD_INITIALIZERS)
|
|
|
|
|
-
|
|
|
|
|
@@ -309 +292 @@ if(SNAPPY_BUILD_TESTS)
|
|
|
|
|
- target_link_libraries(snappy_unittest snappy_test_support gmock_main gtest)
|
|
|
|
|
+ target_link_libraries(snappy_unittest snappy_test_support gtest_main gtest)
|
|
|
|
|
@@ -330 +313 @@ if(SNAPPY_BUILD_BENCHMARKS)
|
|
|
|
|
- target_link_libraries(snappy_benchmark snappy_test_support benchmark_main)
|
|
|
|
|
+ target_link_libraries(snappy_benchmark snappy_test_support benchmark_main benchmark)
|
|
|
|
|
@@ -335 +317,0 @@ if(SNAPPY_BUILD_BENCHMARKS)
|
|
|
|
|
- add_subdirectory("third_party/benchmark")
|
