tweak patch and add commit hash

This commit is contained in:
jasper 2011-05-12 06:14:54 +00:00
parent afea1cd1ff
commit fe9dca7638
2 changed files with 7 additions and 5 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.3 2011/05/12 06:05:16 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.4 2011/05/12 06:14:54 jasper Exp $
SHARED_ONLY= Yes
@ -6,7 +6,7 @@ COMMENT= desktop note-taking application written in C++
GNOME_PROJECT= gnote
GNOME_VERSION= 0.7.4
REVISION= 0
REVISION= 1
HOMEPAGE= http://live.gnome.org/Gnote

View File

@ -1,7 +1,9 @@
$OpenBSD: patch-src_debug_cpp,v 1.1.1.1 2011/05/06 11:25:46 jasper Exp $
$OpenBSD: patch-src_debug_cpp,v 1.2 2011/05/12 06:14:54 jasper Exp $
Incorrect explicit cast: error: cast from 'pthread*' to 'int' loses precision
https://bugzilla.gnome.org/show_bug.cgi?id=649478
Fixes bug #649478.
Upstream git: 326ec37cd316ae3bbf602a7517a4a37a8ebd2f11
--- src/debug.cpp.orig Thu May 5 18:32:59 2011
+++ src/debug.cpp Thu May 5 18:33:15 2011
@ -10,7 +12,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=649478
// boost::recursive_mutex::scoped_lock lock(mutex);
char buf[128];
- snprintf(buf, 128, "(%d) ", (int)pthread_self());
+ snprintf(buf, 128, "(%ld) ", (pthread_t)pthread_self());
+ snprintf(buf, 128, "(%lu) ", (pthread_t)pthread_self());
fwrite(buf, 1, strlen(buf), stderr);
fwrite(prefix, 1, strlen(prefix), stderr);