diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2010-06-19 16:18:20 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-06-19 16:18:20 +0000 |
commit | 6dc0e18d64d2cd2059905d87e890a8250ffcd11b (patch) | |
tree | b33c647605b1d13b449b877364f592e2400fcacd /dev-util/xdelta/files | |
parent | Masking app-doc/repodoc for removal (diff) | |
download | historical-6dc0e18d64d2cd2059905d87e890a8250ffcd11b.tar.gz historical-6dc0e18d64d2cd2059905d87e890a8250ffcd11b.tar.bz2 historical-6dc0e18d64d2cd2059905d87e890a8250ffcd11b.zip |
old
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
Diffstat (limited to 'dev-util/xdelta/files')
-rw-r--r-- | dev-util/xdelta/files/xdelta-1.1.3-64bit.patch | 11 | ||||
-rw-r--r-- | dev-util/xdelta/files/xdelta-1.1.3-freegen.patch | 22 | ||||
-rw-r--r-- | dev-util/xdelta/files/xdelta-1.1.3-gcc4.patch | 11 | ||||
-rw-r--r-- | dev-util/xdelta/files/xdelta-1.1.3-glib2.patch | 227 | ||||
-rw-r--r-- | dev-util/xdelta/files/xdelta-1.1.3-m4.patch | 7 |
5 files changed, 0 insertions, 278 deletions
diff --git a/dev-util/xdelta/files/xdelta-1.1.3-64bit.patch b/dev-util/xdelta/files/xdelta-1.1.3-64bit.patch deleted file mode 100644 index 7f354436dbdd..000000000000 --- a/dev-util/xdelta/files/xdelta-1.1.3-64bit.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- xdelta-1.1.3/libedsio/fh.c.allocbug 2001-06-12 05:16:41.000000000 +0200 -+++ xdelta-1.1.3/libedsio/fh.c 2006-05-09 12:23:04.000000000 +0200 -@@ -92,6 +92,8 @@ - { - if (! ssource->fh->table->table_handle_getui (ssource->fh, &source->alloc_total)) - return ST_Error; -+ /* There are 12 pointers in all required structures. So 64 bit arch needs 48 more bytes. */ -+ source->alloc_total += (sizeof(void *) - 4) * 12; - } - - return x; diff --git a/dev-util/xdelta/files/xdelta-1.1.3-freegen.patch b/dev-util/xdelta/files/xdelta-1.1.3-freegen.patch deleted file mode 100644 index cad913f9330f..000000000000 --- a/dev-util/xdelta/files/xdelta-1.1.3-freegen.patch +++ /dev/null @@ -1,22 +0,0 @@ - -from RedHat/Fedora - ---- 20050325/xdelta-1.1.3/xdelta.c.BAK -+++ 20050325/xdelta-1.1.3/xdelta.c -@@ -230,6 +230,15 @@ - /* $Format: "#define XDELTA_REQUIRED_VERSION \"$ReleaseMajorVersion$.$ReleaseMinorVersion$.\"" $ */ - #define XDELTA_REQUIRED_VERSION "1.1." - -+void -+xdp_generator_free (XdeltaGenerator *xg) -+{ -+ xdp_source_free(xg->data_source); -+ g_ptr_array_free(xg->sources, TRUE); -+ -+ g_free(xg); -+} -+ - XdeltaGenerator* - __xdp_generator_new (const char* version) - { - diff --git a/dev-util/xdelta/files/xdelta-1.1.3-gcc4.patch b/dev-util/xdelta/files/xdelta-1.1.3-gcc4.patch deleted file mode 100644 index c2661452334a..000000000000 --- a/dev-util/xdelta/files/xdelta-1.1.3-gcc4.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- xdmain.c 2001-09-24 08:59:18.000000000 +0200 -+++ xdmain-new.c 2005-05-01 17:26:38.229969816 +0200 -@@ -64,7 +64,7 @@ - - #include "xdelta.h" - --extern HandleFuncTable xd_handle_table; -+static HandleFuncTable xd_handle_table; - - #define XD_PAGE_SIZE (1<<20) - diff --git a/dev-util/xdelta/files/xdelta-1.1.3-glib2.patch b/dev-util/xdelta/files/xdelta-1.1.3-glib2.patch deleted file mode 100644 index 62ce506122ce..000000000000 --- a/dev-util/xdelta/files/xdelta-1.1.3-glib2.patch +++ /dev/null @@ -1,227 +0,0 @@ ---- xdelta-1.1.3/libedsio/edsio.h.glib2 2001-06-12 05:16:41.000000000 +0200 -+++ xdelta-1.1.3/libedsio/edsio.h 2006-05-29 16:45:35.000000000 +0200 -@@ -480,49 +480,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.3/libedsio/edsio.c.glib2 2001-09-24 08:48:52.000000000 +0200 -+++ xdelta-1.1.3/libedsio/edsio.c 2006-05-29 16:45:35.000000000 +0200 -@@ -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); - } -@@ -1481,130 +1481,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.3/configure.in.glib2 2006-05-29 16:46:35.000000000 +0200 -+++ xdelta-1.1.3/configure.in 2006-05-29 16:46:38.000000000 +0200 -@@ -71,13 +71,13 @@ - 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/)) - - AC_CHECK_LIB(z, gzsetparams, -- AC_CHECK_HEADER(zlib.h,, -- AC_MSG_ERROR(ZLIB headers not found)), -- AC_MSG_ERROR(ZLIB library not found)) -+ [AC_CHECK_HEADER(zlib.h,, -+ AC_MSG_ERROR(ZLIB headers not found))], -+ [AC_MSG_ERROR(ZLIB library not found)]) - - AC_OUTPUT(Makefile - doc/Makefile diff --git a/dev-util/xdelta/files/xdelta-1.1.3-m4.patch b/dev-util/xdelta/files/xdelta-1.1.3-m4.patch deleted file mode 100644 index ad37d805902a..000000000000 --- a/dev-util/xdelta/files/xdelta-1.1.3-m4.patch +++ /dev/null @@ -1,7 +0,0 @@ ---- xdelta.m4 -+++ xdelta.m4 -@@ -6,3 +6,3 @@ - dnl --AC_DEFUN(AM_PATH_XDELTA, -+AC_DEFUN([AM_PATH_XDELTA], - [dnl |