weechat 0.4.0

Closes Homebrew/homebrew#18306.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
This commit is contained in:
Akshay Hegde 2013-03-07 00:05:08 -08:00 committed by Jack Nagel
parent 630e8c589e
commit ddb2657e7e

View file

@ -2,8 +2,8 @@ require 'formula'
class Weechat < Formula
homepage 'http://www.weechat.org'
url 'http://www.weechat.org/files/src/weechat-0.3.9.2.tar.bz2'
sha1 '64147c88426c240d5d33c65755c729ed2c435aeb'
url 'http://www.weechat.net/files/src/weechat-0.4.0.tar.bz2'
sha1 'e4b891d9d3d68196f97d226f487c4a2382d59d99'
depends_on 'cmake' => :build
depends_on 'gettext'
@ -20,13 +20,6 @@ class Weechat < Formula
option 'python', 'Build the python module (requires framework Python)'
option 'aspell', 'Build the aspell module that checks your spelling'
def patches
# Fixes bug #38321: The charset plugin doesn't build on OS X
# https://savannah.nongnu.org/bugs/index.php?38321
# Patch incorporated upstream; should be included in the next release
DATA
end
def install
# Remove all arch flags from the PERL_*FLAGS as we specify them ourselves.
# This messes up because the system perl is a fat binary with 32, 64 and PPC
@ -75,25 +68,3 @@ class Weechat < Formula
EOS
end
end
__END__
diff --git a/cmake/FindIconv.cmake b/cmake/FindIconv.cmake
index c077ba0..6622ea3 100644
--- a/cmake/FindIconv.cmake
+++ b/cmake/FindIconv.cmake
@@ -49,10 +49,11 @@ FIND_LIBRARY(ICONV_LIBRARY
IF(ICONV_INCLUDE_PATH)
IF(ICONV_LIBRARY)
STRING(REGEX REPLACE "/[^/]*$" "" ICONV_LIB_PATH "${ICONV_LIBRARY}")
- CHECK_LIBRARY_EXISTS(iconv libiconv_open ${ICONV_LIB_PATH} ICONV_FOUND)
- IF(NOT ICONV_FOUND)
- CHECK_LIBRARY_EXISTS(iconv iconv_open ${ICONV_LIB_PATH} ICONV_FOUND)
- ENDIF(NOT ICONV_FOUND)
+ CHECK_LIBRARY_EXISTS(iconv libiconv_open ${ICONV_LIB_PATH} LIBICONV_OPEN_FOUND)
+ CHECK_LIBRARY_EXISTS(iconv iconv_open ${ICONV_LIB_PATH} ICONV_OPEN_FOUND)
+ IF (LIBICONV_OPEN_FOUND OR ICONV_OPEN_FOUND)
+ SET(ICONV_FOUND TRUE)
+ ENDIF (LIBICONV_OPEN_FOUND OR ICONV_OPEN_FOUND)
ELSE(ICONV_LIBRARY)
CHECK_FUNCTION_EXISTS(iconv_open ICONV_FOUND)
ENDIF(ICONV_LIBRARY)