Patch to allow compilation in GCC4 by Samuli Suominen <sasuomin@uusikaupunki.fi> closes bug #124641.

Package-Manager: portage-2.1_pre5-r4

4 files changed, 68 insertions, 8 deletions

diff --git a/media-video/camorama/ChangeLog b/media-video/camorama/ChangeLog
index 1cc77a4a0539..8c6afe45f596 100644
--- a/media-video/camorama/ChangeLog
+++ b/media-video/camorama/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/camorama
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/camorama/ChangeLog,v 1.6 2005/01/25 20:45:41 hansmi Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/camorama/ChangeLog,v 1.7 2006/03/05 22:47:22 chainsaw Exp $
+
+  05 Mar 2006; Tony Vroon <chainsaw@gentoo.org> +files/0.17-gcc4.patch,
+  camorama-0.17.ebuild:
+  Patch to allow compilation in GCC4 by Samuli Suominen
+  <sasuomin@uusikaupunki.fi> closes bug #124641.
 
   25 Jan 2005; Michael Hanselmann <hansmi@gentoo.org> camorama-0.17.ebuild:
   Added to ~ppc, bug 79239.
diff --git a/media-video/camorama/Manifest b/media-video/camorama/Manifest
index d959ef03719b..2a2c188a2090 100644
--- a/media-video/camorama/Manifest
+++ b/media-video/camorama/Manifest
@@ -1,6 +1,31 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 ecc6d63f4aa2e5bb20c0d6575ab7245e ChangeLog 1046
+RMD160 4463ab4a7a1afa674f3f7133caabac99d10ae97c ChangeLog 1046
+SHA256 8cbeaf9d73acca0d3d727cb6fe3725719b353e55ed0752da01fb5d173c371c6c ChangeLog 1046
 MD5 ae4e57adb8abb6ceb9f5f4eeea55a492 camorama-0.16.ebuild 655
-MD5 6c09e582882781b8e5e951830cc70bf9 metadata.xml 224
-MD5 372798ecf44adec6103371e49efe2993 ChangeLog 842
-MD5 740eb120a1cc41f836f1a3af18000a1c camorama-0.17.ebuild 669
+RMD160 fd4c8652bd915d715dde846378b36037e29316a2 camorama-0.16.ebuild 655
+SHA256 c33c8fd270689a921ceec45319bd200e5139ed64d6bc4572b19009a1e0edd2b2 camorama-0.16.ebuild 655
+MD5 4dff07fecf419c3c00f94c1b837ffb55 camorama-0.17.ebuild 755
+RMD160 6fd324b14b5c2e38da1e5e85b63d5950282c7f5c camorama-0.17.ebuild 755
+SHA256 a453f683ad7553644a50fee6d5f0d43d695a85f50e8ff9d4829e4b9fbc1e97ca camorama-0.17.ebuild 755
+MD5 e9d680565938d2919fb05e42e9fc1a91 files/0.17-gcc4.patch 986
+RMD160 4dd6a0874cee6972d31b3250df14d6bd9a6acde1 files/0.17-gcc4.patch 986
+SHA256 6ef4fbf011050b1c9b295079dafc36dffb8ab1437c099b710b509549e7b4ac0a files/0.17-gcc4.patch 986
 MD5 728eb1852fda23d5f256ad3407321e20 files/digest-camorama-0.16 65
+RMD160 b3e455b6dfee113dbdf7eb521e8309fbdb45963e files/digest-camorama-0.16 65
+SHA256 5458a6d82a5946c6dff57003f415a20328163577b5d5012bfe6fe0a2a360c22e files/digest-camorama-0.16 65
 MD5 9a2c7e8eab2e03086ac2a287651ae019 files/digest-camorama-0.17 66
+RMD160 d8c4887eea7b65411b3842845d7b9c9836d2aef8 files/digest-camorama-0.17 66
+SHA256 7937cb39100c7ce7fd3714150a663ad2a7c5f5ec7c76b75442ef126517a88faa files/digest-camorama-0.17 66
+MD5 6c09e582882781b8e5e951830cc70bf9 metadata.xml 224
+RMD160 a894a47c3ba494f6e918fe6ebc70da6877385457 metadata.xml 224
+SHA256 888efa552a0159d0de6ea80ae3d38ab453c12fcc62a0ede08e26ddc35fc1ed2d metadata.xml 224
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2.1 (GNU/Linux)
+
+iD8DBQFEC2rhp5vW4rUFj5oRArzmAJ4qGiwfcZCHexr08BIUFTahAhMoDwCfZSYF
+Gne+cucJTHZlqyCqK3cs560=
+=ktr3
+-----END PGP SIGNATURE-----
diff --git a/media-video/camorama/camorama-0.17.ebuild b/media-video/camorama/camorama-0.17.ebuild
index bf2c705042e0..c602142a78c3 100644
--- a/media-video/camorama/camorama-0.17.ebuild
+++ b/media-video/camorama/camorama-0.17.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/camorama/camorama-0.17.ebuild,v 1.3 2005/01/25 20:45:42 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/camorama/camorama-0.17.ebuild,v 1.4 2006/03/05 22:47:22 chainsaw Exp $
 
-inherit gnome2
+inherit gnome2 eutils
 
 IUSE=""
 DESCRIPTION="A GNOME 2 Webcam application featuring various image filters."
@@ -20,3 +20,9 @@ DEPEND=">=x11-libs/gtk+-2.0
 	>=dev-util/intltool-0.20"
 
 SCROLLKEEPER_UPDATE="0"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PV}-gcc4.patch
+}
diff --git a/media-video/camorama/files/0.17-gcc4.patch b/media-video/camorama/files/0.17-gcc4.patch
new file mode 100644
index 000000000000..a1aafb11d508
--- /dev/null
+++ b/media-video/camorama/files/0.17-gcc4.patch
@@ -0,0 +1,24 @@
+diff -ur camorama-0.17.orig/src/callbacks.c camorama-0.17/src/callbacks.c
+--- camorama-0.17.orig/src/callbacks.c	2003-08-20 21:24:40.000000000 +0300
++++ camorama-0.17/src/callbacks.c	2006-03-05 16:38:09.000000000 +0200
+@@ -380,7 +380,7 @@
+ {
+     gchar *name, *title;
+ 
+-    (G_CONST_RETURN) name = gtk_widget_get_name (widget);
++    name = gtk_widget_get_name (widget);
+ 
+     if (strcmp (name, "small1") == 0) {
+         cam->x = cam->vid_cap.minwidth;
+diff -ur camorama-0.17.orig/src/main.c camorama-0.17/src/main.c
+--- camorama-0.17.orig/src/main.c	2003-08-20 21:24:40.000000000 +0300
++++ camorama-0.17/src/main.c	2006-03-05 16:38:18.000000000 +0200
+@@ -84,7 +84,7 @@
+     GtkWidget *eventbox = NULL, *image = NULL;
+     gint width, height;
+ 
+-    (GtkTooltips *)cam->tooltips = gtk_tooltips_new ();
++    cam->tooltips = gtk_tooltips_new ();
+     logo = (GdkPixbuf *) create_pixbuf (DATADIR "/pixmaps/camorama.png");
+     if (logo == NULL) {
+         printf ("\n\nLOGO NO GO\n\n");