xorg/xorg/lib/libX11/patches/005-fix-include-path.patch

   1 diff --git a/modules/im/ximcp/Makefile.in b/modules/im/ximcp/Makefile.in
   2 index 905d526..6027e58 100644
   3 --- a/modules/im/ximcp/Makefile.in
   4 +++ b/modules/im/ximcp/Makefile.in
   5 @@ -96,7 +96,7 @@ ximcp_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
   6         $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
   7         $(ximcp_la_LDFLAGS) $(LDFLAGS) -o $@
   8  @XLIB_LOADABLE_I18N_TRUE@am_ximcp_la_rpath = -rpath $(commonlibdir)
   9 -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -I$(top_builddir)/include/X11
  10 +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -I$(top_builddir)/include -I$(top_builddir)/include/X11
  11  depcomp = $(SHELL) $(top_srcdir)/depcomp
  12  am__depfiles_maybe = depfiles
  13  am__mv = mv -f
  14 diff --git a/modules/lc/Utf8/Makefile.in b/modules/lc/Utf8/Makefile.in
  15 index 4078c1c..e7e52fa 100644
  16 --- a/modules/lc/Utf8/Makefile.in
  17 +++ b/modules/lc/Utf8/Makefile.in
  18 @@ -88,7 +88,7 @@ xlcUTF8Load_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
  19         $@
  20  @XLIB_LOADABLE_I18N_TRUE@am_xlcUTF8Load_la_rpath = -rpath \
  21  @XLIB_LOADABLE_I18N_TRUE@      $(commonlibdir)
  22 -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -I$(top_builddir)/include/X11
  23 +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -I$(top_builddir)/include -I$(top_builddir)/include/X11
  24  depcomp = $(SHELL) $(top_srcdir)/depcomp
  25  am__depfiles_maybe = depfiles
  26  am__mv = mv -f
  27 diff --git a/modules/lc/def/Makefile.in b/modules/lc/def/Makefile.in
  28 index b37cec6..89ce832 100644
  29 --- a/modules/lc/def/Makefile.in
  30 +++ b/modules/lc/def/Makefile.in
  31 @@ -86,7 +86,7 @@ xlcDef_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
  32         $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
  33         $(xlcDef_la_LDFLAGS) $(LDFLAGS) -o $@
  34  @XLIB_LOADABLE_I18N_TRUE@am_xlcDef_la_rpath = -rpath $(commonlibdir)
  35 -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -I$(top_builddir)/include/X11
  36 +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -I$(top_builddir)/include -I$(top_builddir)/include/X11
  37  depcomp = $(SHELL) $(top_srcdir)/depcomp
  38  am__depfiles_maybe = depfiles
  39  am__mv = mv -f
  40 diff --git a/modules/lc/gen/Makefile.in b/modules/lc/gen/Makefile.in
  41 index 6e2e522..e832723 100644
  42 --- a/modules/lc/gen/Makefile.in
  43 +++ b/modules/lc/gen/Makefile.in
  44 @@ -86,7 +86,7 @@ xlibi18n_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
  45         $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
  46         $(xlibi18n_la_LDFLAGS) $(LDFLAGS) -o $@
  47  @XLIB_LOADABLE_I18N_TRUE@am_xlibi18n_la_rpath = -rpath $(commonlibdir)
  48 -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -I$(top_builddir)/include/X11
  49 +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -I$(top_builddir)/include -I$(top_builddir)/include/X11
  50  depcomp = $(SHELL) $(top_srcdir)/depcomp
  51  am__depfiles_maybe = depfiles
  52  am__mv = mv -f
  53 diff --git a/modules/lc/xlocale/Makefile.in b/modules/lc/xlocale/Makefile.in
  54 index 7c947ee..b68b06e 100644
  55 --- a/modules/lc/xlocale/Makefile.in
  56 +++ b/modules/lc/xlocale/Makefile.in
  57 @@ -86,7 +86,7 @@ xlocale_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
  58         $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
  59         $(xlocale_la_LDFLAGS) $(LDFLAGS) -o $@
  60  @XLIB_LOADABLE_I18N_TRUE@am_xlocale_la_rpath = -rpath $(commonlibdir)
  61 -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -I$(top_builddir)/include/X11
  62 +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -I$(top_builddir)/include -I$(top_builddir)/include/X11
  63  depcomp = $(SHELL) $(top_srcdir)/depcomp
  64  am__depfiles_maybe = depfiles
  65  am__mv = mv -f
  66 diff --git a/modules/om/generic/Makefile.in b/modules/om/generic/Makefile.in
  67 index e39802b..0979207 100644
  68 --- a/modules/om/generic/Makefile.in
  69 +++ b/modules/om/generic/Makefile.in
  70 @@ -89,7 +89,7 @@ xomGeneric_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
  71         $(xomGeneric_la_LDFLAGS) $(LDFLAGS) -o $@
  72  @XLIB_LOADABLE_I18N_TRUE@am_xomGeneric_la_rpath = -rpath \
  73  @XLIB_LOADABLE_I18N_TRUE@      $(commonlibdir)
  74 -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -I$(top_builddir)/include/X11
  75 +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -I$(top_builddir)/include -I$(top_builddir)/include/X11
  76  depcomp = $(SHELL) $(top_srcdir)/depcomp
  77  am__depfiles_maybe = depfiles
  78  am__mv = mv -f
  79 diff --git a/src/util/Makefile.in b/src/util/Makefile.in
  80 index 65c181e..bfa7c05 100644
  81 --- a/src/util/Makefile.in
  82 +++ b/src/util/Makefile.in
  83 @@ -59,7 +59,7 @@ am__v_lt_0 = --silent
  84  makekeys_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
  85         $(LIBTOOLFLAGS) --mode=link $(CCLD) $(makekeys_CFLAGS) \
  86         $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
  87 -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -I$(top_builddir)/include/X11
  88 +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -I$(top_builddir)/include -I$(top_builddir)/include/X11
  89  depcomp = $(SHELL) $(top_srcdir)/depcomp
  90  am__depfiles_maybe = depfiles
  91  am__mv = mv -f
  92 diff --git a/src/xcms/Makefile.in b/src/xcms/Makefile.in
  93 index 6573196..a140221 100644
  94 --- a/src/xcms/Makefile.in
  95 +++ b/src/xcms/Makefile.in
  96 @@ -65,7 +65,7 @@ libxcms_la_OBJECTS = $(am_libxcms_la_OBJECTS)
  97  AM_V_lt = $(am__v_lt_$(V))
  98  am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
  99  am__v_lt_0 = --silent
 100 -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -I$(top_builddir)/include/X11
 101 +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -I$(top_builddir)/include -I$(top_builddir)/include/X11
 102  depcomp = $(SHELL) $(top_srcdir)/depcomp
 103  am__depfiles_maybe = depfiles
 104  am__mv = mv -f
 105 diff --git a/src/xkb/Makefile.in b/src/xkb/Makefile.in
 106 index 0e52692..43a9660 100644
 107 --- a/src/xkb/Makefile.in
 108 +++ b/src/xkb/Makefile.in
 109 @@ -57,7 +57,7 @@ libxkb_la_OBJECTS = $(am_libxkb_la_OBJECTS)
 110  AM_V_lt = $(am__v_lt_$(V))
 111  am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
 112  am__v_lt_0 = --silent
 113 -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -I$(top_builddir)/include/X11
 114 +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -I$(top_builddir)/include -I$(top_builddir)/include/X11
 115  depcomp = $(SHELL) $(top_srcdir)/depcomp
 116  am__depfiles_maybe = depfiles
 117  am__mv = mv -f
 118 diff --git a/src/xlibi18n/Makefile.in b/src/xlibi18n/Makefile.in
 119 index 50ac253..6c44c48 100644
 120 --- a/src/xlibi18n/Makefile.in
 121 +++ b/src/xlibi18n/Makefile.in
 122 @@ -85,7 +85,7 @@ libi18n_la_OBJECTS = $(am_libi18n_la_OBJECTS)
 123  AM_V_lt = $(am__v_lt_$(V))
 124  am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
 125  am__v_lt_0 = --silent
 126 -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -I$(top_builddir)/include/X11
 127 +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -I$(top_builddir)/include -I$(top_builddir)/include/X11
 128  depcomp = $(SHELL) $(top_srcdir)/depcomp
 129  am__depfiles_maybe = depfiles
 130  am__mv = mv -f
 131 diff --git a/src/Makefile.in b/src/Makefile.in
 132 index a79daa8..ca7f366 100644
 133 --- a/src/Makefile.in
 134 +++ b/src/Makefile.in
 135 @@ -218,7 +218,7 @@ libX11_la_OBJECTS = $(am_libX11_la_OBJECTS)
 136  libX11_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 137         $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 138         $(libX11_la_LDFLAGS) $(LDFLAGS) -o $@
 139 -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include/X11
 140 +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include/ -I$(top_builddir)/include/X11
 141  depcomp = $(SHELL) $(top_srcdir)/depcomp
 142  am__depfiles_maybe = depfiles
 143  am__mv = mv -f