3353bf4722
```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
```
37 lines
865 B
Diff
37 lines
865 B
Diff
diff --git Makefile Makefile
|
|
index c32ed6b..fb2e7a3 100644
|
|
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -1,13 +1,22 @@
|
|
-all: xkblayout-state
|
|
+PROG=xkblayout-state
|
|
|
|
-XKeyboard.o: XKeyboard.cpp XKeyboard.h X11Exception.h
|
|
- g++ -c -Wall -O2 XKeyboard.cpp -o XKeyboard.o
|
|
+SRC = wrapper.cpp XKeyboard.cpp
|
|
+OBJS = ${SRC:.cpp=.o}
|
|
|
|
-wrapper.o: wrapper.cpp XKeyboard.h
|
|
- g++ -c -Wall -O2 wrapper.cpp -o wrapper.o
|
|
+all: ${PROG}
|
|
|
|
-xkblayout-state: XKeyboard.o wrapper.o
|
|
- g++ XKeyboard.o wrapper.o -lX11 -o xkblayout-state
|
|
+.cpp.o:
|
|
+ ${CXX} -c ${CXXFLAGS} $<
|
|
+
|
|
+${PROG}: ${OBJS}
|
|
+ ${CXX} -o $@ ${OBJS} ${LDFLAGS} -lX11
|
|
|
|
clean:
|
|
- rm -f xkblayout-state XKeyboard.o wrapper.o
|
|
+ rm -f ${PROG} ${OBJS}
|
|
+
|
|
+dist:
|
|
+ tar cfa xkblayout-state-v1b.tar.gz Makefile README.md wrapper.cpp X11Exception.h XKeyboard.cpp XKeyboard.h
|
|
+
|
|
+install:
|
|
+ install -Dm755 ${PROG} ${DESTDIR}/usr/bin/${PROG}
|
|
+
|
|
|