Befator-Inc-Firmen-Netzwerk/MSYS2-packages
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

gettext: Update to 0.19.6

Browse Source
This commit is contained in:
Alexey Pavlov 2015-09-15 12:02:25 +03:00
parent 9731145833
commit 8574dfc28e
3 changed files with 196 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gettext/0.18.1.1-autopoint-V.patch
View File

@ -42,13 +42,13 @@
--version | --versio | --versi | --vers | --ver | --ve | --v )
func_version
exit 0 ;;
@@ -276,7 +276,7 @@ fi
if test -n "$xver"; then
if test -n "$ver"; then
if test "X$ver" != "X$xver"; then
- func_fatal_error "Version mismatch: specified -V $ver but the package uses gettext version $xver"
+ echo "autopoint: warning: Version mismatch: specified -V $ver but the package uses gettext version $xver. Forcibly upgrading to $ver" 1>&2
fi
else
ver="$xver"
@@ -355,7 +355,7 @@ fi
if test -n "$xver"; then
if test -n "$ver"; then
if test "X$ver" != "X$xver"; then
- func_fatal_error "Version mismatch: specified -V $ver but the package uses gettext version $xver"
+ echo "autopoint: warning: Version mismatch: specified -V $ver but the package uses gettext version $xver. Forcibly upgrading to $ver" 1>&2
fi
else
ver="$xver"

13
gettext/PKGBUILD
View File

@ -1,7 +1,8 @@
# Maintainer: Alexey Pavlov <alexpux@gmail.com>
pkgbase=gettext
pkgname=('gettext' 'gettext-devel' 'libgettextpo' 'libasprintf' 'libintl')
pkgver=0.19.4
pkgver=0.19.6
pkgrel=1
pkgdesc="GNU internationalization library"
arch=('i686' 'x86_64')
@ -16,15 +17,15 @@ source=(ftp://ftp.gnu.org/pub/gnu/gettext/${pkgname}-${pkgver}.tar.gz{,.sig}
0.18.1.1-no-woe32dll.patch
0.19.3-tests-cygwin.patch
gettext-0.18.3.1-msys2.patch
gettext-0.19.4-archive.patch)
md5sums=('d3511af1e604a3478900d2c2b4a4a48e'
gettext-0.19.6-archive.patch)
md5sums=('6d1447f8c5c45c329371ef4bfe7d79a5'
'SKIP'
'c650eafcafbb6421d6280e397f081a81'
'76d2d4a22b8831497e83a3d4bd798c3c'
'bb446a13cfa7de098ad45e41c24f30a6'
'6d176c6fa8288d71d9c0bb068de4bcda'
'344be5f308e2090c8d93841bd4dc9962'
'486a854ea6d1f681e2e70d32155d1027'
'e19dcf44a49dea46601f00de3678da69')
'428ab317d85bff48e9874471f5a5f1cd')
prepare() {
cd "${srcdir}/${pkgname}-${pkgver}"
@ -43,7 +44,7 @@ prepare() {
tar -xvf archive.dir.tar -C archive
rm -f archive.dir.tar
pushd archive > /dev/null
patch -p1 -i ${srcdir}/gettext-0.19.4-archive.patch
patch -p1 -i ${srcdir}/gettext-0.19.6-archive.patch
tar -cvf ../archive.dir.tar *
popd > /dev/null
rm -rf archive

180
gettext/gettext-0.19.4-archive.patch → gettext/gettext-0.19.6-archive.patch
View File

@ -1699,3 +1699,183 @@ diff -Naur archive-orig/gettext-0.19.4/m4/intl.m4 archive/gettext-0.19.4/m4/intl
*) is_woe32=no ;;
esac
WOE32=$is_woe32
diff -Naur archive-orig/gettext-0.19.5/config.rpath archive/gettext-0.19.5/config.rpath
--- archive-orig/gettext-0.19.5/config.rpath 2014-12-24 10:34:53.000000000 +0300
+++ archive/gettext-0.19.5/config.rpath 2015-03-03 12:13:20.405200000 +0300
@@ -57,7 +57,7 @@
aix*)
wl='-Wl,'
;;
- mingw* | cygwin* | pw32* | os2* | cegcc*)
+ mingw* | cygwin* | msys* | pw32* | os2* | cegcc*)
;;
hpux9* | hpux10* | hpux11*)
wl='-Wl,'
@@ -149,7 +149,7 @@
hardcode_minus_L=no
case "$host_os" in
- cygwin* | mingw* | pw32* | cegcc*)
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
# FIXME: the MSVC++ port hasn't been tested in a loooong time
# When not using gcc, we currently assume that we are using
# Microsoft Visual C++.
@@ -198,7 +198,7 @@
ld_shlibs=no
fi
;;
- cygwin* | mingw* | pw32* | cegcc*)
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec='-L$libdir'
@@ -348,7 +348,7 @@
;;
bsdi[45]*)
;;
- cygwin* | mingw* | pw32* | cegcc*)
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
# When not using gcc, we currently assume that we are using
# Microsoft Visual C++.
# hardcode_libdir_flag_spec is actually meaningless, as there is
@@ -533,7 +533,7 @@
bsdi[45]*)
library_names_spec='$libname$shrext'
;;
- cygwin* | mingw* | pw32* | cegcc*)
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
shrext=.dll
library_names_spec='$libname.dll.a $libname.lib'
;;
diff -Naur archive-orig/gettext-0.19.5/intl/Makefile.in archive/gettext-0.19.5/intl/Makefile.in
--- archive-orig/gettext-0.19.5/intl/Makefile.in 2014-12-24 10:34:43.000000000 +0300
+++ archive/gettext-0.19.5/intl/Makefile.in 2015-03-03 12:13:53.695600000 +0300
@@ -429,7 +429,7 @@
case '@host_os@' in \
darwin[56]*) \
need_charset_alias=true ;; \
- darwin* | cygwin* | mingw* | pw32* | cegcc*) \
+ darwin* | cygwin* | msys* | mingw* | pw32* | cegcc*) \
need_charset_alias=false ;; \
*) \
need_charset_alias=true ;; \
@@ -514,7 +514,7 @@
case '@host_os@' in \
darwin[56]*) \
need_charset_alias=true ;; \
- darwin* | cygwin* | mingw* | pw32* | cegcc*) \
+ darwin* | cygwin* | msys* | mingw* | pw32* | cegcc*) \
need_charset_alias=false ;; \
*) \
need_charset_alias=true ;; \
diff -Naur archive-orig/gettext-0.19.5/m4/intl.m4 archive/gettext-0.19.5/m4/intl.m4
--- archive-orig/gettext-0.19.5/m4/intl.m4 2014-12-24 10:34:46.000000000 +0300
+++ archive/gettext-0.19.5/m4/intl.m4 2015-03-03 12:14:11.432800000 +0300
@@ -113,7 +113,7 @@
dnl exported variables _also_ in the static library.
if test "$enable_shared" = yes; then
case "$host_os" in
- mingw* | cygwin*) is_woe32dll=yes ;;
+ mingw* | cygwin* | msys*) is_woe32dll=yes ;;
*) is_woe32dll=no ;;
esac
else
@@ -125,7 +125,7 @@
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* | cygwin* | msys*) is_woe32=yes ;;
*) is_woe32=no ;;
esac
WOE32=$is_woe32
diff -Naur archive-orig/gettext-0.19.6/config.rpath archive/gettext-0.19.6/config.rpath
--- archive-orig/gettext-0.19.6/config.rpath 2014-12-24 10:34:53.000000000 +0300
+++ archive/gettext-0.19.6/config.rpath 2015-03-03 12:13:20.405200000 +0300
@@ -57,7 +57,7 @@
aix*)
wl='-Wl,'
;;
- mingw* | cygwin* | pw32* | os2* | cegcc*)
+ mingw* | cygwin* | msys* | pw32* | os2* | cegcc*)
;;
hpux9* | hpux10* | hpux11*)
wl='-Wl,'
@@ -149,7 +149,7 @@
hardcode_minus_L=no
case "$host_os" in
- cygwin* | mingw* | pw32* | cegcc*)
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
# FIXME: the MSVC++ port hasn't been tested in a loooong time
# When not using gcc, we currently assume that we are using
# Microsoft Visual C++.
@@ -198,7 +198,7 @@
ld_shlibs=no
fi
;;
- cygwin* | mingw* | pw32* | cegcc*)
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec='-L$libdir'
@@ -348,7 +348,7 @@
;;
bsdi[45]*)
;;
- cygwin* | mingw* | pw32* | cegcc*)
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
# When not using gcc, we currently assume that we are using
# Microsoft Visual C++.
# hardcode_libdir_flag_spec is actually meaningless, as there is
@@ -533,7 +533,7 @@
bsdi[45]*)
library_names_spec='$libname$shrext'
;;
- cygwin* | mingw* | pw32* | cegcc*)
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
shrext=.dll
library_names_spec='$libname.dll.a $libname.lib'
;;
diff -Naur archive-orig/gettext-0.19.6/intl/Makefile.in archive/gettext-0.19.6/intl/Makefile.in
--- archive-orig/gettext-0.19.6/intl/Makefile.in 2014-12-24 10:34:43.000000000 +0300
+++ archive/gettext-0.19.6/intl/Makefile.in 2015-03-03 12:13:53.695600000 +0300
@@ -429,7 +429,7 @@
case '@host_os@' in \
darwin[56]*) \
need_charset_alias=true ;; \
- darwin* | cygwin* | mingw* | pw32* | cegcc*) \
+ darwin* | cygwin* | msys* | mingw* | pw32* | cegcc*) \
need_charset_alias=false ;; \
*) \
need_charset_alias=true ;; \
@@ -514,7 +514,7 @@
case '@host_os@' in \
darwin[56]*) \
need_charset_alias=true ;; \
- darwin* | cygwin* | mingw* | pw32* | cegcc*) \
+ darwin* | cygwin* | msys* | mingw* | pw32* | cegcc*) \
need_charset_alias=false ;; \
*) \
need_charset_alias=true ;; \
diff -Naur archive-orig/gettext-0.19.6/m4/intl.m4 archive/gettext-0.19.6/m4/intl.m4
--- archive-orig/gettext-0.19.6/m4/intl.m4 2014-12-24 10:34:46.000000000 +0300
+++ archive/gettext-0.19.6/m4/intl.m4 2015-03-03 12:14:11.432800000 +0300
@@ -113,7 +113,7 @@
dnl exported variables _also_ in the static library.
if test "$enable_shared" = yes; then
case "$host_os" in
- mingw* | cygwin*) is_woe32dll=yes ;;
+ mingw* | cygwin* | msys*) is_woe32dll=yes ;;
*) is_woe32dll=no ;;
esac
else
@@ -125,7 +125,7 @@
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* | cygwin* | msys*) is_woe32=yes ;;
*) is_woe32=no ;;
esac
WOE32=$is_woe32