summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'x11-misc')
-rw-r--r--x11-misc/nitrogen/ChangeLog6
-rw-r--r--x11-misc/nitrogen/files/nitrogen-1.4-png.patch10
2 files changed, 11 insertions, 5 deletions
diff --git a/x11-misc/nitrogen/ChangeLog b/x11-misc/nitrogen/ChangeLog
index 58fe147f1b51..76af858302f8 100644
--- a/x11-misc/nitrogen/ChangeLog
+++ b/x11-misc/nitrogen/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-misc/nitrogen
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/nitrogen/ChangeLog,v 1.11 2009/11/03 18:59:54 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/nitrogen/ChangeLog,v 1.12 2009/12/23 15:45:08 ssuominen Exp $
+
+ 23 Dec 2009; Samuli Suominen <ssuominen@gentoo.org>
+ files/nitrogen-1.4-png.patch:
+ Include string.h instead of png.h wrt #296783 by Dominik Behr.
03 Nov 2009; Samuli Suominen <ssuominen@gentoo.org>
nitrogen-1.4-r1.ebuild, +files/nitrogen-1.4-png.patch:
diff --git a/x11-misc/nitrogen/files/nitrogen-1.4-png.patch b/x11-misc/nitrogen/files/nitrogen-1.4-png.patch
index 9ab152b2468c..0fc621cb9650 100644
--- a/x11-misc/nitrogen/files/nitrogen-1.4-png.patch
+++ b/x11-misc/nitrogen/files/nitrogen-1.4-png.patch
@@ -1,11 +1,13 @@
-diff -ur nitrogen-1.4.orig/src/Thumbview.cc nitrogen-1.4/src/Thumbview.cc
---- nitrogen-1.4.orig/src/Thumbview.cc 2008-07-30 22:16:53.000000000 +0300
-+++ nitrogen-1.4/src/Thumbview.cc 2009-11-03 20:56:28.000000000 +0200
-@@ -23,7 +23,6 @@
+http://bugs.gentoo.org/show_bug.cgi?id=296783
+
+--- src/Thumbview.cc
++++ src/Thumbview.cc
+@@ -23,7 +23,7 @@
#include "Thumbview.h"
#include "md5.h"
#include <glib/gstdio.h>
-#include <png.h>
++#include <string.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>