diff options
| author |   Julian Ospald <hasufell@gentoo.org> | 2012-08-14 23:23:45 +0000 |
|---|---|---|
| committer | Julian Ospald <hasufell@gentoo.org> | 2012-08-14 23:23:45 +0000 |
| commit | 74f881135fe80a3910591333c5c4ca65990b0bd1 (patch) | |
| tree | ad62822f065cb5ff95d331a23c77eabb06b8ebbd /app-misc | |
| parent | Backporting test fixes from meep-1.2, hopefully fixing bug #423247 (diff) | |
| download | historical-74f881135fe80a3910591333c5c4ca65990b0bd1.tar.gz historical-74f881135fe80a3910591333c5c4ca65990b0bd1.tar.bz2 historical-74f881135fe80a3910591333c5c4ca65990b0bd1.zip | |
fix underlinking wrt #367349
Package-Manager: portage-2.2.0_alpha121/cvs/Linux x86_64
Diffstat (limited to 'app-misc')
| -rw-r--r-- | app-misc/cwiid/ChangeLog | 8 | ||||
| -rw-r--r-- | app-misc/cwiid/Manifest | 19 | ||||
| -rw-r--r-- | app-misc/cwiid/cwiid-20110107-r1.ebuild | 5 | ||||
| -rw-r--r-- | app-misc/cwiid/files/cwiid-20110107-underlinking.patch | 31 |
4 files changed, 57 insertions, 6 deletions
diff --git a/app-misc/cwiid/ChangeLog b/app-misc/cwiid/ChangeLog index c6e5f9652d6e..ea98337132e0 100644 --- a/app-misc/cwiid/ChangeLog +++ b/app-misc/cwiid/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-misc/cwiid -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/cwiid/ChangeLog,v 1.3 2011/03/28 01:04:35 ssuominen Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-misc/cwiid/ChangeLog,v 1.4 2012/08/14 23:23:45 hasufell Exp $ + + 14 Aug 2012; Julian Ospald <hasufell@gentoo.org> cwiid-20110107-r1.ebuild, + +files/cwiid-20110107-underlinking.patch: + fix underlinking wrt #367349 28 Mar 2011; Samuli Suominen <ssuominen@gentoo.org> cwiid-20110107-r1.ebuild: Install 60-cwiid.rules to /lib/udev instead of /etc/udev. diff --git a/app-misc/cwiid/Manifest b/app-misc/cwiid/Manifest index 7a1d1645d421..f6823a3fdbee 100644 --- a/app-misc/cwiid/Manifest +++ b/app-misc/cwiid/Manifest @@ -1,5 +1,20 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + AUX 60-cwiid.rules 91 SHA256 d33d4d013170d7c6e03f937262be8af189d85f95f1ca945cdcd1617d276f899e SHA512 c663b8912d0f1651c490f00ce725452f9fe1689b6bf97859b2d79206dedee8d77e4eb21e675b8db3c2e40108d6e41196eeaba145a80d4ffdacfa44809ef7d871 WHIRLPOOL 36285adbc6dd0345b90946eeb3791ea0f17c7304c38ffbf4c732160ee07cc18e0292133d49c77f9a35c0cec15fd2234e81a13e1465683cfbe282a6db9976207a +AUX cwiid-20110107-underlinking.patch 733 SHA256 ad49aa99e7c80e51a5fc33af09f610ad890ce3ec5d6f078345be42f8dbb779e1 SHA512 c263474fb26126219163debf90a9a2a0990eae8cbd2942cf9301c9fba6cc50a849c002da7c004a0ccee9ac2f18b724d8d0da1c9402539388409fe3a59b27e996 WHIRLPOOL d3da00beef8549b4aa8a97f2d337e9b8cd69bb5296f9f77faad684b819d06f34b98774364e4e7d08b63e69659a9999f5443569b33e06ac4c71b9242e447cb013 DIST cwiid-20110107.tar.bz2 81184 SHA256 7df682dd200eb703b2485ceb86f9834a4bc608c191e1431c3f9d2b58e4865a6f SHA512 b9cde716f7bc67697cf6fafd62f324cf343afc734845d8c3f608e0ad9abe245570e59dbda10a0d3a50b0439a8cc8db0bcf71d592c6d4b733c3955426a97cb46f WHIRLPOOL 5b92fb20c91eef290d334a39bbe0a258a62ca20311cdb65346f21a42b4dbeb271cdd2e326ed1d11c129893edf1131ab590472a911a6a7df32a559a88abd49134 -EBUILD cwiid-20110107-r1.ebuild 1617 SHA256 1fa47e08b13754b52fcf617442ab7ef3ab2289409521bc3c5cc8b9494a4b91b9 SHA512 87afe43e1d095caa4d89b0c992de6ae136895a7b301ddc0606bcb08d56db42d063eaa0fae0aba65d460a0f461a4cbdad678d21df51faaba1f552450e4d23882f WHIRLPOOL 224c2b842ea9395fc894d40fe200e1b38f71541a5cf1fd78d46f6f15c39778cb996788cfef94d275f6437290c88217845c67fdd3c00614e3a070c81d18fa95ea -MISC ChangeLog 800 SHA256 37590ef82839e93fc9ad17e85520fbab48fb21f82be0a06864a142452f40adb5 SHA512 66b0a39f5f13720a3906a070681b466f3e95e4c4ca308928abd318bf682b342643ed4ae437428e7f2637049380b89fcba9e7a3b1a43a3b3c6afd969b9e891a1a WHIRLPOOL 46328c3986a06631f4e7fd36d9b19ce3b4c0d92aa9a4e27fa135b382b2bbb81e8b0a539bd1b2138b292093c5998a17b7fdbd48e6e8d24000796c59bfe96a6a9a +EBUILD cwiid-20110107-r1.ebuild 1662 SHA256 f7fea74196ced9a83499e7c792f24f8fe9b195e03d643a4353c72768b3935fcf SHA512 ac7f8b2413fc55406b1543bf285de2e4959a972a530c537783d459af186c1406892eaef359dbb7473c9e9cbd9a7c8f4c31b63bf89f413685b012af9fc666bed1 WHIRLPOOL cd0dd5a0328d2fd94ebad4b874fa175c0c9d1a1ffa4aa8e93aa886fa9cd9f8f4ce144fa85d5b4ca723903ba5fc260951761cd2e9942a604f49624b20216143d4 +MISC ChangeLog 952 SHA256 ca5c43ab32926ebff7dfe6f36a883f809ad4ef7e5b59d1c35f51b38487d94187 SHA512 46da00b7316b43223f038791d4448d5f4b531444f8cf4c75276561f6617d398b9ed1baaec4718708f569852427b6633541517f62b009d37f37e99c4c53696e17 WHIRLPOOL 9791b6b18a7207da30b4b0ce4e24bd0ca59d6ef6f8c5dea1033c2111dd89678da547e68f44f93b8fec974ca54164b4d76818a41df6e6bcc986b804e5a810bd3f MISC metadata.xml 362 SHA256 fd6c0ce82b520612b5c9d067952103de95a95efa0f30298975bc1ce1deac8eca SHA512 aa23802b84ee4023298505f2bcb2d63704e5dfc188a268ae288f70068210b87826f7cfab47257fabda018dddf1f1063bf2cb3612a32b2df695119eb8d5231241 WHIRLPOOL ace67c0d8850429bbf7e3c74e6803e40e19a816db402f6e334522332c6c82569300aad7dfd5c073f685ab39f9dc28c0638ffa411e7d8e1d520fb5d80a076e323 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.19 (GNU/Linux) + +iQEcBAEBCAAGBQJQKtzmAAoJEFpvPKfnPDWzojAIALJWUIEO3AhxqqaLWQQg8+tX +jG4glNtCrnIthp6Y46mq7+vUPXRUXuG1RrfnetfvSLAhupIOyVaPeme9z05AAnhW +r2b3qb39+egj9KKcycF4JuZSsL5sfOMaDwMkD9xCj04j2zyN7HOYG+GOPpHvDcFE +mfCmHXK0pdCrC8UewJTwmjknwlyhacOvcHdlqqKIDvjWuKllzDbmCqKyk8fZYGZb +uf3+gi1vUkI7qm5MCx0EHID5mlkv3wR+zLNh654cbaquVD6M1M3LzogkE0xFU1k2 +eKZ2RhRZ51lVMatRPD4oFyCxm8cjHIUgNdtuAdAjHWbb00etj81MSRhftU1aW48= +=+4cn +-----END PGP SIGNATURE----- diff --git a/app-misc/cwiid/cwiid-20110107-r1.ebuild b/app-misc/cwiid/cwiid-20110107-r1.ebuild index b63685dd38c4..b049706873c1 100644 --- a/app-misc/cwiid/cwiid-20110107-r1.ebuild +++ b/app-misc/cwiid/cwiid-20110107-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/cwiid/cwiid-20110107-r1.ebuild,v 1.2 2011/03/28 01:04:35 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/cwiid/cwiid-20110107-r1.ebuild,v 1.3 2012/08/14 23:23:45 hasufell Exp $ EAPI="3" @@ -51,6 +51,7 @@ src_prepare() { # Fix broken build system sed -i "s:--disable-ldconfig:--without-ldconfig:g" "${S}"/configure.ac || die sed -i "s:enable_ldconfig:with_ldconfig:g" "${S}"/configure.ac || die + epatch "${FILESDIR}"/${P}-underlinking.patch eautoreconf } src_configure() { diff --git a/app-misc/cwiid/files/cwiid-20110107-underlinking.patch b/app-misc/cwiid/files/cwiid-20110107-underlinking.patch new file mode 100644 index 000000000000..b60f379fc9cc --- /dev/null +++ b/app-misc/cwiid/files/cwiid-20110107-underlinking.patch @@ -0,0 +1,31 @@ +From: Julian Ospald <hasufell@gentoo.org> +Date: Tue Aug 14 23:04:03 UTC 2012 +Subject: build system + +fix build for linkers that don't permit underlinking + +--- configure.ac ++++ configure.ac +@@ -69,6 +69,8 @@ + AC_MSG_ERROR([linux/uinput.h]), + [#include <linux/input.h>]) + ++PKG_CHECK_MODULES([BLUETOOTH], [bluez]) ++ + AC_ISC_POSIX + + AC_ARG_WITH(cwiid-config-dir,AC_HELP_STRING([--with-cwiid-config-dir], +--- wmdemo/Makefile.in ++++ wmdemo/Makefile.in +@@ -6,9 +6,9 @@ + + SOURCES = wmdemo.c + +-CFLAGS += -I@top_builddir@/libcwiid ++CFLAGS += -I@top_builddir@/libcwiid @BLUETOOTH_CFLAGS@ + LDFLAGS += -L@top_builddir@/libcwiid +-LDLIBS += -lcwiid ++LDLIBS += -lcwiid @BLUETOOTH_LIBS@ + INST_DIR = @bindir@ + + include $(COMMON)/include/app.mak |