summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Hill <rhill@gentoo.org>2013-03-03 07:37:08 +0000
committerRyan Hill <rhill@gentoo.org>2013-03-03 07:37:08 +0000
commit432f34a75f1b8d9a8d1cd0cb842caead7d9f8b57 (patch)
treea77e9603d5e15fbc3b275ba5a3a16d07453d5bcd /sci-electronics/plcedit
parentUpdate wine to autotools-multilib.eclass (diff)
downloadhistorical-432f34a75f1b8d9a8d1cd0cb842caead7d9f8b57.tar.gz
historical-432f34a75f1b8d9a8d1cd0cb842caead7d9f8b57.tar.bz2
historical-432f34a75f1b8d9a8d1cd0cb842caead7d9f8b57.zip
Fix build with GCC 4.7 (bug #450856).
Package-Manager: portage-2.2.0_alpha164/cvs/Linux x86_64 Manifest-Sign-Key: 0x957A8463
Diffstat (limited to 'sci-electronics/plcedit')
-rw-r--r--sci-electronics/plcedit/ChangeLog6
-rw-r--r--sci-electronics/plcedit/Manifest29
-rw-r--r--sci-electronics/plcedit/files/plcedit-2.2.1-gcc47.patch15
-rw-r--r--sci-electronics/plcedit/plcedit-2.2.1.ebuild4
4 files changed, 34 insertions, 20 deletions
diff --git a/sci-electronics/plcedit/ChangeLog b/sci-electronics/plcedit/ChangeLog
index 707e3d48579e..cefcafd812f0 100644
--- a/sci-electronics/plcedit/ChangeLog
+++ b/sci-electronics/plcedit/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sci-electronics/plcedit
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/plcedit/ChangeLog,v 1.17 2013/03/02 23:19:49 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/plcedit/ChangeLog,v 1.18 2013/03/03 07:37:07 dirtyepic Exp $
+
+ 03 Mar 2013; Ryan Hill <dirtyepic@gentoo.org> plcedit-2.2.1.ebuild,
+ +files/plcedit-2.2.1-gcc47.patch:
+ Fix build with GCC 4.7 (bug #450856).
02 Mar 2013; Markos Chandras <hwoarang@gentoo.org> plcedit-2.2.1.ebuild:
Move Qt dependencies to the new category
diff --git a/sci-electronics/plcedit/Manifest b/sci-electronics/plcedit/Manifest
index 3466327b34c0..9eada1218c66 100644
--- a/sci-electronics/plcedit/Manifest
+++ b/sci-electronics/plcedit/Manifest
@@ -1,26 +1,19 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
-DIST plcedit-2.2.1.tar.gz 2855243 SHA256 c38be06f538d253052418308ae739e3230a3fb96c57126a1d52b0ea80dbaddfa
-EBUILD plcedit-2.2.1.ebuild 1180 SHA256 4c99b1e7a2120cd87448083ed41a3fc8137f17966a58e1e4a6e627c6b31cb262 SHA512 2b7b3ae15f5ab77aad25d4d5ea3fe431bc8f29ed73d82b89e401c72a64ff19a0254084eea3f6a2c4b8923eca60f03d651298b2869340e2ef7acebbc9531a0443 WHIRLPOOL 1506586734af68a5f5ace0490980dfa8f581d4c3017fb599a38ebcd538d992d29d40aff00095cebb813ac9c76ac23ee2ec1b9c90f6c5374b77220c280b24f5f4
-MISC ChangeLog 2227 SHA256 4a45a16e1d2fe5ca940de933ca710c3cbc3713d7b85f98bd45a41565183fd01b SHA512 6969e026b69c60d6b30cd3bd0d2d9a963c5c296030809f4bffffe41a9c4754d214ba56e2df2cd1121995c9dc517505b8f9d1c699deff3a1e7fa00e66b3280e62 WHIRLPOOL 4d23e0f257f14497479c08135e5098df32d2dab3a88195ef4e8384fbb755ef0d6be740aebf7b1251d39f7c0a3a59ea6cfe8f4b8ed16ceafd9df1474fb512cb6e
+AUX plcedit-2.2.1-gcc47.patch 365 SHA256 58646686b96245504fa71d50cf40c2aac7b8a501812d5e06b23dfde1a04cb496 SHA512 90bbd362e59251bf6fba6052ac0ee7948fb0483af774d94ccab0303782022a6cba98bda89bb1392099e2e1e35cac472257ba9b4535d7ef362aee7e9da82411e7 WHIRLPOOL a367dd07c16915cd13495ee0023a7207b21b94cfbce3259dadfb5c9f54f5fb81af493a346ed077eab0f0855dfd4e4f0499728a26394583d64f8f104ddde76f5c
+DIST plcedit-2.2.1.tar.gz 2855243 SHA256 c38be06f538d253052418308ae739e3230a3fb96c57126a1d52b0ea80dbaddfa SHA512 dee6dedd6b7fcd979311fa25e694b53eb9588bf713b9638a3e1355a155c467974c5cc41c4375d4f9f104e9c850024ba51a643011a107e21abbfbfc38c2dae7c2 WHIRLPOOL b6f2ec9e78754067ef1e8b7336f65d1617224b822b4f3cafad4d23e2504233bc68de4fa5d30413577e5a848a519ddf1746d5512757481c4f7383c8296d439e94
+EBUILD plcedit-2.2.1.ebuild 1221 SHA256 936358fd5fe03a67031cadf7ffa20324323a4e43cec32a98d1380448311c022b SHA512 3cf1c742926c11fcc6f32a8d2c39bfcbfaa25fe0479e4a9a16dc98d46178182368e3211f94382d470927e2ff5509c30bd58c16c397201302a20c173abb63545f WHIRLPOOL 688848aa31d49827f008f38b7739b2b0335fdc7bca8877cf8beeb8f9dc2afc28f9ee97d0d83b046d68a2ba31f7e5d02eeac224e35532016846280d33d3215acc
+MISC ChangeLog 2375 SHA256 513203bbd312b9aaa4e7a7100c65edf4ca357477564e64b97afb8af0ace5efd0 SHA512 09aceb4b1fe970c738ec3b25c8916be03e9c4190be7af4f55514f080921ecc89a1d86b9f17629d22ae18cd91876a916acad3b1b8855d54206e96dc36b5174bd6 WHIRLPOOL f3d6b83c1a21fe99999a31cd0628bda965a4fe955c4a62916703a516e44e3b44a10d9ce9ce3e01fa3d88c67d06212ef0e991a7a39225ef2f3a479ec5ca39ea1d
MISC metadata.xml 294 SHA256 209af586ae032f00659b69da17d4186854660be14b244d31aa0bea2005c2c5ba SHA512 8a952303b9ed04293dacfec70cc1dfdd48d09d5a4726728dae608effd18415ed5207a4e99eb56bc639cbb91f78d77eb31ba900bc5589c9040e24ebf7a76c0b1e WHIRLPOOL 4d303ee22fbdf6a5c370365bc97d2f1840799e405209821346c231962887d88ed57fd7c4a3483f3f862caa691768018e1ba7e849639ce70a2f4976529d04e541
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iQJ8BAEBCABmBQJRMokUXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
-OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88nV0P/14U6YcZRLeQIqo78Pcp8s1b
-0LrsuiwH/oDbRix6oCBVFcWuJjmv20G89GUjZiZcwNA6C+EyTwCJ7hL68hS7cpPQ
-RROaPwt0Kwj6mx+WrSU3Rf6S64yV/wOjWj+wUpPiySjhKSq4fFWw9+i28pqwzh+2
-3ySN2aQxt02HoebSr5rYSEt3hnIf9BvgLeLz+LpTXmILpIUsVsAH1RWkyKrYfGvc
-bFbQcwLcAbeuWbe3XReyj5x3YEV2txfYt12PFJonHWa55wl1hJ/dYexPYfBroXCx
-J1TgoWzCERyE2jxd28DlyFG4gGUArDlsAy463+7u15Ct7OYYVbLpTmmIURcfEiOa
-WC57KiaWjtbf/p8NRI8OvLahpRqpxRMFlLBDvFJVULk3Xa2YAIxU4PW3RVxJqHP5
-V5mOhTAZ5JvjCqMZL2tpoFNzE6NlCkDLdCnBDj+13j03H28GsQti+UZ5/tuE/Xsw
-xwLuEO/805so0ax03o7PFGUWhLMl6WectYiv7y273ezAPs8/rIrh7f4X+mTaePbP
-0IBNM9XJGmLrmrmckGVRadfAgJ4tQg3AmrPwCCbnXZIZYESKDnMMs0KaKCFOVkaf
-Jqt3KuIVA7gcVG7j3hoITiezOTGBE7+OvQQlV4WZkij5c36UFheUSkzNkVq7taKW
-OhyPaOpeOlMXz6qLxJVY
-=q90Q
+iQEcBAEBCAAGBQJRMwAnAAoJEO04vUmVeoRjk3cH/3ct7vHIEK5yRKXfBIM1MDVe
+NPeJiBvY86bdp4oKNurhmnZJnZ3cesdoHML41yaih5OgpHOBMrPATveFt/K0Iw6i
+oxCjv9aE9Ov7s7y7MTJ5YPN9z+rDtOkiGw2bl7c3TmGLtYZPflntv/11rjdbGlOH
+624WeddyjLVWeTxcw3dYLN9J53aaZNscRdwbAUEy5XQEM0Gjo9fFb8rS34NZpIGF
+6af4DezKJXdxvL48+8J98HVcJGwqbhRoKMgHiGgJBWRhjIKB/OJhCxABQ2DpCyVb
++xKRC3gbXCvwzFbgaCq/9rxXHu8XmgPVo+7csaVuclRS4qnybuOPPn0pl0HRKAk=
+=0oCL
-----END PGP SIGNATURE-----
diff --git a/sci-electronics/plcedit/files/plcedit-2.2.1-gcc47.patch b/sci-electronics/plcedit/files/plcedit-2.2.1-gcc47.patch
new file mode 100644
index 000000000000..046a27cbac8c
--- /dev/null
+++ b/sci-electronics/plcedit/files/plcedit-2.2.1-gcc47.patch
@@ -0,0 +1,15 @@
+ https://bugs.gentoo.org/450856
+
+ src/singleapp/qtlocalpeer.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/src/singleapp/qtlocalpeer.cpp
++++ b/src/singleapp/qtlocalpeer.cpp
+@@ -57,6 +57,7 @@ static PProcessIdToSessionId pProcessIdToSessionId = 0;
+ #endif
+ #if defined(Q_OS_UNIX)
+ #include <time.h>
++#include <unistd.h>
+ #endif
+
+ namespace QtLP_Private {
diff --git a/sci-electronics/plcedit/plcedit-2.2.1.ebuild b/sci-electronics/plcedit/plcedit-2.2.1.ebuild
index c993cc7607ee..2b5fc08b01ff 100644
--- a/sci-electronics/plcedit/plcedit-2.2.1.ebuild
+++ b/sci-electronics/plcedit/plcedit-2.2.1.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/sci-electronics/plcedit/plcedit-2.2.1.ebuild,v 1.5 2013/03/02 23:19:49 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/plcedit/plcedit-2.2.1.ebuild,v 1.6 2013/03/03 07:37:07 dirtyepic Exp $
EAPI="2"
@@ -21,6 +21,8 @@ RDEPEND="dev-qt/qtgui:4"
DEPEND="${RDEPEND}"
src_prepare() {
+ epatch "${FILESDIR}"/${P}-gcc47.patch
+
if use doc; then
sed -i -e "/helpDir =/s:Help:html:" \
-e "s:(QApplication\:\:applicationDirPath():\"/usr/share/doc/${PF}\":g" \