summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2016-07-02 11:56:16 +0200
committerPacho Ramos <pacho@gentoo.org>2016-07-02 12:42:43 +0200
commit29f814d41ac74fecc625718185a27f89b60f7fce (patch)
treebfcfab4bdaac24261fd40f8014d8761c8c56eb4f /app-office/gnucash/files
parentapp-editors/ghex: Version bump (diff)
downloadgentoo-29f814d41ac74fecc625718185a27f89b60f7fce.tar.gz
gentoo-29f814d41ac74fecc625718185a27f89b60f7fce.tar.bz2
gentoo-29f814d41ac74fecc625718185a27f89b60f7fce.zip
app-office/gnucash: Drop old
Package-Manager: portage-2.3.0_rc1
Diffstat (limited to 'app-office/gnucash/files')
-rw-r--r--app-office/gnucash/files/gnucash-2.6.9-automagic-guile.patch88
1 files changed, 0 insertions, 88 deletions
diff --git a/app-office/gnucash/files/gnucash-2.6.9-automagic-guile.patch b/app-office/gnucash/files/gnucash-2.6.9-automagic-guile.patch
deleted file mode 100644
index a871233ecd70..000000000000
--- a/app-office/gnucash/files/gnucash-2.6.9-automagic-guile.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From a42d0a1d9e3311a5e2356676fef7843f1726d343 Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Wed, 11 Nov 2015 13:35:46 +0100
-Subject: [PATCH] Make guile support selectable
-
----
- configure.ac | 55 +++++++++++++++++++++++++++++++++++++------------------
- 1 file changed, 37 insertions(+), 18 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 48ab828..ce7ba74 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -538,26 +538,45 @@ AC_CHECK_FUNCS(gethostid link)
- ### --------------------------------------------------------------------------
- ### Guile version checks
-
-+GUILE_EFFECTIVE_VERSION=0
- # - check minimum version
- # - determine GUILE_CFLAGS and GUILE_LIBS
--gnc_have_guile_2=no
--gnc_have_guile_www=no
--PKG_CHECK_MODULES(GUILE,
-- [guile-2.0 >= 2.0.0],
-- [gnc_have_guile_2=yes
-- GUILE_EFFECTIVE_VERSION=2.0
-- AC_PATH_PROG([GUILD], guild)],
-- [PKG_CHECK_MODULES(GUILE,
-- [guile-1.8 >= 1.8.5],
-- [GUILE_EFFECTIVE_VERSION=1.8],
-- [AC_MSG_ERROR([
-- guile does not appear to be installed correctly, or is not in the
-- correct version range. Perhaps you have not installed the guile
-- development packages? Gnucash requires at least version 1.8.5 to build.
-- ])])
--])
-
--AM_CONDITIONAL(GNC_HAVE_GUILE_2, test "x${gnc_have_guile_2}" = xyes)
-+AC_ARG_WITH([guile],
-+ AS_HELP_STRING([--with-guile=1.8|2.0|auto],
-+ [which guile version to compile against @<:@default: auto@:>@]),
-+ [],
-+ [with_guile=auto]
-+)
-+
-+AS_IF([test "$with_guile" = "2.0"],
-+ [PKG_CHECK_MODULES(GUILE, [guile-2.0 >= 2.0.0],
-+ [GUILE_EFFECTIVE_VERSION=2.0
-+ AC_PATH_PROG([GUILD], guild)])],
-+ [test "$with_guile" = "1.8"],
-+ [PKG_CHECK_MODULES(GUILE, [guile-1.8 >= 1.8.5],
-+ [GUILE_EFFECTIVE_VERSION=1.8])],
-+ [test "$with_guile" = "auto"],
-+ [PKG_CHECK_MODULES(GUILE, [guile-2.0 >= 2.0.0],
-+ [GUILE_EFFECTIVE_VERSION=2.0
-+ AC_PATH_PROG([GUILD], guild)],
-+ [PKG_CHECK_MODULES(GUILE, [guile-1.8 >= 1.8.5],
-+ [GUILE_EFFECTIVE_VERSION=1.8],
-+ [GUILE_EFFECTIVE_VERSION=0])
-+ ])],
-+ # else
-+ [AC_MSG_ERROR([invalid guile version specified])]
-+)
-+
-+AS_IF([test "$GUILE_EFFECTIVE_VERSION" = "0"],
-+ [AC_MSG_ERROR([
-+ guile does not appear to be installed correctly, or is not in the
-+ correct version range. Perhaps you have not installed the guile
-+ development packages? Gnucash requires at least version 1.8.5 to build.
-+ ])]
-+)
-+
-+AM_CONDITIONAL(GNC_HAVE_GUILE_2, [test "$GUILE_EFFECTIVE_VERSION" = "2.0"])
- AC_SUBST(GUILE_EFFECTIVE_VERSION)
- AC_SUBST(GUILE, [`pwd`/gnc-guile])
-
-@@ -584,7 +603,7 @@ if test "${BUILDING_FROM_VCS}" = yes
- then
- AX_PKG_SWIG(2.0.10, [gnc_have_swig_2_0_10=yes], [gnc_have_swig_2_0_10=no])
-
-- if test "${gnc_have_guile_2}" = yes
-+ if test "${GUILE_EFFECTIVE_VERSION}" = "2.0"
- then
- if test "${gnc_have_swig_2_0_10}" = no
- then
---
-2.6.3
-