diff options
| author |   Patrick Kursawe <phosphan@gentoo.org> | 2004-10-06 09:17:28 +0000 |
|---|---|---|
| committer | Patrick Kursawe <phosphan@gentoo.org> | 2004-10-06 09:17:28 +0000 |
| commit | fec0b0a6ab5add497851c471f6d4f847738f6eb9 (patch) | |
| tree | 87dad44e28d127e935f7229fe925b597c9d52fba /media-video/nvclock | |
| parent | version bump (bug #65588) (Manifest recommit) (diff) | |
| download | gentoo-2-fec0b0a6ab5add497851c471f6d4f847738f6eb9.tar.gz gentoo-2-fec0b0a6ab5add497851c471f6d4f847738f6eb9.tar.bz2 gentoo-2-fec0b0a6ab5add497851c471f6d4f847738f6eb9.zip | |
Fixing bug #38251
Diffstat (limited to 'media-video/nvclock')
| -rw-r--r-- | media-video/nvclock/ChangeLog | 6 | ||||
| -rw-r--r-- | media-video/nvclock/files/callbacks.patch | 33 | ||||
| -rw-r--r-- | media-video/nvclock/nvclock-0.7-r1.ebuild | 14 |
3 files changed, 48 insertions, 5 deletions
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 <phosphan@gentoo.org> +files/callbacks.patch, + nvclock-0.7-r1.ebuild: + Adding fix from bug #38251. Thanks! 01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> nvclock-0.7-r1.ebuild: 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 } |