From 351fe19fd0345e8a716bc21b61c068436512596f Mon Sep 17 00:00:00 2001
From: Ørjan Malde <red@foxi.me>
Date: Apr 08 2022 13:47:06 +0000
Subject: groups/241.native_packages_inet.group: weechat: bump to v3.5


Signed-off-by: Ørjan Malde <red@foxi.me>

---

diff --git a/groups/241.native_packages_inet.group b/groups/241.native_packages_inet.group
index 00c6aaf..45e87c2 100644
--- a/groups/241.native_packages_inet.group
+++ b/groups/241.native_packages_inet.group
@@ -238,8 +238,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"};
-: ${PKG_WEECHAT_SHA256SUM:=fa361f999e9982817b11ad124a1f7ce0720439f29ce25f92be1da3d8b57a47b5};
-: ${PKG_WEECHAT_VERSION:=3.4.1};
+: ${PKG_WEECHAT_SHA256SUM:=aa903d12a36403e22823ff2dfc3e8fcacb1efe6519e0d56e25d3a72757d38611};
+: ${PKG_WEECHAT_VERSION:=3.5};
 : ${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:PKGCONFIG=${DEFAULT_TARGET}-pkg-config"};
diff --git a/patches/weechat-3.4.1.local.patch b/patches/weechat-3.4.1.local.patch
deleted file mode 100644
index 4d41b8a..0000000
--- a/patches/weechat-3.4.1.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.4.1_pre.local.patch b/patches/weechat-3.4.1_pre.local.patch
deleted file mode 100644
index 1144a86..0000000
--- a/patches/weechat-3.4.1_pre.local.patch
+++ /dev/null
@@ -1,55 +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
- # ------------------------------------------------------------------------------
- 
-@@ -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.5.local.patch b/patches/weechat-3.5.local.patch
new file mode 100644
index 0000000..4d41b8a
--- /dev/null
+++ b/patches/weechat-3.5.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.5_pre.local.patch b/patches/weechat-3.5_pre.local.patch
new file mode 100644
index 0000000..1144a86
--- /dev/null
+++ b/patches/weechat-3.5_pre.local.patch
@@ -0,0 +1,55 @@
+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
+ # ------------------------------------------------------------------------------
+ 
+@@ -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