summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkos Chandras <hwoarang@gentoo.org>2013-04-26 17:54:56 +0000
committerMarkos Chandras <hwoarang@gentoo.org>2013-04-26 17:54:56 +0000
commita7cf53ca98701d5b4e275fd9a372f5ee9980c2c7 (patch)
treef245201ff1e957f4fafaff63cc115c24eda70f1f /media-gfx/mypaint
parentUse AC_CONFIG_HEADERS instead of the obsolete AM_CONFIG_HEADER wrt #467012 by... (diff)
downloadhistorical-a7cf53ca98701d5b4e275fd9a372f5ee9980c2c7.tar.gz
historical-a7cf53ca98701d5b4e275fd9a372f5ee9980c2c7.tar.bz2
historical-a7cf53ca98701d5b4e275fd9a372f5ee9980c2c7.zip
Add patch for new json-c. Bug #467322. Thanks to Helmut Jarausch <jarausch@igpm.rwth-aachen.de>
Package-Manager: portage-2.1.11.62/cvs/Linux x86_64 Manifest-Sign-Key: 0xC2BA7F3C!
Diffstat (limited to 'media-gfx/mypaint')
-rw-r--r--media-gfx/mypaint/ChangeLog7
-rw-r--r--media-gfx/mypaint/Manifest33
-rw-r--r--media-gfx/mypaint/files/mypaint-1.1.0-json-c-0.11.patch15
-rw-r--r--media-gfx/mypaint/mypaint-1.1.0.ebuild6
4 files changed, 43 insertions, 18 deletions
diff --git a/media-gfx/mypaint/ChangeLog b/media-gfx/mypaint/ChangeLog
index a1e1022c1004..033933bf55da 100644
--- a/media-gfx/mypaint/ChangeLog
+++ b/media-gfx/mypaint/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for media-gfx/mypaint
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/mypaint/ChangeLog,v 1.21 2013/01/15 19:59:13 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/mypaint/ChangeLog,v 1.22 2013/04/26 17:54:55 hwoarang Exp $
+
+ 26 Apr 2013; Markos Chandras <hwoarang@gentoo.org>
+ +files/mypaint-1.1.0-json-c-0.11.patch, mypaint-1.1.0.ebuild:
+ Add patch for new json-c. Bug #467322. Thanks to Helmut Jarausch
+ <jarausch@igpm.rwth-aachen.de>
15 Jan 2013; Markos Chandras <hwoarang@gentoo.org> mypaint-1.1.0.ebuild:
Fix SConscript file for proper multilib support
diff --git a/media-gfx/mypaint/Manifest b/media-gfx/mypaint/Manifest
index 910ceb04787f..32ef2fbd9815 100644
--- a/media-gfx/mypaint/Manifest
+++ b/media-gfx/mypaint/Manifest
@@ -4,26 +4,29 @@ Hash: SHA256
AUX mypaint-0.9.0-gentoo.patch 923 SHA256 1854bb028a28ed95b460ccae33a8f25afab2f0670a2adde5e4bdc5d0a49cce7c SHA512 bd4b92a54bc4c2d01490049619e496a6800106b0b11f0cab5aed29b293e6be7eed6b2d6d54ab9de611ce4f16e356af9793616cd1dcea42cf6d37c0dd83f06c68 WHIRLPOOL 3d8c4c970683b21836d33647d7368c2147141c8412536870fd3c02d2218270b7e59a93a7ba3e610d9799917d6878961fab2588f0074976b8bd37509ffae404ad
AUX mypaint-0.9.1-gentoo.patch 923 SHA256 6fb6c5bd1278820c1a648dc406aa6574255060d16fb0656938fe9cc3d803b10c SHA512 feb2dd268d0e7d2929ad0ca65f4c56331cfee802e3969af55adb5098a4db36a1651e765228a09fd1f42732a4d51bf6f106a249af5dadfccfc20c31c0f667cc4b WHIRLPOOL f24bf394bb0614a3c0bc8ee78d5e9574a4f582e7dd87229d8622d4be678a5d6a5d5a0edcc8400acf5e81a04654a97865c51a1667aa95c0f14c179c5f1f6ecef6
AUX mypaint-1.1.0-gentoo.patch 1250 SHA256 60bca9f9f12cd1f256f0cce165d203cd0f67712da7435b481c171d2b1fe17ae6 SHA512 0d8637a212661ae2ad7a610e121b09f6d568192b4ddcb36beea27afcf11bcdf9d2880044c0f93f0f904deb0cd4a052c4a6066d15db5eff600e07bab2f846440f WHIRLPOOL 047a840f04d9cc503d0b189f7bd6289046bb9f03807822f52158aa6b6bb86b1515b0b91ef41dfe8004ce36c97e36967af3018bdf4fe6fdae685a524f5a8c5d18
+AUX mypaint-1.1.0-json-c-0.11.patch 403 SHA256 e3cf5443175d3e8fe2e3e0d687c7d5e644ae7cb70f95d457356f610208c83d49 SHA512 554d0f0cc8c9cb4a48b1f9c57532247461e9705ad819c52f2e264ea238783fe60728af3e51e01667dc0c60883375727624811a48d1603436ad9970282a682605 WHIRLPOOL 05b67cb7c7b2c9dca6443ef5f61609cd0945d10e1bcb937cde9fb8e7b2d662bd32405b352741f3780cf02c117f6efc1a5740eb420a370a9db426447dd4062824
DIST mypaint-1.0.0.tar.bz2 36748957 SHA256 ced440ec0307e29bfe4f612604fe27ec9bfaea3f4f9c8019ffaa50ef12dc7131 SHA512 91434f6d352d4f5dde3d919772a678a17f15a6d2914fb2377b40e4a0fea042e3c96b5618e1864eacdbfa52f449be03062da2ecb8ec08bae168e3a12904047bf2 WHIRLPOOL a4693b6436485126a033dacb014586e85c448863bbb14acb30aff739a96d8d2abdd2c920ad3e9a5be7790d18e13e4a8e15ebcde85fafcaafe9d2a901b53d5f52
DIST mypaint-1.1.0.tar.bz2 37416388 SHA256 780d57e50dd90afd586873bc5120261930ea4c309d4d0958020916932122e838 SHA512 a3eef378ddcaa0a33f9afc49cc587489ecfff6f3e46e2238aab83f89d682f2407e2760e6029eaac3591f0a8955c95280c12839adcb42ec452cefbcdb142ab9b9 WHIRLPOOL bfd7356ad393dd85b91ccc010b5d0be23a6d82a33866edade0ef6eb739a1cbdb6823d7bffbdc943f96cdac9059abb7ac1edacf31d4ac2cd3871444594e23557a
EBUILD mypaint-1.0.0-r1.ebuild 1751 SHA256 fb47ae52970e6efd88bd99e9c1d7d0f2f290a012874840a62df85529647270a5 SHA512 36a3efd6e4eea48cce9b474418134ec844d4854d9cc19798e6284d356b655d01f8eaadbb24296ca9b6b64c6241411ce19d6c00421a820f81103de1eb4a5a477e WHIRLPOOL c22818d99aa54bca811531dd20726aafc597acb4512c742bb0481ba7fca662fa9fe16d725f88ea3ed6c485f9b9a24aa125b7799da1ec1e0515cfe37b59ebc107
-EBUILD mypaint-1.1.0.ebuild 1817 SHA256 e934656f5c0893606ca4f011fc4333d0403198f2205da0128ad24acc8195abb5 SHA512 3e7773510718468ca2e95d40737c88284c5e98dd5da85f01d447414e3715af3d4e140a8fff85fee2e696e95c9838a792e9a585bbe0c7cc991e73c5f652726610 WHIRLPOOL ff7eae600b6aee334d29419522337081ffed1a951eea6dd40bf85e4192a65863dc6d3662e46792b5a3799d06cdc4a3ad31521126ae2cf971cb695ffeb5faf0c8
-MISC ChangeLog 3430 SHA256 a158ee8485f306ae545db10f2dccf6bfe6e54b3bd783918c6b10b6d35f3491d1 SHA512 7d513b166517e394985b6f32824cf118610b8bbb2dd86b4126db6000b21b267518931caf4d6ad106e772bd4ceadb676a4eff276a09dd8e45a14d6426e2b7f6dd WHIRLPOOL 6d5640423eaee2fba86ad9245f9c83ca15a4743d4fef6041b5cc02db8e601e70d5948e857e0c87a5f1108ac29aa747ae953a5f8a19e7fcae68691601b98cc98c
+EBUILD mypaint-1.1.0.ebuild 1912 SHA256 de00678d99ef82a6402936255b1d9eed93107374d71ec5a7f0563604689e2f38 SHA512 a83a4e943b25daee3e727d480e4e241ca8aabe211bb472946ec47a474989373ca72e9297e7bfbac475277fb25ca9defa8f0f1a3f82a9b0b7ffb6102868556c52 WHIRLPOOL e60aa3cfff5a845297a090b4dc000fe8fd1f5dc1e0f1a272c60c80eb34c1628f74e2de0f2ba3bf95d2ae18f2ad9b42c9fa4669f47d4391cc097450ce17116ac2
+MISC ChangeLog 3648 SHA256 5e78d97b10a975beb5bf56e6737efc4a97c27c04e30201f31325355e6c544663 SHA512 375e1ef2ece3adaa3f766f6980a733e4ba300fd53f466dbeafde9bdca99a8111b75831d901510c2f4ed7dae1b2ef09ee699676ae38a623be8b1badd08388ed93 WHIRLPOOL 60484c399001cbd9d1d3b667f7f8d38f40b1ee7535ec202169a17218d31213474ca0372efc7c3ebad716e599215ed98d610de3388ebb741dbe7ac65324e10508
MISC metadata.xml 278 SHA256 07a0afc4dfc12865b213ef6815169e0524357989b213ac40bc9436dea94c3160 SHA512 c47ad7b85f6516eec5bc86f26785d8731544436f25fce07093a7c51de184ddfeca02253022c54fb88c1b75645350d8d23de7fc1d8c62e8050e1288b4d6ebaba6 WHIRLPOOL 5fc748443c6e622808acfb4f906cc41bac88b04718771a678462d1079185b74de2840d3dfe1c0949ad96c5b8d2a278f7587af8b1381cddf72c92b9b3099b40c8
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iQIcBAEBCAAGBQJQ9bUTAAoJEPqDWhW0r/LCe68P/RfZ6za3x6H7go228hqMblKo
-yDTPae4ykxH3UzSGsMVbqBN0z/HTBTsS1xjImbbmwhju/rW81qRyd/ZWaeI++X3/
-uNcDbJgReuEO4QyOZOcS4F4Q6nwkSQF0Z90sHuyH7R0PTnPfZz0N/neqIbZucHuV
-XfE4kg/KpKTtxobgDqkKny1x3SqjkRJPksNIjv/IWhfhPP5DOXJpnnxsbsmDQpVz
-1ApSbTcDb9Eg8o/qKu/6nNUrLCPClvLw4SdclNzl2Ilafio1V0/RYS0CRyxbvFx5
-LD2vGzQ0f1rAZPCii/qiwVRlHDwXk0sMnld0TWpBSkuBQlDmlrgFmcChLlgR3UXG
-cG3qF7WwnmYKJSdhMo4CRulIab0dmYGKyzNLBSOs77y6k66XhcYcqBVIeLMOZEMT
-9HKv91inWpSDyRhIR7wAd9lJumVrkDvmHvVJTHT848Wpvz6PR24tPhEL9CBNFPJ4
-BeI/n1tnmJiUBBXhnI5MD+jCZOXEnMm9TRBsUoZ4gDmzpUkc/5vqiDP+MNkpnbBd
-7Fc1jLCmz4dYIGd/RAQ0DtEWPKkYgcUBlo/+U+9sPu4pNtxTKUDgun0HjXysBOuV
-2iJEDa9bhNG+DQa0QEx9F4f9cnjLheZaOgXv3rN3yS/q6ELnU276IWqHkbW0eIl0
-eqnanS5R+IWJgocFuLCP
-=5F1N
+iQJ8BAEBCABmBQJRer9vXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
+OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88oxoP/Rwb5WEYG1VzvTSrf0fHTINT
+t2GOUU17YM/toD3/Nb0vuUYf0tWKClEn5jWgS9rnErV48jNA9SK0XCN0tAATpm3a
+j6UZ0xHTeAGDB3OZio5g7fAuh8RbYvZM67d6Ag4ZN2ZfXxVy3LI4wM9Qg6ZsYc9N
+7wfvv1+S2jHYcGMjlo20xYPt1rw8ALkAp3yK7phQXFXAyplFAucOQSU/1b3IxInK
+7HKkEuDwjILolczdH6+r22WYkD28bM7d26WJwFsVWYKGdJXCW1FCKm4EjLcMd5rJ
+yF+b7Q8mh2wkxR3pN0NRDPpyZBj8O2TMkC9gxqBcvFg7lusotmbFIlHsZfspD+1F
++kuH8Hn6unZGPlzOna70bOTHk4CAsuk1H23nWw+qHtLQu158CrXhHf3oYor2lH2F
+avncs/z8NQ1Cy8nDFBFz/cIFs2PbrrnDm1TBBKmhmajnRmZx/ydQACkhe7WdKL16
+MFSzRrSFLEm7/dF2OCYp+wax48ZDSF4lpdmJkVEI9VmC5EEQ/tLVDbiX4Jbv8qZL
+FPmBcMnJJ3pTq0GuJPsQJPfqbwu3kTfIsoys4/1i/RQzRXioD+q0EzszbHX2BOp7
+YRhHH2WW4Omhg0UzNvsn5yBEcKZaajfwHeQE0RjdNEIWNEkyuXy7GOypqszmn1xK
+PBqgKN8AvpYh8Byc0H0r
+=fib/
-----END PGP SIGNATURE-----
diff --git a/media-gfx/mypaint/files/mypaint-1.1.0-json-c-0.11.patch b/media-gfx/mypaint/files/mypaint-1.1.0-json-c-0.11.patch
new file mode 100644
index 000000000000..f2aa9b9a0edf
--- /dev/null
+++ b/media-gfx/mypaint/files/mypaint-1.1.0-json-c-0.11.patch
@@ -0,0 +1,15 @@
+https://bugs.gentoo.org/show_bug.cgi?id=467322
+Patch-by: Helmut Jarausch <jarausch@igpm.rwth-aachen.de>
+Fixes pkgconfig name for new json-c (since 0.11)
+
+--- brushlib/SConscript.ORIG 2012-12-31 18:03:38.000000000 +0100
++++ brushlib/SConscript 2013-04-26 11:47:27.008232199 +0200
+@@ -73,7 +73,7 @@
+
+ env.Append(CPPPATH='./')
+
+-pkg_deps = ['json']
++pkg_deps = ['json-c']
+ libs = ['m']
+ linkflags = []
+
diff --git a/media-gfx/mypaint/mypaint-1.1.0.ebuild b/media-gfx/mypaint/mypaint-1.1.0.ebuild
index 534eeade20d0..c1be306b6b90 100644
--- a/media-gfx/mypaint/mypaint-1.1.0.ebuild
+++ b/media-gfx/mypaint/mypaint-1.1.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/mypaint/mypaint-1.1.0.ebuild,v 1.2 2013/01/15 19:59:13 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/mypaint/mypaint-1.1.0.ebuild,v 1.3 2013/04/26 17:54:55 hwoarang Exp $
EAPI=4
@@ -26,7 +26,7 @@ RDEPEND="dev-python/pygtk
dev-python/numpy
>=dev-python/pycairo-1.4
dev-libs/protobuf[python]
- dev-libs/json-c
+ >=dev-libs/json-c-0.11
>=media-libs/lcms-2.0
media-libs/libpng"
DEPEND="${RDEPEND}
@@ -44,6 +44,8 @@ src_prepare() {
SConstruct SConscript || die
# respect CXXFLAGS,CXX,LDFLAGS
epatch "${FILESDIR}"/${PN}-1.1.0-gentoo.patch
+ # pkgconfig patch for json-c-0.11. 467322
+ epatch "${FILESDIR}"/${P}-json-c-0.11.patch
}
src_compile() {