summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Schlemmer <azarah@gentoo.org>2005-06-30 11:29:52 +0000
committerMartin Schlemmer <azarah@gentoo.org>2005-06-30 11:29:52 +0000
commita57a13411d1c427bae88902c4168f71bdc4a65d2 (patch)
tree2738e56334a18e9fd421b9dc5946c3c56f787dd7 /dev-cpp
parentUnmasking for x86 and sparc, 1+ year, no bugs (diff)
downloadhistorical-a57a13411d1c427bae88902c4168f71bdc4a65d2.tar.gz
historical-a57a13411d1c427bae88902c4168f71bdc4a65d2.tar.bz2
historical-a57a13411d1c427bae88902c4168f71bdc4a65d2.zip
Fix building on amd64 with gcc4.
Package-Manager: portage-2.0.51.22-r1
Diffstat (limited to 'dev-cpp')
-rw-r--r--dev-cpp/gconfmm/ChangeLog6
-rw-r--r--dev-cpp/gconfmm/Manifest10
-rw-r--r--dev-cpp/gconfmm/files/gconfmm-2.6.1-amd64-gcc4.patch21
-rw-r--r--dev-cpp/gconfmm/gconfmm-2.6.1.ebuild11
4 files changed, 45 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/Manifest b/dev-cpp/gconfmm/Manifest
index e48d6f0911d8..f7077e8fd415 100644
--- a/dev-cpp/gconfmm/Manifest
+++ b/dev-cpp/gconfmm/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
MD5 5974237ecce8d0fe48ae7965215dae39 gconfmm-2.0.2.ebuild 618
MD5 d718e1b648380ef39ac7fc97b24da12b gconfmm-2.6.1.ebuild 822
MD5 88215b6041140c4bab3d16348f12f34f ChangeLog 3692
@@ -5,3 +8,10 @@ MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
MD5 d07f27847b386ccdeb24dea3d89a270e files/gconfmm-2.6.1-amd64-gcc4.patch 864
MD5 650778e47af5167c7095cfc924e6e697 files/digest-gconfmm-2.6.1 66
MD5 f44b8472013beb3feb14d08ede70ce34 files/digest-gconfmm-2.0.2 66
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCw9ga1ZcsMnZjRyIRAhd+AJ9IQDYWqKXDtWbdJ71bZiUzKt6HbwCeN7I0
+ypby/Dy/jaG3K9KCvQyo4FU=
+=MmvL
+-----END PGP SIGNATURE-----
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