rpms/gettext/devel gettext-xgettext-python-unicode-surrogate-473946.patch, NONE, 1.1 gettext.spec, 1.91, 1.92
Jens Petersen
petersen at fedoraproject.org
Thu Feb 12 06:40:33 UTC 2009
- Previous message (by thread): rpms/perl-Data-Compare/F-9 .cvsignore, 1.6, 1.7 perl-Data-Compare.spec, 1.9, 1.10 sources, 1.6, 1.7
- Next message (by thread): rpms/perl-Config-IniFiles/F-10 .cvsignore, 1.3, 1.4 perl-Config-IniFiles.spec, 1.9, 1.10 sources, 1.3, 1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: petersen
Update of /cvs/pkgs/rpms/gettext/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14605
Modified Files:
gettext.spec
Added Files:
gettext-xgettext-python-unicode-surrogate-473946.patch
Log Message:
- add buildjava switch to allow turning off the java bits completely
- add buildcheck to allow turning off make check
- drop cvs requires for autopoint (Karl Lattimer, #469555)
- add upstream gettext-xgettext-python-unicode-surrogate-473946.patch by
Bruno Haible to fix xgettext handling of utf16 surrogates in python (#473946)
gettext-xgettext-python-unicode-surrogate-473946.patch:
--- NEW FILE gettext-xgettext-python-unicode-surrogate-473946.patch ---
2008-08-03 Bruno Haible <bruno at clisp.org>
* x-python.c (mixed_string_buffer_append): Replace a lone high
surrogate with U+FFFD.
Reported by Yann <asterix at lagaule.org>
via Santiago Vila <sanvila at unex.es>.
*** gettext-tools/src/x-python.c 20 Apr 2008 05:23:52 -0000 1.32
--- gettext-tools/src/x-python.c 3 Aug 2008 19:56:58 -0000
***************
*** 930,935 ****
--- 930,940 ----
if (c >= UNICODE (0xd800) && c < UNICODE (0xdc00))
bp->utf16_surr = UNICODE_VALUE (c);
+ else if (c >= UNICODE (0xdc00) && c < UNICODE (0xe000))
+ {
+ /* A half surrogate is invalid, therefore use U+FFFD instead. */
+ mixed_string_buffer_append_unicode (bp, 0xfffd);
+ }
else
mixed_string_buffer_append_unicode (bp, UNICODE_VALUE (c));
}
Index: gettext.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gettext/devel/gettext.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- gettext.spec 5 Nov 2008 00:33:26 -0000 1.91
+++ gettext.spec 12 Feb 2009 06:40:02 -0000 1.92
@@ -1,10 +1,12 @@
# libintl.jar requires gcj >= 4.3 to build
%define buildjar 1
+%define buildjava 1
+%define buildcheck 1
Summary: GNU libraries and utilities for producing multi-lingual messages
Name: gettext
Version: 0.17
-Release: 8%{?dist}
+Release: 9%{?dist}
License: GPLv3 and LGPLv2+
Group: Development/Tools
URL: http://www.gnu.org/software/gettext/
@@ -16,22 +18,24 @@
BuildRequires: automake >= 1.8
%endif
BuildRequires: autoconf >= 2.5
-BuildRequires: libtool, bison, gcc-c++, gcc-java, libgcj
+BuildRequires: libtool, bison, gcc-c++
+%if %{buildjava}
+BuildRequires: gcc-java, libgcj
# For javadoc
BuildRequires: java-1.6.0-openjdk-devel
-# need expat for xgettext on glade
-Buildrequires: expat-devel
%if %{buildjar}
BuildRequires: %{_bindir}/fastjar
# require zip and unzip for brp-java-repack-jars
BuildRequires: zip, unzip
%endif
-# for autopoint
-Requires: cvs
+%endif
+# need expat for xgettext on glade
+Buildrequires: expat-devel
Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
Patch5: gettext-0.17-open-args.patch
Patch6: gettext-0.17-autopoint-CVS-441481.patch
Patch7: gettext-0.17-rpathFix.patch
+Patch8: gettext-xgettext-python-unicode-surrogate-473946.patch
%description
The GNU gettext package provides a set of tools and documentation for
@@ -77,18 +81,26 @@
%patch5 -p0 -b .5-open-args~
%patch6 -p0 -b .6-autopoint~
%patch7 -p0 -b .rpathFix~
+%patch8 -p0 -b .unicode~
%build
[ -f %{_datadir}/automake/depcomp ] && cp -f %{_datadir}/automake/{depcomp,ylwrap} .
+%if %{buildjava}
export JAVAC=gcj
%if %{buildjar}
export JAR=fastjar
%endif
+%endif
%configure --without-included-gettext --enable-nls --disable-static \
- --enable-shared --with-pic-=yes --disable-csharp --enable-java \
- --disable-rpatha
+ --enable-shared --with-pic-=yes --disable-csharp \
+%if %{buildjava}
+ --enable-java \
+%else
+ --disable-java \
+%endif
+ --disable-rpath
make %{?_smp_mflags} GCJFLAGS="-findirect-dispatch"
# For generating gettext-tools/src/gnu.gettext.*
@@ -157,14 +169,16 @@
rm -rf ${RPM_BUILD_ROOT}
+%if %{buildcheck}
%check
## For Koji build problem
cp ${RPM_BUILD_ROOT}%{_libdir}/libgettext*-%{version}.so ${RPM_BUILD}gettext-tools/src/.libs
cp ${RPM_BUILD_ROOT}%{_libdir}/libgettext*-%{version}.so ${RPM_BUILD}gettext-tools/tests/.libs
cp ${RPM_BUILD_ROOT}%{_libdir}/libasprintf.so* ${RPM_BUILD}gettext-tools/src/.libs
cp ${RPM_BUILD_ROOT}%{_libdir}/libasprintf.so* ${RPM_BUILD}gettext-tools/tests/.libs
-
+# this takes quite a lot of time to run
make check
+%endif
%define install_info /sbin/install-info
@@ -216,7 +230,9 @@
%{_infodir}/gettext*
%{_mandir}/man1/*
%{_libdir}/%{name}
+%if %{buildjava}
%exclude %{_libdir}/%{name}/gnu.gettext.*
+%endif
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/archive.tar.gz
%{_datadir}/%{name}/styles
@@ -246,8 +262,9 @@
%{_mandir}/man3/*
%{_datadir}/%{name}/javaversion.class
%doc gettext-runtime/intl-java/javadoc*
+%if %{buildjava}
%{_libdir}/%{name}/gnu.gettext.*
-
+%endif
%files libs
%defattr(-,root,root,-)
@@ -257,8 +274,12 @@
%changelog
-* Wed Nov 5 2008 Jens Petersen <petersen at redhat.com>
-- move cvs Requires for autopoint to base package (Karl Lattimer, #469555)
+* Thu Feb 12 2009 Jens Petersen <petersen at redhat.com> - 0.17-9
+- add buildjava switch to allow turning off the java bits completely
+- add buildcheck to allow turning off make check
+- drop cvs requires for autopoint (Karl Lattimer, #469555)
+- add upstream gettext-xgettext-python-unicode-surrogate-473946.patch by
+ Bruno Haible to fix xgettext handling of utf16 surrogates in python (#473946)
* Fri Aug 29 2008 Ding-Yi Chen <dchen at redhat dot com> - 0.17-8
- Fix the build failure with koji.
- Previous message (by thread): rpms/perl-Data-Compare/F-9 .cvsignore, 1.6, 1.7 perl-Data-Compare.spec, 1.9, 1.10 sources, 1.6, 1.7
- Next message (by thread): rpms/perl-Config-IniFiles/F-10 .cvsignore, 1.3, 1.4 perl-Config-IniFiles.spec, 1.9, 1.10 sources, 1.3, 1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list