summaryrefslogtreecommitdiff
path: root/package/weechat
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-06-24 08:20:48 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2014-06-24 08:21:05 +0200
commit5d996627a8cbb8ab535a5352e957b7d584fef9a6 (patch)
tree000ce2690fd01606e0c1154944b93d30837a2ed4 /package/weechat
parentd66ebe9be2672f5283e887276d58c32884144a06 (diff)
update to latest upstream version
Diffstat (limited to 'package/weechat')
-rw-r--r--package/weechat/Makefile9
-rw-r--r--package/weechat/patches/patch-configure_ac34
-rw-r--r--package/weechat/patches/patch-src_plugins_Makefile_am13
3 files changed, 24 insertions, 32 deletions
diff --git a/package/weechat/Makefile b/package/weechat/Makefile
index 7e0d71fd9..5f92e50bd 100644
--- a/package/weechat/Makefile
+++ b/package/weechat/Makefile
@@ -4,9 +4,9 @@
include ${ADK_TOPDIR}/rules.mk
PKG_NAME:= weechat
-PKG_VERSION:= 0.4.2
-PKG_RELEASE:= 2
-PKG_MD5SUM:= fd584c258aace2aa898f40e1fcf06084
+PKG_VERSION:= 0.4.3
+PKG_RELEASE:= 1
+PKG_MD5SUM:= 2206cbc7ee66d0c219f25a5499973dd5
PKG_DESCR:= lightweight irc client
PKG_SECTION:= app/chat
PKG_DEPENDS:= libncurses libgcrypt zlib libcurl
@@ -28,8 +28,7 @@ CONFIGURE_ARGS+= --with-debug=0 \
--disable-lua \
--disable-tcl \
--disable-gnutls \
- --disable-ruby \
- --with-libiconv-prefix='${STAGING_TARGET_DIR}/usr'
+ --disable-ruby
weechat-install:
${INSTALL_DIR} ${IDIR_WEECHAT}/usr/bin
diff --git a/package/weechat/patches/patch-configure_ac b/package/weechat/patches/patch-configure_ac
index 11894d691..757f673fb 100644
--- a/package/weechat/patches/patch-configure_ac
+++ b/package/weechat/patches/patch-configure_ac
@@ -1,9 +1,20 @@
---- weechat-0.4.2.orig/configure.ac 2013-10-06 08:58:14.000000000 +0200
-+++ weechat-0.4.2/configure.ac 2013-11-07 10:07:42.000000000 +0100
-@@ -241,28 +241,6 @@ if test "x$ac_found_iconv_header" = "xye
- ICONV_LFLAGS="-liconv"
- LIBS="$LIBS $ICONV_LFLAGS"
- fi
+--- 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>
@@ -20,12 +31,7 @@
- AC_MSG_RESULT(yes)
- fi
-fi
--
--if test "x$iconv_found" = "xno" ; then
-- AC_MSG_ERROR([
--*** Iconv headers and/or libraries couldn't be found on your system.
--*** Try to install them with your software package manager.
--*** WeeChat can't be built without Iconv support.])
- fi
++iconv_found="yes"
- # ------------------------------------------------------------------------------
+ if test "x$iconv_found" = "xno" ; then
+ AC_MSG_ERROR([
diff --git a/package/weechat/patches/patch-src_plugins_Makefile_am b/package/weechat/patches/patch-src_plugins_Makefile_am
deleted file mode 100644
index 02ed4f0af..000000000
--- a/package/weechat/patches/patch-src_plugins_Makefile_am
+++ /dev/null
@@ -1,13 +0,0 @@
---- weechat-0.4.2.orig/src/plugins/Makefile.am 2013-10-06 08:58:14.000000000 +0200
-+++ weechat-0.4.2/src/plugins/Makefile.am 2013-11-07 10:41:59.000000000 +0100
-@@ -113,8 +113,8 @@ EXTRA_DIST = CMakeLists.txt
- # install plugin header
-
- install-data-hook:
-- $(INSTALL) -d $(includedir)/$(PACKAGE)
-- $(INSTALL_DATA) $(abs_top_srcdir)/src/plugins/weechat-plugin.h $(includedir)/$(PACKAGE)
-+ $(INSTALL) -d $(DESTDIR)/$(includedir)/$(PACKAGE)
-+ $(INSTALL_DATA) $(abs_top_srcdir)/src/plugins/weechat-plugin.h $(DESTDIR)/$(includedir)/$(PACKAGE)
-
- # uninstall plugin header
-