diff options
author | Johannes Huber <johu@gentoo.org> | 2015-07-27 22:10:07 +0000 |
---|---|---|
committer | Johannes Huber <johu@gentoo.org> | 2015-07-27 22:10:07 +0000 |
commit | 7f941668869dcce6dfbc84a9887c591453e6a0b9 (patch) | |
tree | ec2c6506347fab1a7b207befe3c0a6fe0e886d8e /media-sound | |
parent | Version bump (diff) | |
download | historical-7f941668869dcce6dfbc84a9887c591453e6a0b9.tar.gz historical-7f941668869dcce6dfbc84a9887c591453e6a0b9.tar.bz2 historical-7f941668869dcce6dfbc84a9887c591453e6a0b9.zip |
Add upstream patch to fix build with Qt 5.5.
Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xFDF4F788
Diffstat (limited to 'media-sound')
-rw-r--r-- | media-sound/tomahawk/ChangeLog | 6 | ||||
-rw-r--r-- | media-sound/tomahawk/Manifest | 35 | ||||
-rw-r--r-- | media-sound/tomahawk/files/tomahawk-0.8.4-qt55.patch | 34 | ||||
-rw-r--r-- | media-sound/tomahawk/tomahawk-0.8.4-r1.ebuild | 4 |
4 files changed, 61 insertions, 18 deletions
diff --git a/media-sound/tomahawk/ChangeLog b/media-sound/tomahawk/ChangeLog index c289ebb5346e..b750a1116512 100644 --- a/media-sound/tomahawk/ChangeLog +++ b/media-sound/tomahawk/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-sound/tomahawk # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/tomahawk/ChangeLog,v 1.49 2015/06/19 12:27:23 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/tomahawk/ChangeLog,v 1.50 2015/07/27 22:10:00 johu Exp $ + + 27 Jul 2015; Johannes Huber <johu@gentoo.org> + +files/tomahawk-0.8.4-qt55.patch, tomahawk-0.8.4-r1.ebuild: + Add upstream patch to fix build with Qt 5.5. 19 Jun 2015; Johannes Huber <johu@gentoo.org> tomahawk-0.8.4-r1.ebuild, tomahawk-9999.ebuild: diff --git a/media-sound/tomahawk/Manifest b/media-sound/tomahawk/Manifest index 4983b7939575..395dd0a11843 100644 --- a/media-sound/tomahawk/Manifest +++ b/media-sound/tomahawk/Manifest @@ -1,25 +1,28 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 +AUX tomahawk-0.8.4-qt55.patch 1034 SHA256 f131309b8758ae05b5b34aceaad79e1fd7d60056677cd017d425b41db61e07f7 SHA512 cb6a963b55972cceb37398dd752320ba1254add7be4fc6282b879d3415e9cda3ae2a6fbb20860e3cb1cdf4921f9c0305324bf7f093d1c6f192af549b305e7035 WHIRLPOOL 8fc30ef98cbfb2d9f79d4b18d3477e754419974c66408aded75b808578dadd8bc6da84b390593e4772961e1782a60ceb8ba6ecdb70566a112e90ca20bda5775f DIST tomahawk-0.8.4.tar.bz2 8611412 SHA256 0fb04bc6b7009e17186b3d384057939727c6f289d22f7f9a5ed2c9c9cd800449 SHA512 5b312f593eac39d06de05e24d4ce429122d0777a9d52d6db8c65309ac283d7ae560c2fc189b186f0f8b1a7bbe1135ed0d59e1d850de6a93655e53efe4f5317c7 WHIRLPOOL 3577f47f13b191f0bea42d7c30c00ad8e6346afc7527eb5f5ecb81185183a8e99dcc0559414afbba485db5d80d2e5f9830fe341d4563d3d7427a98f54382e013 -EBUILD tomahawk-0.8.4-r1.ebuild 2196 SHA256 8c4cc872b4448d5d46ef6b4698f312154f404e3d013a1ddd7ce38046dc1df383 SHA512 e7e24277bc0f7693389182e17aa89b3fc7c4f98ffc07b8388b3fdfacadc2ae8d5a8aa366ccc331dab5a5fb254c7c195a343fa208672380f02ac8378a3756bf58 WHIRLPOOL 6c21e9dd46fbc8a03870dac013baeb356693eb9439ee045307a2b919f72101c0661984b9e2e0b2834ca33bb4e3b238129aaa90ffbfe4f8f71ae72942bd1457ad +EBUILD tomahawk-0.8.4-r1.ebuild 2239 SHA256 3ea0259f2ae66667b02865546ce7366763b48d195eba62187f533cfd826babb5 SHA512 2d2bda9346fcf26911667acff548701c9e54a6814897950d0cbc314e3504f9b4bb0556acf1a68e237d15bc2d280d6c13eaff92c56c73154d06e4996c030e857c WHIRLPOOL 71ef746ba4e39f42e6bdda939974c2e6b38ded2ad4ba9ed83e191a5d85e4bc2254fddaa3f2871e9731991fe37d0df5cd062a29ec4ced90438986ea88b2232e84 EBUILD tomahawk-9999.ebuild 2187 SHA256 63bfa5844c28b5c8175276a9262b38060ed76b49dceffeda0bd236f549c6cdb4 SHA512 1d6a57b8aa8facccfa6b1eed0178739e188e58fc5511d1914bf611680609badb40484b07877baac607c004c7945b228439459ffcf65f0093c1cc2a6162f259ea WHIRLPOOL b8c59e9567597bc75850fde818f8f8d64e2782cb164f8ea693e613b402a3048017100e94334b914cc747b1ef87b9fd77d43b6e1985268c909325f3657d06e9ce -MISC ChangeLog 8012 SHA256 5c33e72ac2297da74f26872e702212135b363664eaf9a176715f37f8006f8f12 SHA512 3cf299372549ea7fa4ee47ed779b2fbd6bb024be488cb8cdfcfb34e26ce92c23a813a995fbbe6dd7c851f4c13fbdba463e29cf67532e2942360621275e8ffe20 WHIRLPOOL ec1ee6d4159d36e0056e5396dd8ec5010b282e31e8b7c3da31bf1d1a73633addea2ced81fec030dd6ed8ec1c8f322b904525c0d7058cbef044426757c9925c57 +MISC ChangeLog 8170 SHA256 ef08376b3756e02356dc68f0ce72af660ae34fa6d6f6479f9bab8497977453e4 SHA512 0d1fb474d3cd11fee9895cb873f8f1bbcb3eee72fe483945bd2ea43c6c2afaa3d2f57eb5859ca21d6e9a7c55852605354971495c8c6ac2a962e2b98dce4990a7 WHIRLPOOL ff68893537e3dc3a83a8fbf8d0477cb710fc086b2f23bf5ef566ed6fb05398c3e2975be947ae14ea0203eeee6d9b14869aee3dcd421d5cac512da66b3e7814ba MISC metadata.xml 449 SHA256 49d0ed467fa509bfdabea945cda8147db6980b565d5cf57ef0f7122d918973f6 SHA512 618943cbf72f232ab56ab529e08e9fb1f600b9c7885dc1a3d7e84f0bbf19bfd13befc253bbfc5b6f22863e9d890040f749fcbf50fe7c3c10825464f30f654343 WHIRLPOOL d13c16baef4735c911d00c682bea15832f0f0dc75b45e151171f498db29820ad8a8ffcc5d98fedafdc66857f681cd3f1455dfa71b71065d82a25bb56f8c5e7a1 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2 +Version: GnuPG v2.1 -iQIcBAEBCAAGBQJVhArUAAoJEGVpnaTzz9K9mzAQAIvXAtl8RNvmYaWLnK4K/OwV -W4VzAk/gm36/3x7GJSgADgcgYR1ikfWYwxF+8LTOOa7tH0IDAcv/qaHZK5/raSR0 -+Na4dEEubIfgWFqZq7H89upk4L11sCLNST80dKrWyNRFnv7tly41hPOKESWHXw0E -uvhWRehzjAIBR3nh3NlteDE1fk5Ioki9w42IDGRAdlfgAJI1ig9ihsk6hCnZoEpf -hdIrP6Lm6nk2ODMsAenkewt3994aiBvQX0GHfAt3K2Navf+YvbMy50x6lDK+z8m9 -cFbmuiOyud7LJ9WdQt4ew6R/N0jgHikMjzT9nNJf4LtPet24vAgktV83Znr/GDxa -A/+xkmWd2N0HfM9lUzJWPB+cv7dLVggtczRT3hbnVtYeq5tM0jXs1pqtLLIYXsMs -WEm/1IhBVFxsCcqnVNiQSEREDqT5OzxbX/CaHW4ijdGI6arMMkxpheX0bInBe/El -dWf0vjSoOLKGHMWEdrYdd64B0eVnBrPpo+XkkdNCdSAUQJh97k0J8vf0Dcdfhcky -PgksfeXU8cY8muYGQscpAPRnIHoQr7/VfwCeRA8H6JX+1pk/p6LS7vZG+2tXBTCp -24QruzkWEer5oCx5/GdHDVHzTdfy87E+Hj28b9MOuBFO1YHG2G66tsAdaR34PfeR -EpN6TyHMl++cvKatdAs3 -=wLSX +iQJ8BAEBCABmBQJVtqytXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0N0Y0MTczMjZGRTRGODM5M0MzOTU4RDAy +OTU0NDVDRUY5MDcyRDJGAAoJEClURc75By0v+dYP/3BQXgKyxF/HeZzeC9bba391 +Sr27JrOCVJNQFE5B84X5sdezj00CVw/RFhvo97RyXoWssLMFC3EABpM+doSl4Rqp +YYr2glEK5TvUsoTvI2QHh8aVSPMbyIfJCHUcp1xzHYq9u7yeFbEsObOoZTEEf3Gz +13rxnMK5RihS1wE8hj9kzvQX6owjm+vTNbkHKoLoFgxE9XOMUsp3kFixrCP8oXpd +W3sfvhKmVbht2sieQFTv8NzE0T8TVE1Rzom9bo7L49AHABWv1EgPd2ewtk3RQrvs +ruxt6DyAkUoHUJRg4Z+4sQzYaMQE8VseopUU5U0//AD5YkS6ptBbOLNf1f0/S50C +gA06aRCzUKi8OaRKf9VOc5xa0k8xBsQ0/vOhI5bmTZc2gQ+8+/NT/RFN8BpHp6No +Q4b9kz2VIJugc6ulHiC7ba5u6SFZClo7ZTg+ByGR70+obluWJoYv0Rvrgd0ED9BI +7LxOKfat+qphrDYD1TKAhufYYrGw5Uv7tu2c+jIrXTotzAc+nJg+xixjHTMdE2on +zWQao/SC+FAwDPH2LUEomf0idAyvYug7TUR4fAOczxuozkwRHkfd38uDG5PyerSR +ZSJ951SrN9E8uArYKzWteYlt1rIeVvGAStDazccf9OJJiudfgVB0tZdE/Ii8mDl1 +vxSt0gZco6ulTdLdKF0o +=nce3 -----END PGP SIGNATURE----- diff --git a/media-sound/tomahawk/files/tomahawk-0.8.4-qt55.patch b/media-sound/tomahawk/files/tomahawk-0.8.4-qt55.patch new file mode 100644 index 000000000000..10b71c07c518 --- /dev/null +++ b/media-sound/tomahawk/files/tomahawk-0.8.4-qt55.patch @@ -0,0 +1,34 @@ +From 50e77ce0db45e9c876eba3d8cc6491f62a5de882 Mon Sep 17 00:00:00 2001 +From: Takahiro Hashimoto <kenya888@gmail.com> +Date: Mon, 22 Jun 2015 14:33:23 +0900 +Subject: [PATCH] fix compilation error with Qt 5.5 + +--- + src/libtomahawk/network/acl/AclRegistry.cpp | 1 + + src/libtomahawk/utils/TomahawkCache.h | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/src/libtomahawk/network/acl/AclRegistry.cpp b/src/libtomahawk/network/acl/AclRegistry.cpp +index b177d19..3bc5056 100644 +--- a/src/libtomahawk/network/acl/AclRegistry.cpp ++++ b/src/libtomahawk/network/acl/AclRegistry.cpp +@@ -21,6 +21,7 @@ + + #include <QThread> + #include <QVariant> ++#include <QDataStream> + + #include "utils/Logger.h" + +diff --git a/src/libtomahawk/utils/TomahawkCache.h b/src/libtomahawk/utils/TomahawkCache.h +index b7c3245..6a4aadd 100644 +--- a/src/libtomahawk/utils/TomahawkCache.h ++++ b/src/libtomahawk/utils/TomahawkCache.h +@@ -27,6 +27,7 @@ + #include <QObject> + #include <QTimer> + #include <QDir> ++#include <QDataStream> + + namespace TomahawkUtils + { diff --git a/media-sound/tomahawk/tomahawk-0.8.4-r1.ebuild b/media-sound/tomahawk/tomahawk-0.8.4-r1.ebuild index 5e810c64f7b4..e9ec656744cd 100644 --- a/media-sound/tomahawk/tomahawk-0.8.4-r1.ebuild +++ b/media-sound/tomahawk/tomahawk-0.8.4-r1.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/media-sound/tomahawk/tomahawk-0.8.4-r1.ebuild,v 1.2 2015/06/19 12:27:23 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/tomahawk/tomahawk-0.8.4-r1.ebuild,v 1.3 2015/07/27 22:10:00 johu Exp $ EAPI=5 @@ -74,6 +74,8 @@ RDEPEND="${DEPEND} DOCS=( AUTHORS ChangeLog README.md ) +PATCHES=( "${FILESDIR}/${P}-qt55.patch" ) + src_configure() { local mycmakeargs=( -DWITH_CRASHREPORTER=OFF |