From 7af1949444b5fd3e182eea940859b1f4211ab09d Mon Sep 17 00:00:00 2001 From: Hans de Graaff Date: Fri, 16 Dec 2011 07:38:27 +0000 Subject: [PATCH] Remove hardcoded CXXFLAGS in various places. Fixes bug 394743. Package-Manager: portage-2.1.10.11/cvs/Linux x86_64 --- dev-db/mysql-workbench/ChangeLog | 6 +++++- dev-db/mysql-workbench/Manifest | 10 +++++----- dev-db/mysql-workbench/mysql-workbench-5.2.36.ebuild | 6 +++++- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/dev-db/mysql-workbench/ChangeLog b/dev-db/mysql-workbench/ChangeLog index 7fe6bc7a5b13..2518ccd24778 100644 --- a/dev-db/mysql-workbench/ChangeLog +++ b/dev-db/mysql-workbench/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-db/mysql-workbench # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-workbench/ChangeLog,v 1.48 2011/12/16 07:19:17 graaff Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-workbench/ChangeLog,v 1.49 2011/12/16 07:38:27 graaff Exp $ + + 16 Dec 2011; Hans de Graaff + mysql-workbench-5.2.36.ebuild: + Remove hardcoded CXXFLAGS in various places. Fixes bug 394743. 16 Dec 2011; Hans de Graaff mysql-workbench-5.2.36.ebuild: diff --git a/dev-db/mysql-workbench/Manifest b/dev-db/mysql-workbench/Manifest index 01613a3e7b37..21fb3862d9d2 100644 --- a/dev-db/mysql-workbench/Manifest +++ b/dev-db/mysql-workbench/Manifest @@ -8,13 +8,13 @@ DIST mysql-workbench-gpl-5.2.35-src.tar.gz 17874329 RMD160 6207d7350cf1ea7a426ec DIST mysql-workbench-gpl-5.2.36-src.tar.gz 18571353 RMD160 2afa2de53cff8fa7e23be449691421db59ca5830 SHA1 039a797970bf237f17eb58c9c6758b52e1b60ea2 SHA256 eedcde69505a0f374613485cf0f1b4e61fc6a32db38a54bbe06b32eebdc175f7 EBUILD mysql-workbench-5.2.34.ebuild 2171 RMD160 d16791cacb8fb4d75441d7c0334b82e077bf6c40 SHA1 dadf3caae51f149c3fce3bfac69ac2261d3e9512 SHA256 8c9ee7ddaa655c52c289839a02f682648c220a37009cdfc6f6d42389d687a33f EBUILD mysql-workbench-5.2.35.ebuild 2132 RMD160 d5f010e34e41060fb6ee41934b05d701e424c2fe SHA1 58bc5dbfef7d02f6c60e0464477422299473845b SHA256 a0c8afbe2f4e67d11929042ddafb15195ab076f707201fbd069775ee0edccb69 -EBUILD mysql-workbench-5.2.36.ebuild 2156 RMD160 35920434a65a23bc7057a57b7b40ed8dccb9209c SHA1 44949b53360e0fbccea5fdc741d5892abfc1e77a SHA256 fac5a889ebab6f023c7e4d5dc2ded58f758f669f3a16640aee20d35998d8cc6e -MISC ChangeLog 9150 RMD160 82c6f78fb0c28e170feecbbb39465a864ca2f3f9 SHA1 710f4d0c3f0df3f4e03cfaf50df66a5fd300c7cf SHA256 7d4c3a03865361130ebff583ca60d8900bb790b25b6c559990916f9e0b94f2f6 +EBUILD mysql-workbench-5.2.36.ebuild 2346 RMD160 0b503bfcfd804e8fca4e2f67627c9474a7173381 SHA1 423b5ccdd058a9cb3cb3ff0675bbbf84cea66580 SHA256 ddadafa88dde473dd3dec0f4afef7454df2de8580594221c67e3e0381e74f81f +MISC ChangeLog 9299 RMD160 ad30386737de23ab79b3939e6aa40db03e663e9f SHA1 01b2bab4180531eb20faf390d0424ebe7ba038f6 SHA256 d39c599b37f52002ca36a85565e1c977511a5c5a976d2a0700a99a9105a20f85 MISC metadata.xml 201 RMD160 bbf7920d9809941fb024d20016dbe2fb9f15ff97 SHA1 e629d21795e99a77bd0a6aded1a153fd12d5b2c5 SHA256 c90b12c6600840878686d4544dbc51d97b0715add76b40d9400415cdef6324ad -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iF4EAREIAAYFAk7q8QIACgkQiIP6VqMIqNczoAEAg3ys7qtF0sJlJmH59NXeqqFj -4iVdCTgDTx4nTnddzhgBAIjsazj4TtZJE3vHshBjyOnqXXC3GYaeTbAgoL6RjZOS -=fAQ3 +iF4EAREIAAYFAk7q9XgACgkQiIP6VqMIqNfUigD8DJTLdj2OwdCpeokMlWtJBP83 +ZDECdPKNHHSp9p4JEE0BAJUCBoKzevb/1S0rjQsL+4VP5g2AkTaVEZAbyPDC8bs3 +=JIbH -----END PGP SIGNATURE----- diff --git a/dev-db/mysql-workbench/mysql-workbench-5.2.36.ebuild b/dev-db/mysql-workbench/mysql-workbench-5.2.36.ebuild index d7dfadc65238..72c0caa3f4f7 100644 --- a/dev-db/mysql-workbench/mysql-workbench-5.2.36.ebuild +++ b/dev-db/mysql-workbench/mysql-workbench-5.2.36.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-workbench/mysql-workbench-5.2.36.ebuild,v 1.3 2011/12/16 07:19:17 graaff Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-workbench/mysql-workbench-5.2.36.ebuild,v 1.4 2011/12/16 07:38:27 graaff Exp $ EAPI="3" GCONF_DEBUG="no" @@ -64,6 +64,10 @@ src_prepare() { # http://bugs.mysql.com/bug.php?id=63750 sed -i -e 's/4,5,6/4,5,6,7/' plugins/wb.admin/backend/wb_admin_ssh.py || die + # Remove hardcoded CXXFLAGS + sed -i -e 's/debug_flags="-ggdb3 /debug_flags="/' configure || die + sed -i -e 's/-O0 -g3//' ext/scintilla/gtk/Makefile.in ext/scintilla/gtk/Makefile.am || die + # Remove bundled ctemplate version to make sure we use the system # version, but leave a directory to avoid confusing configure, bug # 357539. -- 2.26.2