2021-01-24 07:44:49 +01:00
|
|
|
lzma is p7zip not liblzma
|
srcpkgs/[A-Z]*: 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 05:03:21 +02:00
|
|
|
--- a/src/External/CMakeLists.txt
|
|
|
|
|
+++ b/src/External/CMakeLists.txt
|
2021-01-24 07:44:49 +01:00
|
|
|
@@ -24,12 +24,10 @@
|
|
|
|
|
file(GLOB_RECURSE EXTERNAL_SOURCES
|
|
|
|
|
*.cpp
|
|
|
|
|
*.cxx
|
|
|
|
|
- dumb/*.c
|
|
|
|
|
- lua/*.c
|
|
|
|
|
lzma/C/LzmaDec.c
|
|
|
|
|
${SLADE_HEADERS}
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
add_library(external STATIC ${EXTERNAL_SOURCES})
|
|
|
|
|
target_link_libraries(external ${ZLIB_LIBRARY})
|
|
|
|
|
-set(EXTERNAL_LIBRARIES external PARENT_SCOPE)
|
|
|
|
|
+set(EXTERNAL_LIBRARIES external dumb lua5.3 PARENT_SCOPE)
|
