From a9353085f73bed6ed888a0adb3f2b1d730fab2a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz?= Date: Fri, 10 May 2019 18:36:43 +0000 Subject: vars/build.vars:weechat: updated to v2.4 (via Redfoxmoon.) patches/weechat-2.1_pre.local.patch: removes obsolete patch. patches/weechat-2.4.local.patch: updated (via Redfoxmoon.) --- patches/weechat-2.1.local.patch | 43 ------------------------------------- patches/weechat-2.1_pre.local.patch | 11 ---------- patches/weechat-2.4.local.patch | 43 +++++++++++++++++++++++++++++++++++++ vars/build.vars | 4 ++-- 4 files changed, 45 insertions(+), 56 deletions(-) delete mode 100644 patches/weechat-2.1.local.patch delete mode 100644 patches/weechat-2.1_pre.local.patch create mode 100644 patches/weechat-2.4.local.patch diff --git a/patches/weechat-2.1.local.patch b/patches/weechat-2.1.local.patch deleted file mode 100644 index 2b08df5b..00000000 --- a/patches/weechat-2.1.local.patch +++ /dev/null @@ -1,43 +0,0 @@ ---- weechat-2.1/configure.orig 2017-11-28 13:45:00.520000000 +0000 -+++ weechat-2.1/configure 2017-11-28 13:46:29.676000000 +0000 -@@ -22487,7 +22487,6 @@ - # pkg-config - # ------------------------------------------------------------------------------ - --PKGCONFIG="" - for ac_prog in pkg-config - do - # Extract the first word of "$ac_prog", so it can be a program name with args. -@@ -24277,8 +24276,8 @@ - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 - $as_echo "yes" >&6; } -- GCRYPT_CFLAGS=`libgcrypt-config --cflags` -- GCRYPT_LFLAGS=`libgcrypt-config --libs` -+ GCRYPT_CFLAGS=`$LIBGCRYPT_CONFIG --cflags` -+ GCRYPT_LFLAGS=`$LIBGCRYPT_CONFIG --libs` - - - fi -@@ -24355,8 +24354,8 @@ - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 - $as_echo "yes" >&6; } -- GNUTLS_CFLAGS=`pkg-config gnutls --cflags` -- GNUTLS_LFLAGS=`pkg-config gnutls --libs` -+ GNUTLS_CFLAGS=`$PKG_CONFIG gnutls --cflags` -+ GNUTLS_LFLAGS=`$PKG_CONFIG gnutls --libs` - - - $as_echo "#define HAVE_GNUTLS 1" >>confdefs.h -@@ -24567,8 +24566,8 @@ - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 - $as_echo "yes" >&6; } -- ZLIB_CFLAGS=`pkg-config zlib --cflags` -- ZLIB_LFLAGS=`pkg-config zlib --libs` -+ ZLIB_CFLAGS=`$PKG_CONFIG zlib --cflags` -+ ZLIB_LFLAGS=`$PKG_CONFIG zlib --libs` - - - fi diff --git a/patches/weechat-2.1_pre.local.patch b/patches/weechat-2.1_pre.local.patch deleted file mode 100644 index e05a3326..00000000 --- a/patches/weechat-2.1_pre.local.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- weechat-2.1/autogen.sh.orig 2016-10-02 09:35:04.000000000 +0200 -+++ weechat-2.1/autogen.sh 2016-12-07 21:16:43.722726800 +0100 -@@ -64,7 +64,7 @@ - run "rm -rf intl" - - # execute autoreconf cmds --run "autoreconf -fvi" -+run "autoreconf -vi" - - # ending - rm -f $AUTOGEN_LOG diff --git a/patches/weechat-2.4.local.patch b/patches/weechat-2.4.local.patch new file mode 100644 index 00000000..2b08df5b --- /dev/null +++ b/patches/weechat-2.4.local.patch @@ -0,0 +1,43 @@ +--- weechat-2.1/configure.orig 2017-11-28 13:45:00.520000000 +0000 ++++ weechat-2.1/configure 2017-11-28 13:46:29.676000000 +0000 +@@ -22487,7 +22487,6 @@ + # pkg-config + # ------------------------------------------------------------------------------ + +-PKGCONFIG="" + for ac_prog in pkg-config + do + # Extract the first word of "$ac_prog", so it can be a program name with args. +@@ -24277,8 +24276,8 @@ + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } +- GCRYPT_CFLAGS=`libgcrypt-config --cflags` +- GCRYPT_LFLAGS=`libgcrypt-config --libs` ++ GCRYPT_CFLAGS=`$LIBGCRYPT_CONFIG --cflags` ++ GCRYPT_LFLAGS=`$LIBGCRYPT_CONFIG --libs` + + + fi +@@ -24355,8 +24354,8 @@ + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } +- GNUTLS_CFLAGS=`pkg-config gnutls --cflags` +- GNUTLS_LFLAGS=`pkg-config gnutls --libs` ++ GNUTLS_CFLAGS=`$PKG_CONFIG gnutls --cflags` ++ GNUTLS_LFLAGS=`$PKG_CONFIG gnutls --libs` + + + $as_echo "#define HAVE_GNUTLS 1" >>confdefs.h +@@ -24567,8 +24566,8 @@ + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } +- ZLIB_CFLAGS=`pkg-config zlib --cflags` +- ZLIB_LFLAGS=`pkg-config zlib --libs` ++ ZLIB_CFLAGS=`$PKG_CONFIG zlib --cflags` ++ ZLIB_LFLAGS=`$PKG_CONFIG zlib --libs` + + + fi diff --git a/vars/build.vars b/vars/build.vars index f4dca4fc..d06068df 100644 --- a/vars/build.vars +++ b/vars/build.vars @@ -1576,8 +1576,8 @@ mailutils mtr mutt microsocks nginx openlitespeed openssh pacman rsync socat tht : ${PKG_THTTPD_IN_TREE:=1}; : ${PKG_THTTPD_MAKE_INSTALL_VNAME:=prefix}; : ${PKG_THTTPD_MAKEFLAGS_BUILD_EXTRA:=-j1}; -: ${PKG_WEECHAT_SHA256SUM:=2c27fa68783bd4fda7ad00d6f3ea0fefb6c792f4bda8261ca7106ea4b4595906}; -: ${PKG_WEECHAT_VERSION:=2.1}; +: ${PKG_WEECHAT_SHA256SUM:=963fecddf55c4c8d6c96938d1a907e448679817706e7d20bc6af24797085a74c}; +: ${PKG_WEECHAT_VERSION:=2.4}; : ${PKG_WEECHAT_URL:=https://weechat.org/files/src/weechat-${PKG_WEECHAT_VERSION}.tar.gz}; : ${PKG_WEECHAT_CONFIGURE_ARGS_EXTRA:="--disable-aspell --disable-guile --disable-javascript --disable-lua --disable-perl --disable-python --disable-ruby --disable-tcl"}; : ${PKG_WEECHAT_ENV_VARS_EXTRA:="CURL_CONFIG=${PREFIX_NATIVE}/bin/curl-config:LIBGCRYPT_CONFIG=${PREFIX_NATIVE}/bin/libgcrypt-config"}; -- cgit v1.2.3