logo

overlay

My own overlay for experimentations, use with caution, no support is provided git clone https://hacktivis.me/git/overlay.git

librsvg-2.40.12-gtk-optional.patch (2193B)

    

  1. From 18917f7fd3160afe06019f4b6234aeb78a3fdb4e Mon Sep 17 00:00:00 2001
  2. From: Ross Burton <ross.burton@intel.com>
  3. Date: Tue, 19 Nov 2013 16:00:29 +0000
  4. Subject: [PATCH] configure: add option to enable/disable use of GTK+
  6. Distro packagers like predictability and automatically detected optional
  7. dependencies are not predicable.  Add a --with-gtk3 option (default to "auto")
  8. for forcibly controlling whether GTK+ will be used or not.
  10. Signed-off-by: Ross Burton <ross.burton@intel.com>
  12. https://bugzilla.gnome.org/show_bug.cgi?id=712693
  13. ---
  14.  configure.in |   17 +++++++++++------
  15.  1 file changed, 11 insertions(+), 6 deletions(-)
  17. diff --git a/configure.in b/configure.in
  18. index f7a89dc..1498f72 100644
  19. --- a/configure.ac
  20. +++ b/configure.ac
  21. @@ -119,17 +119,22 @@ AC_CHECK_FUNCS(strtok_r)
  22.  # GTK
  23.  # ===========================================================================
  24.  
  25. -PKG_CHECK_MODULES([GTK3],[gtk+-3.0 >= $GTK3_REQUIRED],[have_gtk_3=yes],[have_gtk_3=no])
  26. -
  27.  GTK3_BINARY_VERSION=
  28.  
  29. -if test "$have_gtk_3" = "yes"; then
  30. -    GTK3_BINARY_VERSION="`$PKG_CONFIG --variable=gtk_binary_version gtk+-3.0`"
  31. +AC_MSG_CHECKING([whether to use GTK+ 3])
  32. +AC_ARG_WITH([gtk3],
  33. +  [AS_HELP_STRING([--without-gtk3],[Don't build GTK+3 tools (default=auto)])],
  34. +  [],[PKG_CHECK_EXISTS([gtk+-3.0 >= $GTK3_REQUIRED],[with_gtk3=yes],[with_gtk3=no])])
  35. +AC_MSG_RESULT([$with_gtk3])
  36. +
  37. +if test "$with_gtk3" = "yes"; then
  38. +  PKG_CHECK_MODULES(GTK3, [gtk+-3.0 >= $GTK3_REQUIRED])
  39. +  GTK3_BINARY_VERSION="`$PKG_CONFIG --variable=gtk_binary_version gtk+-3.0`"
  40.  fi
  41.  
  42.  AC_SUBST([GTK3_BINARY_VERSION])
  43.  
  44. -AM_CONDITIONAL([HAVE_GTK_3],[test "$have_gtk_3" = "yes"])
  45. +AM_CONDITIONAL([HAVE_GTK_3],[test "$with_gtk3" = "yes"])
  46.  
  47.  dnl ===========================================================================
  48.  dnl GDK-Pixbuf SVG loader
  49. @@ -305,6 +310,6 @@ librsvg-$VERSION
  50.  	Build introspectable bindings:  ${found_introspection}
  51.  	Build Vala bindings:            ${enable_vala}
  52.  	Build GdkPixbuf loader:         ${enable_pixbuf_loader}
  53. -        GTK+ $GTK3_REQUIRED or later:           ${have_gtk_3}
  54. +        GTK 3.0:                        ${with_gtk3}
  55.  	Build miscellaneous tools:      ${build_misc_tools}
  56.  "
  57. -- 
  58. 1.7.10.4