lrelease only shows warning when duplicate messages found in *.ts( #491514)

This commit is contained in:
Than Ngo 2009-03-24 13:02:39 +00:00
parent 26f6fe85fb
commit 1d995dfe23
2 changed files with 17 additions and 1 deletions

View File

@ -0,0 +1,11 @@
--- qt-x11-opensource-src-4.5.0/tools/linguist/lrelease/main.cpp.orig 2009-03-24 13:42:02.000000000 +0100
+++ qt-x11-opensource-src-4.5.0/tools/linguist/lrelease/main.cpp 2009-03-24 13:47:21.000000000 +0100
@@ -102,7 +102,7 @@
if (!msg.comment().isEmpty())
qWarning("\n* Comment: %s", qPrintable(msg.comment()));
}
- ok = false;
+ //ok = false;
}
}
return ok;

View File

@ -12,7 +12,7 @@ Epoch: 1
Name: qt4
%endif
Version: 4.5.0
Release: 8%{?dist}
Release: 9%{?dist}
# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
License: LGPLv2 with exceptions or GPLv3 with exceptions
@ -39,6 +39,7 @@ Patch3: qt-x11-opensource-src-4.2.2-multilib-QMAKEPATH.patch
Patch5: qt-all-opensource-src-4.4.0-rc1-as_IN-437440.patch
Patch10: qt-x11-opensource-src-4.5.0-rc1-ppc64.patch
Patch11: qt-x11-opensource-src-4.5.0-linguist-crash.patch
Patch12: qt-x11-opensource-src-4.5.0-lrelease.patch
## upstreamable bits
# http://bugzilla.redhat.com/485677
@ -317,6 +318,7 @@ test -x apply_patches && ./apply_patches
%patch5 -p1 -b .bz#437440-as_IN-437440
%patch10 -p1 -b .ppc64
%patch11 -p1 -b .linguist-crash
%patch12 -p1 -b .lrelease
%patch50 -p1 -b .qhostaddress
%patch51 -p1 -b .qdoc3
%patch52 -p1 -b .sparc64
@ -800,6 +802,9 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
%changelog
* Tue Mar 24 2009 Than Ngo <than@redhat.com> - 4.5.0-9
- lrelease only shows warning when duplicate messages found in *.ts( #491514)
* Fri Mar 20 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.5.0-8
- qt-copy-patches-20090319