gdk-pixbuf/gdk-pixbuf-2.23.0.patch

   1 --- misc/gdk-pixbuf-2.23.0/configure    2010-12-23 15:18:11.000000000 +0100
   2 +++ misc/build/gdk-pixbuf-2.23.0/configure      2011-06-14 15:20:05.000000000 +0200
   3 @@ -16839,7 +16839,7 @@
   4
   5
   6
   7 -
   8 +if false; then
   9
  10  if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
  11         if test -n "$ac_tool_prefix"; then
  12 @@ -17158,14 +17158,18 @@
  13
  14
  15    rm -f conf.glibtest
  16 -
  17 +else
  18 +  GLIB_MKENUMS=glib-mkenums
  19 +  GLIB_GENMARSHAL=glib-genmarshal
  20 +  GOBJECT_QUERY=gobject-query
  21 +fi
  22
  23  # See if it's safe to turn G_DISABLE_DEPRECATED on.
  24 -GLIB_VERSION_MAJOR_MINOR=`$PKG_CONFIG --modversion glib-2.0 | sed "s/\.[^.]*\$//"`
  25 -GLIB_REQUIRED_VERSION_MAJOR_MINOR=`echo 2.25.15 | sed "s/\.[^.]*\$//"`
  26 -if test "x$GLIB_VERSION_MAJOR_MINOR" = "x$GLIB_REQUIRED_VERSION_MAJOR_MINOR"; then
  27 +#GLIB_VERSION_MAJOR_MINOR=`$PKG_CONFIG --modversion glib-2.0 | sed "s/\.[^.]*\$//"`
  28 +#GLIB_REQUIRED_VERSION_MAJOR_MINOR=`echo 2.25.15 | sed "s/\.[^.]*\$//"`
  29 +#if test "x$GLIB_VERSION_MAJOR_MINOR" = "x$GLIB_REQUIRED_VERSION_MAJOR_MINOR"; then
  30    CFLAGS="-DG_DISABLE_DEPRECATED $CFLAGS"
  31 -fi
  32 +#fi
  33
  34  CFLAGS="-DGDK_PIXBUF_DISABLE_DEPRECATED $CFLAGS"
  35
  36 @@ -17801,7 +17805,7 @@
  37      for l in libpng libpng14 libpng12 libpng13 libpng10 ; do
  38        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $l" >&5
  39  $as_echo_n "checking for $l... " >&6; }
  40 -      if $PKG_CONFIG --exists $l ; then
  41 +      if false ; then
  42          { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  43  $as_echo "yes" >&6; }
  44          PNG='png'
  45 @@ -18206,8 +18210,8 @@
  46  $as_echo_n "checking if gio can sniff png... " >&6; }
  47    gtk_save_LIBS="$LIBS"
  48    gtk_save_CFLAGS="$CFLAGS"
  49 -  LIBS="`$PKG_CONFIG --libs gio-2.0`"
  50 -  CFLAGS="`$PKG_CONFIG --cflags gio-2.0`"
  51 +  #LIBS="`$PKG_CONFIG --libs gio-2.0`"
  52 +  #CFLAGS="`$PKG_CONFIG --cflags gio-2.0`"
  53    if test "$cross_compiling" = yes; then :
  54    { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  55  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
  56 @@ -18622,8 +18626,8 @@
  57  GDK_PIXBUF_PACKAGES="gmodule-no-export-2.0 gobject-2.0 gio-2.0"
  58  GDK_PIXBUF_EXTRA_LIBS="$STATIC_LIB_DEPS $MATH_LIB $MEDIA_LIB"
  59  GDK_PIXBUF_EXTRA_CFLAGS=
  60 -GDK_PIXBUF_DEP_LIBS="`$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES` $GDK_PIXBUF_EXTRA_LIBS"
  61 -GDK_PIXBUF_DEP_CFLAGS="`$PKG_CONFIG --cflags  gthread-2.0 $GDK_PIXBUF_PACKAGES $PNG_DEP_CFLAGS_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS"
  62 +GDK_PIXBUF_DEP_LIBS="$GDK_PIXBUF_EXTRA_LIBS"
  63 +GDK_PIXBUF_DEP_CFLAGS="$GDK_PIXBUF_EXTRA_CFLAGS"
  64
  65
  66
  67 @@ -18640,7 +18644,7 @@
  68  GDK_PIXBUF_XLIB_EXTRA_CFLAGS=
  69  GDK_PIXBUF_XLIB_EXTRA_LIBS=
  70
  71 -if $PKG_CONFIG --exists x11; then
  72 +if false; then
  73     if true; then
  74    USE_X11_TRUE=
  75    USE_X11_FALSE='#'
  76 --- misc/gdk-pixbuf-2.23.0/gdk-pixbuf/gdk-pixbuf-util.c
  77 +++ misc/build/gdk-pixbuf-2.23.0/gdk-pixbuf/gdk-pixbuf-util.c
  78 @@ -23,7 +23,9 @@
  79
  80  #include "config.h"
  81  #include <string.h>
  82 +#ifdef ENABLE_NLS
  83  #include <libintl.h>
  84 +#endif
  85
  86  #include "gdk-pixbuf-transform.h"
  87  #include "gdk-pixbuf-private.h"
  88 @@ -336,15 +338,19 @@
  89  const gchar *
  90  gdk_pixbuf_gettext (const gchar *msgid)
  91  {
  92 +#ifdef ENABLE_NLS
  93          static gsize gettext_initialized = FALSE;
  94
  95          if (G_UNLIKELY (g_once_init_enter (&gettext_initialized))) {
  96                  bindtextdomain (GETTEXT_PACKAGE, GDK_PIXBUF_LOCALEDIR);
  97  #ifdef HAVE_BIND_TEXTDOMAIN_CODESET
  98                  bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
  99  #endif
 100                  g_once_init_leave (&gettext_initialized, TRUE);
 101          }
 102
 103          return g_dgettext (GETTEXT_PACKAGE, msgid);
 104 +#else
 105 +        return msgid;
 106 +#endif
 107  }
 108 From: Maarten Bosmans <mkbosmans@gmail.com>
 109 Date: Mon, 24 Jan 2011 10:39:22 +0000
 110 Subject: Use png_jmpbuf macro
 111
 112 This makes the png loader compatible with libpng 1.5
 113
 114 diff --git a/gdk-pixbuf/io-png.c b/gdk-pixbuf/io-png.c
 115 index 79c81fd..76f3304 100644
 116 --- misc/build/gdk-pixbuf-2.23.0/gdk-pixbuf/io-png.c
 117 +++ misc/build/gdk-pixbuf-2.23.0/gdk-pixbuf/io-png.c
 118 @@ -183,7 +183,7 @@ png_simple_error_callback(png_structp png_save_ptr,
 119                               error_msg);
 120          }
 121
 122 -        longjmp (png_save_ptr->jmpbuf, 1);
 123 +        longjmp (png_jmpbuf (png_save_ptr), 1);
 124  }
 125
 126  static void
 127 @@ -287,7 +287,7 @@ gdk_pixbuf__png_image_load (FILE *f, GError **error)
 128                 return NULL;
 129         }
 130
 131 -       if (setjmp (png_ptr->jmpbuf)) {
 132 +       if (setjmp (png_jmpbuf (png_ptr))) {
 133                 g_free (rows);
 134
 135                 if (pixbuf)
 136 @@ -459,7 +459,7 @@ gdk_pixbuf__png_image_begin_load (GdkPixbufModuleSizeFunc size_func,
 137                  return NULL;
 138          }
 139
 140 -       if (setjmp (lc->png_read_ptr->jmpbuf)) {
 141 +       if (setjmp (png_jmpbuf (lc->png_read_ptr))) {
 142                 if (lc->png_info_ptr)
 143                         png_destroy_read_struct(&lc->png_read_ptr, NULL, NULL);
 144                  g_free(lc);
 145 @@ -531,7 +531,7 @@ gdk_pixbuf__png_image_load_increment(gpointer context,
 146          lc->error = error;
 147
 148          /* Invokes our callbacks as needed */
 149 -       if (setjmp (lc->png_read_ptr->jmpbuf)) {
 150 +       if (setjmp (png_jmpbuf (lc->png_read_ptr))) {
 151                  lc->error = NULL;
 152                 return FALSE;
 153         } else {
 154 @@ -769,7 +769,7 @@ png_error_callback(png_structp png_read_ptr,
 155                               error_msg);
 156          }
 157
 158 -        longjmp (png_read_ptr->jmpbuf, 1);
 159 +        longjmp (png_jmpbuf (png_read_ptr), 1);
 160  }
 161
 162  static void
 163 @@ -978,7 +978,7 @@ static gboolean real_save_png (GdkPixbuf        *pixbuf,
 164                success = FALSE;
 165                goto cleanup;
 166         }
 167 -       if (setjmp (png_ptr->jmpbuf)) {
 168 +       if (setjmp (png_jmpbuf (png_ptr))) {
 169                success = FALSE;
 170                goto cleanup;
 171         }