diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:57:42 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:57:42 +0100 |
commit | 1798c4aeca70ac8d0a243684d6a798fbc65735f8 (patch) | |
tree | e48e19cb6fa03de18e1c63e1a93371b7ebc4eb56 /dev-util/xdelta/files | |
parent | d87262dd706fec50cd150aab3e93883b6337466d (diff) |
gentoo resync : 14.07.2018
Diffstat (limited to 'dev-util/xdelta/files')
-rw-r--r-- | dev-util/xdelta/files/xdelta-1.1.4-glib2.patch | 221 | ||||
-rw-r--r-- | dev-util/xdelta/files/xdelta-1.1.4-m4.patch | 11 | ||||
-rw-r--r-- | dev-util/xdelta/files/xdelta-1.1.4-pkgconfig.patch | 113 |
3 files changed, 0 insertions, 345 deletions
diff --git a/dev-util/xdelta/files/xdelta-1.1.4-glib2.patch b/dev-util/xdelta/files/xdelta-1.1.4-glib2.patch deleted file mode 100644 index 916b3ee2c007..000000000000 --- a/dev-util/xdelta/files/xdelta-1.1.4-glib2.patch +++ /dev/null @@ -1,221 +0,0 @@ -Nicked from http://cvs.fedoraproject.org/viewvc/devel/xdelta/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,, */ diff --git a/dev-util/xdelta/files/xdelta-1.1.4-m4.patch b/dev-util/xdelta/files/xdelta-1.1.4-m4.patch deleted file mode 100644 index ad8c99de5970..000000000000 --- a/dev-util/xdelta/files/xdelta-1.1.4-m4.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- xdelta-1.1.3/xdelta.m4.aclocal 2004-10-20 00:20:47.875648144 +0200 -+++ xdelta-1.1.3/xdelta.m4 2004-10-20 00:21:47.205628616 +0200 -@@ -4,7 +4,7 @@ - dnl AM_PATH_XDELTA([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) - dnl Test for XDELTA, and define XDELTA_CFLAGS and XDELTA_LIBS, if "gmodule" or - dnl --AC_DEFUN(AM_PATH_XDELTA, -+AC_DEFUN([AM_PATH_XDELTA], - [dnl - dnl Get the cflags and libraries from the xdelta-config script - dnl diff --git a/dev-util/xdelta/files/xdelta-1.1.4-pkgconfig.patch b/dev-util/xdelta/files/xdelta-1.1.4-pkgconfig.patch deleted file mode 100644 index bb509b8d4356..000000000000 --- a/dev-util/xdelta/files/xdelta-1.1.4-pkgconfig.patch +++ /dev/null @@ -1,113 +0,0 @@ -Nicked from http://cvs.fedoraproject.org/viewvc/devel/xdelta/xdelta-1.1.3-pkgconfig.patch - ---- /dev/null 2006-05-17 14:47:01.398050000 +0200 -+++ xdelta-1.1.3/xdelta.pc.in 2006-05-30 16:00:55.000000000 +0200 -@@ -0,0 +1,13 @@ -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ -+libdir=@libdir@ -+includedir=@includedir@ -+pkgdatadir=@pkgdatadir@ -+ -+Name: xdelta -+Description: A binary file delta generator and an RCS replacement library. -+Version: @VERSION@ -+Requires: glib-2.0 -+Libs: -L${libdir} -lxdelta -ledsio -+Cflags: -I${includedir} -+ ---- /dev/null 2006-05-17 14:47:01.398050000 +0200 -+++ xdelta-1.1.3/xdelta-config 2006-05-30 16:04:22.000000000 +0200 -@@ -0,0 +1,60 @@ -+#!/bin/bash -+# -+# Simple wrapper around pkg-config to replace /usr/bin/<foo>-config scripts -+# -+# Copyright 2006 Red Hat, Inc. -+# Jeremy Katz <katzj@redhat.com> -+ -+CFGPATH=$(basename $0) -+MODULE=${CFGPATH%-config} -+ -+usage() { -+ pkg-config --help -+ exit 1 -+} -+ -+if [ $# -lt 1 ]; then -+ usage 1>&2 -+fi -+ -+ARGS="" -+ -+while test $# -gt 0; do -+ case $1 in -+ --version) -+ ARGS="$ARGS --modversion" -+ ;; -+ --cflags) -+ ARGS="$ARGS --cflags" -+ ;; -+ --libs) -+ ARGS="$ARGS --libs" -+ ;; -+ --libdir*) -+ ARGS="$ARGS --libs-only-L" -+ ;; -+ --includedir*) -+ ARGS="$ARGS --cflags-only-I" -+ ;; -+ --prefix*) -+ ARGS="$ARGS --variable=prefix" -+ ;; -+ --exec-prefix*) -+ ARGS="$ARGS --variable=exec_prefix" -+ ;; -+ --module*) -+ if echo $1 | grep -q '=' ; then -+ MODULE=`echo $1 | sed 's/^--module=//'` -+ else -+ MODULE=$2 -+ shift -+ fi -+ ;; -+ *) -+ usage 1>&2 -+ ;; -+ esac -+ shift -+done -+ -+pkg-config $ARGS $MODULE ---- xdelta-1.1.3/Makefile.am.pkgconfig 2006-05-30 16:00:55.000000000 +0200 -+++ xdelta-1.1.3/Makefile.am 2006-05-30 16:00:55.000000000 +0200 -@@ -27,6 +27,9 @@ - m4datadir = $(datadir)/aclocal - m4data_DATA = xdelta.m4 - -+pkgconfigdir = $(libdir)/pkgconfig -+pkgconfig_DATA = xdelta.pc -+ - ## $Format: "libxdelta_la_LDFLAGS = -version-info $LibCurrent$:$LibRevision$:$LibAge$" $ - libxdelta_la_LDFLAGS = -version-info 2:0:0 - ---- xdelta-1.1.3/configure.in.pkgconfig 2006-05-30 16:00:55.000000000 +0200 -+++ xdelta-1.1.3/configure.in 2006-05-30 16:00:55.000000000 +0200 -@@ -63,6 +63,8 @@ - AC_HEADER_STDC - AC_PROG_MAKE_SET - -+PKG_PROG_PKG_CONFIG -+ - AC_CHECK_FUNCS(gettimeofday) - AC_HEADER_TIME - -@@ -83,7 +85,7 @@ - doc/Makefile - test/Makefile - djgpp/Makefile -- xdelta-config -+ xdelta.pc - libedsio/Makefile - libedsio/edsio-comp, - |