host-libgtk2-2.12.12-reduce-dependencies.patch 6.3 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200
  1. Index: gtk+-2.12.12/configure.in
  2. ===================================================================
  3. --- gtk+-2.12.12.orig/configure.in 2008-09-13 02:01:07.000000000 +0200
  4. +++ gtk+-2.12.12/configure.in 2010-02-21 10:42:40.000000000 +0100
  5. @@ -32,9 +32,6 @@
  6. # required versions of other packages
  7. m4_define([glib_required_version], [2.13.5])
  8. -m4_define([pango_required_version], [1.17.3])
  9. -m4_define([atk_required_version], [1.9.0])
  10. -m4_define([cairo_required_version], [1.2.0])
  11. AC_INIT([gtk+], [gtk_version],
  12. @@ -239,12 +236,12 @@
  13. gdktarget=x11
  14. fi
  15. -AC_ARG_WITH(gdktarget, [ --with-gdktarget=[[x11/win32/quartz/directfb]] select non-default GDK target],
  16. +AC_ARG_WITH(gdktarget, [ --with-gdktarget=[[x11/win32/quartz/directfb/none]] select non-default GDK target],
  17. gdktarget=$with_gdktarget)
  18. AC_SUBST(gdktarget)
  19. case $gdktarget in
  20. - x11|win32|quartz|directfb) ;;
  21. + x11|win32|quartz|directfb|none) ;;
  22. *) AC_MSG_ERROR([Invalid target for GDK: use x11, quartz, directfb or win32.]);;
  23. esac
  24. @@ -349,10 +346,7 @@
  25. ## the version requirements since those make the module lists
  26. ## annoying to construct
  27. PKG_CHECK_MODULES(BASE_DEPENDENCIES,
  28. - [glib-2.0 >= glib_required_version dnl
  29. - atk >= atk_required_version dnl
  30. - pango >= pango_required_version dnl
  31. - cairo >= cairo_required_version])
  32. + [glib-2.0 >= glib_required_version])
  33. if test "$os_win32" != yes; then
  34. # libtool option to control which symbols are exported
  35. @@ -1061,7 +1055,7 @@
  36. GDK_PIXBUF_XLIB_EXTRA_CFLAGS=
  37. GDK_PIXBUF_XLIB_EXTRA_LIBS=
  38. -X_PACKAGES=fontconfig
  39. +X_PACKAGES=
  40. GDK_EXTRA_LIBS="$GDK_WLIBS"
  41. GDK_EXTRA_CFLAGS=
  42. @@ -1070,14 +1064,6 @@
  43. GTK_DEP_LIBS_FOR_X=
  44. if test "x$gdktarget" = "xx11"; then
  45. - #
  46. - # We use fontconfig very peripherally when decoding the default
  47. - # settings.
  48. - #
  49. - if $PKG_CONFIG --exists fontconfig; then : ; else
  50. - AC_MSG_ERROR([
  51. -*** fontconfig (http://www.fontconfig.org) is required by the X11 backend.])
  52. - fi
  53. #
  54. # Check for basic X packages; we use pkg-config if available
  55. @@ -1124,16 +1110,6 @@
  56. gtk_save_LIBS=$LIBS
  57. LIBS="$x_libs_for_checks $LIBS"
  58. - # Sanity check for the X11 and Xext libraries. While everything we need from
  59. - # Xext is optional, the chances a system has *none* of these things is so
  60. - # small that we just unconditionally require it.
  61. - AC_CHECK_FUNC(XOpenDisplay, :,
  62. - AC_MSG_ERROR([*** libX11 not found. Check 'config.log' for more details.]))
  63. - AC_CHECK_FUNC(XextFindDisplay, :,
  64. - AC_MSG_ERROR([*** libXext not found. Check 'config.log' for more details.]))
  65. - AC_CHECK_FUNC(XRenderQueryExtension, :,
  66. - AC_MSG_ERROR([*** libXrender not found. Check 'config.log' for more details.]))
  67. -
  68. # Check for xReply
  69. AC_MSG_CHECKING([if <X11/extensions/XIproto.h> is needed for xReply])
  70. @@ -1418,48 +1394,6 @@
  71. AM_CONDITIONAL(USE_DIRECTFB, false)
  72. fi
  73. -
  74. -# Check for Pango flags
  75. -
  76. -if test "x$gdktarget" = "xwin32"; then
  77. - PANGO_PACKAGES="pangowin32 pangocairo"
  78. -else
  79. - PANGO_PACKAGES="pango pangocairo"
  80. -fi
  81. -
  82. -AC_MSG_CHECKING(Pango flags)
  83. -if $PKG_CONFIG --exists $PANGO_PACKAGES ; then
  84. - PANGO_CFLAGS=`$PKG_CONFIG --cflags $PANGO_PACKAGES`
  85. - PANGO_LIBS=`$PKG_CONFIG --libs $PANGO_PACKAGES`
  86. -
  87. - AC_MSG_RESULT($PANGO_CFLAGS $PANGO_LIBS)
  88. -else
  89. - AC_MSG_ERROR([
  90. -*** Pango not found. Pango built with Cairo support is required
  91. -*** to build GTK+. See http://www.pango.org for Pango information.
  92. -])
  93. -fi
  94. -
  95. -CFLAGS="$CFLAGS $PANGO_CFLAGS"
  96. -
  97. -if $PKG_CONFIG --uninstalled $PANGO_PACKAGES; then
  98. - :
  99. -else
  100. - gtk_save_LIBS="$LIBS"
  101. - LIBS="$PANGO_LIBS $LIBS"
  102. - AC_TRY_LINK_FUNC(pango_context_new, :, AC_MSG_ERROR([
  103. -*** Can't link to Pango. Pango is required to build
  104. -*** GTK+. For more information see http://www.pango.org]))
  105. - LIBS="$gtk_save_LIBS"
  106. -fi
  107. -
  108. -CFLAGS="$saved_cflags"
  109. -LDFLAGS="$saved_ldflags"
  110. -
  111. -GDK_PACKAGES="$PANGO_PACKAGES"
  112. -if test "x$gdktarget" = "xx11"; then
  113. - GDK_PACKAGES="$GDK_PACKAGES $X_PACKAGES"
  114. -fi
  115. GDK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $GDK_PACKAGES` $GDK_PIXBUF_EXTRA_LIBS"
  116. GDK_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PIXBUF_PACKAGES $GDK_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_EXTRA_CFLAGS"
  117. @@ -1468,7 +1402,7 @@
  118. # into the pkg-config files
  119. #
  120. if test $enable_explicit_deps != yes ; then
  121. - GDK_PACKAGES="$PANGO_PACKAGES"
  122. + GDK_PACKAGES=
  123. GDK_EXTRA_LIBS=
  124. fi
  125. @@ -1479,39 +1413,10 @@
  126. AC_SUBST(GDK_DEP_CFLAGS)
  127. -########################################
  128. -# Check for Accessibility Toolkit flags
  129. -########################################
  130. -
  131. -ATK_PACKAGES=atk
  132. -AC_MSG_CHECKING(ATK flags)
  133. -if $PKG_CONFIG --exists $ATK_PACKAGES ; then
  134. - ATK_CFLAGS=`$PKG_CONFIG --cflags $ATK_PACKAGES`
  135. - ATK_LIBS=`$PKG_CONFIG --libs $ATK_PACKAGES`
  136. -
  137. - AC_MSG_RESULT($ATK_CFLAGS $ATK_LIBS)
  138. -else
  139. - AC_MSG_ERROR([
  140. -*** Accessibility Toolkit not found. Accessibility Toolkit is required
  141. -*** to build GTK+.
  142. -])
  143. -fi
  144. -
  145. -if $PKG_CONFIG --uninstalled $ATK_PACKAGES; then
  146. - :
  147. -else
  148. - gtk_save_LIBS="$LIBS"
  149. - LIBS="$ATK_LIBS $LIBS"
  150. - AC_TRY_LINK_FUNC(atk_object_get_type, : , AC_MSG_ERROR([
  151. - *** Cannot link to Accessibility Toolkit. Accessibility Toolkit is required
  152. - *** to build GTK+]))
  153. - LIBS="$gtk_save_LIBS"
  154. -fi
  155. -
  156. -GTK_PACKAGES="atk cairo"
  157. +GTK_PACKAGES=
  158. GTK_EXTRA_LIBS=
  159. GTK_EXTRA_CFLAGS=
  160. -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"
  161. +GTK_DEP_LIBS="$GDK_EXTRA_LIBS $GTK_DEP_LIBS_FOR_X `$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $GTK_PACKAGES_FOR_X $GTK_PACKAGES` $GTK_EXTRA_LIBS $GDK_PIXBUF_EXTRA_LIBS"
  162. 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"
  163. if test x"$os_win32" = xyes; then
  164. @@ -1601,17 +1506,6 @@
  165. gtk_save_cppflags="$CPPFLAGS"
  166. CPPFLAGS="$CPPFLAGS $GTK_DEP_CFLAGS"
  167. -
  168. -AC_CHECK_HEADER(cairo-pdf.h,,AC_MSG_ERROR([
  169. -*** Can't find cairo-pdf.h. You must build Cairo with the pdf
  170. -*** backend enabled.]))
  171. -
  172. -if test "$os_win32" != "yes"; then
  173. - AC_CHECK_HEADER(cairo-ps.h,,AC_MSG_ERROR([
  174. -*** Can't find cairo-ps.h. You must build Cairo with the
  175. -*** postscript backend enabled.]))
  176. -fi
  177. -
  178. CPPFLAGS="$gtk_save_cppflags"