diff options
| author |   David Seifert <soap@gentoo.org> | 2016-02-14 10:21:10 +0100 |
|---|---|---|
| committer | David Seifert <soap@gentoo.org> | 2016-02-14 10:21:39 +0100 |
| commit | 469316b4d1b0f83d6a2ab70ff2cb514109368686 (patch) | |
| tree | ed8d218e663a5f2f383eb717c0a004f558c30850 | |
| parent | sys-kernel/vanilla-sources: Automated version bump to 3.2.77 - remove old. (diff) | |
| download | gentoo-469316b4d1b0f83d6a2ab70ff2cb514109368686.tar.gz gentoo-469316b4d1b0f83d6a2ab70ff2cb514109368686.tar.bz2 gentoo-469316b4d1b0f83d6a2ab70ff2cb514109368686.zip | |
app-cdr/cdrdao: Add AM_GCONF_SOURCE_2 macro to patch
Gentoo-Bug: 574660
* AM_GCONF_SOURCE_2 is normally defined in gnome-base/gconf,
which we do not watch to DEPEND on.
Package-Manager: portage-2.2.27
| -rw-r--r-- | app-cdr/cdrdao/files/cdrdao-1.2.3-ax_pthread.patch | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/app-cdr/cdrdao/files/cdrdao-1.2.3-ax_pthread.patch b/app-cdr/cdrdao/files/cdrdao-1.2.3-ax_pthread.patch index 52dda7cdcf18..c20a73dd64a6 100644 --- a/app-cdr/cdrdao/files/cdrdao-1.2.3-ax_pthread.patch +++ b/app-cdr/cdrdao/files/cdrdao-1.2.3-ax_pthread.patch @@ -369,3 +369,50 @@ See also: https://bugs.gentoo.org/show_bug.cgi?id=548004 +fi +AC_LANG_POP +])dnl AX_PTHREAD +--- cdrdao-1.2.3/m4/gconf-2.m4 ++++ cdrdao-1.2.3/m4/gconf-2.m4 +@@ -0,0 +1,44 @@ ++dnl AM_GCONF_SOURCE_2 ++dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas ++dnl (i.e. pass to gconftool-2 ++dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where ++dnl you should install foo.schemas files ++dnl ++ ++AC_DEFUN([AM_GCONF_SOURCE_2], ++[ ++ if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then ++ GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source` ++ else ++ GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE ++ fi ++ ++ AC_ARG_WITH([gconf-source], ++ AC_HELP_STRING([--with-gconf-source=sourceaddress], ++ [Config database for installing schema files.]), ++ [GCONF_SCHEMA_CONFIG_SOURCE="$withval"],) ++ ++ AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE) ++ AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation]) ++ ++ if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then ++ GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas' ++ fi ++ ++ AC_ARG_WITH([gconf-schema-file-dir], ++ AC_HELP_STRING([--with-gconf-schema-file-dir=dir], ++ [Directory for installing schema files.]), ++ [GCONF_SCHEMA_FILE_DIR="$withval"],) ++ ++ AC_SUBST(GCONF_SCHEMA_FILE_DIR) ++ AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files]) ++ ++ AC_ARG_ENABLE(schemas-install, ++ AC_HELP_STRING([--disable-schemas-install], ++ [Disable the schemas installation]), ++ [case ${enableval} in ++ yes|no) ;; ++ *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-install]) ;; ++ esac]) ++ AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no]) ++]) |