From edb93864e8f71a72b1d169726c526f7130475c19 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Tue, 5 Dec 2017 00:39:54 -0600 Subject: cygwin-gettext 0.19.8.1 --- .gitignore | 1 + cygwin-gettext.spec | 17 +++++++++-------- gettext-0.18.1.1-no-woe32dll.patch | 31 ------------------------------- gettext-0.19.7-gnulib-cygwin25.patch | 22 ---------------------- gettext-0.19.8.1-cygwin-ftm.patch | 11 +++++++++++ gettext-0.19.8.1-have_wprintf.patch | 11 +++++++++++ gettext-0.19.8.1-no-woe32dll.patch | 31 +++++++++++++++++++++++++++++++ sources | 2 +- 8 files changed, 64 insertions(+), 62 deletions(-) delete mode 100644 gettext-0.18.1.1-no-woe32dll.patch delete mode 100644 gettext-0.19.7-gnulib-cygwin25.patch create mode 100644 gettext-0.19.8.1-cygwin-ftm.patch create mode 100644 gettext-0.19.8.1-have_wprintf.patch create mode 100644 gettext-0.19.8.1-no-woe32dll.patch diff --git a/.gitignore b/.gitignore index e4c90f9..6c50432 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /gettext-0.19.7.tar.xz +/gettext-0.19.8.1.tar.xz diff --git a/cygwin-gettext.spec b/cygwin-gettext.spec index 9c92546..92f54a3 100644 --- a/cygwin-gettext.spec +++ b/cygwin-gettext.spec @@ -1,7 +1,7 @@ %{?cygwin_package_header} Name: cygwin-gettext -Version: 0.19.7 +Version: 0.19.8.1 Release: 1%{?dist} Summary: GNU libraries and utilities for producing multi-lingual messages @@ -13,8 +13,9 @@ BuildArch: noarch Source0: http://ftp.gnu.org/pub/gnu/gettext/gettext-%{version}.tar.xz Patch0: gettext-0.18.1.1-autopoint-V.patch Patch1: gettext-0.19.3-localename.patch -Patch4: gettext-0.18.1.1-no-woe32dll.patch -Patch5: gettext-0.19.7-gnulib-cygwin25.patch +Patch2: gettext-0.19.8.1-no-woe32dll.patch +Patch3: gettext-0.19.8.1-cygwin-ftm.patch +Patch4: gettext-0.19.8.1-have_wprintf.patch BuildRequires: autoconf automake cygwin-libtool-base BuildRequires: cygwin32-filesystem >= 10 @@ -37,8 +38,6 @@ Gettext libraries for Cygwin toolchains. %package -n cygwin32-gettext Summary: Gettext libraries for Cygwin32 toolchain Group: Development/Libraries -Provides: %{name} = %{version}-%{release} -Obsoletes: %{name} < %{version}-%{release} %description -n cygwin32-gettext Gettext library for the Cygwin i686 toolchain. @@ -48,8 +47,6 @@ Summary: Static version of the Cygwin32 Gettext library Group: Development/Libraries Requires: cygwin32-gettext = %{version}-%{release} Requires: cygwin32-libiconv-static -Provides: %{name}-static = %{version}-%{release} -Obsoletes: %{name}-static < %{version}-%{release} %description -n cygwin32-gettext-static Static version of the Gettext library for the Cygwin i686 toolchain. @@ -77,8 +74,9 @@ Static version of the Gettext library for the Cygwin x86_64 toolchain. %setup -q -n gettext-%{version} %patch0 -p2 %patch1 -p2 +%patch2 -p2 +%patch3 -p2 %patch4 -p2 -%patch5 -p2 rm -f m4/libtool.m4 gettext-tools/gnulib-m4/openmp.m4 touch m4/libtool.m4 gettext-tools/gnulib-m4/openmp.m4 @@ -232,6 +230,9 @@ find $RPM_BUILD_ROOT -name '*.la' -delete %changelog +* Tue Dec 05 2017 Yaakov Selkowitz - 0.19.8.1-1 +- new version + * Mon Sep 12 2016 Yaakov Selkowitz - 0.19.7-1 - new version diff --git a/gettext-0.18.1.1-no-woe32dll.patch b/gettext-0.18.1.1-no-woe32dll.patch deleted file mode 100644 index 575e309..0000000 --- a/gettext-0.18.1.1-no-woe32dll.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- origsrc/gettext-0.18.1.1/gettext-tools/configure.ac 2010-06-06 15:04:04.000000000 -0500 -+++ src/gettext-0.18.1.1/gettext-tools/configure.ac 2013-03-07 22:13:24.525723500 -0600 -@@ -108,7 +108,7 @@ AC_SUBST([LTNOUNDEF]) - dnl On mingw and Cygwin, we can activate special Makefile rules which add - dnl version information to the shared libraries and executables. - case "$host_os" in -- mingw* | cygwin*) is_woe32=yes ;; -+ mingw*) is_woe32=yes ;; - *) is_woe32=no ;; - esac - AM_CONDITIONAL([WOE32], [test $is_woe32 = yes]) -@@ -211,7 +211,7 @@ dnl must arrange to define the auxili - dnl exported variables _also_ in the static library. - if test "$enable_shared" = yes; then - case "$host_os" in -- mingw* | cygwin*) is_woe32dll=yes ;; -+ mingw*) is_woe32dll=yes ;; - *) is_woe32dll=no ;; - esac - else ---- origsrc/gettext-0.18.1.1/m4/woe32-dll.m4 2010-06-06 07:49:58.000000000 -0500 -+++ src/gettext-0.18.1.1/m4/woe32-dll.m4 2013-03-07 23:33:34.183820200 -0600 -@@ -29,7 +29,7 @@ AC_DEFUN([gl_WOE32_DLL], - [ - AC_REQUIRE([AC_CANONICAL_HOST]) - case "$host_os" in -- mingw* | cygwin*) -+ mingw*) - AC_MSG_CHECKING([for auto-import of symbols]) - AC_CACHE_VAL([gl_cv_ld_autoimport], [ - gl_save_LDFLAGS="$LDFLAGS" diff --git a/gettext-0.19.7-gnulib-cygwin25.patch b/gettext-0.19.7-gnulib-cygwin25.patch deleted file mode 100644 index e2e6954..0000000 --- a/gettext-0.19.7-gnulib-cygwin25.patch +++ /dev/null @@ -1,22 +0,0 @@ -https://lists.gnu.org/archive/html/bug-gnulib/2016-03/msg00057.html - ---- origsrc/gettext-0.19.7/gettext-tools/gnulib-lib/sys_select.in.h 2015-12-27 17:08:31.000000000 -0600 -+++ src/gettext-0.19.7/gettext-tools/gnulib-lib/sys_select.in.h 2016-05-04 10:07:56.425638400 -0500 -@@ -82,7 +82,7 @@ - Also, Mac OS X, AIX, HP-UX, IRIX, Solaris, Interix declare select() - in . - But avoid namespace pollution on glibc systems. */ --# ifndef __GLIBC__ -+# if !(defined __GLIBC__ || defined __NEWLIB__) - # include - # endif - -@@ -103,7 +103,7 @@ - But avoid namespace pollution on glibc systems. - Do this after the include_next (for the sake of OpenBSD 5.0) but before - the split double-inclusion guard (for the sake of Solaris). */ --#if !(defined __GLIBC__ && !defined __UCLIBC__) -+#if !((defined __GLIBC__ || defined __NEWLIB__) && !defined __UCLIBC__) - # include - #endif - diff --git a/gettext-0.19.8.1-cygwin-ftm.patch b/gettext-0.19.8.1-cygwin-ftm.patch new file mode 100644 index 0000000..23f88f0 --- /dev/null +++ b/gettext-0.19.8.1-cygwin-ftm.patch @@ -0,0 +1,11 @@ +--- origsrc/gettext-0.19.8.1/gettext-runtime/intl/libgnuintl.in.h 2016-06-09 17:56:00.000000000 -0500 ++++ src/gettext-0.19.8.1/gettext-runtime/intl/libgnuintl.in.h 2016-10-20 11:03:43.187813700 -0500 +@@ -435,7 +435,7 @@ extern int vswprintf (wchar_t *, size_t, + extern char *setlocale (int, const char *); + #endif + +-#if @HAVE_NEWLOCALE@ ++#if @HAVE_NEWLOCALE@ && __POSIX_VISIBLE >= 200809 + + #undef newlocale + #define newlocale libintl_newlocale diff --git a/gettext-0.19.8.1-have_wprintf.patch b/gettext-0.19.8.1-have_wprintf.patch new file mode 100644 index 0000000..75efe51 --- /dev/null +++ b/gettext-0.19.8.1-have_wprintf.patch @@ -0,0 +1,11 @@ +--- origsrc/gettext-0.19.8.1/gettext-runtime/m4/intl.m4 2016-03-20 02:37:53.000000000 -0500 ++++ src/gettext-0.19.8.1/gettext-runtime/m4/intl.m4 2016-10-20 11:07:16.828746100 -0500 +@@ -94,7 +94,7 @@ + HAVE_NEWLOCALE=0 + fi + AC_SUBST([HAVE_NEWLOCALE]) +- if test "$ac_cv_func_wprintf" = yes; then ++ if test "$ac_cv_func_fwprintf" = yes; then + HAVE_WPRINTF=1 + else + HAVE_WPRINTF=0 diff --git a/gettext-0.19.8.1-no-woe32dll.patch b/gettext-0.19.8.1-no-woe32dll.patch new file mode 100644 index 0000000..49fafe1 --- /dev/null +++ b/gettext-0.19.8.1-no-woe32dll.patch @@ -0,0 +1,31 @@ +--- origsrc/gettext-0.19.8.1/gettext-tools/configure.ac 2016-06-09 17:56:00.000000000 -0500 ++++ src/gettext-0.19.8.1/gettext-tools/configure.ac 2016-10-10 02:10:37.323106300 -0500 +@@ -100,7 +100,7 @@ LT_LANG([Windows Resource]) + dnl On mingw and Cygwin, we can activate special Makefile rules which add + dnl version information to the shared libraries and executables. + case "$host_os" in +- mingw* | cygwin*) special_makefile_rules=woe32 ;; ++ mingw*) special_makefile_rules=woe32 ;; + os2*) special_makefile_rules=os2 ;; + *) special_makefile_rules=none ;; + esac +@@ -212,7 +212,7 @@ dnl must arrange to define the auxili + dnl exported variables _also_ in the static library. + if test "$enable_shared" = yes; then + case "$host_os" in +- mingw* | cygwin*) is_woe32dll=yes ;; ++ mingw*) is_woe32dll=yes ;; + *) is_woe32dll=no ;; + esac + else +--- origsrc/gettext-0.19.8.1/m4/woe32-dll.m4 2016-03-20 02:37:53.000000000 -0500 ++++ src/gettext-0.19.8.1/m4/woe32-dll.m4 2016-10-10 02:11:04.906081600 -0500 +@@ -30,7 +30,7 @@ AC_DEFUN([gl_WOE32_DLL], + [ + AC_REQUIRE([AC_CANONICAL_HOST]) + case "$host_os" in +- mingw* | cygwin*) ++ mingw*) + AC_MSG_CHECKING([for auto-import of symbols]) + AC_CACHE_VAL([gl_cv_ld_autoimport], [ + gl_save_LDFLAGS="$LDFLAGS" diff --git a/sources b/sources index 74dd2c3..5cf8953 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9b7c37e410df4bd1bf854e8c897cf937 gettext-0.19.5.1.tar.xz +df3f5690eaa30fd228537b00cb7b7590 gettext-0.19.8.1.tar.xz -- cgit