Fixing bug #38251
authorPatrick Kursawe <phosphan@gentoo.org>
Wed, 6 Oct 2004 09:17:28 +0000 (09:17 +0000)
committerPatrick Kursawe <phosphan@gentoo.org>
Wed, 6 Oct 2004 09:17:28 +0000 (09:17 +0000)
media-video/nvclock/ChangeLog
media-video/nvclock/Manifest
media-video/nvclock/files/callbacks.patch [new file with mode: 0644]
media-video/nvclock/nvclock-0.7-r1.ebuild

index 036012aeb4865caee7058c5e0ce9e6b97ea9519d..2e813ece527b23d678bb4b05a12bc07d7080ea69 100644 (file)
@@ -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:
index 89e2e22d99d3c2605de4cb11d7678217c491ec8d..0bd900614cab17c286f4e4c13b7c91fd8139449e 100644 (file)
@@ -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 (file)
index 0000000..2e996bf
--- /dev/null
@@ -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);
index 42812a7184960e6a77dfaa664a307f7bfd063a4d..8953114c07ca34ae8bca625feb69737d02eb0d07 100644 (file)
@@ -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
 }