From c1f4c2b73bd1e6a3d33c53a2bc5c34adfedc9b02 Mon Sep 17 00:00:00 2001 From: Ørjan Malde Date: Oct 22 2022 14:06:30 +0000 Subject: groups/241.native_packages_inet.group: weechat: bump to v3.7.1 Signed-off-by: Ørjan Malde --- diff --git a/groups/241.native_packages_inet.group b/groups/241.native_packages_inet.group index c6b68bf..bc5a44d 100644 --- a/groups/241.native_packages_inet.group +++ b/groups/241.native_packages_inet.group @@ -248,8 +248,8 @@ mutt_cv_regex_broken=no"}; : ${PKG_W3M_MAKEFLAGS_BUILD:=-j1}; : ${PKG_W3M_SUBDIR:=w3m-0.5.3-git20190105}; : ${PKG_WEECHAT_DEPENDS:="curl gnutls libgcrypt libz ncursesw perl"}; -: ${PKG_WEECHAT_SHA256SUM:=f095f452aca0a92d86f46db74d712a890bca130fe1f20f7fad6e515b5c3be644}; -: ${PKG_WEECHAT_VERSION:=3.6}; +: ${PKG_WEECHAT_SHA256SUM:=5a359f2bc0460aa651aef842c04f4668b93607928ff4dc38e5f163357d66f302}; +: ${PKG_WEECHAT_VERSION:=3.7.1}; : ${PKG_WEECHAT_URL:=https://weechat.org/files/src/weechat-${PKG_WEECHAT_VERSION}.tar.gz}; : ${PKG_WEECHAT_CONFIGURE_ARGS_EXTRA:="--disable-guile --disable-javascript --disable-python --disable-ruby --disable-tcl --enable-perl PERL_CFLAGS=-I${PREFIX_NATIVE}/lib/perl5/5.36.0/${DEFAULT_TARGET}/CORE PERL_LFLAGS=-lperl"}; : ${PKG_WEECHAT_ENV_VARS_EXTRA:="CURL_CONFIG=${PREFIX_NATIVE}/bin/curl-config:LIBGCRYPT_CONFIG=${PREFIX_NATIVE}/bin/libgcrypt-config:PKGCONFIG=${DEFAULT_TARGET}-pkg-config"}; diff --git a/patches/weechat-3.6.local.patch b/patches/weechat-3.6.local.patch deleted file mode 100644 index 4d41b8a..0000000 --- a/patches/weechat-3.6.local.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- weechat-3.0/Makefile.am.orig 2020-11-11 07:46:53.000000000 +0000 -+++ weechat-3.0/Makefile.am 2021-01-22 20:28:22.128960631 +0000 -@@ -29,7 +29,7 @@ - tests_dir = tests - endif - --SUBDIRS = icons po doc intl src $(tests_dir) -+SUBDIRS = icons po doc src $(tests_dir) - - EXTRA_DIST = AUTHORS.adoc \ - ChangeLog.adoc \ diff --git a/patches/weechat-3.6_pre.local.patch b/patches/weechat-3.6_pre.local.patch deleted file mode 100644 index dd37cde..0000000 --- a/patches/weechat-3.6_pre.local.patch +++ /dev/null @@ -1,108 +0,0 @@ -diff -ru weechat-2.9.orig/configure.ac weechat-2.9/configure.ac ---- weechat-2.9.orig/configure.ac 2020-07-18 13:59:02.000000000 +0200 -+++ weechat-2.9/configure.ac 2020-10-06 22:27:28.776471083 +0200 -@@ -192,18 +192,6 @@ - fi - - # ------------------------------------------------------------------------------ --# pkg-config --# ------------------------------------------------------------------------------ -- --PKGCONFIG="" --AC_CHECK_PROGS(PKGCONFIG, pkg-config) --if test "x$PKGCONFIG" = "x"; then -- AC_MSG_ERROR([ --*** "pkg-config" couldn't be found on your system. --*** Try to install it with your software package manager.]) --fi -- --# ------------------------------------------------------------------------------ - # dynamic loader - # ------------------------------------------------------------------------------ - -@@ -398,52 +398,6 @@ - - # ---------------------------------- perl -------------------------------------- - --PERL_VERSION= -- --if test "x$enable_perl" = "xyes" ; then -- AC_PATH_PROGS(PERL, perl perl5) -- if test -z $PERL ; then -- AC_MSG_WARN([ --*** Perl must be installed on your system but perl interpreter couldn't be found in path. --*** Please check that perl is in path, or install it with your software package manager. --*** WeeChat will be built without Perl support.]) -- enable_perl="no" -- not_found="$not_found perl" -- else -- PERL_VERSION=`perl -V:version | sed "s/version='\(.*\)';/\1/"` -- AC_MSG_CHECKING(for Perl headers files) -- -- PERL_HEADER_TEST=`PT=perltest.c ; echo "#include " > $PT; echo "#include " >> $PT; echo "#include " >> $PT ; echo "int main() { return 0; }" >> $PT ; $CC -Wall $PT -o $PT.out $($PERL -MExtUtils::Embed -e ccopts -e ldopts) 1>/dev/null 2>&1; echo $?; rm -f $PT $PT.out 1>/dev/null 2>&1` -- -- if test "x$PERL_HEADER_TEST" = "x0" ; then -- PERL_CFLAGS=`$PERL -MExtUtils::Embed -e ccopts` -- AC_MSG_RESULT(found) -- AC_MSG_CHECKING(for Perl library) -- PERL_LIB_TEST=`PT=perltest.c ; echo "int main() { return 0; }" > $PT ; $CC -Wall $PT -o $PT.out $($PERL -MExtUtils::Embed -e ldopts) 1>/dev/null 2>&1; echo $?; rm -f $PT $PT.out 1>/dev/null 2>&1` -- if test "x$PERL_LIB_TEST" = "x0" ; then -- PERL_LFLAGS=`$PERL -MExtUtils::Embed -e ldopts` -- AC_MSG_RESULT(found) -- else -- AC_MSG_WARN([ --*** Perl library couldn't be found on your system. --*** Try to install it with your software package manager. --*** WeeChat will be built without Perl support.]) -- enable_perl="no" -- not_found="$not_found perl" -- fi -- else -- AC_MSG_WARN([ --*** Perl headers couldn't be found on your system. --*** Try to install it with your software package manager. --*** WeeChat will be built without Perl support.]) -- enable_perl="no" -- not_found="$not_found perl" -- fi -- fi --else -- not_asked="$not_asked perl" --fi -- - if test "x$enable_perl" = "xyes" ; then - AC_SUBST(PERL_CFLAGS) - AC_SUBST(PERL_LFLAGS) -@@ -1049,8 +1037,8 @@ - *** or try to install it with your software package manager.]) - else - AC_MSG_RESULT(yes) -- GCRYPT_CFLAGS=`libgcrypt-config --cflags` -- GCRYPT_LFLAGS=`libgcrypt-config --libs` -+ GCRYPT_CFLAGS=`$LIBGCRYPT_CONFIG --cflags` -+ GCRYPT_LFLAGS=`$LIBGCRYPT_CONFIG --libs` - AC_SUBST(GCRYPT_CFLAGS) - AC_SUBST(GCRYPT_LFLAGS) - fi -@@ -1070,8 +1058,8 @@ - *** or try to install it with your software package manager.]) - else - AC_MSG_RESULT(yes) -- GNUTLS_CFLAGS=`pkg-config gnutls --cflags` -- GNUTLS_LFLAGS=`pkg-config gnutls --libs` -+ GNUTLS_CFLAGS=`$PKGCONFIG gnutls --cflags` -+ GNUTLS_LFLAGS=`$PKGCONFIG gnutls --libs` - AC_SUBST(GNUTLS_CFLAGS) - AC_SUBST(GNUTLS_LFLAGS) - fi -@@ -1160,8 +1148,8 @@ - *** or try to install it with your software package manager.]) - else - AC_MSG_RESULT(yes) -- ZLIB_CFLAGS=`pkg-config zlib --cflags` -- ZLIB_LFLAGS=`pkg-config zlib --libs` -+ ZLIB_CFLAGS=`$PKGCONFIG zlib --cflags` -+ ZLIB_LFLAGS=`$PKGCONFIG zlib --libs` - AC_SUBST(ZLIB_CFLAGS) - AC_SUBST(ZLIB_LFLAGS) - fi diff --git a/patches/weechat-3.7.1.local.patch b/patches/weechat-3.7.1.local.patch new file mode 100644 index 0000000..4d41b8a --- /dev/null +++ b/patches/weechat-3.7.1.local.patch @@ -0,0 +1,11 @@ +--- weechat-3.0/Makefile.am.orig 2020-11-11 07:46:53.000000000 +0000 ++++ weechat-3.0/Makefile.am 2021-01-22 20:28:22.128960631 +0000 +@@ -29,7 +29,7 @@ + tests_dir = tests + endif + +-SUBDIRS = icons po doc intl src $(tests_dir) ++SUBDIRS = icons po doc src $(tests_dir) + + EXTRA_DIST = AUTHORS.adoc \ + ChangeLog.adoc \ diff --git a/patches/weechat-3.7.1_pre.local.patch b/patches/weechat-3.7.1_pre.local.patch new file mode 100644 index 0000000..dd37cde --- /dev/null +++ b/patches/weechat-3.7.1_pre.local.patch @@ -0,0 +1,108 @@ +diff -ru weechat-2.9.orig/configure.ac weechat-2.9/configure.ac +--- weechat-2.9.orig/configure.ac 2020-07-18 13:59:02.000000000 +0200 ++++ weechat-2.9/configure.ac 2020-10-06 22:27:28.776471083 +0200 +@@ -192,18 +192,6 @@ + fi + + # ------------------------------------------------------------------------------ +-# pkg-config +-# ------------------------------------------------------------------------------ +- +-PKGCONFIG="" +-AC_CHECK_PROGS(PKGCONFIG, pkg-config) +-if test "x$PKGCONFIG" = "x"; then +- AC_MSG_ERROR([ +-*** "pkg-config" couldn't be found on your system. +-*** Try to install it with your software package manager.]) +-fi +- +-# ------------------------------------------------------------------------------ + # dynamic loader + # ------------------------------------------------------------------------------ + +@@ -398,52 +398,6 @@ + + # ---------------------------------- perl -------------------------------------- + +-PERL_VERSION= +- +-if test "x$enable_perl" = "xyes" ; then +- AC_PATH_PROGS(PERL, perl perl5) +- if test -z $PERL ; then +- AC_MSG_WARN([ +-*** Perl must be installed on your system but perl interpreter couldn't be found in path. +-*** Please check that perl is in path, or install it with your software package manager. +-*** WeeChat will be built without Perl support.]) +- enable_perl="no" +- not_found="$not_found perl" +- else +- PERL_VERSION=`perl -V:version | sed "s/version='\(.*\)';/\1/"` +- AC_MSG_CHECKING(for Perl headers files) +- +- PERL_HEADER_TEST=`PT=perltest.c ; echo "#include " > $PT; echo "#include " >> $PT; echo "#include " >> $PT ; echo "int main() { return 0; }" >> $PT ; $CC -Wall $PT -o $PT.out $($PERL -MExtUtils::Embed -e ccopts -e ldopts) 1>/dev/null 2>&1; echo $?; rm -f $PT $PT.out 1>/dev/null 2>&1` +- +- if test "x$PERL_HEADER_TEST" = "x0" ; then +- PERL_CFLAGS=`$PERL -MExtUtils::Embed -e ccopts` +- AC_MSG_RESULT(found) +- AC_MSG_CHECKING(for Perl library) +- PERL_LIB_TEST=`PT=perltest.c ; echo "int main() { return 0; }" > $PT ; $CC -Wall $PT -o $PT.out $($PERL -MExtUtils::Embed -e ldopts) 1>/dev/null 2>&1; echo $?; rm -f $PT $PT.out 1>/dev/null 2>&1` +- if test "x$PERL_LIB_TEST" = "x0" ; then +- PERL_LFLAGS=`$PERL -MExtUtils::Embed -e ldopts` +- AC_MSG_RESULT(found) +- else +- AC_MSG_WARN([ +-*** Perl library couldn't be found on your system. +-*** Try to install it with your software package manager. +-*** WeeChat will be built without Perl support.]) +- enable_perl="no" +- not_found="$not_found perl" +- fi +- else +- AC_MSG_WARN([ +-*** Perl headers couldn't be found on your system. +-*** Try to install it with your software package manager. +-*** WeeChat will be built without Perl support.]) +- enable_perl="no" +- not_found="$not_found perl" +- fi +- fi +-else +- not_asked="$not_asked perl" +-fi +- + if test "x$enable_perl" = "xyes" ; then + AC_SUBST(PERL_CFLAGS) + AC_SUBST(PERL_LFLAGS) +@@ -1049,8 +1037,8 @@ + *** or try to install it with your software package manager.]) + else + AC_MSG_RESULT(yes) +- GCRYPT_CFLAGS=`libgcrypt-config --cflags` +- GCRYPT_LFLAGS=`libgcrypt-config --libs` ++ GCRYPT_CFLAGS=`$LIBGCRYPT_CONFIG --cflags` ++ GCRYPT_LFLAGS=`$LIBGCRYPT_CONFIG --libs` + AC_SUBST(GCRYPT_CFLAGS) + AC_SUBST(GCRYPT_LFLAGS) + fi +@@ -1070,8 +1058,8 @@ + *** or try to install it with your software package manager.]) + else + AC_MSG_RESULT(yes) +- GNUTLS_CFLAGS=`pkg-config gnutls --cflags` +- GNUTLS_LFLAGS=`pkg-config gnutls --libs` ++ GNUTLS_CFLAGS=`$PKGCONFIG gnutls --cflags` ++ GNUTLS_LFLAGS=`$PKGCONFIG gnutls --libs` + AC_SUBST(GNUTLS_CFLAGS) + AC_SUBST(GNUTLS_LFLAGS) + fi +@@ -1160,8 +1148,8 @@ + *** or try to install it with your software package manager.]) + else + AC_MSG_RESULT(yes) +- ZLIB_CFLAGS=`pkg-config zlib --cflags` +- ZLIB_LFLAGS=`pkg-config zlib --libs` ++ ZLIB_CFLAGS=`$PKGCONFIG zlib --cflags` ++ ZLIB_LFLAGS=`$PKGCONFIG zlib --libs` + AC_SUBST(ZLIB_CFLAGS) + AC_SUBST(ZLIB_LFLAGS) + fi