glib/glib-2.28.1.patch

   1 --- misc/glib-2.28.1/gio/gzlibcompressor.c      2011-02-11 16:23:12.000000000 +0100
   2 +++ misc/build/glib-2.28.1/gio/gzlibcompressor.c        2011-02-25 15:59:17.000000000 +0100
   3 @@ -73,7 +73,7 @@
   4  g_zlib_compressor_set_gzheader (GZlibCompressor *compressor)
   5  {
   6    /* On win32, these functions were not exported before 1.2.4 */
   7 -#if !defined (G_OS_WIN32) || ZLIB_VERNUM >= 0x1240
   8 +#if (!defined (G_OS_WIN32) && ! defined(BUILD_OS_APPLEOSX)) || ZLIB_VERNUM >= 0x1240
   9    const gchar *filename;
  10
  11    if (compressor->format != G_ZLIB_COMPRESSOR_FORMAT_GZIP ||
  12 --- misc/glib-2.28.1/gio/gzlibdecompressor.c    2011-02-11 16:23:12.000000000 +0100
  13 +++ misc/build/glib-2.28.1/gio/gzlibdecompressor.c      2011-02-25 16:00:43.000000000 +0100
  14 @@ -76,7 +76,7 @@
  15  g_zlib_decompressor_set_gzheader (GZlibDecompressor *decompressor)
  16  {
  17    /* On win32, these functions were not exported before 1.2.4 */
  18 -#if !defined (G_OS_WIN32) || ZLIB_VERNUM >= 0x1240
  19 +#if (!defined (G_OS_WIN32) && !defined(BUILD_OS_APPLEOSX)) || ZLIB_VERNUM >= 0x1240
  20    if (decompressor->format != G_ZLIB_COMPRESSOR_FORMAT_GZIP)
  21      return;
  22
  23 @@ -376,7 +376,7 @@
  24    *bytes_read = inbuf_size - decompressor->zstream.avail_in;
  25    *bytes_written = outbuf_size - decompressor->zstream.avail_out;
  26
  27 -#if !defined (G_OS_WIN32) || ZLIB_VERNUM >= 0x1240
  28 +#if (!defined (G_OS_WIN32) && !defined(BUILD_OS_APPLEOSX)) || ZLIB_VERNUM >= 0x1240
  29    if (decompressor->header_data != NULL &&
  30        decompressor->header_data->gzheader.done == 1)
  31      {
  32 --- misc/glib-2.28.1/glib/gatomic.c     2011-02-11 16:23:12.000000000 +0100
  33 +++ misc/build/glib-2.28.1/glib/gatomic.c       2011-02-25 15:51:45.000000000 +0100
  34 @@ -28,6 +28,7 @@
  35  #endif
  36
  37  #include "gatomic.h"
  38 +#include "gthread.h"
  39  #include "gthreadprivate.h"
  40
  41  /**
  42 --- misc/glib-2.28.1/glib/gconvert.c
  43 +++ misc/build/glib-2.28.1/glib/gconvert.c
  44 @@ -58,13 +58,6 @@
  45
  46  #include "glibintl.h"
  47
  48 -#if defined(USE_LIBICONV_GNU) && !defined (_LIBICONV_H)
  49 -#error GNU libiconv in use but included iconv.h not from libiconv
  50 -#endif
  51 -#if !defined(USE_LIBICONV_GNU) && defined (_LIBICONV_H)
  52 -#error GNU libiconv not in use but included iconv.h is from libiconv
  53 -#endif
  54 -
  55
  56  /**
  57   * SECTION:conversions
  58
  59 --- misc/glib-2.28.1/configure
  60 +++ misc/build/glib-2.28.1/configure
  61 @@ -7097,6 +7097,7 @@
  62  fi
  63
  64
  65 +if false; then
  66  # Need suitable python path for greport
  67
  68
  69 @@ -7325,6 +7326,7 @@
  70
  71
  72
  73 +fi
  74
  75
  76
  77 @@ -7988,6 +7988,7 @@
  78  CONFIG_STATUS_DEPENDENCIES='$(top_srcdir)/po/LINGUAS'
  79
  80
  81 + if false; then
  82     for ac_header in locale.h
  83  do :
  84    ac_fn_c_check_header_mongrel "$LINENO" "locale.h" "ac_cv_header_locale_h" "$ac_includes_default"
  85 @@ -8701,6 +8701,8 @@
  86
  87  LIBS="$INTLLIBS $LIBS"
  88
  89 +fi
  90 +
  91  GETTEXT_PACKAGE=glib20
  92
  93
  94 --- misc/glib-2.28.1/Makefile.in
  95 +++ misc/build/glib-2.28.1/Makefile.in
  96 @@ -422,7 +422,7 @@
  97         gio-2.0-uninstalled.pc.in gio-unix-2.0-uninstalled.pc.in
  98  TEST_PROGS =
  99  ACLOCAL_AMFLAGS = -I m4macros ${ACLOCAL_FLAGS}
 100 -SUBDIRS = . m4macros glib gmodule gthread gobject gio tests po docs
 101 +SUBDIRS = . m4macros glib gmodule gthread gobject gio tests
 102  DIST_SUBDIRS = $(SUBDIRS) build
 103  bin_SCRIPTS = glib-gettextize
 104  AM_CPPFLAGS = \
 105 --- misc/glib-2.28.1/glib/gi18n.h
 106 +++ misc/build/glib-2.28.1/glib/gi18n.h
 107 @@ -20,15 +20,10 @@
 108  #ifndef __G_I18N_H__
 109  #define __G_I18N_H__
 110
 111 -#include <glib.h>
 112 -
 113 -#include <libintl.h>
 114 -#include <string.h>
 115 -
 116 -#define  _(String) gettext (String)
 117 -#define Q_(String) g_dpgettext (NULL, String, 0)
 118 -#define N_(String) (String)
 119 -#define C_(Context,String) g_dpgettext (NULL, Context "\004" String, strlen (Context) + 1)
 120 +#define _(String) (String)
 121 +#define Q_(String) (String)
 122 +#define N_(String) (String)
 123 +#define C_(Context,String) (String)
 124  #define NC_(Context, String) (String)
 125
 126  #endif  /* __G_I18N_H__ */
 127 --- misc/glib-2.28.1/gio/tests/gsettings.c
 128 +++ misc/build/glib-2.28.1/gio/tests/gsettings.c
 129 @@ -1,7 +1,9 @@
 130 +#include "config.h"
 131 +
 132  #include <stdlib.h>
 133  #include <locale.h>
 134 -#include <libintl.h>
 135  #include <gio/gio.h>
 136 +#include "glibintl.h"
 137  #include <gstdio.h>
 138  #define G_SETTINGS_ENABLE_BACKEND
 139  #include <gio/gsettingsbackend.h>
 140 --- misc/glib-2.28.1/gio/tests/gschema-compile.c
 141 +++ misc/build/glib-2.28.1/gio/tests/gschema-compile.c
 142 @@ -1,8 +1,10 @@
 143 +#include "config.h"
 144 +
 145  #include <stdlib.h>
 146  #include <unistd.h>
 147  #include <locale.h>
 148 -#include <libintl.h>
 149  #include <gio/gio.h>
 150 +#include "glibintl.h"
 151  #include <gstdio.h>
 152
 153  typedef struct {