srcpkgs/b*: 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 04:18:31 +02:00
|
|
|
--- a/src/Makefile.in
|
|
|
|
|
+++ b/src/Makefile.in
|
2021-02-23 23:57:08 +01:00
|
|
|
@@ -108,7 +108,6 @@
|
|
|
|
|
Netclient.$(OBJEXT) ScreenHandler.$(OBJEXT) window.$(OBJEXT) \
|
|
|
|
|
WindowlistMenu.$(OBJEXT)
|
|
|
|
|
bbkeys_OBJECTS = $(am_bbkeys_OBJECTS)
|
|
|
|
|
-bbkeys_DEPENDENCIES = /usr/lib/libbt.a
|
|
|
|
|
AM_V_P = $(am__v_P_@AM_V@)
|
|
|
|
|
am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
|
|
|
|
|
am__v_P_0 = false
|
|
|
|
|
@@ -350,7 +349,7 @@
|
|
|
|
|
WindowlistMenu.cpp \
|
|
|
|
|
WindowlistMenu.h
|
|
|
|
|
|
|
|
|
|
-bbkeys_LDADD = /usr/lib/libbt.a
|
|
|
|
|
+bbkeys_LDADD = -lbt
|
|
|
|
|
AM_INSTALLCHECK_STD_OPTIONS_EXEMPT = bbkeys
|
|
|
|
|
all: all-am
|
|
|
|
|
|
|
|
|
|
@@ -444,7 +443,7 @@
|
|
|
|
|
done; \
|
|
|
|
|
done; rm -f c$${pid}_.???; exit $$bad
|
|
|
|
|
|
|
|
|
|
-bbkeys$(EXEEXT): $(bbkeys_OBJECTS) $(bbkeys_DEPENDENCIES) $(EXTRA_bbkeys_DEPENDENCIES)
|
|
|
|
|
+bbkeys$(EXEEXT): $(bbkeys_OBJECTS) $(EXTRA_bbkeys_DEPENDENCIES)
|
|
|
|
|
@rm -f bbkeys$(EXEEXT)
|
|
|
|
|
$(AM_V_CXXLD)$(CXXLINK) $(bbkeys_OBJECTS) $(bbkeys_LDADD) $(LIBS)
|
|
|
|
|
|
srcpkgs/b*: 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 04:18:31 +02:00
|
|
|
--- a/src/Makefile.am
|
|
|
|
|
+++ b/src/Makefile.am
|
2021-02-23 23:57:08 +01:00
|
|
|
@@ -31,6 +31,5 @@
|
|
|
|
|
window.hh \
|
|
|
|
|
WindowlistMenu.cpp \
|
|
|
|
|
WindowlistMenu.h
|
|
|
|
|
-bbkeys_LDADD = /usr/lib/libbt.a
|
|
|
|
|
|
|
|
|
|
AM_INSTALLCHECK_STD_OPTIONS_EXEMPT = bbkeys
|
