diff options
| author |   Martin Schlemmer <azarah@gentoo.org> | 2005-06-30 11:29:52 +0000 |
|---|---|---|
| committer | Martin Schlemmer <azarah@gentoo.org> | 2005-06-30 11:29:52 +0000 |
| commit | 3dd029c662f3cdd76d4d82cd70b2be7ca5aa7529 (patch) | |
| tree | 1585570627267d9c43409a9a597b6c3bf5d4d5d2 /dev-cpp | |
| parent | Unmasking for x86 and sparc, 1+ year, no bugs (diff) | |
| download | gentoo-2-3dd029c662f3cdd76d4d82cd70b2be7ca5aa7529.tar.gz gentoo-2-3dd029c662f3cdd76d4d82cd70b2be7ca5aa7529.tar.bz2 gentoo-2-3dd029c662f3cdd76d4d82cd70b2be7ca5aa7529.zip | |
Fix building on amd64 with gcc4.
(Portage version: 2.0.51.22-r1)
Diffstat (limited to 'dev-cpp')
| -rw-r--r-- | dev-cpp/gconfmm/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-cpp/gconfmm/files/gconfmm-2.6.1-amd64-gcc4.patch | 21 | ||||
| -rw-r--r-- | dev-cpp/gconfmm/gconfmm-2.6.1.ebuild | 11 |
3 files changed, 35 insertions, 3 deletions
diff --git a/dev-cpp/gconfmm/ChangeLog b/dev-cpp/gconfmm/ChangeLog index 56e04aa6acbd..402e51e90681 100644 --- a/dev-cpp/gconfmm/ChangeLog +++ b/dev-cpp/gconfmm/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-cpp/gconfmm # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gconfmm/ChangeLog,v 1.24 2005/05/18 12:02:44 corsair Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gconfmm/ChangeLog,v 1.25 2005/06/30 11:29:52 azarah Exp $ + + 30 Jun 2005; Martin Schlemmer <azarah@gentoo.org> + +files/gconfmm-2.6.1-amd64-gcc4.patch, gconfmm-2.6.1.ebuild: + Fix building on amd64 with gcc4. 18 May 2005; Markus Rothe <corsair@gentoo.org> gconfmm-2.0.2.ebuild, gconfmm-2.6.1.ebuild: diff --git a/dev-cpp/gconfmm/files/gconfmm-2.6.1-amd64-gcc4.patch b/dev-cpp/gconfmm/files/gconfmm-2.6.1-amd64-gcc4.patch new file mode 100644 index 000000000000..b2dc5f454aee --- /dev/null +++ b/dev-cpp/gconfmm/files/gconfmm-2.6.1-amd64-gcc4.patch @@ -0,0 +1,21 @@ +Fixes: + + client.cc: In member function 'GSList* Gnome::Conf::Client::get_list(const Glib::ustring&, GConfValueType) const': + client.cc:185: error: cast from 'void*' to 'int' loses precision + client.cc:188: error: cast from 'void*' to 'gboolean' loses precision + +--- gconfmm-2.6.1/gconf/gconfmm/client.cc.orig 2005-06-30 13:10:50.000000000 +0200 ++++ gconfmm-2.6.1/gconf/gconfmm/client.cc 2005-06-30 13:09:45.000000000 +0200 +@@ -182,10 +182,10 @@ + switch(list_type) + { + case GCONF_VALUE_INT: +- gconf_value_set_int(v,(int)i->data); ++ gconf_value_set_int(v,(int)((long)i->data)); + break; + case GCONF_VALUE_BOOL: +- gconf_value_set_bool(v,(gboolean)i->data); ++ gconf_value_set_bool(v,(gboolean)((long)i->data)); + break; + case GCONF_VALUE_FLOAT: + gconf_value_set_float(v,*(gdouble*)i->data); diff --git a/dev-cpp/gconfmm/gconfmm-2.6.1.ebuild b/dev-cpp/gconfmm/gconfmm-2.6.1.ebuild index 1b52efd14f3a..43ff56a7273d 100644 --- a/dev-cpp/gconfmm/gconfmm-2.6.1.ebuild +++ b/dev-cpp/gconfmm/gconfmm-2.6.1.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gconfmm/gconfmm-2.6.1.ebuild,v 1.15 2005/05/18 12:02:44 corsair Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gconfmm/gconfmm-2.6.1.ebuild,v 1.16 2005/06/30 11:29:52 azarah Exp $ IUSE="" -inherit gnome2 +inherit gnome2 eutils DESCRIPTION="C++ bindings for GConf" HOMEPAGE="http://gtkmm.sourceforge.net/" @@ -24,6 +24,13 @@ DEPEND=">=dev-util/pkgconfig-0.12.0 DOCS="AUTHORS COPYING* ChangeLog NEWS README INSTALL" +src_unpack() { + unpack ${A} + + cd ${S} + epatch ${FILESDIR}/${P}-amd64-gcc4.patch +} + src_compile() { if useq amd64 || useq ppc64; then aclocal -I scripts |