diff options
Diffstat (limited to 'package/weechat')
| -rw-r--r-- | package/weechat/Makefile | 47 | ||||
| -rw-r--r-- | package/weechat/patches/patch-configure | 40 | ||||
| -rw-r--r-- | package/weechat/patches/patch-ltmain_sh | 11 | ||||
| -rw-r--r-- | package/weechat/patches/patch-src_gui_gui-completion_c | 11 | ||||
| -rw-r--r-- | package/weechat/patches/patch-src_plugins_Makefile_in | 11 |
5 files changed, 25 insertions, 95 deletions
diff --git a/package/weechat/Makefile b/package/weechat/Makefile index e3d22768e..ec397bd73 100644 --- a/package/weechat/Makefile +++ b/package/weechat/Makefile @@ -1,36 +1,39 @@ # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. -include ${TOPDIR}/rules.mk +include ${ADK_TOPDIR}/rules.mk PKG_NAME:= weechat -PKG_VERSION:= 0.3.2 -PKG_RELEASE:= 2 -PKG_MD5SUM:= 0c4f6e7196703c6eca12217f254612aa -PKG_DESCR:= Lightweight IRC client -PKG_SECTION:= chat -PKG_DEPENDS:= libncurses libiconv -PKG_BUILDDEP:= ncurses libiconv +PKG_VERSION:= 4.2.1 +PKG_RELEASE:= 1 +PKG_HASH:= 253ddf086f6c845031a2dd294b1552851d6b04cc08a2f9da4aedfb3e2f91bdcd +PKG_DESCR:= lightweight irc client +PKG_SECTION:= app/chat +PKG_DEPENDS:= libncurses zlib libcurl libgcrypt libgnutls +PKG_BUILDDEP:= cmake-host ncurses zlib curl libgcrypt gnutls PKG_URL:= http://www.weechat.org/ -PKG_SITES:= http://www.weechat.org/files/src/ +PKG_SITES:= https://weechat.org/files/src/ -include ${TOPDIR}/mk/package.mk +include ${ADK_TOPDIR}/mk/package.mk -$(eval $(call PKG_template,WEECHAT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,WEECHAT,weechat,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -TARGET_LDFLAGS+= -liconv -CONFIGURE_ARGS+= --with-debug=0 \ - --disable-perl \ - --disable-python \ - --disable-lua \ - --disable-tcl \ - --disable-gnutls \ - --disable-ruby \ - --with-libiconv-prefix='${STAGING_TARGET_DIR}/usr' +CONFIG_STYLE:= cmake +CMAKE_FLAGS+= -DENABLE_PERL=OFF \ + -DENABLE_PYTHON=OFF \ + -DENABLE_LUA=OFF \ + -DENABLE_RUBY=OFF \ + -DENABLE_PHP=OFF \ + -DENABLE_TCL=OFF \ + -DENABLE_GUILE=OFF \ + -DENABLE_SPELL=OFF \ + -DENABLE_NLS=OFF \ + -DGCRYPT_LDFLAGS="-L$(STAGING_TARGET_DIR)/usr/lib -ltinfo -lgcrypt" \ + -DGCRYPT_CFLAGS="-I$(STAGING_TARGET_DIR)/usr/include" \ -post-install: +weechat-install: ${INSTALL_DIR} ${IDIR_WEECHAT}/usr/bin ${INSTALL_BIN} ${WRKINST}/usr/bin/weechat-curses \ ${IDIR_WEECHAT}/usr/bin/weechat -include ${TOPDIR}/mk/pkg-bottom.mk +include ${ADK_TOPDIR}/mk/pkg-bottom.mk 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-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_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. |