[arch-commits] Commit in qt/repos (3 files)

[Pierre Schmitz]

    Date: Sunday, April 19, 2009 @ 08:05:42
  Author: pierre
Revision: 36009

Merged revisions 36007 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/qt/trunk

........
  r36007 | pierre | 2009-04-19 13:01:53 +0200 (So, 19 Apr 2009) | 1 line
  
  upgpkg: qt 4.5.0-5
........

Added:
  qt/repos/extra-i686/lrelease.patch
    (from rev 36007, qt/trunk/lrelease.patch)
Modified:
  qt/repos/extra-i686/	(properties)
  qt/repos/extra-i686/PKGBUILD

----------------+
 PKGBUILD       |    9 ++++++---
 lrelease.patch |   11 +++++++++++
 2 files changed, 17 insertions(+), 3 deletions(-)


Property changes on: qt/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /qt/trunk:1-31294
   + /qt/trunk:1-36008

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-04-19 11:02:29 UTC (rev 36008)
+++ extra-i686/PKGBUILD	2009-04-19 12:05:42 UTC (rev 36009)
@@ -3,7 +3,7 @@
 
 pkgname=qt
 pkgver=4.5.0
-pkgrel=4
+pkgrel=5
 _qtcopyver=942255
 pkgdesc='A cross-platform application and UI framework'
 arch=('i686' 'x86_64')
@@ -21,14 +21,15 @@
 source=("ftp://ftp.qtsoftware.com/qt/source/${_pkgfqn}.tar.bz2"
         "ftp://ftp.archlinux.org/other/qt/qt-copy-patches-${_qtcopyver}.tar.bz2"
         'assistant.desktop' 'designer.desktop' 'linguist.desktop' 'qtconfig.desktop'
-        'qdoc3.patch')
+        'qdoc3.patch' 'lrelease.patch')
 md5sums=('55e8c74a89e1bc128a5a6f1ff6b8b5ba'
          '95c2318cf97a4ed72db8baaff8543251'
          'b352b4b70faba2571af3fce5d119580a'
          '491a96682faa03407f768a53cca71db5'
          'cda7ed7e132689991dc2968a0043b4b0'
          '717669b728a0a795217d2f52969e454c'
-         '868056a3edab09fbac0f82ec8b4a4be3')
+         '868056a3edab09fbac0f82ec8b4a4be3'
+         '5859535390a2a58f298c36645aa58ad0')
 
 build() {
 	unset QMAKESPEC
@@ -43,6 +44,8 @@
 	done
 
 	patch -p1 -i $srcdir/qdoc3.patch
+	# see http://bugs.archlinux.org/task/14369
+	patch -p1 -i $srcdir/lrelease.patch
 
 	sed -i "s|-O2|$CXXFLAGS|" mkspecs/common/g++.conf
 

Copied: qt/repos/extra-i686/lrelease.patch (from rev 36007, qt/trunk/lrelease.patch)
===================================================================
--- extra-i686/lrelease.patch	                        (rev 0)
+++ extra-i686/lrelease.patch	2009-04-19 12:05:42 UTC (rev 36009)
@@ -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;