sed: update to 4.7

This commit is contained in:
Tom G. Christensen 2019-03-24 17:01:05 +01:00
parent 30cc694e1e
commit 78de65404e
3 changed files with 9 additions and 46 deletions

View File

@ -6,11 +6,11 @@
########################################################### ###########################################################
# Check the following 4 variables before running the script # Check the following 4 variables before running the script
topdir=sed topdir=sed
version=4.2.2 version=4.7
pkgver=1 pkgver=1
source[0]=ftp://ftp.sunet.se/pub/gnu/sed/$topdir-$version.tar.gz source[0]=https://mirrors.kernel.org/gnu/sed/$topdir-$version.tar.xz
# If there are no patches, simply comment this # If there are no patches, simply comment this
patch[0]=sed-4.2.2-fix-gnulib-locale_h.patch #patch[0]=
# Source function library # Source function library
. ${BUILDPKG_SCRIPTS}/buildpkg.functions . ${BUILDPKG_SCRIPTS}/buildpkg.functions
@ -24,6 +24,9 @@ reg prep
prep() prep()
{ {
generic_prep generic_prep
setdir source
# Workaround broken config.guess (fixed upstream 2018-12-21)
${__gsed} -i 's/`isainfo -b`/32/' build-aux/config.guess
} }
reg build reg build
@ -42,7 +45,6 @@ reg install
install() install()
{ {
generic_install DESTDIR generic_install DESTDIR
rmdir ${stagedir}${prefix}/${_libdir}
doc NEWS ChangeLog BUGS COPYING doc NEWS ChangeLog BUGS COPYING
} }

View File

@ -1,4 +1,7 @@
CHANGELOG CHANGELOG
--------- ---------
* Sun Mar 24 2019 Tom G. Christensen <swpkg@jupiterrise.com> - 4.7-1
- Update to 4.7
* Fri Nov 08 2013 Tom G. Christensen <swpkg@jupiterrise.com> - 4.2.2-1 * Fri Nov 08 2013 Tom G. Christensen <swpkg@jupiterrise.com> - 4.2.2-1
- Update to 4.2.2 - Update to 4.2.2

View File

@ -1,42 +0,0 @@
diff -up sed-4.2.2/lib/locale.in.h.orig sed-4.2.2/lib/locale.in.h
--- sed-4.2.2/lib/locale.in.h.orig 2012-09-13 08:58:19.000000000 +0200
+++ sed-4.2.2/lib/locale.in.h 2013-04-26 17:38:07.512115000 +0200
@@ -14,16 +14,30 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifndef _@GUARD_PREFIX@_LOCALE_H
-
#if __GNUC__ >= 3
@PRAGMA_SYSTEM_HEADER@
#endif
@PRAGMA_COLUMNS@
+#ifdef _GL_ALREADY_INCLUDING_LOCALE_H
+
+/* Special invocation conventions to handle Solaris header files
+ (through Solaris 10) when combined with gettext's libintl.h. */
+
+#@INCLUDE_NEXT@ @NEXT_LOCALE_H@
+
+#else
+/* Normal invocation convention. */
+
+#ifndef _@GUARD_PREFIX@_LOCALE_H
+
+#define _GL_ALREADY_INCLUDING_LOCALE_H
+
/* The include_next requires a split double-inclusion guard. */
#@INCLUDE_NEXT@ @NEXT_LOCALE_H@
+#undef _GL_ALREADY_INCLUDING_LOCALE_H
+
#ifndef _@GUARD_PREFIX@_LOCALE_H
#define _@GUARD_PREFIX@_LOCALE_H
@@ -198,4 +212,5 @@ _GL_WARN_ON_USE (duplocale, "duplocale i
#endif
#endif /* _@GUARD_PREFIX@_LOCALE_H */
+#endif /* ! _GL_ALREADY_INCLUDING_LOCALE_H */
#endif /* _@GUARD_PREFIX@_LOCALE_H */