diff options
| author |   Michael Sterrett <mr_bones_@gentoo.org> | 2015-07-26 20:20:53 +0000 |
|---|---|---|
| committer | Michael Sterrett <mr_bones_@gentoo.org> | 2015-07-26 20:20:53 +0000 |
| commit | a0c0acdf37a29e8ae741042dc4d451214e144fd6 (patch) | |
| tree | a0e77e998552c81c5d4c68f1dd44180ace96e23d /app-emulation | |
| parent | warn-error A is set for development versions (tagged with +) upstream, howeve... (diff) | |
| download | historical-a0c0acdf37a29e8ae741042dc4d451214e144fd6.tar.gz historical-a0c0acdf37a29e8ae741042dc4d451214e144fd6.tar.bz2 historical-a0c0acdf37a29e8ae741042dc4d451214e144fd6.zip | |
Add upstream patch to work around compile failure described in bug #540142
Package-Manager: portage-2.2.20/cvs/Linux x86_64
Diffstat (limited to 'app-emulation')
| -rw-r--r-- | app-emulation/vice/ChangeLog | 6 | ||||
| -rw-r--r-- | app-emulation/vice/Manifest | 5 | ||||
| -rw-r--r-- | app-emulation/vice/files/vice-2.4.20-xf86extensions.patch | 15 | ||||
| -rw-r--r-- | app-emulation/vice/vice-2.4.20.ebuild | 5 |
4 files changed, 26 insertions, 5 deletions
diff --git a/app-emulation/vice/ChangeLog b/app-emulation/vice/ChangeLog index e5e50b3cb17a..14f60bafdd5c 100644 --- a/app-emulation/vice/ChangeLog +++ b/app-emulation/vice/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-emulation/vice # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/vice/ChangeLog,v 1.103 2015/07/01 02:44:09 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/vice/ChangeLog,v 1.104 2015/07/26 20:20:47 mr_bones_ Exp $ + + 26 Jul 2015; Michael Sterrett <mr_bones_@gentoo.org> + +files/vice-2.4.20-xf86extensions.patch, vice-2.4.20.ebuild: + Add upstream patch to work around compile failure described in bug #540142 01 Jul 2015; Patrick Lauer <patrick@gentoo.org> metadata.xml: Remove unneeded useflag description from metadata.xml diff --git a/app-emulation/vice/Manifest b/app-emulation/vice/Manifest index f0d6ab74586a..f41d8e16ead5 100644 --- a/app-emulation/vice/Manifest +++ b/app-emulation/vice/Manifest @@ -3,9 +3,10 @@ AUX vice-2.4-autotools.patch 349 SHA256 ea876b67f456e56faea4aeb0e8ade5e5dc730242 AUX vice-2.4-buffer.patch 501 SHA256 4fef89a8724452f39b032db8f26e76102bf21f7a83861474a1b0f3297740d396 SHA512 ab1b2d90953d81061a6032c006121670bef0c880dfee017c00007616254642bb806eda2c89e382f079ee874f78839ec3bdcb14eb15bfb5279cfc45d2a88cfef2 WHIRLPOOL cce26a6c72072f2bccf4ff16d2fa3d8e1f6330acd50f399fc511b9e6982a474e02fdc7df1c2948ee6dff6cfd89b576cdc920364b852a4ecc1bbc561833780ba8 AUX vice-2.4-ffmpeg-1.patch 6037 SHA256 0f3247c009f64e3e911748ce44b86ff6c2e899d8d74d6ff958f2e0c2277233f6 SHA512 7029522b0d6266ca696dfb802da623ac7a7c581978e32639e9139eabeca5d54c043f2510d362d63550987f6e8f43d1afa153d8cb18d82f1eda25e25f57b5713c WHIRLPOOL 9b7495861df422d4965c01bcafee1c51184ccfb144b8d01dbed2ff0fda377f428b38030d59fe88c5a07d11ffb46c18f6a0ecdf3857ce454613e0a3dbe123506d AUX vice-2.4.20-autotools.patch 353 SHA256 5d9232698424a6c98ed27e3206fb46a12093666e42dd6a59b21fd362923e9511 SHA512 10ba3f9f9c0e69f34ea3ab361b198826b7055586e2dade320a60c1a1e429797d2eaf1554b1e9fde63f8ddb23bd4a9b8fb24d3f9692433b6b6d043d09761924d3 WHIRLPOOL cad09cca9eb43298168ff4c8f3c5acd52e56aeee1a3db63f91906c5f4dc440f230d3e2e68c039759fbea0e5d7bb54adec58c2c14fe4be41a75e69c1a0fe35ab6 +AUX vice-2.4.20-xf86extensions.patch 314 SHA256 033ba98a8f2cd274a7ce59b5bb21c33024fb3cc4356c45baa0380fe6bc8d951c SHA512 dfdc0a84b48eed8bb4dd07ffae985c55087c8bb2377577c11db997f2391456a9ea94f88e174a7734610b6273cba9636b21f610c7f041d3a305bf2143e6012590 WHIRLPOOL 2a726ed22e9eb5a9730e5375a45607dc607aff1ee467b1ef880dc9a526a076988eb820b49be9a861221afd72b2e2cfffd6da0f56e6c220cadc26fe1fc05cd488 DIST vice-2.4.20.tar.gz 25156408 SHA256 e5d3d125940f0fafe409aabeec9de4e3ae8d9c19a731aa7ec6a57f6d2b897c5f SHA512 a27b1672ca356d0e8f2890c91e449b78ef76512f6d81bdf25350b90c1f472d57ae6d23646d0176c5544c47d81023aa3deb172e3a02eeb0022ea32a13311b5a76 WHIRLPOOL 5f25bfa72ade54dbe09699b5932df2c37017c3993daba048eb09f723a4351300b6722cf06ceb264202459051780a775f45b787b6ea60db78560d5c65da684541 DIST vice-2.4.tar.gz 13656511 SHA256 ff8b8d5f0f497d1f8e75b95bbc4204993a789284a08a8a59ba727ad81dcace10 SHA512 ad197fc35eb80c9738b7f4f551d350dbb4440c7c8103e5d472b7f7ea5106c1356e9d6e3f481552a028a313129ef233833d3147e03f6f00b9890229d5708e3ebb WHIRLPOOL 80f89f7c144fe1ef2305e109049b49e47dfa4af9b69d0d848bf7b06bd0f2d210669acece363b550abad1c50f53dd45a30397eb1bfacfaa443c9e865c686d0823 -EBUILD vice-2.4.20.ebuild 4219 SHA256 d38dc90aafa5b68b0f6fbb930982737916345d2b41147841cfc3fbfc76952bc0 SHA512 ae0236d279d4b76f39c5c3e3335d1ff02a74b6a85bc727c00dcb42711fffb60ed08edb9e1dcc9e7cd0f9b6a6b3c78d55aef3b087168e1c55571be733467bb8b1 WHIRLPOOL fd1741e07474b96d8240fa38647c2a588fe4692c146720fd4aa368e4c4016f1cdf535a07dd0be414ecbf1e3aea046fdde61d03a6170e6dd4769b192766f4cab8 +EBUILD vice-2.4.20.ebuild 4263 SHA256 51ee625d79afe62e5936023d579ec74165b903ed75aa9cbb5b8efcddb8f70bb5 SHA512 1917d3b32499ede2402308a48c3ed14503044d070beaaaae92f57f1a9e7cde39c168a6508672303a293804060e9b6f7c5824de29dcfd2c4cf03bc75c67c87b21 WHIRLPOOL 34bc598d78213d6e090494b684348eb185b04fe66873184067a98f8a66bb47f19743047c566aa17b401ffd0b6d24d864c33f19c1e6217a3ca415deceb91ead11 EBUILD vice-2.4.ebuild 3034 SHA256 f13eeb0f0e005c01706fabd03d0f7fa87da6fe6d3a4062d9a4df8cd09b89d7df SHA512 bdc3e192548a739636fb45db3fc84b9a94219e21518475fd667ad03cf1a547b51a569bd793b0289278183fbba07e4f7f143d7e343a000ee5733de76aaaa86f02 WHIRLPOOL 2acf927c307445a501ab6364f086d84ff0b1bb0247b586efc7c88b3535ec58f6dde298cc8ef2633327ec03baae41bb2e5cf1db41c49861819828fb1e27a71c6c -MISC ChangeLog 13938 SHA256 a60d72d22fb81065429dfd396e783f17f2fbda50837e0c85e746c699186d11c5 SHA512 b176b394842f13b37299fb30d659aeaa09f9ef300ed42234262783b231b49c26b92b25bdc7839a9967b07067856195f714e05524c2ec093373e54159e31f7eb1 WHIRLPOOL 8b0c9326a8647c753f4b59ed2b8a7447290d024632d0f37423cd26277b78bf9914f23178587f1152ad1add3b91aaa942b21afe7cd12879e602c30702d10ce11e +MISC ChangeLog 14136 SHA256 c54d5e83a4cff6844319dbae3158ef50022f55a9693e2257373bba6b41419974 SHA512 671441c3d99f95380e6bcfd65804a75b8b26eba1430316f96d1b8f66bdc3d5fb71a18b671d538c3a7a4cb48cc62aefd64009f18964ca8fb440108d652ce68fc6 WHIRLPOOL d5d9a9222909585a69dd6688b7fa266ad81da394d522baa7479c246072ccb0ff6ab90907e69049cde941bab9e6534b128fc722331febcc0c542e582b605e9a17 MISC metadata.xml 744 SHA256 f915b91ce18e4df59cb8e8c3f9964c86d50144d0b74f6d63edd51e476ebf5803 SHA512 d611f1b94eb12d5ff22ac6f9205aa3e918c8d9c2af2c11fd2a1f37addb1644eaf4dfaa23a20b48e12ccce24eabdc7fc0b0f34aa0654a9bc1bde43cc614514ffa WHIRLPOOL a22647cf85776df5a0285836487825738927582c52dfcba16e4625e49053ba07ae0701315123b999d201356cc4830d9acd794ae409ff5f86cb363ec5fa627c21 diff --git a/app-emulation/vice/files/vice-2.4.20-xf86extensions.patch b/app-emulation/vice/files/vice-2.4.20-xf86extensions.patch new file mode 100644 index 000000000000..357d68666511 --- /dev/null +++ b/app-emulation/vice/files/vice-2.4.20-xf86extensions.patch @@ -0,0 +1,15 @@ +--- a/trunk/vice/src/arch/unix/x11/gnome/x11ui.c ++++ b/trunk/vice/src/arch/unix/x11/gnome/x11ui.c +@@ -102,9 +102,10 @@ + #include "ui-threads.h" + #endif + +-#ifdef USE_XF86_EXTENSIONS ++#if defined(USE_XF86_EXTENSIONS) || !defined(HAVE_VTE) + #include <gdk/gdkx.h> + #endif ++ + #include "x11ui.h" + + #ifdef DEBUG_X11UI + diff --git a/app-emulation/vice/vice-2.4.20.ebuild b/app-emulation/vice/vice-2.4.20.ebuild index d674195f53cd..f8ef7901d82f 100644 --- a/app-emulation/vice/vice-2.4.20.ebuild +++ b/app-emulation/vice/vice-2.4.20.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/vice/vice-2.4.20.ebuild,v 1.2 2015/06/15 07:38:33 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/vice/vice-2.4.20.ebuild,v 1.3 2015/07/26 20:20:47 mr_bones_ Exp $ EAPI=5 inherit autotools eutils toolchain-funcs flag-o-matic games @@ -87,7 +87,8 @@ DEPEND="${RDEPEND} src_prepare() { epatch \ - "${FILESDIR}"/${P}-autotools.patch + "${FILESDIR}"/${P}-autotools.patch \ + "${FILESDIR}"/${P}-xf86extensions.patch sed -i \ -e 's/building//' \ doc/Makefile.am || die |