Skip to content

Commit

Permalink
swig_python.patch: redo
Browse files Browse the repository at this point in the history
fixing Hunk #6 succeeded at 205945 (offset 13869 lines)
add -b to patch call for easier redoing the difforig.
  • Loading branch information
rurban committed Jul 25, 2018
1 parent dd8df62 commit 96d3c00
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ gcov.log
/bindings/python/libredwg.py
/bindings/python/Makefile3.6
/bindings/python/swig_python.c
/bindings/python/swig_python.c.orig
/build-aux/compile
/build-aux/config.guess
/build-aux/config.sub
Expand Down
2 changes: 1 addition & 1 deletion bindings/python/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ if HAVE_PATCH
swig_python.c : $(SWIG_SOURCES) Makefile.am
swig -python -I$(top_srcdir)/include -o swig_python.c $(srcdir)/../dwg.i
-$(PATCH) -t --dry-run -N -p2 -i $(SWIG_PYTHON_PATCH) && \
$(PATCH) -t -N -p2 -i $(SWIG_PYTHON_PATCH)
$(PATCH) -t -N -p2 -b -i $(SWIG_PYTHON_PATCH)
CLEANFILES = swig_python.c.orig
else
swig_python.c : $(SWIG_SOURCES) Makefile.am
Expand Down
6 changes: 3 additions & 3 deletions build-aux/swig_python.patch
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
difforig bindings/python/swig_python.c

diff -u bindings/python/swig_python.c.orig bindings/python/swig_python.c
--- bindings/python/swig_python.c.orig 2018-07-10 17:19:22.000000000 +0200
+++ bindings/python/swig_python.c 2018-07-10 17:19:23.000000000 +0200
--- bindings/python/swig_python.c.orig 2018-07-25 12:13:08.000000000 +0200
+++ bindings/python/swig_python.c 2018-07-25 12:13:14.000000000 +0200
@@ -2480,7 +2480,7 @@
*/

Expand Down Expand Up @@ -83,7 +83,7 @@ diff -u bindings/python/swig_python.c.orig bindings/python/swig_python.c
Py_DECREF(dict);
}

@@ -192076,6 +192076,17 @@
@@ -205945,6 +205945,17 @@
#ifdef __cplusplus
extern "C"
#endif
Expand Down

0 comments on commit 96d3c00

Please # to comment.