From 6c8d81e603f9fe6729ed39703ab5ace1b5b6f6fc Mon Sep 17 00:00:00 2001 From: Fabian Lipken Date: Fri, 29 Sep 2023 10:39:43 +0200 Subject: [PATCH] irssi: update to 1.4.4 update to 1.4.4 switch to meson remove obsolete patch Signed-off-by: Fabian Lipken --- net/irssi/Makefile | 21 +++++++++--------- ...SSL-when-1.1-with-deprecated-APIs-di.patch | 22 ------------------- 2 files changed, 10 insertions(+), 33 deletions(-) delete mode 100644 net/irssi/patches/010-Fix-finding-OpenSSL-when-1.1-with-deprecated-APIs-di.patch diff --git a/net/irssi/Makefile b/net/irssi/Makefile index c5d2cb2e55..85a136bf0c 100644 --- a/net/irssi/Makefile +++ b/net/irssi/Makefile @@ -8,23 +8,22 @@ include $(TOPDIR)/rules.mk PKG_NAME:=irssi -PKG_VERSION:=1.2.3 -PKG_RELEASE:=2 +PKG_VERSION:=1.4.4 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://github.com/irssi/irssi/releases/download/$(PKG_VERSION)/ -PKG_HASH:=a647bfefed14d2221fa77b6edac594934dc672c4a560417b1abcbbc6b88d769f +PKG_HASH:=fefe9ec8c7b1475449945c934a2360ab12693454892be47a6d288c63eb107ead PKG_LICENSE:=GPL-2.0-or-later PKG_LICENSE_FILES:=COPYING PKG_CPE_ID:=cpe:/a:irssi:irssi -PKG_FIXUP:=autoreconf -PKG_BUILD_PARALLEL:=1 PKG_INSTALL:=1 include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/nls.mk +include $(INCLUDE_DIR)/meson.mk define Package/irssi SUBMENU:=Instant Messaging @@ -42,12 +41,12 @@ endef TARGET_LDFLAGS += -Wl,--gc-sections -CONFIGURE_ARGS += \ - --disable-glibtest \ - --with-textui \ - --without-bot \ - --without-perl \ - --without-proxy +MESON_ARGS += \ + -Dwithout-textui=no \ + -Dwith-bot=no \ + -Dwith-otr=no \ + -Dwith-perl=no \ + -Dwith-proxy=no \ define Build/InstallDev $(INSTALL_DIR) $(1)/usr/include/irssi diff --git a/net/irssi/patches/010-Fix-finding-OpenSSL-when-1.1-with-deprecated-APIs-di.patch b/net/irssi/patches/010-Fix-finding-OpenSSL-when-1.1-with-deprecated-APIs-di.patch deleted file mode 100644 index 095c82c92c..0000000000 --- a/net/irssi/patches/010-Fix-finding-OpenSSL-when-1.1-with-deprecated-APIs-di.patch +++ /dev/null @@ -1,22 +0,0 @@ -From cff1385b398b59c74c535d6c0cd9deec561101fd Mon Sep 17 00:00:00 2001 -From: Rosen Penev -Date: Fri, 15 Feb 2019 15:02:34 -0800 -Subject: [PATCH] Fix finding OpenSSL when 1.1 with deprecated APIs disabled - -SSL_library_init is a deprecated function. OPENSSL_init_ssl is not in 1.0.2. -SSL_CTX_new is in both. ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/configure.ac -+++ b/configure.ac -@@ -328,7 +328,7 @@ PKG_CHECK_MODULES([OPENSSL], [openssl], - CFLAGS="$CFLAGS $OPENSSL_CFLAGS" - LIBS="$LIBS $OPENSSL_LIBS" - ], [ -- AC_CHECK_LIB([ssl], [SSL_library_init], [ -+ AC_CHECK_LIB([ssl], [SSL_CTX_new], [ - LIBS="$LIBS -lssl -lcrypto" - ], [ - AC_MSG_ERROR([The OpenSSL library was not found])