summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2015-04-28 16:19:32 -0500
committerWaldemar Brodkorb <wbx@openadk.org>2015-04-28 16:19:47 -0500
commit835abeaeefd5fcde0d07c45ae66fb406d7e9b416 (patch)
tree1ec7aaac87c1b8e57b323eb4bb291495e1c0d50c
parentb1c81e590e9786329b92ff5c52ecae88dfa9fcea (diff)
update and fix build
-rw-r--r--package/weechat/Makefile24
-rw-r--r--package/weechat/patches/patch-configure_ac37
2 files changed, 11 insertions, 50 deletions
diff --git a/package/weechat/Makefile b/package/weechat/Makefile
index da51651bd..5b63816e2 100644
--- a/package/weechat/Makefile
+++ b/package/weechat/Makefile
@@ -4,13 +4,13 @@
include ${ADK_TOPDIR}/rules.mk
PKG_NAME:= weechat
-PKG_VERSION:= 0.4.3
+PKG_VERSION:= 1.1.1
PKG_RELEASE:= 1
-PKG_HASH:= bfb5a34f78eaad0e22e1aa0783ff330907f253fcd50a1d3fd0aa19df9114dde9
+PKG_HASH:= a32f7e57d5e834195bacaffa874419b4a9d17cd42883c80d7ecb9fadbf601349
PKG_DESCR:= lightweight irc client
PKG_SECTION:= app/chat
-PKG_DEPENDS:= libncurses libgcrypt zlib libcurl
-PKG_BUILDDEP:= ncurses zlib libgcrypt curl
+PKG_DEPENDS:= libncurses zlib libcurl libgcrypt
+PKG_BUILDDEP:= cmake-host ncurses zlib curl libgcrypt
PKG_URL:= http://www.weechat.org/
PKG_SITES:= http://www.weechat.org/files/src/
@@ -20,15 +20,13 @@ include ${ADK_TOPDIR}/mk/package.mk
$(eval $(call PKG_template,WEECHAT,weechat,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-AUTOTOOL_STYLE:= autoreconf
-TARGET_LDFLAGS+= -ltinfo
-CONFIGURE_ARGS+= --with-debug=0 \
- --disable-perl \
- --disable-python \
- --disable-lua \
- --disable-tcl \
- --disable-gnutls \
- --disable-ruby
+CONFIG_STYLE:= cmake
+CMAKE_FLAGS+= -DENABLE_GNUTLS=OFF \
+ -DENABLE_PERL=OFF \
+ -DENABLE_PYTHON=OFF \
+ -DENABLE_NLS=OFF \
+ -DGCRYPT_LDFLAGS="-L$(STAGING_TARGET_DIR)/usr/lib -ltinfo -lgcrypt" \
+ -DGCRYPT_CFLAGS="-I$(STAGING_TARGET_DIR)/usr/include" \
weechat-install:
${INSTALL_DIR} ${IDIR_WEECHAT}/usr/bin
diff --git a/package/weechat/patches/patch-configure_ac b/package/weechat/patches/patch-configure_ac
deleted file mode 100644
index 757f673fb..000000000
--- a/package/weechat/patches/patch-configure_ac
+++ /dev/null
@@ -1,37 +0,0 @@
---- weechat-0.4.3.orig/configure.ac 2014-02-09 09:52:53.000000000 +0100
-+++ weechat-0.4.3/configure.ac 2014-06-24 08:07:06.000000000 +0200
-@@ -232,33 +232,7 @@ fi
-
- ICONV_LFLAGS=""
-
--iconv_found="no"
--AC_CHECK_HEADER(iconv.h,ac_found_iconv_header="yes",ac_found_iconv_header="no")
--if test "x$ac_found_iconv_header" = "xyes" ; then
-- AC_CHECK_LIB(iconv,iconv_open,ac_found_iconv_lib="yes",ac_found_iconv_lib="no")
-- if test "x$ac_found_iconv_lib" = "xno" ; then
-- AC_CHECK_LIB(iconv,libiconv_open,ac_found_iconv_lib="yes",ac_found_iconv_lib="no")
-- fi
-- if test "x$ac_found_iconv_lib" = "xyes" ; then
-- ICONV_LFLAGS="-liconv"
-- LIBS="$LIBS $ICONV_LFLAGS"
-- fi
-- AC_MSG_CHECKING(for iconv usability in programs)
-- AC_TRY_RUN([
-- #include <iconv.h>
-- int main(int argc, char **argv) {
-- iconv_t conv = iconv_open("ISO8859-1", "UTF-8");
-- if (conv != (iconv_t) -1) {
-- return 0;
-- }
-- return 1;
-- }],iconv_found="yes")
-- if test "x$iconv_found" = "xno" ; then
-- AC_MSG_RESULT(no)
-- else
-- AC_MSG_RESULT(yes)
-- fi
--fi
-+iconv_found="yes"
-
- if test "x$iconv_found" = "xno" ; then
- AC_MSG_ERROR([