Browse Source

gettext: Updated (0.16.1 -> 0.17), all the changes were made to get it compiled with libtool-2.x

crossperl
Aldas Nabazas 16 years ago committed by Alejandro Mery
parent
commit
30e14888b3
  1. 7
      base/gettext/gettext.conf
  2. 8
      base/gettext/gettext.desc
  3. 27
      base/gettext/no_long_long.patch
  4. 86
      base/gettext/wchar-fix.patch

7
base/gettext/gettext.conf

@ -2,7 +2,7 @@
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
# #
# Filename: package/.../gettext/gettext.conf # Filename: package/.../gettext/gettext.conf
# Copyright (C) 2006 The OpenSDE Project # Copyright (C) 2006 - 2008 The OpenSDE Project
# Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project
# Copyright (C) 1998 - 2003 Clifford Wolf # Copyright (C) 1998 - 2003 Clifford Wolf
# #
@ -21,3 +21,8 @@ hook_add postmake 5 "rm -f $root/po-mode.el"
if ! atstage native; then if ! atstage native; then
var_append confopt ' ' "--disable-csharp" var_append confopt ' ' "--disable-csharp"
fi fi
# make it libtool-2.x compatible
hook_add premake 1 "sed -i 's/\-\-mode=compile \$(COMPILE)/\-\-mode=compile \-\-tag=CC \$(COMPILE)/' \
gettext-runtime/intl/Makefile.in"
hook_add premake 1 "sed -i 's/\-\-mode=link /\-\-mode=link \-\-tag=CC /' gettext-runtime/intl/Makefile.in"

8
base/gettext/gettext.desc

@ -1,9 +1,8 @@
[COPY] --- SDE-COPYRIGHT-NOTE-BEGIN --- [COPY] --- SDE-COPYRIGHT-NOTE-BEGIN ---
[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
[COPY] [COPY]
[COPY] Filename: package/.../gettext/gettext.desc [COPY] Filename: package/.../gettext/gettext.desc
[COPY] Copyright (C) 2006 The OpenSDE Project [COPY] Copyright (C) 2006 - 2008 The OpenSDE Project
[COPY] Copyright (C) 2004 - 2006 The T2 SDE Project [COPY] Copyright (C) 2004 - 2006 The T2 SDE Project
[COPY] Copyright (C) 1998 - 2003 Clifford Wolf [COPY] Copyright (C) 1998 - 2003 Clifford Wolf
[COPY] [COPY]
@ -34,8 +33,7 @@
[L] GPL [L] GPL
[S] Stable [S] Stable
[V] 0.16.1 [V] 0.17
[P] X -1-3--6--9 105.800 [P] X -1-3--6--9 105.800
[D] 1164334990 gettext-0.16.1.tar.gz ftp://ftp.gnu.org/pub/gnu/gettext/ [D] 3464746716 gettext-0.17.tar.gz ftp://ftp.gnu.org/pub/gnu/gettext/

27
base/gettext/no_long_long.patch

@ -0,0 +1,27 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../gettext/no_long_long.patch
# Copyright (C) 2008 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
diff -Nur gettext-0.17-orig/gettext-runtime/libasprintf/configure.ac gettext-0.17/gettext-runtime/libasprintf/configure.ac
--- gettext-0.17-orig/gettext-runtime/libasprintf/configure.ac 2008-04-10 18:29:40.000000000 +0000
+++ gettext-0.17/gettext-runtime/libasprintf/configure.ac 2008-04-10 18:30:17.000000000 +0000
@@ -54,7 +54,6 @@
dnl Checks for typedefs, structures, and compiler characteristics.
AC_C_INLINE
AC_TYPE_SIZE_T
-gl_AC_TYPE_LONG_LONG
gt_TYPE_LONGDOUBLE
gt_TYPE_WCHAR_T
gt_TYPE_WINT_T

86
base/gettext/wchar-fix.patch

@ -0,0 +1,86 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../gettext/wchar-fix.patch
# Copyright (C) 2008 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
diff -Nur gettext-0.17-orig/gettext-runtime/gnulib-lib/wchar.in.h gettext-0.17/gettext-runtime/gnulib-lib/wchar.in.h
--- gettext-0.17-orig/gettext-runtime/gnulib-lib/wchar.in.h 2008-04-10 18:18:04.000000000 +0000
+++ gettext-0.17/gettext-runtime/gnulib-lib/wchar.in.h 2008-04-10 18:19:04.000000000 +0000
@@ -26,6 +26,14 @@
* the declaration of wcwidth().
*/
+#ifdef __need_mbstate_t
+/* Special invocation convention inside glibc header files. */
+
+#@INCLUDE_NEXT@ @NEXT_WCHAR_H@
+
+#else
+/* Normal invocation convention. */
+
#ifndef _GL_WCHAR_H
/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
@@ -80,3 +88,4 @@
#endif /* _GL_WCHAR_H */
#endif /* _GL_WCHAR_H */
+#endif
diff -Nur gettext-0.17-orig/gettext-tools/gnulib-lib/wchar.in.h gettext-0.17/gettext-tools/gnulib-lib/wchar.in.h
--- gettext-0.17-orig/gettext-tools/gnulib-lib/wchar.in.h 2008-04-11 17:03:22.000000000 +0000
+++ gettext-0.17/gettext-tools/gnulib-lib/wchar.in.h 2008-04-11 17:49:45.000000000 +0000
@@ -26,6 +26,14 @@
* the declaration of wcwidth().
*/
+#ifdef __need_mbstate_t
+/* Special invocation convention inside glibc header files. */
+
+#@INCLUDE_NEXT@ @NEXT_WCHAR_H@
+
+#else
+/* Normal invocation convention. */
+
#ifndef _GL_WCHAR_H
/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
@@ -80,3 +88,4 @@
#endif /* _GL_WCHAR_H */
#endif /* _GL_WCHAR_H */
+#endif
diff -Nur gettext-0.17-orig/gettext-tools/libgettextpo/wchar.in.h gettext-0.17/gettext-tools/libgettextpo/wchar.in.h
--- gettext-0.17-orig/gettext-tools/libgettextpo/wchar.in.h 2008-04-11 17:03:22.000000000 +0000
+++ gettext-0.17/gettext-tools/libgettextpo/wchar.in.h 2008-04-11 18:14:51.000000000 +0000
@@ -26,6 +26,14 @@
* the declaration of wcwidth().
*/
+#ifdef __need_mbstate_t
+/* Special invocation convention inside glibc header files. */
+
+#@INCLUDE_NEXT@ @NEXT_WCHAR_H@
+
+#else
+/* Normal invocation convention. */
+
#ifndef _GL_WCHAR_H
/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
@@ -80,3 +88,4 @@
#endif /* _GL_WCHAR_H */
#endif /* _GL_WCHAR_H */
+#endif
Loading…
Cancel
Save