ae69000001
* arduino and antiword 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
```
33 lines
702 B
Diff
33 lines
702 B
Diff
--- a/Makefile 2016-12-06 21:40:22.715155552 +0100
|
|
+++ b/Makefile 2016-12-06 21:41:39.523155740 +0100
|
|
@@ -50,12 +50,8 @@
|
|
|
|
FE_VERSION=v2.2.0
|
|
|
|
-CC=gcc
|
|
-CXX=g++
|
|
CFLAGS=$(EXTRA_CFLAGS)
|
|
-STRIP=strip
|
|
PKG_CONFIG=pkg-config
|
|
-AR=ar
|
|
ARFLAGS=rc
|
|
RM=rm -f
|
|
MD=mkdir -p
|
|
@@ -84,7 +84,7 @@
|
|
override WINDRES := $(TOOLCHAIN)-$(WINDRES)
|
|
endif
|
|
|
|
-prefix=/usr/local
|
|
+prefix=/usr
|
|
datarootdir=$(prefix)/share
|
|
datadir=$(datarootdir)
|
|
exec_prefix=$(prefix)
|
|
@@ -414,7 +414,7 @@
|
|
|
|
$(EXE): $(OBJ) $(EXPAT) $(SQUIRREL) $(AUDIO)
|
|
$(EXE_MSG)
|
|
- $(SILENT)$(CXX) -o $@ $^ $(CFLAGS) $(FE_FLAGS) $(LIBS)
|
|
+ $(SILENT)$(CXX) -o $@ $^ $(LDFLAGS) $(CFLAGS) $(FE_FLAGS) $(LIBS)
|
|
ifneq ($(FE_DEBUG),1)
|
|
$(SILENT)$(STRIP) $@
|
|
endif
|