diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2014-08-13 11:13:56 +0000 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2014-08-13 11:13:56 +0000 |
| commit | 574788a2fc150e1dd2c9d416c6b67bb040446098 (patch) | |
| tree | 8c2456ce81dff601a5fe9504aeb669c87417b03b /dev-libs/libhid | |
| parent | Use eudev on uclibc and musl. (diff) | |
| download | historical-574788a2fc150e1dd2c9d416c6b67bb040446098.tar.gz historical-574788a2fc150e1dd2c9d416c6b67bb040446098.tar.bz2 historical-574788a2fc150e1dd2c9d416c6b67bb040446098.zip | |
Add assert() patch by Martin von Gagern (bug #427010).
Package-Manager: portage-2.2.11-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613
Diffstat (limited to 'dev-libs/libhid')
| -rw-r--r-- | dev-libs/libhid/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-libs/libhid/Manifest | 10 | ||||
| -rw-r--r-- | dev-libs/libhid/files/libhid-0.2.16-swig.patch | 32 |
3 files changed, 41 insertions, 6 deletions
diff --git a/dev-libs/libhid/ChangeLog b/dev-libs/libhid/ChangeLog index 170eafa46929..6310dd365250 100644 --- a/dev-libs/libhid/ChangeLog +++ b/dev-libs/libhid/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-libs/libhid # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libhid/ChangeLog,v 1.11 2014/08/13 11:08:25 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libhid/ChangeLog,v 1.12 2014/08/13 11:13:55 jer Exp $ + + 13 Aug 2014; Jeroen Roovers <jer@gentoo.org> files/libhid-0.2.16-swig.patch: + Add assert() patch by Martin von Gagern (bug #427010). *libhid-0.2.16-r4 (13 Aug 2014) diff --git a/dev-libs/libhid/Manifest b/dev-libs/libhid/Manifest index d8117f46274a..f7df57d1adcb 100644 --- a/dev-libs/libhid/Manifest +++ b/dev-libs/libhid/Manifest @@ -3,16 +3,16 @@ Hash: SHA256 AUX libhid-0.2.16-gentoo.patch 628 SHA256 8e1b2de09cd20ad82dfc344f5bd7900e4c2e9597d6b8fa1ebc5df2593cc11753 SHA512 a756d99b115e1903ff633e511c8b9c2de1743b9d8c5050ba422281aea6c4d330b70632e45f688177d8d06ba4077574193e7e378f0e0a79924d2463f5e1584d40 WHIRLPOOL a68a7bf477a55afcb15b22f56bbe1b2f790927a8ad11062ab2963388d28e5838a65e58c402993db8f494b925f9be19750d7a1a225349d2a702ea57c92b6775ff AUX libhid-0.2.16-libusb.patch 421 SHA256 cf9afdad56296622811feee908f506adcaa17aed6cd0f5f82f2fe7227fdb2a32 SHA512 0fa3be119d1ab3efa428c81b96709a0cee4fd40fa4515d255a64be095a4e26f68a2c8175beda6615c720aaa593edc5aaaa2909bfc5ab9e7f9b818d8c507b9fde WHIRLPOOL 40c91f44ca567417b4499047ffac83acb06dc9455cdc1dbef2bcd849b31974b140646ebd910832ca1171ef49122951bb7b2009f5fd8539eb8c2059ba208cf052 -AUX libhid-0.2.16-swig.patch 387 SHA256 f3ec8c660bd8af5445b6d6973938f0b338773a0e62f5f57422382eaa5d862e57 SHA512 14baf739e30db210c369e0ed6d29c6b24e890bc7c99c5ec242d7c93837d9d1402d1b53aa3c612ed0a047fcea2a286052ee53baebaffac7b434721f05bf7250f2 WHIRLPOOL 8915ede1f475a636c932db6f48869f1f48d092c23dc6918bd95f5b698dbd4a626ce8cfd3210971c07c544da82ba3c72bda2306ec775e0a69de4a1e2db2f1ae14 +AUX libhid-0.2.16-swig.patch 1424 SHA256 3994c73ecc8bc2faac6a2e26a9f574bee05b2340d5b87f8516afd714de79eb61 SHA512 62ff58921aa99947f8b33b0d1c02cf30f19fd3f75393cbb681846266b67af49bf6a2e70a995c9a7252b27c67e573e2c198b366830c15ca3c5e87a93325a849cb WHIRLPOOL 6cf22a0e2915d1cd643357a8846397484456d08a05321f58a6ad094c18a86b79183c18ee5cc7af70671fb7c4bee94088fd51194c08c4116a2776db3b8cd7fcb4 DIST libhid-0.2.16.tar.gz 435245 SHA256 f6809ab3b9c907cbb05ceba9ee6ca23a705f85fd71588518e14b3a7d9f2550e5 SHA512 3c9348f9d63e0e1577e983c65ff8e6acbaee0d5f43ecb29b7004654a7e9d14a94176aa029f259e0b8576fc30e8a9af6d1df34912dd582bfadc2b29f9b87eb52b WHIRLPOOL 76edaf3a22f015d16fe2583102c9ee9a839ff17b8172309d3595f3054a22e3f8b119b3560a621490fac7a47966f2519b9b31824e91958012f767387adaa8871c EBUILD libhid-0.2.16-r3.ebuild 1843 SHA256 e1d3ae1263b78374cf86d9347b40058c32bfab9f5d02aec2fc15feebd1aa96e1 SHA512 be9606d6fc6631bd4faeedebcc8c19aa2eeb96013ee5c015b36d7e4a99ecd08f60dd643c0415631a6a0165635051d9ac0da38ef0f5b1205b41844fff6cfcc9a1 WHIRLPOOL 301128855a2009dd18acc48911abdcfd3acaedabed7456bbaa678e11d76e910b85db05fe70e3cfb6b76b329b4bc209725b40f48ea739281280afcb9b96813dd8 EBUILD libhid-0.2.16-r4.ebuild 1270 SHA256 62dc2c4206664285ac61681e37843714816e5ca6fb69ad4454645135b62bf8aa SHA512 6bfa22b14908b20a002efa7f5b2fce6502ba7c8029c77acaeb98c5aa41b366c7f80bf90e7b54f8a404c1f746916709c3ec3711ba881ea95eb9e60d38ebecd4ee WHIRLPOOL e4431949ffdd1e294a7f81f57403787ee3de6578be88cf640e128db8fe95cea7134ce649e1754d85eab7ccd5ed83a0e12b45b2a4807c88566aef2deee4509b62 -MISC ChangeLog 2084 SHA256 53e1507c908a66aa20d687ebe4f80e4aa00e12f207fb1d2c3b1da1703f22005b SHA512 1796511ef8c2331f3920a66f0b015a6864dd6369c8634f28a57ce0cc04f8ab9df4dfb09aa45857ff4b004d1d349c2f344a8e8e0098abb11a53968f8c49a97439 WHIRLPOOL 7420331d65d962060404dd85d4df3e55cac05ed7473287347ccb67cf54ec359cc06d1a37d9b55df3aa67b53d3d537479826375379c5ac3b0d6c1ce33c9016afb +MISC ChangeLog 2221 SHA256 15c7bd28e459f15f61b6c1f62909c9ed9ff5816537eeb73a2536d53e8958d799 SHA512 8fab939745395997887613a4c16348b3674664491e84c378cd01c9e9d625d4f43f1b0c747b34dafcf6d713d15c7731367a4b23a4652630b63a01394decada128 WHIRLPOOL 2b97f3aa1cd550ea8db6e592311ff5468c972f840535dd16421626a5526a3060fd9f505b742a3ce16be8cf4fc0af7fa1d7ff49cc7eaecf0e72648f46865b71ac MISC metadata.xml 540 SHA256 10328cefda78e580a89e52cfcc424a62ee91b430c782d0bd6409644674714b97 SHA512 55bfb95a071db6597a759017a238315f4b25820267d6a1803889e848d7fb69dec3469b032bef6ff316e37e14598fdbad9e6070080f9a9281e720a6864f36fcac WHIRLPOOL 2f80a720b33ed3e3b2e9dfd35ae80fe3a557ecdd6c275175cacb2b834e4204b1434b9a47158e49c9ff8278795bb712f810de710a104a332814c53904b50607a8 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iEYEAREIAAYFAlPrRysACgkQVWmRsqeSphNVhwCdG81f6CE1jV6lM2X/heVv0B/U -pzcAnRTDhAy4ZIvCC61Z5ZE1MnOQzmHB -=yhIx +iEYEAREIAAYFAlPrSHQACgkQVWmRsqeSphMWaACeN6vIrSfqY7YDvccwyL1R/FNW +1jYAn2zz4R4NidIE9RVnEmkElo8iDrAQ +=yNLi -----END PGP SIGNATURE----- diff --git a/dev-libs/libhid/files/libhid-0.2.16-swig.patch b/dev-libs/libhid/files/libhid-0.2.16-swig.patch index fcd4668cf001..ce5dae7481b9 100644 --- a/dev-libs/libhid/files/libhid-0.2.16-swig.patch +++ b/dev-libs/libhid/files/libhid-0.2.16-swig.patch @@ -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"); |