jer 14/08/13 11:13:55 Modified: libhid-0.2.16-swig.patch Log: Add assert() patch by Martin von Gagern (bug #427010). (Portage version: 2.2.11-r1/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Revision Changes Path 1.2 dev-libs/libhid/files/libhid-0.2.16-swig.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libhid/files/libhid-0.2.16-swig.patch?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libhid/files/libhid-0.2.16-swig.patch?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libhid/files/libhid-0.2.16-swig.patch?r1=1.1&r2=1.2 Index: libhid-0.2.16-swig.patch =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-libs/libhid/files/libhid-0.2.16-swig.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libhid-0.2.16-swig.patch 13 Aug 2014 11:08:25 -0000 1.1 +++ libhid-0.2.16-swig.patch 13 Aug 2014 11:13:55 -0000 1.2 @@ -11,3 +11,35 @@ if test -z "${HAVE_SWIG_TRUE}" ; then AM_PATH_PYTHON SWIG_PYTHON +--- a/swig/Makefile.am ++++ b/swig/Makefile.am +@@ -1,7 +1,7 @@ + # AM_MAKEFLAGS = @MAKEFLAGS@ + ACLOCAL_AMFLAGS = -I m4 + +-AM_CPPFLAGS = $(SWIG_PYTHON_CPPFLAGS) -I$(top_srcdir)/include -I$(top_srcdir)/hidparser -DHID_INTERNAL -DSWIG ++AM_CPPFLAGS = $(SWIG_PYTHON_CPPFLAGS) -iquote$(top_srcdir)/include -I$(top_srcdir)/hidparser -DHID_INTERNAL -DSWIG + AM_CFLAGS = -fPIC -fno-strict-aliasing + AM_LDFLAGS = -shared ../src/libhid.la -lusb + +@@ -29,7 +29,7 @@ __init__.py: hid.py + + %_wrap.c %.py: %.i $(top_srcdir)/include/hid.h + $(SWIG) $(SWIG_PYTHON_OPT) $(SWIG_INC) -o $@ $< +- echo '#include <compiler.h>' > tmp.c ++ echo '#include "compiler.h"' > tmp.c + sed -e 's/PyObject \*self/& UNUSED/' \ + -e 's/int flags)/int flags UNUSED)/' < $@ >> tmp.c \ + && mv tmp.c $@ +--- a/swig/hid.i ++++ b/swig/hid.i +@@ -1,7 +1,7 @@ + %module(docstring="libhid is a user-space USB HID access library built on libusb.", "threads"=1) hid + %{ +-#include <compiler.h> +-#include <hid.h> ++#include "compiler.h" ++#include "hid.h" + %} + + %feature("autodoc","0");
