diff options
Diffstat (limited to 'package/libs/popt')
| -rw-r--r-- | package/libs/popt/Makefile | 14 | ||||
| -rw-r--r-- | package/libs/popt/patches/100-configure.ac-remove-require-gettext-version.patch | 26 |
2 files changed, 32 insertions, 8 deletions
diff --git a/package/libs/popt/Makefile b/package/libs/popt/Makefile index 34ae4d7c617..ba9c82349bb 100644 --- a/package/libs/popt/Makefile +++ b/package/libs/popt/Makefile @@ -8,16 +8,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=popt -PKG_VERSION:=1.16 -PKG_RELEASE:=2 +PKG_VERSION:=1.19 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:= \ - http://distfiles.gentoo.org/distfiles/ \ - http://distcache.freebsd.org/ports-distfiles/ \ - http://rpm5.org/files/popt/ -PKG_HASH:=e728ed296fe9f069a0e005003c3d6b2dde3d9cad453422a10d6558616d304cc8 +PKG_SOURCE_URL:=http://ftp.rpm.org/popt/releases/popt-1.x/ +PKG_HASH:=c25a4838fc8e4c1c8aacb8bd620edb3084a3d63bf8987fdad3ca2758c63240f9 PKG_LICENSE:=MIT +PKG_CPE_ID:=cpe:/a:popt_project:popt PKG_FIXUP:=autoreconf PKG_REMOVE_FILES:=autogen.sh aclocal.m4 @@ -33,7 +31,7 @@ define Package/libpopt SECTION:=libs CATEGORY:=Libraries TITLE:=A command line option parsing library - URL:=http://rpm5.org/files/popt/ + URL:=https://github.com/rpm-software-management/popt ABI_VERSION:=0 endef diff --git a/package/libs/popt/patches/100-configure.ac-remove-require-gettext-version.patch b/package/libs/popt/patches/100-configure.ac-remove-require-gettext-version.patch new file mode 100644 index 00000000000..24ad076433e --- /dev/null +++ b/package/libs/popt/patches/100-configure.ac-remove-require-gettext-version.patch @@ -0,0 +1,26 @@ +From 19d21b2d9e5aea5f73b1709b3c7803f920471146 Mon Sep 17 00:00:00 2001 +From: Nick Hainke <vincent@systemli.org> +Date: Sun, 25 Sep 2022 11:52:29 +0200 +Subject: [PATCH] configure.ac: remove require gettext version + +This breaks compilation with OpenWrt: +./configure: line 13059: syntax error near unexpected token `0.19.8' +./configure: line 13059: `AM_GNU_GETTEXT_REQUIRE_VERSION(0.19.8)' + +Fixes: bf8dd64e8aa0 ("Update gettext autoconf usage") + +Signed-off-by: Nick Hainke <vincent@systemli.org> +--- + configure.ac | 1 - + 1 file changed, 1 deletion(-) + +--- a/configure.ac ++++ b/configure.ac +@@ -53,7 +53,6 @@ AC_SEARCH_LIBS([setreuid], [ucb]) + AC_CHECK_FUNCS([getuid geteuid iconv mtrace secure_getenv __secure_getenv setreuid setuid stpcpy strerror vasprintf srandom glob_pattern_p mbsrtowcs]) + + AM_GNU_GETTEXT_VERSION([0.19.8]) +-AM_GNU_GETTEXT_REQUIRE_VERSION([0.19.8]) + AM_GNU_GETTEXT([external]) + AM_ICONV_LINK + |