From: Patrick Kursawe Date: Wed, 6 Oct 2004 09:17:28 +0000 (+0000) Subject: Fixing bug #38251 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7f051ff58e6bd5543826917832de1f3141503f0d;p=gentoo.git Fixing bug #38251 --- diff --git a/media-video/nvclock/ChangeLog b/media-video/nvclock/ChangeLog index 036012aeb486..2e813ece527b 100644 --- a/media-video/nvclock/ChangeLog +++ b/media-video/nvclock/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-video/nvclock # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/nvclock/ChangeLog,v 1.13 2004/07/01 08:41:01 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/nvclock/ChangeLog,v 1.14 2004/10/06 09:17:27 phosphan Exp $ + + 06 Oct 2004; Patrick Kursawe +files/callbacks.patch, + nvclock-0.7-r1.ebuild: + Adding fix from bug #38251. Thanks! 01 Jul 2004; Jeremy Huddleston nvclock-0.7-r1.ebuild: diff --git a/media-video/nvclock/Manifest b/media-video/nvclock/Manifest index 89e2e22d99d3..0bd900614cab 100644 --- a/media-video/nvclock/Manifest +++ b/media-video/nvclock/Manifest @@ -1,7 +1,8 @@ -MD5 8779c406e5443774640822f3b5b540f7 ChangeLog 1913 +MD5 020473f3465ff83a720398c46e80ce67 nvclock-0.7-r1.ebuild 1357 +MD5 d3c870bc36052a1da493f7460f3a8070 ChangeLog 2052 MD5 18e357d8033ba8530d4c6b8a2c6e0a57 metadata.xml 324 -MD5 69a8e61aa0adf537d39a9f5f72f92bba nvclock-0.7-r1.ebuild 1286 -MD5 0afb58d7f073145f86d31cee842bfb10 files/configure.in.diff 348 -MD5 fd8ac9ae1a4d86f822f0b84ce8f5723a files/digest-nvclock-0.7-r1 61 MD5 f935ebffac8b81708d875e0bef2fe7ab files/nvclock_confd 360 MD5 c61383e40bda1679161b03f78e577609 files/nvclock_initd 146 +MD5 80f3f5a3e09142270f16873fddfb5d7d files/callbacks.patch 837 +MD5 0afb58d7f073145f86d31cee842bfb10 files/configure.in.diff 348 +MD5 fd8ac9ae1a4d86f822f0b84ce8f5723a files/digest-nvclock-0.7-r1 61 diff --git a/media-video/nvclock/files/callbacks.patch b/media-video/nvclock/files/callbacks.patch new file mode 100644 index 000000000000..2e996bf407d1 --- /dev/null +++ b/media-video/nvclock/files/callbacks.patch @@ -0,0 +1,33 @@ +--- src/gtk/callbacks.c.old 2004-10-05 18:57:05 -0400 ++++ src/gtk/callbacks.c 2004-10-05 18:58:40 -0400 +@@ -36,11 +36,12 @@ + { + va_list arg; + char* message; ++ GtkWidget *dialog; ++ + va_start(arg, format); + + message = g_strdup_vprintf(format, arg); + +- GtkWidget *dialog; + switch(code) + { + case ERROR: +@@ -106,6 +107,7 @@ + + void timer() + { ++ gint result; + GtkWidget *label; + Timeout *timeout; + timeout = g_malloc(sizeof(Timeout)); +@@ -126,7 +128,7 @@ + /* Create the real timeout */ + timeout->timeout_id = g_timeout_add(1000, timeout_callback, timeout); + +- gint result = gtk_dialog_run(GTK_DIALOG(timeout->dialog)); ++ result = gtk_dialog_run(GTK_DIALOG(timeout->dialog)); + + /* Stop the timer because we got an answer back */ + g_source_remove(timeout->timeout_id); diff --git a/media-video/nvclock/nvclock-0.7-r1.ebuild b/media-video/nvclock/nvclock-0.7-r1.ebuild index 42812a718496..8953114c07ca 100644 --- a/media-video/nvclock/nvclock-0.7-r1.ebuild +++ b/media-video/nvclock/nvclock-0.7-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/nvclock/nvclock-0.7-r1.ebuild,v 1.4 2004/07/01 08:41:01 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/nvclock/nvclock-0.7-r1.ebuild,v 1.5 2004/10/06 09:17:27 phosphan Exp $ inherit eutils @@ -18,10 +18,16 @@ IUSE="gtk qt" DEPEND="virtual/libc sys-devel/autoconf gtk? ( =x11-libs/gtk+-2* ) - qt? ( x11-libs/qt )" + qt? ( =x11-libs/qt-3* )" + +src_unpack() { + unpack ${A} + cd ${S} + epatch ${FILESDIR}/configure.in.diff + epatch ${FILESDIR}/callbacks.patch +} src_compile() { - epatch ${FILESDIR}/configure.in.diff || die mv configure.in configure.ac ./autogen.sh || die @@ -43,7 +49,7 @@ src_install() { cp ${FILESDIR}/nvclock_initd ${D}/etc/init.d/nvclock cp ${FILESDIR}/nvclock_confd ${D}/etc/conf.d/nvclock - chmod u+x ${D}/etc/init.d/nvclock + chmod a+x ${D}/etc/init.d/nvclock dodoc AUTHORS COPYING README }