From e1df14010f26fdcb531487b3fe621b075cb51b91 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Sat, 30 Mar 2019 11:24:36 +0100 Subject: [PATCH] - fix guile 2.2 detection - rel 3 --- ac.patch | 22 ++++++++++++++++++++++ guile-clutter.spec | 7 ++++--- 2 files changed, 26 insertions(+), 3 deletions(-) create mode 100644 ac.patch diff --git a/ac.patch b/ac.patch new file mode 100644 index 0000000..855242e --- /dev/null +++ b/ac.patch @@ -0,0 +1,22 @@ +--- guile-clutter-1.12.2.1/m4/guile.m4~ 2015-11-19 04:28:36.000000000 +0100 ++++ guile-clutter-1.12.2.1/m4/guile.m4 2019-03-30 11:20:29.022102681 +0100 +@@ -64,7 +64,7 @@ + # + AC_DEFUN([GUILE_PKG], + [PKG_PROG_PKG_CONFIG +- _guile_versions_to_search="m4_default([$1], [2.2 2.0])" ++ _guile_versions_to_search="2.2 2.0" + if test -n "$GUILE_EFFECTIVE_VERSION"; then + _guile_tmp="" + for v in $_guile_versions_to_search; do +--- guile-clutter-1.12.2.1/configure.ac~ 2019-03-30 11:21:03.000000000 +0100 ++++ guile-clutter-1.12.2.1/configure.ac 2019-03-30 11:23:23.344355111 +0100 +@@ -73,7 +73,7 @@ + [DISABLE_DEPRECATED=false]) + + GUILE_PKG([2.2, 2.0]) +-GUILE_PROGS([2.0.11]) ++GUILE_PROGS() + GUILE_GLOBAL_SITE_DIR + GUILE_SITE_DIR + GUILE_SITE_CCACHE_DIR diff --git a/guile-clutter.spec b/guile-clutter.spec index 2b9ce1e..3e2fa07 100644 --- a/guile-clutter.spec +++ b/guile-clutter.spec @@ -2,21 +2,21 @@ Summary: Clutter library wrapper for Guile Scheme Summary(pl.UTF-8): Wrapper biblioteki Clutter dla Guile Scheme Name: guile-clutter Version: 1.12.2.1 -Release: 2 +Release: 3 License: GPL v2+ Group: Libraries Source0: http://ftp.gnu.org/gnu/guile-gnome/guile-clutter/%{name}-%{version}.tar.gz # Source0-md5: db566c9e3148fc92daad7235921ccf96 Patch0: %{name}-info.patch Patch1: %{name}-nox.patch +Patch2: ac.patch URL: http://www.gnu.org/software/guile-gnome/ BuildRequires: autoconf >= 2.61 BuildRequires: automake >= 1:1.12 BuildRequires: cogl-devel >= 1.12.2 BuildRequires: clutter-devel >= 1.12.2 BuildRequires: g-wrap-devel >= 1.9.15 -#BuildRequires: guile-cairo >= 1.10.0 -BuildRequires: guile-cairo >= 1.4.0 +BuildRequires: guile-cairo >= 1.10.0 BuildRequires: guile-devel >= 5:2.0.11 BuildRequires: guile-gnome-atk >= 2.16.4 BuildRequires: guile-gnome-cairo >= 2.16.4 @@ -44,6 +44,7 @@ Guile-Clutter obudowuje bibliotekę Clutter dla Guile Scheme. %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build %{__libtoolize} -- 2.44.0