rpms/xdelta/devel xdelta-1.1.4-glib2.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 xdelta.spec, 1.23, 1.24 xdelta-1.1.3-allocbug.patch, 1.1, NONE xdelta-1.1.3-freegen.patch, 1.1, NONE xdelta-1.1.3-gcc4.patch, 1.1, NONE xdelta-1.1.3-glib2.patch, 1.2, NONE

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Mon Jan 29 14:26:15 UTC 2007 

Author: atkac

Update of /cvs/dist/rpms/xdelta/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19879/xdelta/devel

Modified Files:
	.cvsignore sources xdelta.spec 
Added Files:
	xdelta-1.1.4-glib2.patch 
Removed Files:
	xdelta-1.1.3-allocbug.patch xdelta-1.1.3-freegen.patch 
	xdelta-1.1.3-gcc4.patch xdelta-1.1.3-glib2.patch 
Log Message:
updated to 1.1.4pre1


xdelta-1.1.4-glib2.patch:
 configure.in     |    4 -
 libedsio/edsio.c |  132 +------------------------------------------------------
 libedsio/edsio.h |   43 -----------------
 3 files changed, 5 insertions(+), 174 deletions(-)

--- NEW FILE xdelta-1.1.4-glib2.patch ---
--- xdelta-1.1.4pre1/libedsio/edsio.c.glib2	2007-01-29 14:55:10.000000000 +0100
+++ xdelta-1.1.4pre1/libedsio/edsio.c	2007-01-29 14:56:52.000000000 +0100
@@ -179,9 +179,9 @@
 		    }
 		}
 
-	      while (g_queue_get_size (queued) > 0)
+	      while (g_queue_get_length (queued) > 0)
 		{
-		  DelayedEvent* de = g_queue_pop (queued);
+		  DelayedEvent* de = g_queue_pop_head (queued);
 
 		  for (i = 0; i < all_event_watchers->len; i += 1)
 		    {
@@ -211,7 +211,7 @@
 	      de->def = def;
 	      de->msg = out->str;
 
-	      g_queue_push (queued, de);
+	      g_queue_push_tail (queued, de);
 
 	      g_ptr_array_add (free_strings, out);
 	    }
@@ -1482,129 +1482,3 @@
   g_free (source);
 }
 
-/* Missing glib stuff
- */
-
-GQueue *
-g_queue_new (void)
-{
-  GQueue *q = g_new (GQueue, 1);
-
-  q->list = q->list_end = NULL;
-  q->list_size = 0;
-
-  return q;
-}
-
-
-void
-g_queue_free (GQueue *q)
-{
-  if (q)
-    {
-      if (q->list)
-        g_list_free (q->list);
-      g_free (q);
-    }
-}
-
-
-guint
-g_queue_get_size (GQueue *q)
-{
-  return (q == NULL) ? 0 : q->list_size;
-}
-
-
-void
-g_queue_push_front (GQueue *q, gpointer data)
-{
-  if (q)
-    {
-      q->list = g_list_prepend (q->list, data);
-
-      if (q->list_end == NULL)
-        q->list_end = q->list;
-
-      q->list_size++;
-    }
-}
-
-
-void
-g_queue_push_back (GQueue *q, gpointer data)
-{
-  if (q)
-    {
-      q->list_end = g_list_append (q->list_end, data);
-
-      if (! q->list)
-        q->list = q->list_end;
-      else
-        q->list_end = q->list_end->next;
-
-      q->list_size++;
-    }
-}
-
-
-gpointer
-g_queue_pop_front (GQueue *q)
-{
-  gpointer data = NULL;
-
-  if ((q) && (q->list))
-    {
-      GList *node;
-
-      node = q->list;
-      data = node->data;
-
-      if (! node->next)
-        {
-          q->list = q->list_end = NULL;
-          q->list_size = 0;
-        }
-      else
-        {
-          q->list = node->next;
-          q->list->prev = NULL;
-          q->list_size--;
-        }
-
-      g_list_free_1 (node);
-    }
-
-  return data;
-}
-
-
-gpointer
-g_queue_pop_back (GQueue *q)
-{
-  gpointer data = NULL;
-
-  if ((q) && (q->list))
-    {
-      GList *node;
-
-      node = q->list_end;
-      data = node->data;
-
-      if (! node->prev)
-	{
-          q->list = q->list_end = NULL;
-          q->list_size = 0;
-        }
-      else
-	{
-          q->list_end = node->prev;
-          q->list_end->next = NULL;
-          q->list_size--;
-        }
-
-      g_list_free_1 (node);
-    }
-
-  return data;
-}
--- xdelta-1.1.4pre1/libedsio/edsio.h.glib2	2007-01-29 14:54:38.000000000 +0100
+++ xdelta-1.1.4pre1/libedsio/edsio.h	2007-01-29 14:55:00.000000000 +0100
@@ -481,49 +481,6 @@
 
 #endif
 
-/* Missing glib stuff
- */
-
-typedef struct _GQueue		GQueue;
-
-struct _GQueue
-{
-  GList *list;
-  GList *list_end;
-  guint list_size;
-};
-
-/* Queues
- */
-
-GQueue *	g_queue_new		(void);
-void		g_queue_free		(GQueue *q);
-guint		g_queue_get_size	(GQueue *q);
-void		g_queue_push_front	(GQueue *q, gpointer data);
-void		g_queue_push_back	(GQueue *q, gpointer data);
-gpointer	g_queue_pop_front	(GQueue *q);
-gpointer	g_queue_pop_back	(GQueue *q);
-
-#define g_queue_empty(queue) \
-	((((GQueue *)(queue)) && ((GQueue *)(queue))->list) ? FALSE : TRUE)
-
-#define g_queue_peek_front(queue) \
-	((((GQueue *)(queue)) && ((GQueue *)(queue))->list) ? \
-		((GQueue *)(queue))->list->data : NULL)
-
-#define g_queue_peek_back(queue) \
-	((((GQueue *)(queue)) && ((GQueue *)(queue))->list_end) ? \
-		((GQueue *)(queue))->list_end->data : NULL)
-
-#define g_queue_index(queue,ptr) \
-	((((GQueue *)(queue)) && ((GQueue *)(queue))->list) ? \
-		g_list_index (((GQueue *)(queue))->list, (ptr)) : -1)
-
-#define		g_queue_push		g_queue_push_back
-#define		g_queue_pop		g_queue_pop_front
-#define		g_queue_peek		g_queue_peek_front
-
-
 #ifdef __cplusplus
 }
 #endif
--- xdelta-1.1.4pre1/configure.in.glib2	2007-01-29 14:58:06.000000000 +0100
+++ xdelta-1.1.4pre1/configure.in	2007-01-29 14:59:18.000000000 +0100
@@ -71,8 +71,8 @@
 top_srcdir_absolute=`cd $srcdir; pwd`
 AC_SUBST(top_srcdir_absolute)
 
-AM_PATH_GLIB(1.2.8,,
-  AC_MSG_ERROR(Test for GLIB failed. Download it from ftp://ftp.gtk.org/pub/gtk/v1.2/))
+AM_PATH_GLIB_2_0(2.10.0,,
+  AC_MSG_ERROR(Test for GLIB2.0 failed. Download it from ftp://ftp.gtk.org/pub/gtk/v2.10/))
 
 dnl AC_CHECK_LIB(z, gzsetparams, */
 dnl   AC_CHECK_HEADER(zlib.h,, */


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xdelta/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	9 Sep 2004 14:37:30 -0000	1.3
+++ .cvsignore	29 Jan 2007 14:26:13 -0000	1.4
@@ -1 +1 @@
-xdelta-1.1.3.tar.gz
+xdelta-1.1.4pre1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xdelta/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	9 Sep 2004 14:37:30 -0000	1.3
+++ sources	29 Jan 2007 14:26:13 -0000	1.4
@@ -1 +1 @@
-08e964c28541605b6fe61c0dd6595516  xdelta-1.1.3.tar.gz
+4a8e7ae9b963785c0d57a9a5c08661b6  xdelta-1.1.4pre1.tar.gz


Index: xdelta.spec
===================================================================
RCS file: /cvs/dist/rpms/xdelta/devel/xdelta.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- xdelta.spec	15 Jul 2006 03:04:20 -0000	1.23
+++ xdelta.spec	29 Jan 2007 14:26:13 -0000	1.24
@@ -1,16 +1,13 @@
 Summary: A binary file delta generator and an RCS replacement library.
 Name: xdelta
-Version: 1.1.3
-Release: 20
+Version: 1.1.4pre1
+Release: 1%{?dist}
 License: GPL
 Group: Development/Tools
 Source: http://prdownloads.sourceforge.net/xdelta/xdelta-%{version}.tar.gz
-Patch0: xdelta-1.1.3-freegen.patch
 Patch1: xdelta-1.1.3-aclocal.patch
-Patch2: xdelta-1.1.3-gcc4.patch
 Patch3: xdelta-1.1.3-edsio.patch
-Patch4: xdelta-1.1.3-glib2.patch
-Patch5: xdelta-1.1.3-allocbug.patch
+Patch4: xdelta-1.1.4-glib2.patch
 Patch6: xdelta-1.1.3-pkgconfig.patch
 Url: http://sourceforge.net/projects/xdelta/
 BuildRequires: glib2-devel, zlib-devel, libtool >= 1.5.22, automake >= 1.9.6, autoconf >= 2.59, pkgconfig
@@ -36,12 +33,9 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .freegen
 %patch1 -p1 -b .aclocal
-%patch2 -p1 -b .gcc4
 %patch3 -p1 -b .edsio
 %patch4 -p1 -b .glib2
-%patch5 -p1 -b .allocbug
 %patch6 -p1 -b .pkgconfig
 
 %build
@@ -86,6 +80,10 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Mon Jan 29 2007 Adam Tkac <atkac redhat com> 1.1.4pre1-1.fc7
+- started using dist macro
+- updated to 1.1.4pre1
+
 * Fri Jul 14 2006 Jesse Keating <jkeating at redhat.com> 1.1.3-20
 - rebuild
 


--- xdelta-1.1.3-allocbug.patch DELETED ---


--- xdelta-1.1.3-freegen.patch DELETED ---


--- xdelta-1.1.3-gcc4.patch DELETED ---


--- xdelta-1.1.3-glib2.patch DELETED ---

More information about the fedora-cvs-commits mailing list