summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--groups/241.native_packages_inet.group4
-rw-r--r--patches/weechat-2.8.local.patch45
-rw-r--r--patches/weechat-2.9_pre.local.patch55
3 files changed, 57 insertions, 47 deletions
diff --git a/groups/241.native_packages_inet.group b/groups/241.native_packages_inet.group
index 1a19baa3..9444d53d 100644
--- a/groups/241.native_packages_inet.group
+++ b/groups/241.native_packages_inet.group
@@ -216,8 +216,8 @@ pacman proxytunnel rsync socat thttpd w3m weechat wget whois")";
: ${PKG_W3M_MAKEFLAGS_BUILD:=-j1};
: ${PKG_W3M_SUBDIR:=w3m-0.5.3-git20190105};
: ${PKG_WEECHAT_DEPENDS:="curl gnutls libgcrypt libz ncursesw"};
-: ${PKG_WEECHAT_SHA256SUM:=69da6874e2d583b4a4666b166f520ee45b6ac84544a4a9434030f82989893c88};
-: ${PKG_WEECHAT_VERSION:=2.8};
+: ${PKG_WEECHAT_SHA256SUM:=3a78063b76c42ba306eacf8f74cb8c9a260f8a61d1915d0b5d76f11d2be69a53};
+: ${PKG_WEECHAT_VERSION:=2.9};
: ${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-2.8.local.patch b/patches/weechat-2.8.local.patch
deleted file mode 100644
index 279185c6..00000000
--- a/patches/weechat-2.8.local.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- weechat-2.7/configure.orig 2020-02-09 23:15:37.432482865 +0000
-+++ weechat-2.7/configure 2020-02-09 23:17:57.591493077 +0000
-@@ -22793,8 +22793,7 @@
- # pkg-config
- # ------------------------------------------------------------------------------
-
--PKGCONFIG=""
--for ac_prog in pkg-config
-+for ac_prog in $PKG_CONFIG
- do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
-@@ -24756,8 +24755,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
-@@ -24834,8 +24833,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
-@@ -25046,8 +25045,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.9_pre.local.patch b/patches/weechat-2.9_pre.local.patch
new file mode 100644
index 00000000..1144a869
--- /dev/null
+++ b/patches/weechat-2.9_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