diff options
| author |   Tony Vroon <chainsaw@gentoo.org> | 2006-03-05 22:47:22 +0000 |
|---|---|---|
| committer | Tony Vroon <chainsaw@gentoo.org> | 2006-03-05 22:47:22 +0000 |
| commit | 9fa5795711975c5acd03caa26638c64a4544b404 (patch) | |
| tree | d6e17b8204f98fcfb9b2faf449598d0e2ae2fb22 | |
| parent | Remove manifest. (diff) | |
| download | gentoo-2-9fa5795711975c5acd03caa26638c64a4544b404.tar.gz gentoo-2-9fa5795711975c5acd03caa26638c64a4544b404.tar.bz2 gentoo-2-9fa5795711975c5acd03caa26638c64a4544b404.zip | |
Patch to allow compilation in GCC4 by Samuli Suominen <sasuomin@uusikaupunki.fi> closes bug #124641.
(Portage version: 2.1_pre5-r4)
| -rw-r--r-- | media-video/camorama/ChangeLog | 9 | ||||
| -rw-r--r-- | media-video/camorama/camorama-0.17.ebuild | 12 | ||||
| -rw-r--r-- | media-video/camorama/files/0.17-gcc4.patch | 24 |
3 files changed, 40 insertions, 5 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/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"); |