diff --git a/tzcode/PKGBUILD b/tzcode/PKGBUILD index d880cb6a..fa126569 100644 --- a/tzcode/PKGBUILD +++ b/tzcode/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Alexey Pavlov pkgname=tzcode -_ver=2018c +_ver=2019a # use a pacman compatible version scheme pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}} pkgrel=1 @@ -16,15 +16,13 @@ source=( https://www.iana.org/time-zones/repository/releases/tzdata${_ver}.tar.gz{,.asc} https://www.iana.org/time-zones/repository/releases/${pkgname}${_ver}.tar.gz{,.asc} tzcode-makefile.patch - tzcode-makefile-exe-extensions.patch - tzcode-fix-unknown-type-locale_t.patch) -sha256sums=('2825c3e4b7ef520f24d393bcc02942f9762ffd3e7fc9b23850789ed8f22933f6' + tzcode-makefile-exe-extensions.patch) +sha256sums=('90366ddf4aa03e37a16cd49255af77f801822310b213f195e2206ead48c59772' 'SKIP' - '31fa7fc0f94a6ff2d6bc878c0a35e8ab8b5aa0e8b01445a1d4a8f14777d0e665' + '8739f162bc30cdfb482435697f969253abea49595541a0afd5f443fbae433ff5' 'SKIP' - '93d047fcf6151a67f676f16888c34f82b5dfabca6a51d90e123dc197ef649003' - 'faf73eb5f07c56b019b540005f4262f33927a4ff2acf3752a055e8530decd749' - '10abdf8b8a4a50bc6e27b293acb214d5debbab47837768e053eadd590678448d') + 'f5ba93ebce547b14c44e55f94986046af6ed1c8befad296e4846412d053c4470' + 'faf73eb5f07c56b019b540005f4262f33927a4ff2acf3752a055e8530decd749') validpgpkeys=('7E3792A9D8ACF7D633BC1588ED97E90E62AA7E34') timezones=('africa' 'antarctica' 'asia' 'australasia' @@ -37,7 +35,6 @@ prepare() { patch -p1 -i ${srcdir}/tzcode-makefile.patch patch -p1 -i ${srcdir}/tzcode-makefile-exe-extensions.patch - patch -p1 -i ${srcdir}/tzcode-fix-unknown-type-locale_t.patch } build() { diff --git a/tzcode/tzcode-fix-unknown-type-locale_t.patch b/tzcode/tzcode-fix-unknown-type-locale_t.patch deleted file mode 100644 index ff517156..00000000 --- a/tzcode/tzcode-fix-unknown-type-locale_t.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- src/private.h.orig 2018-03-02 11:30:00.359375000 +0800 -+++ src/private.h 2018-03-02 11:36:46.156250000 +0800 -@@ -112,6 +112,10 @@ - /* ... and enable large inode numbers on Mac OS X 10.5 and later. */ - #define _DARWIN_USE_64_BIT_INODE 1 - -+#ifdef __CYGWIN32__ -+typedef char* locale_t; -+#endif -+ - /* - ** Nested includes - */ diff --git a/tzcode/tzcode-makefile.patch b/tzcode/tzcode-makefile.patch index e28bf1ab..4c0c7c12 100644 --- a/tzcode/tzcode-makefile.patch +++ b/tzcode/tzcode-makefile.patch @@ -1,6 +1,6 @@ --- src/Makefile.orig 2018-01-17 18:05:36.000000000 +0900 +++ src/Makefile 2018-01-19 17:58:12.857248200 +0900 -@@ -19,7 +19,7 @@ +@@ -33,7 +33,7 @@ # make zonenames # to get a list of the values you can use for LOCALTIME. @@ -9,7 +9,7 @@ # If you want something other than Eastern United States time as a template # for handling POSIX-style time zone environment variables, -@@ -88,7 +88,7 @@ +@@ -101,7 +101,7 @@ ZDUMPDIR = $(BINDIR) # The "zic" command goes in: @@ -18,7 +18,7 @@ # Manual pages go in subdirectories of. . . MANDIR = $(TOPDIR)/$(USRSHAREDIR)/man -@@ -322,7 +322,7 @@ +@@ -345,7 +345,7 @@ # January's first Monday when a "%V" format is used and January 1 # falls on a Friday, Saturday, or Sunday. @@ -27,16 +27,16 @@ # Linker flags. Default to $(LFLAGS) for backwards compatibility # to release 2012h and earlier. -@@ -346,7 +346,7 @@ - ZIC_INSTALL= $(ZIC) -d '$(DESTDIR)$(TZDIR)' $(LEAPSECONDS) - - # The name of a Posix-compliant 'awk' on your system. +@@ -375,7 +375,7 @@ + # Older 'mawk' versions, such as the 'mawk' in Ubuntu 16.04, might dump core; + # on Ubuntu you can work around this with + # AWK= gawk -AWK= awk +AWK= gawk # The full path name of a Posix-compliant shell, preferably one that supports # the Korn shell's 'select' statement as an extension. -@@ -425,7 +425,7 @@ +@@ -469,7 +469,7 @@ #MAKE= make