2021-05-05 00:27:28 +02:00
|
|
|
https://patch-diff.githubusercontent.com/raw/J-Lentz/iwgtk/pull/14.patch
|
|
|
|
|
|
srcpkgs/i*: 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/Makefile
|
|
|
|
|
+++ b/Makefile
|
2021-05-05 00:27:28 +02:00
|
|
|
@@ -1,8 +1,8 @@
|
|
|
|
|
-CC=gcc
|
|
|
|
|
-CFLAGS=`pkg-config --cflags gtk+-3.0`
|
|
|
|
|
+CC?=gcc
|
|
|
|
|
+CCINCS=`pkg-config --cflags gtk+-3.0`
|
|
|
|
|
LDLIBS=`pkg-config --libs gtk+-3.0`
|
|
|
|
|
|
|
|
|
|
-prefix=/usr/local
|
|
|
|
|
+prefix?=$(PREFIX)
|
|
|
|
|
exec_prefix=$(prefix)
|
|
|
|
|
bindir=$(exec_prefix)/bin
|
|
|
|
|
datarootdir=$(prefix)/share
|
|
|
|
|
@@ -23,10 +23,10 @@
|
|
|
|
|
.PHONY : clean install uninstall
|
|
|
|
|
|
|
|
|
|
iwgtk : $(objects)
|
|
|
|
|
- $(CC) $(CFLAGS) -o $@ $^ $(LDLIBS)
|
|
|
|
|
+ $(CC) $(CCINCS) $(CFLAGS) -o $@ $^ $(LDLIBS)
|
|
|
|
|
|
|
|
|
|
%.o : $(srcdir)/%.c $(headers)
|
|
|
|
|
- $(CC) -c $(CFLAGS) -o $@ $<
|
|
|
|
|
+ $(CC) -c $(CCINCS) $(CFLAGS) -o $@ $<
|
|
|
|
|
|
|
|
|
|
$(srcdir)/icons.c : icons.gresource.xml $(icons)
|
|
|
|
|
glib-compile-resources --target=$@ --sourcedir=icons --generate-source $<
|
