gtk/gtk+-2.20.1-cross_compile.patch

   1 diff -purN gtk+-2.20.1.orig/configure gtk+-2.20.1/configure
   2 --- gtk+-2.20.1.orig/configure  2010-10-29 09:33:42.000000000 +0200
   3 +++ gtk+-2.20.1/configure       2010-10-29 12:03:19.000000000 +0200
   4 @@ -22817,8 +22817,14 @@ fi
   5  GDK_PIXBUF_PACKAGES="gmodule-no-export-2.0 gobject-2.0 gio-2.0"
   6  GDK_PIXBUF_EXTRA_LIBS="$STATIC_LIB_DEPS $MATH_LIB $MEDIA_LIB"
   7  GDK_PIXBUF_EXTRA_CFLAGS=
   8 -GDK_PIXBUF_DEP_LIBS="`$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES` $GDK_PIXBUF_EXTRA_LIBS"
   9 -GDK_PIXBUF_DEP_CFLAGS="`$PKG_CONFIG --cflags  gthread-2.0 $GDK_PIXBUF_PACKAGES $PNG_DEP_CFLAGS_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS"
  10 +
  11 +if test "$cross_compiling" = "yes";  then
  12 +  GDK_PIXBUF_DEP_LIBS=$GDK_PIXBUF_DEP_LIBS
  13 +  GDK_PIXBUF_DEP_CFLAGS=$GDK_PIXBUF_DEP_CFLAGS
  14 +else
  15 +  GDK_PIXBUF_DEP_LIBS="`$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES` $GDK_PIXBUF_EXTRA_LIBS"
  16 +  GDK_PIXBUF_DEP_CFLAGS="`$PKG_CONFIG --cflags  gthread-2.0 $GDK_PIXBUF_PACKAGES $PNG_DEP_CFLAGS_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS"
  17 +fi
  18
  19  ########################################
  20  # Windowing system checks
  21 @@ -22842,15 +22848,27 @@ if test "x$gdktarget" = "xx11"; then
  22    # We use fontconfig very peripherally when decoding the default
  23    # settings.
  24    #
  25 -  if $PKG_CONFIG --exists fontconfig; then : ; else
  26 -    as_fn_error "
  27 +  if test "$cross_compiling" != "yes"; then
  28 +    if $PKG_CONFIG --exists fontconfig; then : ; else
  29 +      as_fn_error "
  30  *** fontconfig (http://www.fontconfig.org) is required by the X11 backend." "$LINENO" 5
  31 +    fi
  32    fi
  33
  34    #
  35    # Check for basic X packages; we use pkg-config if available
  36    #
  37 -  if $PKG_CONFIG --exists x11 xext xrender; then
  38 +
  39 +  # on crosscompiling we assumed x11, xext and xrender installed
  40 +  if test "$cross_compiling" = "yes"; then
  41 +    have_base_x_pc=true
  42 +    X_PACKAGES="$X_PACKAGES x11 xext xrender" # X_PACKAGES="fontconfig x11 xext xrender"
  43 +    x_libs="$X_LIBS"
  44 +    X_CFLAGS="$X_CFLAGS"
  45 +    x_libs_for_checks="$x_libs_for_checks $x_libs"
  46 +    GDK_PIXBUF_XLIB_PACKAGES="x11"
  47 +    GDK_PACKAGES_FOR_X="x11"
  48 +  elif $PKG_CONFIG --exists x11 xext xrender; then
  49      have_base_x_pc=true
  50      X_PACKAGES="$X_PACKAGES x11 xext xrender"
  51      x_libs="`$PKG_CONFIG --libs x11 xext xrender`"
  52 @@ -23992,7 +24010,6 @@ $as_echo "no" >&6; }
  53
  54  $as_echo "#define XINPUT_XFREE 1" >>confdefs.h
  55
  56 -
  57      if $PKG_CONFIG --exists xi ; then
  58        X_PACKAGES="$X_PACKAGES xi"
  59      else
  60 @@ -24016,6 +24033,14 @@ else
  61    XINPUT_XFREE_FALSE=
  62  fi
  63
  64 +# on crosscompilation we assumed xrandr, xcursor, xfixes installed
  65 +if test "$cross_compiling" = "yes"; then
  66 +  X_PACKAGES="$X_PACKAGES xrandr xcursor xfixes"
  67 +  GTK_PACKAGES_FOR_X="$GTK_PACKAGES_FOR_X xrandr xcursor xfixes"
  68 +  $as_echo "#define HAVE_RANDR 1" >>confdefs.h
  69 +  $as_echo "#define HAVE_XCURSOR 1" >>confdefs.h
  70 +  $as_echo "#define HAVE_XFIXES 1" >>confdefs.h
  71 +else
  72
  73    # Check for the RANDR extension
  74    if $PKG_CONFIG --exists "xrandr >= 1.2.99" ; then
  75 @@ -24069,6 +24094,8 @@ $as_echo "#define HAVE_XDAMAGE 1" >>conf
  76      GTK_PACKAGES_FOR_X="$GTK_PACKAGES_FOR_X xdamage"
  77    fi
  78
  79 +fi
  80 +
  81    if $have_base_x_pc ; then
  82      GDK_EXTRA_LIBS="$x_extra_libs"
  83    else
  84 @@ -24157,9 +24184,13 @@ fi
  85
  86  fi
  87
  88 -GDK_PIXBUF_XLIB_DEP_LIBS="`$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $GDK_PIXBUF_XLIB_PACKAGES` $GDK_PIXBUF_XLIB_EXTRA_LIBS $GDK_PIXBUF_EXTRA_LIBS"
  89 -GDK_PIXBUF_XLIB_DEP_CFLAGS="`$PKG_CONFIG --cflags  gthread-2.0 $GDK_PIXBUF_PACKAGES $GDK_PIXBUF_XLIB_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_PIXBUF_XLIB_EXTRA_CFLAGS"
  90 -
  91 +if test "$cross_compiling" = "yes"; then
  92 +  GDK_PIXBUF_XLIB_DEP_LIBS="$GDK_PIXBUF_XLIB_DEP_LIBS"
  93 +  GDK_PIXBUF_XLIB_DEP_CFLAGS="$GDK_PIXBUF_XLIB_DEP_CFLAGS"
  94 +else
  95 +  GDK_PIXBUF_XLIB_DEP_LIBS="`$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $GDK_PIXBUF_XLIB_PACKAGES` $GDK_PIXBUF_XLIB_EXTRA_LIBS $GDK_PIXBUF_EXTRA_LIBS"
  96 +  GDK_PIXBUF_XLIB_DEP_CFLAGS="`$PKG_CONFIG --cflags  gthread-2.0 $GDK_PIXBUF_PACKAGES $GDK_PIXBUF_XLIB_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_PIXBUF_XLIB_EXTRA_CFLAGS"
  97 +fi
  98
  99
 100
 101 @@ -24287,7 +24318,14 @@ fi
 102
 103  { $as_echo "$as_me:${as_lineno-$LINENO}: checking Pango flags" >&5
 104  $as_echo_n "checking Pango flags... " >&6; }
 105 -if $PKG_CONFIG --exists $PANGO_PACKAGES ; then
 106 +if test "$cross_compiling" = "yes"; then
 107 +       PANGO_CFLAGS="$PANGO_CFLAGS"
 108 +       PANGO_LIBS="$PANGO_LIBS"
 109 +
 110 +               { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PANGO_CFLAGS $PANGO_LIBS" >&5
 111 +$as_echo "$PANGO_CFLAGS $PANGO_LIBS" >&6; }
 112 +
 113 +elif $PKG_CONFIG --exists $PANGO_PACKAGES ; then
 114          PANGO_CFLAGS=`$PKG_CONFIG --cflags $PANGO_PACKAGES`
 115          PANGO_LIBS=`$PKG_CONFIG --libs $PANGO_PACKAGES`
 116
 117 @@ -24302,8 +24340,10 @@ fi
 118
 119  CFLAGS="$CFLAGS $PANGO_CFLAGS"
 120
 121 -if $PKG_CONFIG --uninstalled $PANGO_PACKAGES; then
 122 -        :
 123 +if test "$cross_compiling" = "yes"; then
 124 +        :
 125 +elif $PKG_CONFIG --uninstalled $PANGO_PACKAGES; then
 126 +       :
 127  else
 128         gtk_save_LIBS="$LIBS"
 129          LIBS="$PANGO_LIBS $LIBS"
 130 @@ -24347,8 +24387,13 @@ else
 131    GDK_PACKAGES="$PANGO_PACKAGES $X_PACKAGES cairo-$cairo_backend"
 132  fi
 133
 134 -GDK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $GDK_PACKAGES` $GDK_PIXBUF_EXTRA_LIBS"
 135 -GDK_DEP_CFLAGS="`$PKG_CONFIG --cflags  gthread-2.0 $GDK_PIXBUF_PACKAGES $GDK_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_EXTRA_CFLAGS"
 136 +if test "$cross_compiling" = "yes"; then
 137 +  GDK_DEP_LIBS="$GDK_DEP_LIBS"
 138 +  GDK_DEP_CFLAGS="$GDK_DEP_CFLAGS"
 139 +else
 140 +  GDK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $GDK_PACKAGES` $GDK_PIXBUF_EXTRA_LIBS"
 141 +  GDK_DEP_CFLAGS="`$PKG_CONFIG --cflags  gthread-2.0 $GDK_PIXBUF_PACKAGES $GDK_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_EXTRA_CFLAGS"
 142 +fi
 143  #
 144  # If we aren't writing explicit dependencies, then don't put the extra libraries we need
 145  # into the pkg-config files
 146 @@ -24372,7 +24417,10 @@ fi
 147  ATK_PACKAGES=atk
 148  { $as_echo "$as_me:${as_lineno-$LINENO}: checking ATK flags" >&5
 149  $as_echo_n "checking ATK flags... " >&6; }
 150 -if $PKG_CONFIG --exists $ATK_PACKAGES ; then
 151 +if test "$cross_compiling" = "yes"; then
 152 +       ATK_CFLAGS="$ATK_CFLAGS"
 153 +       ATK_LIBS="$ATK_LIBS"
 154 +elif $PKG_CONFIG --exists $ATK_PACKAGES ; then
 155          ATK_CFLAGS=`$PKG_CONFIG --cflags $ATK_PACKAGES`
 156          ATK_LIBS=`$PKG_CONFIG --libs $ATK_PACKAGES`
 157
 158 @@ -24385,8 +24433,10 @@ else
 159  " "$LINENO" 5
 160  fi
 161
 162 -if $PKG_CONFIG --uninstalled $ATK_PACKAGES; then
 163 -        :
 164 +if test "$cross_compiling" = "yes"; then
 165 +       :
 166 +elif $PKG_CONFIG --uninstalled $ATK_PACKAGES; then
 167 +               :
 168  else
 169         gtk_save_LIBS="$LIBS"
 170          LIBS="$ATK_LIBS $LIBS"
 171 @@ -24426,17 +24476,30 @@ if test "x$gdktarget" = "xx11"; then
 172  fi
 173  GTK_EXTRA_LIBS=
 174  GTK_EXTRA_CFLAGS=
 175 -GTK_DEP_LIBS="$GDK_EXTRA_LIBS $GTK_DEP_LIBS_FOR_X `$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $PANGO_PACKAGES $GTK_PACKAGES_FOR_X $GTK_PACKAGES` $GTK_EXTRA_LIBS $GDK_PIXBUF_EXTRA_LIBS"
 176 -GTK_DEP_CFLAGS="`$PKG_CONFIG --cflags  gthread-2.0 $GDK_PIXBUF_PACKAGES $GDK_PACKAGES $GTK_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_EXTRA_CFLAGS $GTK_EXTRA_CFLAGS"
 177 +
 178 +if test "$cross_compiling" = "yes"; then
 179 +  GTK_DEP_LIBS="$GDK_EXTRA_LIBS $GTK_DEP_LIBS_FOR_X $GDK_LIBS"
 180 +  GTK_DEP_CFLAGS="$GTK_DEP_CFLAGS"
 181 +else
 182 +  GTK_DEP_LIBS="$GDK_EXTRA_LIBS $GTK_DEP_LIBS_FOR_X `$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $PANGO_PACKAGES $GTK_PACKAGES_FOR_X $GTK_PACKAGES` $GTK_EXTRA_LIBS $GDK_PIXBUF_EXTRA_LIBS"
 183 +  GTK_DEP_CFLAGS="`$PKG_CONFIG --cflags  gthread-2.0 $GDK_PIXBUF_PACKAGES $GDK_PACKAGES $GTK_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_EXTRA_CFLAGS $GTK_EXTRA_CFLAGS"
 184 +fi
 185
 186  if test x"$os_win32" = xyes; then
 187    GTK_EXTRA_CFLAGS="$msnative_struct"
 188  fi
 189
 190 -GLIB_PREFIX="`$PKG_CONFIG --variable=prefix glib-2.0`"
 191 -ATK_PREFIX="`$PKG_CONFIG --variable=prefix atk`"
 192 -PANGO_PREFIX="`$PKG_CONFIG --variable=prefix pango`"
 193 -CAIRO_PREFIX="`pkg-config --variable=prefix cairo`"
 194 +if test "$cross_compiling" = "yes"; then
 195 +  GLIB_PREFIX="$GLIB_PREFIX"
 196 +  ATK_PREFIX="$ATK_PREFIX"
 197 +  PANGO_PREFIX="$PANGO_PREFIX"
 198 +  CAIRO_PREFIX="$CAIRO_PREFIX"
 199 +else
 200 +  GLIB_PREFIX="`$PKG_CONFIG --variable=prefix glib-2.0`"
 201 +  ATK_PREFIX="`$PKG_CONFIG --variable=prefix atk`"
 202 +  PANGO_PREFIX="`$PKG_CONFIG --variable=prefix pango`"
 203 +  CAIRO_PREFIX="`pkg-config --variable=prefix cairo`"
 204 +fi
 205
 206  if test $enable_explicit_deps != yes ; then
 207    GDK_PIXBUF_EXTRA_LIBS=