summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Harder <radhermit@gentoo.org>2012-12-19 03:01:44 +0000
committerTim Harder <radhermit@gentoo.org>2012-12-19 03:01:44 +0000
commit64a1b38ba602acec9b475e77c507cdf430a294af (patch)
treed2dbdfacc4e865978811fb73a3d31150b7adcb8f /media-gfx/inkscape
parentVersion bump with gstreamer-1.0 support. Update license. (diff)
downloadhistorical-64a1b38ba602acec9b475e77c507cdf430a294af.tar.gz
historical-64a1b38ba602acec9b475e77c507cdf430a294af.tar.bz2
historical-64a1b38ba602acec9b475e77c507cdf430a294af.zip
Fix compile issue with older gcc versions (bug #447766).
Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64 Manifest-Sign-Key: 0x4AB3E85B4F064CA3
Diffstat (limited to 'media-gfx/inkscape')
-rw-r--r--media-gfx/inkscape/ChangeLog6
-rw-r--r--media-gfx/inkscape/Manifest19
-rw-r--r--media-gfx/inkscape/files/inkscape-0.48.4-fix-member-decl.patch11
-rw-r--r--media-gfx/inkscape/inkscape-0.48.4.ebuild5
4 files changed, 29 insertions, 12 deletions
diff --git a/media-gfx/inkscape/ChangeLog b/media-gfx/inkscape/ChangeLog
index 3806fa14e2e2..dba8f6e3a136 100644
--- a/media-gfx/inkscape/ChangeLog
+++ b/media-gfx/inkscape/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-gfx/inkscape
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/ChangeLog,v 1.189 2012/12/18 08:20:07 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/ChangeLog,v 1.190 2012/12/19 03:01:40 radhermit Exp $
+
+ 19 Dec 2012; Tim Harder <radhermit@gentoo.org> inkscape-0.48.4.ebuild,
+ +files/inkscape-0.48.4-fix-member-decl.patch:
+ Fix compile issue with older gcc versions (bug #447766).
*inkscape-0.48.4 (18 Dec 2012)
diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index 43bd1a1b04e2..b3e2e9b5b596 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -5,22 +5,23 @@ AUX inkscape-0.48.0-spell.patch 1815 SHA256 697c781a7aa378f0e65160838fd13919f70b
AUX inkscape-0.48.1-libpng15.patch 1616 SHA256 55e113db90267d6789cdb6a54a6c744bd0e9d755b2a7b5835a3713ea04e98c87 SHA512 f783982c8cf2cfc805cb56b6f93e5ecfdce676955f5ddd150f8d9868aa3d7d5ad571dcb1fe12c9c03e35cc05609625ea129894c95b002f0897571016d177c58e WHIRLPOOL d8f3576bb78c9e2491adc0778987f3c72846a3dc1b561c9d4550ef85aca6c8d5fff5a24a8b1854a302891339aecee4aefd4d80121c0db23cb85e2f29a6a10e1c
AUX inkscape-0.48.2-libwpg.patch 1006 SHA256 12cea23c64ef880bbd02e67002ca05c33475701e489d9d0ba3e057b6c2c71c9d SHA512 268df3061749cd5940612b098565d8005de55a1ab7ef9d0f6a51ff93c0535afdcc4943231e019137282ccce0a8cacf0e0176f55926d792590cd22f37bf648c19 WHIRLPOOL a25e107731eab0f7fc5b3652387f090b78f6838f118f6807ad369b599091781f8d0258b8f9a5aa219dd5c57da7cb5661fe482a650d06683b1ab2d9850f067a92
AUX inkscape-0.48.3.1-desktop.patch 508 SHA256 4d15c12545613e1d63c976d21b5ae86f7808bf34b627cf3e64e92283b96f2ea7 SHA512 ce1ca356dc4f81ad2c5367cc02dab80140c47a9b9964ad82f30d99af64ff36b21da8c62d09269c27e90cd2ebeefa9179298b60e67ec8cd1b1c7eeea38364a891 WHIRLPOOL 70baa134cd8f26982a2dd0f459f13ee893f0fc5ee7af0c1109a316eb1f1656002230da52e257e87d0458d9c767f815b809a3a0e5b65dc5a2e7a7f759e117b93a
+AUX inkscape-0.48.4-fix-member-decl.patch 336 SHA256 f80b2a534f0455e2b90c35f369c09c8f8d5cca21f3908e27bdf9fcb0bc4098d4 SHA512 7286c58a666396ae6c9f5664493c512985429872f3da82ea6ae6af33b97dae60e01cd8cc6d23c2ae2fcfc716b287c06cdf634c8740f4f4e6773b3f44785f88d7 WHIRLPOOL 317e8f22c21266f67c9cd56f3755edb66797f1bbf1d48e9282a774ee9294df71872a87ea76e578505d6d932c8c210ddce66ac04cfc897128c16afb40f8bd34a9
AUX inkscape-0.48.4-python2.patch 439 SHA256 28fdc6e28f6c7bf0dab4144c4ac2ddbf5c038494906361a4656a2ad76de45f81 SHA512 065444bec9d9511a5eec34e3646bc34dd05f1d64eb4405fc28c47e9d7dc1b702d706b2b8a05593445756d3288c712692d2256fdd46e2b8f0e091253a266d8171 WHIRLPOOL 0f4f2a0c7b961928f8e55e991ef0a08d0f4fcb871ce7df31a5840f9c24d886ceff3e1c2951a186090eacb53e604a757aec9ae2a329b7e76c825475b0aaf09be1
DIST inkscape-0.48.3.1-poppler-0.20.patch.bz2 3831 SHA256 c48c8ac90c4d5759bc96facb584db50ad7e32a29398553bf8465f1c5c81548ef SHA512 6f64eea80f19734824de4565698da53d9b033cadef6de0913c88ede5c50a34feb5f500a6c3fe3312f6c8bbaf3a7b6d54680ea0386349076c162c0ecc7b8547d9 WHIRLPOOL dabe6c089491250b3555214beb3e2f45e42bc1a915e7ea8cd89f1e34d2d622c940918808f8a8eb963013769fa218acb3bea1bbf28ce6b5f867b84ab815809aa7
DIST inkscape-0.48.3.1.tar.bz2 19688778 SHA256 073bf585b6a708747485f2de1f5a1b77c3f45a79e6ee128bf946bae99476db88 SHA512 8b1d75daf2ea6f84d70117381b9e1674a70de5783e08f4095f0ca6f81726096951459cfbde43be3e578fbc3a0b1a02f205de8570e70e167a795296a3eca5c8c3 WHIRLPOOL 427b57006df728bba05c0e79b2c7aa6f81f63ed3475393f1bae1356e6b0af07d1bc0aaee73111902d82d28ccd1c9ce4db51ce10333e03221e60d786007738b4f
DIST inkscape-0.48.4.tar.bz2 19712522 SHA256 8741ad8cbb5aa5cee4f234ebc45479cff2479b16d903870693174bdede8a519d SHA512 55954925e74e2c222e7ddb86bf75e9ad17c854d991258fd3a1bf1b2aafe7014418138246a51f9ab9c4444795b03419781517910debd3448ae461f1dd1b5848be WHIRLPOOL 927dafd74c81c41ff794b22ed80fb6b6e8fcb60fc5f5b6d21ce222812cf6e34bcea9d415ee1f663d2685f64c1f89c4f62d8475da143d2763c53406d7b50f4053
EBUILD inkscape-0.48.3.1.ebuild 2569 SHA256 d549398a8c5a9842a2e021660617d3b33f8594b2a437b8e3d376535707b25aff SHA512 5ef5f829021f3b33b7e03c5d6e337742e8a7dc36aae34d37687a9c0f25e066b60518db09d9c0be43b3618f95ccb6bb8bf33f609a162063a5d04dd2f7402b8ed7 WHIRLPOOL 74c4723ae6a7fc950628e9ad46f3bc0fb80e2843be4e4ded1a1a11f172c3b44d2cd8a102a407adc4ab867f304f01193375e4a3544ecf865afdcf915b909657f4
-EBUILD inkscape-0.48.4.ebuild 2537 SHA256 3c9e7d6bb1465ca2ca05b4e2a42527317d54cddcac4a7913f534cc746846d0fe SHA512 bd3ff4eda15e59cfa596d2d8dbc51359fd69fc624d73f04b1ae0d2e2788715dab4e2ec5540c846c1025d72a60787ec88a263b05e2eb5bf58dd97133f688fc093 WHIRLPOOL 8d8103bad0a7e08bc5d50ecf34c72945bf9b7348a988affaecc510c14cbff5d64c52fd83b0e2a6060370b3bd849246882ad678958d7f0befb0149c2bd8b89b20
-MISC ChangeLog 26803 SHA256 23aee771cd7ab51ab13fa9cde11b993a3479685f7e7e68d7701950d0a7f15365 SHA512 edff80e63560499f85f81d843ae7f1f23ad976ae3bce4fb8d53fb4fda9daff8f81c9975c12063d3febdc7f3c311a41f1b22f31e7a7cbd689679863d4fea278f4 WHIRLPOOL 4688e834477046c85d1139442f059df3b9ea43c38172bb3ba86b92a4b63af1cb7dc7e0497f49063ce01158e131fbe6975d126c67f1cf00f169ee15f64e2ae9a0
+EBUILD inkscape-0.48.4.ebuild 2590 SHA256 4b1a34832dd0cbaf1a173df53033bcc2a76d9f1223038a039232a8454c2114e4 SHA512 d3639922edfab17de5199a59e108c8aaad300aed9e687147e0c0401814a5615249a488e0ca56894ad4dca7d8c8cc9a025936d45d6d3062b7707185531692b87f WHIRLPOOL c59a4999e1a4a42943eff29535daae0f4b8b504aad685df0ffe0b956967a2b7fed29343b33e66a4e0be2125b7f0e7596429d0e13d26d572a9b58a0b25d0956b5
+MISC ChangeLog 26984 SHA256 842f0ccd2e487308ec847dfb1221c9d4b496be596114a49d1b064224922822cb SHA512 cb85dd0c456aa7f68511d51cba30062dad68f7ab778ce442c86d50f9978d9fbc65a1dda3e707156a1e89c676c1900cad68b0489c325f2c4bdd5aebda3e768f7f WHIRLPOOL 6091506da925f68568670573954a798506df30c159e920330d85c71f4d8bf0f74be39cf25a248d60b58f356e9048ca76e3b34820788a8318857698e4486e9aac
MISC metadata.xml 354 SHA256 705fec37c8550d17c1ef9260c24a45843351908700c9fe3eb1d652e4a601e007 SHA512 e8798a3aa2a76aed27f2b7124792d7b4972300146b7cfec3e8e86c42196e8746f63a45a64c12161d1c2b2f4bd211d43eedbb29738277cd319d899dd156089bd3 WHIRLPOOL c1d998bc9e5fdadaaf70bd0f8cf2e7b41a0495f73a1d6ff0c55d1c006b11d263a2fa1c405cf5eacd0a490e6300578a126303ce47dcbc844a362b7e07ee506608
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iQEcBAEBCAAGBQJQ0Cc8AAoJEEqz6FtPBkyjEZwH/0DB25Qt7pJzrKEHeS/EeyRw
-kJZhK9WHtGxMby8upRw63aMLrK0vXYnxIRPwwinivloqJ//wwCRqj26bJ+8yNRH0
-eBP6y6KcZKkSFRAmKukVnzG9gsUWPuR9qfB/VItaH+HIqQsK8fbr7+EsCKjtuF+6
-DY7Je+isaPnt9VkKkgiUoddgGqtXX24zIcHoAyWa8A0FDzak034VrGtPwgOiEeps
-cypS4JtKZFoOtN7U9XfhmVUmLVZ/AfcKObCyuAd0s/wGpHM9FLI38R2PL3H5lvY2
-h6qE72TphLJMtOwFFFaN5W9EiESZzRzbL3EJKdADhjjdqr/47Z1BOnG8Xr1F7e0=
-=+Pdv
+iQEcBAEBCAAGBQJQ0S4YAAoJEEqz6FtPBkyjzF4IAKPl0NjVCb8RwUouYrFzRAYz
+xYm4pDDVVBQQmMFRKiBigSd1bRLzlJLWJm1jGSkDM2uzHsvOHoak5hA9hVbY/qSX
+Nwc9+zRHTMCHf5qkLl2HbXKXm+ul+JgRjMILBddPUkrA/VlVfpLv15YQZc5GZcLQ
+0lpPwvRKaumNS48qFQWJNhl6eOSbkjwebcri6pmLmYuQmmsCQ7W/IgyRevKW+Fo0
+DRA93hQe3HZrIfov0T/KeXF3WIVob3wz6Ym3+fNR2fKfM1keORbYY4FbZORGQPWu
+9zz6glGHGJZZIunvbPiSD1uRfT7nT+gEgxFwDLZ7eXjAW5AyJdN/fiapAFjEEss=
+=zpYX
-----END PGP SIGNATURE-----
diff --git a/media-gfx/inkscape/files/inkscape-0.48.4-fix-member-decl.patch b/media-gfx/inkscape/files/inkscape-0.48.4-fix-member-decl.patch
new file mode 100644
index 000000000000..993dfdaf9193
--- /dev/null
+++ b/media-gfx/inkscape/files/inkscape-0.48.4-fix-member-decl.patch
@@ -0,0 +1,11 @@
+--- inkscape-0.48.4/src/widgets/desktop-widget.h
++++ inkscape-0.48.4/src/widgets/desktop-widget.h
+@@ -239,7 +239,7 @@
+ private:
+ GtkWidget *tool_toolbox;
+ GtkWidget *aux_toolbox;
+- GtkWidget *commands_toolbox,;
++ GtkWidget *commands_toolbox;
+ GtkWidget *snap_toolbox;
+
+ static void init(SPDesktopWidget *widget);
diff --git a/media-gfx/inkscape/inkscape-0.48.4.ebuild b/media-gfx/inkscape/inkscape-0.48.4.ebuild
index 546b3febfdbe..b639d383f2e7 100644
--- a/media-gfx/inkscape/inkscape-0.48.4.ebuild
+++ b/media-gfx/inkscape/inkscape-0.48.4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/inkscape-0.48.4.ebuild,v 1.1 2012/12/18 08:20:07 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/inkscape-0.48.4.ebuild,v 1.2 2012/12/19 03:01:40 radhermit Exp $
EAPI=5
@@ -78,7 +78,8 @@ src_prepare() {
epatch "${FILESDIR}"/${PN}-0.48.0-spell.patch \
"${FILESDIR}"/${PN}-0.48.2-libwpg.patch \
"${FILESDIR}"/${PN}-0.48.3.1-desktop.patch \
- "${FILESDIR}"/${P}-python2.patch
+ "${FILESDIR}"/${P}-python2.patch \
+ "${FILESDIR}"/${PN}-0.48.4-fix-member-decl.patch
eautoreconf