From f285b720e3252dc4fd4b37c00d13b928f0f8375c Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sat, 25 May 2024 11:39:13 -0700 Subject: [PATCH] attr: switch to normal tarballs Avoids having to use autoreconf. Signed-off-by: Rosen Penev --- utils/attr/Makefile | 9 ++++----- .../patches/100-no-gettext_configure.patch | 19 ------------------- .../attr/patches/101-no-gettext_autogen.patch | 9 --------- .../patches/102-no-gettext_Makefile.patch | 11 ----------- 4 files changed, 4 insertions(+), 44 deletions(-) delete mode 100644 utils/attr/patches/100-no-gettext_configure.patch delete mode 100644 utils/attr/patches/101-no-gettext_autogen.patch delete mode 100644 utils/attr/patches/102-no-gettext_Makefile.patch diff --git a/utils/attr/Makefile b/utils/attr/Makefile index bf9b59337..618cf6701 100644 --- a/utils/attr/Makefile +++ b/utils/attr/Makefile @@ -9,16 +9,15 @@ include $(TOPDIR)/rules.mk PKG_NAME:=attr PKG_VERSION:=2.5.2 -PKG_RELEASE:=2 +PKG_RELEASE:=3 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=http://git.savannah.nongnu.org/cgit/attr.git/snapshot -PKG_HASH:=b266cf45e2256b4d85a86554b42c0218abce40356f5c3026f88e15dcf73df775 +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz +PKG_SOURCE_URL:=@SAVANNAH/attr +PKG_HASH:=f2e97b0ab7ce293681ab701915766190d607a1dba7fae8a718138150b700a70b PKG_MAINTAINER:=Maxim Storchak PKG_CPE_ID:=cpe:/a:attr_project:attr -PKG_FIXUP:=autoreconf PKG_INSTALL:=1 PKG_BUILD_PARALLEL:=1 diff --git a/utils/attr/patches/100-no-gettext_configure.patch b/utils/attr/patches/100-no-gettext_configure.patch deleted file mode 100644 index 716f86e00..000000000 --- a/utils/attr/patches/100-no-gettext_configure.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -37,9 +37,6 @@ AC_SYS_LARGEFILE - AM_PROG_AR - LT_INIT - --AM_GNU_GETTEXT_VERSION([0.18.2]) --AM_GNU_GETTEXT([external]) -- - AC_ARG_ENABLE([debug], - [AS_HELP_STRING([--enable-debug], [Enable extra debugging])]) - AS_IF([test "x$enable_debug" = "xyes"], -@@ -65,6 +62,5 @@ AC_CONFIG_COMMANDS([include/attr], - AC_CONFIG_FILES([ - libattr.pc - Makefile -- po/Makefile.in - ]) - AC_OUTPUT diff --git a/utils/attr/patches/101-no-gettext_autogen.patch b/utils/attr/patches/101-no-gettext_autogen.patch deleted file mode 100644 index a80009681..000000000 --- a/utils/attr/patches/101-no-gettext_autogen.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- a/autogen.sh -+++ b/autogen.sh -@@ -1,6 +1,4 @@ - #!/bin/sh -ex --po/update-potfiles --autopoint --force - am_libdir=$(automake --print-libdir) - cp "${am_libdir}/INSTALL" doc/ - exec autoreconf -f -i diff --git a/utils/attr/patches/102-no-gettext_Makefile.patch b/utils/attr/patches/102-no-gettext_Makefile.patch deleted file mode 100644 index 4d562b972..000000000 --- a/utils/attr/patches/102-no-gettext_Makefile.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/Makefile.am -+++ b/Makefile.am -@@ -3,8 +3,6 @@ ACLOCAL_AMFLAGS = -I m4 - EXTRA_DIST = \ - exports - --SUBDIRS = po -- - AM_CPPFLAGS = \ - -I$(top_builddir)/include \ - -I$(top_srcdir)/include \