rpms/gcolor2/F-12 gcolor2-0.4-missing-includes.patch, NONE, 1.1 gcolor2.spec, 1.2, 1.3

[Christoph Wickert]

Author: cwickert

Update of /cvs/pkgs/rpms/gcolor2/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25619/F-12

Modified Files:
	gcolor2.spec 
Added Files:
	gcolor2-0.4-missing-includes.patch 
Log Message:
* Sat Oct 03 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4-3
- Fix missing includes (#525783)


gcolor2-0.4-missing-includes.patch:
 callbacks.c |    2 ++
 main.c      |    8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

--- NEW FILE gcolor2-0.4-missing-includes.patch ---
Nur in gcolor2-0.4/po: potfiles.
diff -dur gcolor2-0.4.orig/src/callbacks.c gcolor2-0.4/src/callbacks.c
--- gcolor2-0.4.orig/src/callbacks.c	2005-07-12 20:06:12.000000000 +0200
+++ gcolor2-0.4/src/callbacks.c	2009-10-03 13:56:41.000000000 +0200
@@ -9,6 +9,8 @@
 #include "interface.h"
 #include "support.h"
 
+#include <string.h>
+#include <glib/gprintf.h>
 
 GtkWidget        *savedialog;
 gchar            *colorname;
diff -dur gcolor2-0.4.orig/src/main.c gcolor2-0.4/src/main.c
--- gcolor2-0.4.orig/src/main.c	2005-07-11 16:55:49.000000000 +0200
+++ gcolor2-0.4/src/main.c	2009-10-03 13:59:32.000000000 +0200
@@ -8,6 +8,9 @@
 #include "interface.h"
 #include "support.h"
 #include "callbacks.h"
+#include <stdlib.h>
+#include <string.h>
+#include <glib/gprintf.h>
 
 GtkListStore *liststore;
 GdkWindow    *gdkwin;
@@ -48,8 +51,6 @@
 
 void add_list_color (gchar *spec, gchar *name, gchar *type, gboolean is_new_color)
 {
-	GdkPixmap   *pixmap;
-	GdkBitmap   *mask;
 	GdkPixbuf   *buf;
 	GtkTreeIter  iter;
 	
@@ -103,7 +104,7 @@
 	gchar *name;
 	gchar  buffer[512];
 	gchar  spec[8];
-	gint   r, g, b, lr, lg, lb;
+	gint   r, g, b, lr=0, lg=0, lb=0;
 	
 	fp = fopen (filename, "r");
 	if (!fp)
@@ -140,7 +141,6 @@
 	GtkTreeViewColumn *column;
 	GtkWidget         *treeview;
 	GtkTreeSelection  *select;
-	gchar             *buf;
 	
 #ifdef ENABLE_NLS
 	bindtextdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR);


Index: gcolor2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcolor2/F-12/gcolor2.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- gcolor2.spec	24 Jul 2009 23:36:49 -0000	1.2
+++ gcolor2.spec	3 Oct 2009 12:09:03 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           gcolor2
 Version:        0.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A simple color selector for GTK+2
 
 Group:          Applications/Publishing
@@ -8,6 +8,7 @@ License:        GPLv2
 URL:            http://gcolor2.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
 Source1:        %{name}.desktop
+Patch0:         %{name}-0.4-missing-includes.patch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires:  gtk2-devel perl(XML::Parser) desktop-file-utils
@@ -18,9 +19,11 @@ ported to use GTK+2, and now has a compl
 
 %prep
 %setup -q
+%patch0 -p1 -b .missing
 # make sure path to icon is correct
 sed -i 's!/usr/share!%{_datadir}!' %{SOURCE1}
 
+
 %build
 %configure
 make %{?_smp_mflags}
@@ -46,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/%{name}.desktop
 
 %changelog
+* Sat Oct 03 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4-3
+- Fix missing includes (#525783)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild