Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/x11-libs
diff options
context:
space:
mode:
authorMichael Palimaka <kensington@gentoo.org>2012-12-30 14:05:03 +0000
committerMichael Palimaka <kensington@gentoo.org>2012-12-30 14:05:03 +0000
commit3dc07b7f7319b33a0eddcb306b0451cfb5fb903f (patch)
tree7803a16efbe5f0e6b3b56e0a2065aa9eacefbad7 /x11-libs
parentStable for sparc, wrt bug #437414 (diff)
downloadhistorical-3dc07b7f7319b33a0eddcb306b0451cfb5fb903f.tar.gz
historical-3dc07b7f7319b33a0eddcb306b0451cfb5fb903f.tar.bz2
historical-3dc07b7f7319b33a0eddcb306b0451cfb5fb903f.zip
Add patch to from OpenMamba to fix build on arm, wrt bug #448136.
Package-Manager: portage-2.1.11.38/cvs/Linux x86_64 Manifest-Sign-Key: 0x675D0D2C
Diffstat (limited to 'x11-libs')
-rw-r--r--x11-libs/qtscriptgenerator/ChangeLog7
-rw-r--r--x11-libs/qtscriptgenerator/Manifest25
-rw-r--r--x11-libs/qtscriptgenerator/files/qtscriptgenerator-0.2.0-arm.patch41
-rw-r--r--x11-libs/qtscriptgenerator/qtscriptgenerator-0.2.0.ebuild6
4 files changed, 63 insertions, 16 deletions
diff --git a/x11-libs/qtscriptgenerator/ChangeLog b/x11-libs/qtscriptgenerator/ChangeLog
index 65f62e73fc4c..111ba653e449 100644
--- a/x11-libs/qtscriptgenerator/ChangeLog
+++ b/x11-libs/qtscriptgenerator/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-libs/qtscriptgenerator
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qtscriptgenerator/ChangeLog,v 1.26 2012/06/07 21:24:24 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qtscriptgenerator/ChangeLog,v 1.27 2012/12/30 14:04:37 kensington Exp $
+
+ 30 Dec 2012; Michael Palimaka <kensington@gentoo.org>
+ +files/qtscriptgenerator-0.2.0-arm.patch, qtscriptgenerator-0.2.0.ebuild:
+ Add patch to from OpenMamba to fix build on arm, wrt bug #448136.
07 Jun 2012; Johannes Huber <johu@gentoo.org>
-files/qtscriptgenerator-0.1.0-qt48.patch,
@@ -118,4 +122,3 @@
+metadata.xml, +qtscriptgenerator-0.1.0.ebuild:
Initial import to the tree of qtscriptgenerator from the kde-testing
overlay. Thanks to hwoarang and reavertm for their work on the ebuild.
-
diff --git a/x11-libs/qtscriptgenerator/Manifest b/x11-libs/qtscriptgenerator/Manifest
index 02b1584d9a95..c54458181a0b 100644
--- a/x11-libs/qtscriptgenerator/Manifest
+++ b/x11-libs/qtscriptgenerator/Manifest
@@ -1,18 +1,19 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
-DIST qtscriptgenerator-src-0.2.0.tar.gz 379776 RMD160 01c8ce3b4c8e9ebb3bc3c2d7b319846f34baee04 SHA1 4c1078f26b196156e857c17c9d11a66cfea66f00 SHA256 895feb274470b9272264c7a141e5bd7f90c92e95d37f346f5f95a352541c8e69
-EBUILD qtscriptgenerator-0.2.0.ebuild 1564 RMD160 a432d4e3d74f793e439139ba53168685a561132c SHA1 44dc177d0ab49b9a843e017aa9c8294971826e4f SHA256 ae8a0f487bcadb085581be5f8a35acfecaa026f8f694467567ce88ae0c711d11
-MISC ChangeLog 4396 RMD160 0a44394dca425a6461db6c403ca3214a06baf49d SHA1 897b891e0136042fa378d40883ccdb9357d6418b SHA256 7735c6032fcf3393ef29da97425adcfafbd84505592157222e09fca5af9a8a7d
-MISC metadata.xml 261 RMD160 b1e0e0a7f84104e2ef353bcebb39f1d31c953b9e SHA1 27ca922aab2c4ab2b11eb90f4a33f997762252bf SHA256 6637fda35f6983444e39c10bd3911c9625ba964a168538da06f0b6712d6b841a
+AUX qtscriptgenerator-0.2.0-arm.patch 2601 SHA256 8ca35c7066ef51b9cb3c61bb9da46cb105ba4eec51de635d10e462d193b491f9 SHA512 285ca3c10e452407a40d000f8fd352d38fa7414a5fb9fdefc0af20cc3da541459c33eb1fbd97320846acf1e86163e1e57a1ac4258a326f6fe8ab5f4c29df62b0 WHIRLPOOL 43a8a1648793e5dded0077a14a56beef2110af4fee3744d64e94135b13a5966cb7e126933a76206c992d6e6ec0a7f790bfaeb831e32f54529ce7e2a93244bcbb
+DIST qtscriptgenerator-src-0.2.0.tar.gz 379776 SHA256 895feb274470b9272264c7a141e5bd7f90c92e95d37f346f5f95a352541c8e69 SHA512 54b91562d275b634b50ae8f6ae024cf738605efadeb3085527087ebdc8b6b86559088972ab5dafb7ff1ede6d18dc135f935ac1fb307a17ea1975b4f7629cc0fa WHIRLPOOL 7d52a0f88b89f1a374a175b946ef304752c1ced67fa4123f1dd87da35160221c4495834a4012d05a2f8628344b1a58e39ad46e697a16ca358de07406b9db27ec
+EBUILD qtscriptgenerator-0.2.0.ebuild 1624 SHA256 cf9e030366e8a3f3de75c47763d52d8b3cad17ffd835e990f324dd945c23c2e4 SHA512 21f46d7e9cb7da53ea43aae3ef3738908c647f65c6b9b32978c97dcd857892c4b8a122eb8c5db288c5f97e0cb67d01d9ed1d46b0ba50a94e443f8113b95fc9eb WHIRLPOOL 5cd6cb689d021fc421670adfad5a8fcf606bd1ba554826108dd7e690d8e9e06408101f476b47b9c4e8508d395f8120d7e645f5ae850915e07f7ec347171ea72b
+MISC ChangeLog 4602 SHA256 6ec32a606eafb39c9199da6d856ebdac485cf880d0f6460ad51c3f1a241d6676 SHA512 26e884809b3b7ee9b7020f4d15d6e08f1ef605a196ccd47e2b17329c95deb1c8ef4e1a102854716f8f35df23e5f3fbe07f405bad4308ccabcef2641ce9b4b4ff WHIRLPOOL 38015670d0236cb5b6c4f6e81d8f66c76e0d2a22dfeb66c3a6ef011d2a021aeb80bf3718f8d6ee658a4372abc3b8c7efd71498f2b375241ea0e9f38a1da86e43
+MISC metadata.xml 261 SHA256 6637fda35f6983444e39c10bd3911c9625ba964a168538da06f0b6712d6b841a SHA512 4729002719953f799837680e1efc9fa605eabaed0670a15ae6929ec54cd56b84f924b590545ee4c4ef7e90b7b10a6ab7afc10dc93f5b11551be897c168015229 WHIRLPOOL 8d47af5e371c18dabb837872d849a9992430e57d49b736446bd234883a30efffb4bda133ef0b9a182260364819d02c35ebd0cbb88a8592d77461953c34c99435
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iQEcBAEBCgAGBQJP0RwJAAoJEO+t9ga+3I3a5f4IAKMKgP5vGXa6VvgLRhL4NhcQ
-gH57SiZ6juRPru9BxMpzJhcTgI4028u0myHf+9OzMEY0aBiErK3bW+AC3mPdmE5T
-8SlNZlCPuCQvQ4fq//LQdspPgdPd+TpEzm1S3lycq1Q3YYGrGPl71sj+VNC31PrD
-vjCvXpfMnOtwVZAIhAMWG/uTmZApJY/xhINhkYTlv8oPHUlGUDZA6ISiToHIugNO
-QuEMhazdf6RvJbF/luw10mT6peHEgQsdDu7j8g0lmmxMZyB/i8L0lPh+tL9Ye98s
-PK/jjrhbTN7gQ47Cr+gTUNDOTCy+Jl3IjhILlLnesicqwzb6Y5D3R8tyTI6/Yl8=
-=uWOo
+iQEcBAEBCAAGBQJQ4ElAAAoJEMbwO6tnXQ0sPM0H/3ymjd1Xk2+REsf1vVhZPf5G
+r5uEOWNNarzH5deZI/rG9Zv+gYfH+be50Nrsc+ieCcVnK7Wy1QNl+hAqciEsUHNC
+Xjj44oQYzHVw4iwdoyRw9EkPa6QimWEn+X3ydtXXjX/lLZYiSreXBjl25mvWAHgL
+/d/G9hnuScbtRKdYiPgVjz/XhoDRfLUzDnNA2oJcdgmVY9svgSQGYq3uGsDCwjm1
+U3MgdVLMS7aISgUl3BKnM8Jm7/0nZ+Usv8syyU7Alj8X+YwMLMcEMU2SvHqljuKg
+Sxon6xm7Rz9m7Usv7f+sGYxIEGFlRjLaUwoQxvdaJ3wXQW6mgXO7nuzzzrdj2N0=
+=DUkd
-----END PGP SIGNATURE-----
diff --git a/x11-libs/qtscriptgenerator/files/qtscriptgenerator-0.2.0-arm.patch b/x11-libs/qtscriptgenerator/files/qtscriptgenerator-0.2.0-arm.patch
new file mode 100644
index 000000000000..6305c9ad2a27
--- /dev/null
+++ b/x11-libs/qtscriptgenerator/files/qtscriptgenerator-0.2.0-arm.patch
@@ -0,0 +1,41 @@
+diff -Nru qtscriptgenerator-src-0.2.0.orig/generator/typesystem_core-common.xml qtscriptgenerator-src-0.2.0/generator/typesystem_core-common.xml
+--- qtscriptgenerator-src-0.2.0.orig/generator/typesystem_core-common.xml 2012-01-23 12:30:03.000000000 +0100
++++ qtscriptgenerator-src-0.2.0/generator/typesystem_core-common.xml 2012-03-08 05:36:14.342528441 +0100
+@@ -921,6 +921,7 @@
+ <value-type name="QEasingCurve">
+ <modify-function signature="customType()const" remove="all" />
+ <modify-function signature="setCustomType(double)" remove="all" />
++ <modify-function signature="setCustomType(float)" remove="all" />
+ </value-type>
+
+ <object-type name="QAbstractAnimation" />
+diff -Nru qtscriptgenerator-src-0.2.0.orig/generator/typesystem_core-qtscript.xml qtscriptgenerator-src-0.2.0/generator/typesystem_core-qtscript.xml
+--- qtscriptgenerator-src-0.2.0.orig/generator/typesystem_core-qtscript.xml 2012-01-23 12:30:03.000000000 +0100
++++ qtscriptgenerator-src-0.2.0/generator/typesystem_core-qtscript.xml 2012-03-08 05:41:37.492524499 +0100
+@@ -1447,6 +1447,7 @@
+ <modify-function signature="operator==(const QEasingCurve &amp;)const" remove="all"/>
+ <modify-function signature="operator!=(const QEasingCurve &amp;)const" remove="all"/>
+ <modify-function signature="setCustomType(double)" remove="all"/>
++ <modify-function signature="setCustomType(float)" remove="all"/>
+ <modify-function signature="customType()const" remove="all"/>
+ </value-type>
+
+diff -Nru qtscriptgenerator-src-0.2.0.orig/generator/typesystem_core.xml qtscriptgenerator-src-0.2.0/generator/typesystem_core.xml
+--- qtscriptgenerator-src-0.2.0.orig/generator/typesystem_core.xml 2012-01-23 12:30:03.000000000 +0100
++++ qtscriptgenerator-src-0.2.0/generator/typesystem_core.xml 2012-03-08 05:39:53.932524942 +0100
+@@ -1388,14 +1388,12 @@
+ </value-type>
+
+ <value-type name="QEasingCurve">
+- <modify-function signature="customType()const" remove="all"/>
+- <modify-function signature="setCustomType(double)" remove="all"/>
+-
+ <modify-function signature="QEasingCurve(QEasingCurve)" remove="all"/>
+ <modify-function signature="operator=(QEasingCurve)" remove="all"/>
+ <modify-function signature="operator==(const QEasingCurve &amp;)const" remove="all"/>
+ <modify-function signature="operator!=(const QEasingCurve &amp;)const" remove="all"/>
+ <modify-function signature="setCustomType(double)" remove="all"/>
++ <modify-function signature="setCustomType(float)" remove="all"/>
+ <modify-function signature="customType()const" remove="all"/>
+ </value-type>
+
diff --git a/x11-libs/qtscriptgenerator/qtscriptgenerator-0.2.0.ebuild b/x11-libs/qtscriptgenerator/qtscriptgenerator-0.2.0.ebuild
index 5102199896c7..15dfc8688f45 100644
--- a/x11-libs/qtscriptgenerator/qtscriptgenerator-0.2.0.ebuild
+++ b/x11-libs/qtscriptgenerator/qtscriptgenerator-0.2.0.ebuild
@@ -1,13 +1,13 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qtscriptgenerator/qtscriptgenerator-0.2.0.ebuild,v 1.4 2012/06/07 21:19:18 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qtscriptgenerator/qtscriptgenerator-0.2.0.ebuild,v 1.5 2012/12/30 14:04:37 kensington Exp $
EAPI=4
MY_PN="${PN}-src"
MY_P="${MY_PN}-${PV}"
-inherit multilib qt4-r2
+inherit eutils multilib qt4-r2
DESCRIPTION="Tool for generating Qt bindings for Qt Script"
HOMEPAGE="http://code.google.com/p/qtscriptgenerator/"
@@ -44,6 +44,8 @@ src_prepare() {
sed -i "/typesystem_phonon.xml/d" generator/generator.qrc || die "sed failed"
sed -i "/qtscript_phonon/d" qtbindings/qtbindings.pro || die "sed failed"
+ use arm && epatch "${FILESDIR}"/${P}-arm.patch
+
qt4-r2_src_prepare
}