rpms/d4x/devel d4x-2.5.0-fixes.patch,NONE,1.1 d4x.spec,1.6,1.7

[Matthias Saou (thias)]

Author: thias

Update of /cvs/extras/rpms/d4x/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1907

Modified Files:
	d4x.spec 
Added Files:
	d4x-2.5.0-fixes.patch 
Log Message:
Include gcc4 fixes.


d4x-2.5.0-fixes.patch:

--- NEW FILE d4x-2.5.0-fixes.patch ---
--- d4x-2.5.0rel.orig/main/face/lod.cc
+++ d4x-2.5.0rel/main/face/lod.cc
@@ -126,21 +126,20 @@
 };
 
 /***************************************************************/
-
-struct GtkCellRendererProgress{
+struct GtkCellRendererProgressD4X{
 	GtkCellRenderer parent;
 	gfloat percent;
 	tDownload *dwn;
 };
 
-struct GtkCellRendererProgressClass{
+struct GtkCellRendererProgressD4XClass{
 	GtkCellRendererClass parent_class;
 };
 
-GtkType          gtk_cell_renderer_progress_get_type (void);
-GtkCellRenderer *gtk_cell_renderer_progress_new      (void);
+//GtkType          gtk_cell_renderer_progress_get_type (void);
+//GtkCellRenderer *gtk_cell_renderer_progress_new      (void);
 
-static void gtk_cell_renderer_progress_init (GtkCellRendererProgress *cellpixbuf){
+static void gtk_cell_renderer_progress_init (GtkCellRendererProgressD4X *cellpixbuf){
 };
 
 static void
@@ -172,7 +171,7 @@
 					 guint         param_id,
 					 const GValue *value,
 					 GParamSpec   *pspec){
-	GtkCellRendererProgress *renderer = (GtkCellRendererProgress *)object;
+	GtkCellRendererProgressD4X *renderer = (GtkCellRendererProgressD4X *)object;
 	switch (param_id){
 	case 1:
 		renderer->percent=g_value_get_float(value);
@@ -195,7 +194,7 @@
 				   GdkRectangle       *expose_area,
 				   GtkCellRendererState flags){
 	char tmpc[100];
-	float p=((GtkCellRendererProgress*)cell)->percent;
+	float p=((GtkCellRendererProgressD4X*)cell)->percent;
 
 	if (p>99.0 && p<100.0)
 		sprintf(tmpc,"%.1f",p);
@@ -223,7 +222,7 @@
 	switch (CFG.PROGRESS_MODE){
 	case 2:{
 		if (p<=0) break;
-		tDownload *temp=((GtkCellRendererProgress*)cell)->dwn;;
+		tDownload *temp=((GtkCellRendererProgressD4X*)cell)->dwn;;
 		if (temp && temp->segments && temp->finfo.size>0){
 			temp->segments->lock_public();
 			tSegment *tmp=temp->segments->get_first();
@@ -271,7 +270,7 @@
 };
 
 
-static void gtk_cell_renderer_progress_class_init (GtkCellRendererProgressClass *klass){
+static void gtk_cell_renderer_progress_class_init (GtkCellRendererProgressD4XClass *klass){
 	GObjectClass *object_class = G_OBJECT_CLASS (klass);
 	GtkCellRendererClass *cell_class = GTK_CELL_RENDERER_CLASS (klass);
 
@@ -300,19 +299,19 @@
 	{
 		static const GTypeInfo cell_progress_info =
 		{
-			sizeof (GtkCellRendererProgressClass),
+			sizeof (GtkCellRendererProgressD4XClass),
 			NULL,		/* base_init */
 			NULL,		/* base_finalize */
 			(GClassInitFunc) gtk_cell_renderer_progress_class_init,
 			NULL,		/* class_finalize */
 			NULL,		/* class_data */
-			sizeof (GtkCellRendererProgress),
+			sizeof (GtkCellRendererProgressD4X),
 			0,              /* n_preallocs */
 			(GInstanceInitFunc) gtk_cell_renderer_progress_init,
 		};
 
 		cell_progress_type = g_type_register_static (GTK_TYPE_CELL_RENDERER,
-							     "GtkCellRendererProgress",
+							     "GtkCellRendererProgressD4X",
 							     &cell_progress_info,
 							     GTypeFlags(0));
 	}


Index: d4x.spec
===================================================================
RCS file: /cvs/extras/rpms/d4x/devel/d4x.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- d4x.spec	6 Apr 2005 22:11:36 -0000	1.6
+++ d4x.spec	3 May 2005 11:38:05 -0000	1.7
@@ -7,13 +7,13 @@
 Summary: Downloader for X that supports resuming and many other features
 Name: d4x
 Version: 2.5.0
-Release: %{?pre:0.%{pre}.}4
-
+Release: 5%{?pre:.%{pre}}
 Group: Applications/Internet
 License: Artistic
 URL: http://www.krasu.ru/soft/chuchelo/
 Source: http://www.krasu.ru/soft/chuchelo/files/d4x-%{version}%{?pre}%{?final}.tar.gz
 Patch0: d4x-2.5.0-ifwithnoexpression.patch
+Patch1: d4x-2.5.0-fixes.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: gtk2-devel, glib2-devel >= 2.4.0, gcc-c++, libstdc++-devel
 BuildRequires: libao-devel, esound-devel, desktop-file-utils
@@ -30,6 +30,7 @@
 %prep
 %setup -n %{name}-%{version}%{?pre}%{?final}
 %patch0 -p1
+%patch1 -p1
 
 %build
 %configure
@@ -67,8 +68,8 @@
 
 
 %changelog
-* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
-- rebuilt
+* Tue May  3 2005 Matthias Saou <http://freshrpms.net/> 2.5.0-5
+- Added gcc4 patch from Debian.
 
 * Mon Feb 14 2005 David Woodhouse <dwmw2 at infradead.org> 2.5.0-3
 - Fix #elif with no expression in main/sndserv.cc