Fix test compilation problems reported by Hans de Graaff in bug #413701 with upstream patch.

Package-Manager: portage-2.1.10.57/cvs/Linux x86_64

4 files changed, 149 insertions, 7 deletions

diff --git a/gnome-extra/libgsf/ChangeLog b/gnome-extra/libgsf/ChangeLog
index 2e32c17e1bd9..9b5bc2feef20 100644
--- a/gnome-extra/libgsf/ChangeLog
+++ b/gnome-extra/libgsf/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-extra/libgsf
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgsf/ChangeLog,v 1.196 2012/04/29 15:52:13 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgsf/ChangeLog,v 1.197 2012/04/29 18:58:06 pacho Exp $
+
+  29 Apr 2012; Pacho Ramos <pacho@gentoo.org>
+  +files/libgsf-1.14.23-clone-identifier.patch, libgsf-1.14.23.ebuild:
+  Fix test compilation problems reported by Hans de Graaff in bug #413701 with
+  upstream patch.
 
   29 Apr 2012; Markus Meier <maekke@gentoo.org> libgsf-1.14.22.ebuild:
   x86 stable, bug #410611
diff --git a/gnome-extra/libgsf/Manifest b/gnome-extra/libgsf/Manifest
index dc6892bee633..4aa8f17085c4 100644
--- a/gnome-extra/libgsf/Manifest
+++ b/gnome-extra/libgsf/Manifest
@@ -4,19 +4,20 @@ Hash: SHA1
 AUX libgsf-1.14.16-automake-fixes.patch 618 RMD160 6426795391ab582106f9f6c131974f57d078f432 SHA1 7e85ce7ae9d23599a88f740e2ddbd2d4b1d92acf SHA256 db89b4a2d6614c0ed233303f12340856ff5313a536a60bc89bc9e4dec6684135
 AUX libgsf-1.14.16-gconf-automagic.patch 2201 RMD160 0a7f63db3fd9dd740f37de0d2cb42f6f75294a75 SHA1 4636e593872ec761b79921e9e935725541f4edb6 SHA256 9171232083d44e581918872f2eb3bf9b3571cde63b434caa9a04ff7c8b0c93f7
 AUX libgsf-1.14.19-missing-declaration.patch 681 RMD160 6eb01d9991e2609dd85057017886d6267b7e3601 SHA1 8a85dcbc8f502b96ddfdd47d56c081dc395f132b SHA256 8b8ef1e0fd6d8ecc61c7ef5c2ef6967bbebbe34470d4e2dadf0aea2ec467a6bd
+AUX libgsf-1.14.23-clone-identifier.patch 3688 RMD160 504a43811f211352491bdcfcae6b0769c85a7b25 SHA1 10f775e88660e76239f44d556770efbb1735adb5 SHA256 f563798dcc95e5980b70aa8bce298c7c7c3eeedc9a2391d01ac1db17e4e06f37
 DIST gnome-mplayer-0.9.6-gconf-2.m4.tgz 763 RMD160 cdf17b11dea5da26cc9a17fff953480ee1c39a0f SHA1 e0403cd21c59e305ae26e2d511740a9b1ea17be1 SHA256 d392f4cdb99f398ffb67674a2f0e64debcc4574f5ea203c1c25e91532fce894f
 DIST libgsf-1.14.21.tar.bz2 597463 RMD160 168c0200fde9792bd8c7937d1c83f3af9c8c0193 SHA1 17981f238f1f8dddb7af01c161bd6a1c4d5e85d2 SHA256 eef0a9d6eca4e6af6c16b208947e3c958c428b94d22792bdd0b80c08a4b301db
 DIST libgsf-1.14.22.tar.xz 506188 RMD160 a47fa284ace94ead51f2130cba31d8962d554f3b SHA1 ca1c5aa92a840e322d7cafd9f2dede3d38a69660 SHA256 a5f23be3cab72abd91bb443a32f41d6adc73250285b53787460750b6d60b783f
 DIST libgsf-1.14.23.tar.xz 515136 RMD160 443d250b2f498c771c972851824cc717b7b29c62 SHA1 4f19933342b2d42246200e3522b0797a032fdf19 SHA256 bfc1c6178f5319d5e6d854c380ce26542f9a103a5ff31c9d25a834e0be52fb17
 EBUILD libgsf-1.14.21.ebuild 3100 RMD160 8f4add9dac2bca2095d0d8c829d55027c4853d0a SHA1 05a82c24f2823240a97f01c9eec52d13a007e79b SHA256 3c1520434c228de353a2127c8438e52c94bcea2ebe0becac5694e8f8dff9da18
 EBUILD libgsf-1.14.22.ebuild 2786 RMD160 47f2221cf5c063d1aa61bc67dc0a6b1c1afb9636 SHA1 6cd0a11416bbcae733292a032620ba08640bfad6 SHA256 7a866856b0efa083471d511740b2d96f680ed8785e37c55a18edf36a1b6b0fe5
-EBUILD libgsf-1.14.23.ebuild 2878 RMD160 6b0b11d3d4f331bc1cf4102a1e630494f96d2baa SHA1 dd06282783c6106eb68abde846b332c64cc6f569 SHA256 9049da1d55d9b262bbba5029c323321d90d1667f81c0d70a1d6a3c1b35067d5c
-MISC ChangeLog 24683 RMD160 d84b6914aaa9f3c80dd03a27724fa41890b4ff37 SHA1 251a843237514c0ec54f528d4322dc815117ca02 SHA256 8781857d27440bd5c5b44d21f1744749047600445075242837da19c6654151a5
+EBUILD libgsf-1.14.23.ebuild 2993 RMD160 0db41a0bed220185426a22006929dbd62f3ed095 SHA1 66d004512cce822778a08517ca1f68ff1eb5938b SHA256 53bcb6e50c893b16b59c387f4650da92fb508c2c36adf7b9e0cd31b9b9213800
+MISC ChangeLog 24897 RMD160 45bec95048d4f3352bf27bb71b4a15580014530e SHA1 dd512ccce93e159c8e4dc183f3ba902e8c0f48b0 SHA256 e8d8edaa1125cd1696920b2d00f93088f13250d981777bfba1bb0a556e4fffb0
 MISC metadata.xml 403 RMD160 fd3cb8449a769b9561ed0f6dbda866e776be7a0e SHA1 3d88da1800401c14140410e95b3c597904ab8330 SHA256 1be1454195dc641b968829a70975fa8f9897199d72017a9964be954fe19e6552
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk+dZGUACgkQkKaRLQcq0GJuCgCeNdxR+gZJ2v2mcRkQEuCRDQMy
-SHMAn3s42wuvmmfA5/Vwoclyp2JqVIq4
-=QjfK
+iEYEARECAAYFAk+dj0QACgkQCaWpQKGI+9QT7wCfdUSoB4/jSwr0ZrZqZe3wtkAN
+rWwAnjqEQGxX2I+ZNJedppKp+P7Qski1
+=STNf
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/libgsf/files/libgsf-1.14.23-clone-identifier.patch b/gnome-extra/libgsf/files/libgsf-1.14.23-clone-identifier.patch
new file mode 100644
index 000000000000..d270a3134658
--- /dev/null
+++ b/gnome-extra/libgsf/files/libgsf-1.14.23-clone-identifier.patch
@@ -0,0 +1,133 @@
+From 7a4a9d62e0efa8510a9c8aa957233327d11f355b Mon Sep 17 00:00:00 2001
+From: Morten Welinder <terra@gnome.org>
+Date: Fri, 20 Apr 2012 13:54:54 +0000
+Subject: compilation: avoid identifier "clone".
+
+It clashes with the clone syscall when the wrong headers get included.
+---
+diff --git a/tests/test-cp-msole.c b/tests/test-cp-msole.c
+index e076bb4..4ed3246 100644
+--- a/tests/test-cp-msole.c
++++ b/tests/test-cp-msole.c
+@@ -34,7 +34,7 @@
+ static void clone_dir (GsfInfile *in, GsfOutfile *out);
+ 
+ static void
+-clone (GsfInput *input, GsfOutput *output)
++clone_ (GsfInput *input, GsfOutput *output)
+ {
+ 	if (gsf_input_size (input) > 0) {
+ 		guint8 const *data;
+@@ -87,7 +87,7 @@ clone_dir (GsfInfile *in, GsfOutfile *out)
+ 				gsf_infile_name_by_index  (in, i),
+ 				is_dir);
+ 
+-		clone (new_input, new_output);
++		clone_ (new_input, new_output);
+ 	}
+ 	/* An observation: when you think about the explanation to is_dir
+ 	 * above, you realize that clone_dir is called even for regular files.
+@@ -137,7 +137,7 @@ test (char *argv[])
+ 
+ 	outfile = gsf_outfile_msole_new (output);
+ 	g_object_unref (G_OBJECT (output));
+-	clone (GSF_INPUT (infile), GSF_OUTPUT (outfile));
++	clone_ (GSF_INPUT (infile), GSF_OUTPUT (outfile));
+ 
+ 	return 0;
+ }
+diff --git a/tests/test-cp-zip.c b/tests/test-cp-zip.c
+index 5523f33..3263c02 100644
+--- a/tests/test-cp-zip.c
++++ b/tests/test-cp-zip.c
+@@ -32,7 +32,7 @@
+ #include <stdio.h>
+ 
+ static void
+-clone (GsfInfile *in, GsfOutfile *out)
++clone_ (GsfInfile *in, GsfOutfile *out)
+ {
+ 	GsfInput *input = GSF_INPUT (in);
+ 	GsfOutput *output = GSF_OUTPUT (out);
+@@ -85,7 +85,7 @@ clone (GsfInfile *in, GsfOutfile *out)
+ 			output = gsf_outfile_new_child_full  (out, name, is_dir,
+ 							      "compression-level", level,
+ 							      NULL);
+-			clone (GSF_INFILE (input), GSF_OUTFILE (output));
++			clone_ (GSF_INFILE (input), GSF_OUTFILE (output));
+ 		}
+ 	}
+ 	gsf_output_close (GSF_OUTPUT (out));
+@@ -137,7 +137,7 @@ test (char *argv[])
+ 
+ 	outfile = gsf_outfile_zip_new (output, &err);
+ 	g_object_unref (G_OBJECT (output));
+-	clone (infile, outfile);
++	clone_ (infile, outfile);
+ 
+ 	return 0;
+ }
+diff --git a/tests/test-dump-msole.c b/tests/test-dump-msole.c
+index 3837394..b6ef5ce 100644
+--- a/tests/test-dump-msole.c
++++ b/tests/test-dump-msole.c
+@@ -32,7 +32,7 @@
+ #include <stdio.h>
+ 
+ static void
+-clone (GsfInput *input, GsfOutput *output)
++clone_ (GsfInput *input, GsfOutput *output)
+ {
+ 	guint8 const *data;
+ 	size_t len;
+@@ -72,7 +72,7 @@ clone (GsfInput *input, GsfOutput *output)
+ 			dst = gsf_outfile_new_child  (out,
+ 				gsf_infile_name_by_index  (in, i),
+ 				is_dir);
+-			clone (src, dst);
++			clone_ (src, dst);
+ 		}
+ 	}
+ 
+@@ -118,7 +118,7 @@ test (char *argv[])
+ 		g_error_free (err);
+ 		return 1;
+ 	}
+-	clone (GSF_INPUT (infile), GSF_OUTPUT (outfile));
++	clone_ (GSF_INPUT (infile), GSF_OUTPUT (outfile));
+ 
+ 	return 0;
+ }
+diff --git a/tests/test-restore-msole.c b/tests/test-restore-msole.c
+index cfd1d68..b9c54b5 100644
+--- a/tests/test-restore-msole.c
++++ b/tests/test-restore-msole.c
+@@ -32,7 +32,7 @@
+ #include <stdio.h>
+ 
+ static void
+-clone (GsfInput *input, GsfOutput *output)
++clone_ (GsfInput *input, GsfOutput *output)
+ {
+ 	guint8 const *data;
+ 	size_t len;
+@@ -72,7 +72,7 @@ clone (GsfInput *input, GsfOutput *output)
+ 			dst = gsf_outfile_new_child  (out,
+ 				gsf_infile_name_by_index (in, i),
+ 				is_dir);
+-			clone (src, dst);
++			clone_ (src, dst);
+ 		}
+ 	}
+ 
+@@ -111,7 +111,7 @@ test (char *argv[])
+ 
+ 	outfile = gsf_outfile_msole_new (output);
+ 	g_object_unref (G_OBJECT (output));
+-	clone (GSF_INPUT (infile), GSF_OUTPUT (outfile));
++	clone_ (GSF_INPUT (infile), GSF_OUTPUT (outfile));
+ 
+ 	return 0;
+ }
+--
+cgit v0.9.0.2
diff --git a/gnome-extra/libgsf/libgsf-1.14.23.ebuild b/gnome-extra/libgsf/libgsf-1.14.23.ebuild
index 1b9a51bc99cd..2af6582e914a 100644
--- a/gnome-extra/libgsf/libgsf-1.14.23.ebuild
+++ b/gnome-extra/libgsf/libgsf-1.14.23.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/gnome-extra/libgsf/libgsf-1.14.23.ebuild,v 1.1 2012/04/23 10:47:41 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgsf/libgsf-1.14.23.ebuild,v 1.2 2012/04/29 18:58:06 pacho Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -57,6 +57,9 @@ src_prepare() {
 
 	use python && python_clean_py-compile_files
 
+	# compilation: avoid identifier "clone", fixed in next version
+	epatch "${FILESDIR}/${P}-clone-identifier.patch"
+
 	intltoolize --force --copy --automake || die "intltoolize failed"
 	eautoreconf
 	gnome2_src_prepare