514 lines
15 KiB
514 lines
15 KiB
# --- T2-COPYRIGHT-NOTE-BEGIN --- |
|
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. |
|
# |
|
# T2 SDE: package/.../xdelta/glib2.patch |
|
# Copyright (C) 2006 The T2 SDE Project |
|
# |
|
# More information can be found in the files COPYING and README. |
|
# |
|
# This patch file is dual-licensed. It is available under the license the |
|
# patched project is licensed under, as long as it is an OpenSource license |
|
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms |
|
# of the GNU General Public License as published by the Free Software |
|
# Foundation; either version 2 of the License, or (at your option) any later |
|
# version. |
|
# --- T2-COPYRIGHT-NOTE-END --- |
|
|
|
--- xdelta-1.1.3/libedsio/edsio.c.glib2 2001-09-24 08:48:52.000000000 +0200 |
|
+++ xdelta-1.1.3/libedsio/edsio.c 2005-09-09 11:01: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/libedsio/edsio.h.glib2 2001-06-12 05:16:41.000000000 +0200 |
|
+++ xdelta-1.1.3/libedsio/edsio.h 2005-09-09 10:55:56.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/configure.glib2 2001-09-24 08:59:20.000000000 +0200 |
|
+++ xdelta-1.1.3/configure 2005-09-09 10:55:56.000000000 +0200 |
|
@@ -142,12 +142,6 @@ |
|
--with-gnu-ld assume the C compiler uses GNU ld [default=no]" |
|
ac_help="$ac_help |
|
--disable-libtool-lock avoid locking (might break parallel builds)" |
|
-ac_help="$ac_help |
|
- --with-glib-prefix=PFX Prefix where GLIB is installed (optional)" |
|
-ac_help="$ac_help |
|
- --with-glib-exec-prefix=PFX Exec prefix where GLIB is installed (optional)" |
|
-ac_help="$ac_help |
|
- --disable-glibtest Do not try to compile and run a test GLIB program" |
|
|
|
# Initialize some variables set by options. |
|
# The variables have the same names as the options, with |
|
@@ -2024,276 +2018,6 @@ |
|
top_srcdir_absolute=`cd $srcdir; pwd` |
|
|
|
|
|
-# Check whether --with-glib-prefix or --without-glib-prefix was given. |
|
-if test "${with_glib_prefix+set}" = set; then |
|
- withval="$with_glib_prefix" |
|
- glib_config_prefix="$withval" |
|
-else |
|
- glib_config_prefix="" |
|
-fi |
|
- |
|
-# Check whether --with-glib-exec-prefix or --without-glib-exec-prefix was given. |
|
-if test "${with_glib_exec_prefix+set}" = set; then |
|
- withval="$with_glib_exec_prefix" |
|
- glib_config_exec_prefix="$withval" |
|
-else |
|
- glib_config_exec_prefix="" |
|
-fi |
|
- |
|
-# Check whether --enable-glibtest or --disable-glibtest was given. |
|
-if test "${enable_glibtest+set}" = set; then |
|
- enableval="$enable_glibtest" |
|
- : |
|
-else |
|
- enable_glibtest=yes |
|
-fi |
|
- |
|
- |
|
- if test x$glib_config_exec_prefix != x ; then |
|
- glib_config_args="$glib_config_args --exec-prefix=$glib_config_exec_prefix" |
|
- if test x${GLIB_CONFIG+set} != xset ; then |
|
- GLIB_CONFIG=$glib_config_exec_prefix/bin/glib-config |
|
- fi |
|
- fi |
|
- if test x$glib_config_prefix != x ; then |
|
- glib_config_args="$glib_config_args --prefix=$glib_config_prefix" |
|
- if test x${GLIB_CONFIG+set} != xset ; then |
|
- GLIB_CONFIG=$glib_config_prefix/bin/glib-config |
|
- fi |
|
- fi |
|
- |
|
- for module in . |
|
- do |
|
- case "$module" in |
|
- gmodule) |
|
- glib_config_args="$glib_config_args gmodule" |
|
- ;; |
|
- gthread) |
|
- glib_config_args="$glib_config_args gthread" |
|
- ;; |
|
- esac |
|
- done |
|
- |
|
- # Extract the first word of "glib-config", so it can be a program name with args. |
|
-set dummy glib-config; ac_word=$2 |
|
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 |
|
-echo "configure:2081: checking for $ac_word" >&5 |
|
-if eval "test \"`echo '$''{'ac_cv_path_GLIB_CONFIG'+set}'`\" = set"; then |
|
- echo $ac_n "(cached) $ac_c" 1>&6 |
|
-else |
|
- case "$GLIB_CONFIG" in |
|
- /*) |
|
- ac_cv_path_GLIB_CONFIG="$GLIB_CONFIG" # Let the user override the test with a path. |
|
- ;; |
|
- ?:/*) |
|
- ac_cv_path_GLIB_CONFIG="$GLIB_CONFIG" # Let the user override the test with a dos path. |
|
- ;; |
|
- *) |
|
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" |
|
- ac_dummy="$PATH" |
|
- for ac_dir in $ac_dummy; do |
|
- test -z "$ac_dir" && ac_dir=. |
|
- if test -f $ac_dir/$ac_word; then |
|
- ac_cv_path_GLIB_CONFIG="$ac_dir/$ac_word" |
|
- break |
|
- fi |
|
- done |
|
- IFS="$ac_save_ifs" |
|
- test -z "$ac_cv_path_GLIB_CONFIG" && ac_cv_path_GLIB_CONFIG="no" |
|
- ;; |
|
-esac |
|
-fi |
|
-GLIB_CONFIG="$ac_cv_path_GLIB_CONFIG" |
|
-if test -n "$GLIB_CONFIG"; then |
|
- echo "$ac_t""$GLIB_CONFIG" 1>&6 |
|
-else |
|
- echo "$ac_t""no" 1>&6 |
|
-fi |
|
- |
|
- min_glib_version=1.2.8 |
|
- echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6 |
|
-echo "configure:2116: checking for GLIB - version >= $min_glib_version" >&5 |
|
- no_glib="" |
|
- if test "$GLIB_CONFIG" = "no" ; then |
|
- no_glib=yes |
|
- else |
|
- GLIB_CFLAGS=`$GLIB_CONFIG $glib_config_args --cflags` |
|
- GLIB_LIBS=`$GLIB_CONFIG $glib_config_args --libs` |
|
- glib_config_major_version=`$GLIB_CONFIG $glib_config_args --version | \ |
|
- sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` |
|
- glib_config_minor_version=`$GLIB_CONFIG $glib_config_args --version | \ |
|
- sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'` |
|
- glib_config_micro_version=`$GLIB_CONFIG $glib_config_args --version | \ |
|
- sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'` |
|
- if test "x$enable_glibtest" = "xyes" ; then |
|
- ac_save_CFLAGS="$CFLAGS" |
|
- ac_save_LIBS="$LIBS" |
|
- CFLAGS="$CFLAGS $GLIB_CFLAGS" |
|
- LIBS="$GLIB_LIBS $LIBS" |
|
- rm -f conf.glibtest |
|
- if test "$cross_compiling" = yes; then |
|
- echo $ac_n "cross compiling; assumed OK... $ac_c" |
|
-else |
|
- cat > conftest.$ac_ext <<EOF |
|
-#line 2139 "configure" |
|
-#include "confdefs.h" |
|
- |
|
-#include <glib.h> |
|
-#include <stdio.h> |
|
-#include <stdlib.h> |
|
- |
|
-int |
|
-main () |
|
-{ |
|
- int major, minor, micro; |
|
- char *tmp_version; |
|
- |
|
- system ("touch conf.glibtest"); |
|
- |
|
- /* HP/UX 9 (%@#!) writes to sscanf strings */ |
|
- tmp_version = g_strdup("$min_glib_version"); |
|
- if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { |
|
- printf("%s, bad version string\n", "$min_glib_version"); |
|
- exit(1); |
|
- } |
|
- |
|
- if ((glib_major_version != $glib_config_major_version) || |
|
- (glib_minor_version != $glib_config_minor_version) || |
|
- (glib_micro_version != $glib_config_micro_version)) |
|
- { |
|
- printf("\n*** 'glib-config --version' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", |
|
- $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version, |
|
- glib_major_version, glib_minor_version, glib_micro_version); |
|
- printf ("*** was found! If glib-config was correct, then it is best\n"); |
|
- printf ("*** to remove the old version of GLIB. You may also be able to fix the error\n"); |
|
- printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); |
|
- printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); |
|
- printf("*** required on your system.\n"); |
|
- printf("*** If glib-config was wrong, set the environment variable GLIB_CONFIG\n"); |
|
- printf("*** to point to the correct copy of glib-config, and remove the file config.cache\n"); |
|
- printf("*** before re-running configure\n"); |
|
- } |
|
- else if ((glib_major_version != GLIB_MAJOR_VERSION) || |
|
- (glib_minor_version != GLIB_MINOR_VERSION) || |
|
- (glib_micro_version != GLIB_MICRO_VERSION)) |
|
- { |
|
- printf("*** GLIB header files (version %d.%d.%d) do not match\n", |
|
- GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION); |
|
- printf("*** library (version %d.%d.%d)\n", |
|
- glib_major_version, glib_minor_version, glib_micro_version); |
|
- } |
|
- else |
|
- { |
|
- if ((glib_major_version > major) || |
|
- ((glib_major_version == major) && (glib_minor_version > minor)) || |
|
- ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro))) |
|
- { |
|
- return 0; |
|
- } |
|
- else |
|
- { |
|
- printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n", |
|
- glib_major_version, glib_minor_version, glib_micro_version); |
|
- printf("*** You need a version of GLIB newer than %d.%d.%d. The latest version of\n", |
|
- major, minor, micro); |
|
- printf("*** GLIB is always available from ftp://ftp.gtk.org.\n"); |
|
- printf("***\n"); |
|
- printf("*** If you have already installed a sufficiently new version, this error\n"); |
|
- printf("*** probably means that the wrong copy of the glib-config shell script is\n"); |
|
- printf("*** being found. The easiest way to fix this is to remove the old version\n"); |
|
- printf("*** of GLIB, but you can also set the GLIB_CONFIG environment to point to the\n"); |
|
- printf("*** correct copy of glib-config. (In this case, you will have to\n"); |
|
- printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); |
|
- printf("*** so that the correct libraries are found at run-time))\n"); |
|
- } |
|
- } |
|
- return 1; |
|
-} |
|
- |
|
-EOF |
|
-if { (eval echo configure:2215: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null |
|
-then |
|
- : |
|
-else |
|
- echo "configure: failed program was:" >&5 |
|
- cat conftest.$ac_ext >&5 |
|
- rm -fr conftest* |
|
- no_glib=yes |
|
-fi |
|
-rm -fr conftest* |
|
-fi |
|
- |
|
- CFLAGS="$ac_save_CFLAGS" |
|
- LIBS="$ac_save_LIBS" |
|
- fi |
|
- fi |
|
- if test "x$no_glib" = x ; then |
|
- echo "$ac_t""yes" 1>&6 |
|
- : |
|
- else |
|
- echo "$ac_t""no" 1>&6 |
|
- if test "$GLIB_CONFIG" = "no" ; then |
|
- echo "*** The glib-config script installed by GLIB could not be found" |
|
- echo "*** If GLIB was installed in PREFIX, make sure PREFIX/bin is in" |
|
- echo "*** your path, or set the GLIB_CONFIG environment variable to the" |
|
- echo "*** full path to glib-config." |
|
- else |
|
- if test -f conf.glibtest ; then |
|
- : |
|
- else |
|
- echo "*** Could not run GLIB test program, checking why..." |
|
- CFLAGS="$CFLAGS $GLIB_CFLAGS" |
|
- LIBS="$LIBS $GLIB_LIBS" |
|
- cat > conftest.$ac_ext <<EOF |
|
-#line 2249 "configure" |
|
-#include "confdefs.h" |
|
- |
|
-#include <glib.h> |
|
-#include <stdio.h> |
|
- |
|
-int main() { |
|
- return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); |
|
-; return 0; } |
|
-EOF |
|
-if { (eval echo configure:2259: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then |
|
- rm -rf conftest* |
|
- echo "*** The test program compiled, but did not run. This usually means" |
|
- echo "*** that the run-time linker is not finding GLIB or finding the wrong" |
|
- echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your" |
|
- echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" |
|
- echo "*** to the installed location Also, make sure you have run ldconfig if that" |
|
- echo "*** is required on your system" |
|
- echo "***" |
|
- echo "*** If you have an old version installed, it is best to remove it, although" |
|
- echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" |
|
- echo "***" |
|
- echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that" |
|
- echo "*** came with the system with the command" |
|
- echo "***" |
|
- echo "*** rpm --erase --nodeps gtk gtk-devel" |
|
-else |
|
- echo "configure: failed program was:" >&5 |
|
- cat conftest.$ac_ext >&5 |
|
- rm -rf conftest* |
|
- echo "*** The test program failed to compile or link. See the file config.log for the" |
|
- echo "*** exact error that occured. This usually means GLIB was incorrectly installed" |
|
- echo "*** or that you have moved GLIB since it was installed. In the latter case, you" |
|
- echo "*** may want to edit the glib-config script: $GLIB_CONFIG" |
|
-fi |
|
-rm -f conftest* |
|
- CFLAGS="$ac_save_CFLAGS" |
|
- LIBS="$ac_save_LIBS" |
|
- fi |
|
- fi |
|
- GLIB_CFLAGS="" |
|
- GLIB_LIBS="" |
|
- { echo "configure: error: Test for GLIB failed. Download it from ftp://ftp.gtk.org/pub/gtk/v1.2/" 1>&2; exit 1; } |
|
- fi |
|
- |
|
- |
|
- rm -f conf.glibtest |
|
- |
|
- |
|
echo $ac_n "checking for gzsetparams in -lz""... $ac_c" 1>&6 |
|
echo "configure:2299: checking for gzsetparams in -lz" >&5 |
|
ac_lib_var=`echo z'_'gzsetparams | sed 'y%./+-%__p_%'`
|
|
|