[packages/weechat] add patch to find guile headers/libs in cmake

glen glen at pld-linux.org
Sat Apr 20 11:15:01 CEST 2013


commit 80e0faa47600189b6dfd078abdeedc9f1dcfb7ff
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sat Apr 20 12:14:46 2013 +0300

    add patch to find guile headers/libs in cmake

 findguile.patch | 16 ++++++++++++++++
 weechat.spec    |  2 ++
 2 files changed, 18 insertions(+)
---
diff --git a/weechat.spec b/weechat.spec
index a17012f..f4dab4d 100644
--- a/weechat.spec
+++ b/weechat.spec
@@ -27,6 +27,7 @@ Source0:	http://www.weechat.org/files/src/%{name}-%{version}.tar.gz
 Patch0:		%{name}-ac.patch
 Patch1:		%{name}-plugins_header.patch
 Patch2:		%{name}-curses.patch
+Patch3:		findguile.patch
 URL:		http://www.weechat.org/
 %{?with_aspell:BuildRequires:	aspell-devel}
 BuildRequires:	cmake
@@ -92,6 +93,7 @@ HTML documentation for weechat.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p0
+%patch3 -p1
 
 %{__sed} -i -e 's#PYTHON_LIB=.*#PYTHON_LIB=%{_libdir}#g' configure.in
 %{__sed} -i -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.in
diff --git a/findguile.patch b/findguile.patch
new file mode 100644
index 0000000..5deb527
--- /dev/null
+++ b/findguile.patch
@@ -0,0 +1,16 @@
+they should really use pkgconfig on guile-2.0
+
+--- weechat-0.4.0/cmake/FindGuile.cmake~	2013-01-20 10:21:06.000000000 +0200
++++ weechat-0.4.0/cmake/FindGuile.cmake	2013-04-20 12:10:11.580621173 +0300
+@@ -31,9 +31,9 @@
+    SET(GUILE_FIND_QUIETLY TRUE)
+ ENDIF(GUILE_FOUND)
+ 
+-FIND_PATH(GUILE_INCLUDE_DIR libguile.h /usr/include /usr/local/include /usr/include/libguile /usr/local/include/libguile)
++FIND_PATH(GUILE_INCLUDE_DIR libguile.h /usr/include /usr/local/include /usr/include/libguile /usr/local/include/libguile /usr/include/guile/2.0)
+ 
+-FIND_LIBRARY(GUILE_LIBRARY NAMES guile PATH /usr/lib /usr/local/lib)
++FIND_LIBRARY(GUILE_LIBRARY NAMES guile guile-2.0 PATH /usr/lib /usr/local/lib /usr/lib64)
+ 
+ IF(GUILE_INCLUDE_DIR AND GUILE_LIBRARY)
+   SET(GUILE_FOUND TRUE)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/weechat.git/commitdiff/80e0faa47600189b6dfd078abdeedc9f1dcfb7ff



More information about the pld-cvs-commit mailing list