update weechat to latest upstream, fix compile

8 files changed, 63 insertions, 80 deletions

diff --git a/package/weechat/Makefile b/package/weechat/Makefile
index 326d44ee0..e5b67dd00 100644
--- a/package/weechat/Makefile
+++ b/package/weechat/Makefile
@@ -4,13 +4,14 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		weechat
-PKG_VERSION:=		0.3.2
-PKG_RELEASE:=		2
-PKG_MD5SUM:=		0c4f6e7196703c6eca12217f254612aa
-PKG_DESCR:=		Lightweight IRC client
+PKG_VERSION:=		0.4.2
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		fd584c258aace2aa898f40e1fcf06084
+PKG_DESCR:=		lightweight IRC client
 PKG_SECTION:=		chat
-PKG_DEPENDS:=		libncurses
-PKG_BUILDDEP:=		ncurses libiconv-tiny
+PKG_DEPENDS:=		libncurses libgcrypt libz libcurl
+PKG_BUILDDEP:=		ncurses libiconv-tiny autotool libgcrypt
+PKG_BUILDDEP+=		zlib curl
 PKG_URL:=		http://www.weechat.org/
 PKG_SITES:=		http://www.weechat.org/files/src/
 
@@ -18,7 +19,7 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,WEECHAT,weechat,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-TARGET_LDFLAGS+=	-liconv
+AUTOTOOL_STYLE:=	autoreconf
 CONFIGURE_ARGS+=	--with-debug=0 \
 			--disable-perl \
 			--disable-python \
diff --git a/package/weechat/patches/patch-configure b/package/weechat/patches/patch-configure
deleted file mode 100644
index efb7207e2..000000000
--- a/package/weechat/patches/patch-configure
+++ /dev/null
@@ -1,40 +0,0 @@
---- weechat-0.3.2.orig/configure	2010-04-17 11:40:27.000000000 +0200
-+++ weechat-0.3.2/configure	2010-07-09 17:34:32.236316102 +0200
-@@ -17146,36 +17146,8 @@ else
- fi
- 
-    fi
--   if test "x$ac_found_iconv_lib" = "xyes" ; then
--      ICONV_LFLAGS="-liconv"
--      LIBS="$LIBS $ICONV_LFLAGS"
--   fi
--   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv usability in programs" >&5
--$as_echo_n "checking for iconv usability in programs... " >&6; }
--   if test "$cross_compiling" = yes; then :
--  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error "cannot run test program while cross compiling
--See \`config.log' for more details." "$LINENO" 5; }
--else
--  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
- 
--        #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;
--      }
--_ACEOF
--if ac_fn_c_try_run "$LINENO"; then :
--  iconv_found="yes"
--fi
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
--  conftest.$ac_objext conftest.beam conftest.$ac_ext
--fi
-+iconv_found="yes"
- 
-   if test "x$iconv_found" = "xno" ; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
diff --git a/package/weechat/patches/patch-configure_ac b/package/weechat/patches/patch-configure_ac
new file mode 100644
index 000000000..11894d691
--- /dev/null
+++ b/package/weechat/patches/patch-configure_ac
@@ -0,0 +1,31 @@
+--- 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
+-   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
+-
+-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
+ 
+ # ------------------------------------------------------------------------------
diff --git a/package/weechat/patches/patch-configure_ac.orig b/package/weechat/patches/patch-configure_ac.orig
new file mode 100644
index 000000000..99b187ce6
--- /dev/null
+++ b/package/weechat/patches/patch-configure_ac.orig
@@ -0,0 +1,11 @@
+--- 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:05:15.000000000 +0100
+@@ -242,7 +242,7 @@ if test "x$ac_found_iconv_header" = "xye
+       LIBS="$LIBS $ICONV_LFLAGS"
+    fi
+    AC_MSG_CHECKING(for iconv usability in programs)
+-   AC_TRY_RUN([
++   AC_TRY_LINK([
+         #include <iconv.h>
+         int main(int argc, char **argv) {
+             iconv_t conv = iconv_open("ISO8859-1", "UTF-8");
diff --git a/package/weechat/patches/patch-ltmain_sh b/package/weechat/patches/patch-ltmain_sh
deleted file mode 100644
index 33915daef..000000000
--- a/package/weechat/patches/patch-ltmain_sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- weechat-0.3.2.orig/ltmain.sh	2010-04-17 11:39:59.000000000 +0200
-+++ weechat-0.3.2/ltmain.sh	2011-01-17 16:44:00.000000000 +0100
-@@ -4765,7 +4765,7 @@ func_mode_link ()
-       # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
-       # @file GCC response files
-       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
--      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
-+      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto)
-         func_quote_for_eval "$arg"
- 	arg="$func_quote_for_eval_result"
-         func_append compile_command " $arg"
diff --git a/package/weechat/patches/patch-src_gui_gui-completion_c b/package/weechat/patches/patch-src_gui_gui-completion_c
deleted file mode 100644
index b1601a13e..000000000
--- a/package/weechat/patches/patch-src_gui_gui-completion_c
+++ /dev/null
@@ -1,11 +0,0 @@
---- weechat-0.3.2.orig/src/gui/gui-completion.c	2010-04-08 16:05:14.000000000 +0200
-+++ weechat-0.3.2/src/gui/gui-completion.c	2010-07-15 16:41:35.415870907 +0200
-@@ -1658,7 +1658,7 @@ gui_completion_build_list (struct t_gui_
-     }
-     if (repeat_last)
-     {
--        pos_space = rindex (HOOK_COMMAND(ptr_hook, completion), ' ');
-+        pos_space = strrchr (HOOK_COMMAND(ptr_hook, completion), ' ');
-         gui_completion_build_list_template (completion,
-                                             (pos_space) ?
-                                             pos_space + 1 : HOOK_COMMAND(ptr_hook,
diff --git a/package/weechat/patches/patch-src_plugins_Makefile_am b/package/weechat/patches/patch-src_plugins_Makefile_am
new file mode 100644
index 000000000..02ed4f0af
--- /dev/null
+++ b/package/weechat/patches/patch-src_plugins_Makefile_am
@@ -0,0 +1,13 @@
+--- 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
+ 
diff --git a/package/weechat/patches/patch-src_plugins_Makefile_in b/package/weechat/patches/patch-src_plugins_Makefile_in
deleted file mode 100644
index e03608f6f..000000000
--- a/package/weechat/patches/patch-src_plugins_Makefile_in
+++ /dev/null
@@ -1,11 +0,0 @@
---- weechat-0.3.2.orig/src/plugins/Makefile.in	2010-04-17 11:40:31.000000000 +0200
-+++ weechat-0.3.2/src/plugins/Makefile.in	2010-07-09 17:38:00.229617601 +0200
-@@ -751,8 +751,6 @@ uninstall-am:
- # install plugin header
- 
- install-data-hook:
--	$(INSTALL) -d $(includedir)/$(PACKAGE)
--	$(INSTALL_DATA) weechat-plugin.h $(includedir)/$(PACKAGE)
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.