[packages/weechat] - up to 2.4 - guile and docs don't build

[baggins]

commit 9b136ab8eb964aee9601ff7885cefad42d1e24a8
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sun Mar 17 10:51:52 2019 +0100

    - up to 2.4
    - guile and docs don't build

 guile-2.2.patch | 12 ++++++++++++
 weechat.spec    | 14 ++++++--------
 2 files changed, 18 insertions(+), 8 deletions(-)
---
diff --git a/weechat.spec b/weechat.spec
index 38aae1e..55a9dc3 100644
--- a/weechat.spec
+++ b/weechat.spec
@@ -23,15 +23,16 @@
 Summary:	WeeChat - fast and light chat environment
 Summary(pl.UTF-8):	WeeChat - szybkie i lekkie środowisko do rozmów
 Name:		weechat
-Version:	1.5
-Release:	8
+Version:	2.4
+Release:	0.1
 License:	GPL v3+
 Group:		Applications/Communications
 Source0:	http://www.weechat.org/files/src/%{name}-%{version}.tar.gz
-# Source0-md5:	6e4f9c2ec870aab0696c43936800d733
+# Source0-md5:	a148af9fa88a408b716139b735854ed7
+Patch0:		guile-2.2.patch
 Patch2:		%{name}-curses.patch
 URL:		http://www.weechat.org/
-%{?with_doc:BuildRequires:	asciidoc}
+%{?with_doc:BuildRequires:	asciidoctor}
 %{?with_aspell:BuildRequires:	aspell-devel}
 BuildRequires:	cmake
 BuildRequires:	curl-devel
@@ -44,7 +45,6 @@ BuildRequires:	ncurses-devel
 %{?with_perl:BuildRequires:	perl-devel}
 BuildRequires:	pkgconfig
 BuildRequires:	sed >= 4.0
-%{?with_doc:BuildRequires:	source-highlight}
 %{?with_js:BuildRequires:	v8-devel}
 %if %{with python}
 BuildRequires:	python-devel
@@ -81,11 +81,9 @@ HTML documentation for weechat.
 
 %prep
 %setup -q
+%patch0 -p1
 %patch2 -p0
 
-%{__sed} -i -e 's#PYTHON_LIB=.*#PYTHON_LIB=%{_libdir}#g' configure.ac
-%{__sed} -i -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.ac
-
 %build
 install -d build
 cd build
diff --git a/guile-2.2.patch b/guile-2.2.patch
new file mode 100644
index 0000000..962da90
--- /dev/null
+++ b/guile-2.2.patch
@@ -0,0 +1,12 @@
+--- weechat-2.4/cmake/FindGuile.cmake~	2019-02-17 08:20:07.000000000 +0100
++++ weechat-2.4/cmake/FindGuile.cmake	2019-03-17 10:12:48.050206452 +0100
+@@ -34,6 +34,9 @@
+ find_package(PkgConfig)
+ if(PKG_CONFIG_FOUND)
+   pkg_search_module(GUILE guile-2.0)
++  if(NOT GUILE_FOUND)
++    pkg_search_module(GUILE guile-2.2)
++  endif()
+   if(GUILE_FOUND)
+     # check if variable "scm_install_gmp_memory_functions" exists
+     set(CMAKE_REQUIRED_INCLUDES ${GUILE_INCLUDE_DIRS})
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/weechat.git/commitdiff/9b136ab8eb964aee9601ff7885cefad42d1e24a8