diff options
author | Jeroen Roovers <jer@gentoo.org> | 2015-10-17 09:39:56 +0200 |
---|---|---|
committer | Jeroen Roovers <jer@gentoo.org> | 2015-10-17 09:40:22 +0200 |
commit | 1cceedcb87ea36998c538b06acea96fc9f2d1a0e (patch) | |
tree | 70222692e76d926960321be3d4a5e40c5ced544c /x11-misc/gtkdialog/files | |
parent | dev-ruby/racc: add 1.4.13 (diff) | |
download | gentoo-1cceedcb87ea36998c538b06acea96fc9f2d1a0e.tar.gz gentoo-1cceedcb87ea36998c538b06acea96fc9f2d1a0e.tar.bz2 gentoo-1cceedcb87ea36998c538b06acea96fc9f2d1a0e.zip |
x11-misc/gtkdialog: Make gnome-base/libglade and x11-libs/vte dependencies optional and explicit (bug #562988 by AaylaSecura)
Package-Manager: portage-2.2.23
Diffstat (limited to 'x11-misc/gtkdialog/files')
-rw-r--r-- | x11-misc/gtkdialog/files/gtkdialog-0.8.3-optdeps.patch | 62 |
1 files changed, 62 insertions, 0 deletions
diff --git a/x11-misc/gtkdialog/files/gtkdialog-0.8.3-optdeps.patch b/x11-misc/gtkdialog/files/gtkdialog-0.8.3-optdeps.patch new file mode 100644 index 000000000000..e032c1290215 --- /dev/null +++ b/x11-misc/gtkdialog/files/gtkdialog-0.8.3-optdeps.patch @@ -0,0 +1,62 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -25,32 +25,40 @@ + AC_PROG_YACC + AC_SUBST(YACC) + ++PKG_PROG_PKG_CONFIG([0.24]) ++ + # Checks for libraries. +-pkg_modules="gtk+-2.0 >= 2.0.0" +-PKG_CHECK_MODULES(GTK, [$pkg_modules]) ++PKG_CHECK_MODULES(GTK, [gtk+-2.0 >= 2.0.0]) + AC_SUBST(GTK_CFLAGS) + AC_SUBST(GTK_LIBS) + +-pkg_modules="gthread-2.0" +-PKG_CHECK_MODULES(GTHREAD, [$pkg_modules]) ++PKG_CHECK_MODULES(GTHREAD, [gthread-2.0]) + AC_SUBST(GTHREAD_CFLAGS) + AC_SUBST(GTHREAD_LIBS) + +-glade_lib="libglade-2.0" +-PKG_CHECK_MODULES([GLADE_LIB], \ +- [$glade_lib], \ +- AC_SUBST(HAVE_GLADE_LIB, 1),\ +- AC_SUBST(HAVE_GLADE_LIB, 0)) +-AC_SUBST(GLADE_LIB_CFLAGS) +-AC_SUBST(GLADE_LIB_LIBS) +- +-vte_lib="vte >= 0.23.5" +-PKG_CHECK_MODULES([VTE], \ +- [$vte_lib], \ +- AC_SUBST(HAVE_VTE, 1),\ +- AC_SUBST(HAVE_VTE, 0)) +-AC_SUBST(VTE_CFLAGS) +-AC_SUBST(VTE_LIBS) ++AC_ARG_WITH([glade], ++ AS_HELP_STRING([--with-glade], [enable support for libglade]) ++) ++ ++AC_ARG_WITH([vte], ++ AS_HELP_STRING([--with-vte], [enable support for vte]) ++) ++ ++AS_IF( ++ [test "x$with_glade" = "xyes"], ++ [PKG_CHECK_MODULES([GLADE_LIB], [libglade-2.0], [have_glade_lib=1], AC_MSG_ERROR([glade requested but not found]))], ++ [test "x$with_glade" = "xno"], ++ [have_glade_lib=0] ++) ++AC_SUBST([HAVE_GLADE_LIB], [$have_glade_lib]) ++ ++AS_IF( ++ [test "x$with_vte" = "xyes"], ++ [PKG_CHECK_MODULES([VTE], [vte >= 0.23.5], [have_vte=1], AC_MSG_ERROR([vte requested but not found]))], ++ [test "x$with_vte" = "xno"], ++ [have_vte=0] ++) ++AC_SUBST([HAVE_VTE], [$have_vte]) + + # Checks for header files. + AC_CHECK_HEADERS([locale.h]) |