Xorg/lib/wnck/patches/100-optional_gdk_pixbuf_csource.patch

   1 --- a/configure
   2 +++ b/configure
   3 @@ -26634,7 +26634,7 @@
   4  done
   5  IFS=$as_save_IFS
   6
   7 -  test -z "$ac_cv_path_GDK_PIXBUF_CSOURCE" && ac_cv_path_GDK_PIXBUF_CSOURCE="no"
   8 +  test -z "$ac_cv_path_GDK_PIXBUF_CSOURCE" && ac_cv_path_GDK_PIXBUF_CSOURCE=""
   9    ;;
  10  esac
  11  fi
  12 @@ -26649,14 +26649,6 @@
  13
  14
  15
  16 -if test x"$GDK_PIXBUF_CSOURCE" = xno; then
  17 -  { { $as_echo "$as_me:$LINENO: error: gdk-pixbuf-csource executable not found in your path - should be installed with GTK" >&5
  18 -$as_echo "$as_me: error: gdk-pixbuf-csource executable not found in your path - should be installed with GTK" >&2;}
  19 -   { (exit 1); exit 1; }; }
  20 -fi
  21 -
  22 -
  23 -
  24  ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
  25
  26  ##################################################
  27 --- a/configure.in
  28 +++ b/configure.in
  29 @@ -128,11 +128,7 @@
  30  GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`
  31  AC_SUBST(GLIB_GENMARSHAL)
  32
  33 -AC_PATH_PROG(GDK_PIXBUF_CSOURCE, gdk-pixbuf-csource, no)
  34 -
  35 -if test x"$GDK_PIXBUF_CSOURCE" = xno; then
  36 -  AC_MSG_ERROR([gdk-pixbuf-csource executable not found in your path - should be installed with GTK])
  37 -fi
  38 +AC_PATH_PROG(GDK_PIXBUF_CSOURCE, gdk-pixbuf-csource)
  39
  40  AC_SUBST(GDK_PIXBUF_CSOURCE)
  41
  42 --- a/libwnck/Makefile.am
  43 +++ b/libwnck/Makefile.am
  44 @@ -163,7 +163,8 @@
  45         $(wnck_built_cfiles)
  46
  47  inlinepixbufs.h: $(IMAGES)
  48 -       $(GDK_PIXBUF_CSOURCE) --raw --build-list $(VARIABLES) >$(srcdir)/inlinepixbufs.h
  49 +       $(if $(GDK_PIXBUF_CSOURCE),$(GDK_PIXBUF_CSOURCE) --raw --build-list $(VARIABLES) >$(srcdir)/inlinepixbufs.h)
  50 +       touch $@
  51
  52  $(OBJECTS): inlinepixbufs.h
  53
  54 --- a/libwnck/Makefile.in
  55 +++ b/libwnck/Makefile.in
  56 @@ -826,7 +826,8 @@
  57         && rm -f new-wnck-enum-types.c
  58
  59  inlinepixbufs.h: $(IMAGES)
  60 -       $(GDK_PIXBUF_CSOURCE) --raw --build-list $(VARIABLES) >$(srcdir)/inlinepixbufs.h
  61 +       $(if $(GDK_PIXBUF_CSOURCE),$(GDK_PIXBUF_CSOURCE) --raw --build-list $(VARIABLES) >$(srcdir)/inlinepixbufs.h)
  62 +       touch $@
  63
  64  $(OBJECTS): inlinepixbufs.h
  65  # Tell versions [3.59,3.63) of GNU make to not export all variables.