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

[Pierre Schmitz]

    Date: Thursday, May 28, 2009 @ 03:24:48
  Author: pierre
Revision: 40104

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

........
  r40087 | pierre | 2009-05-27 23:26:20 +0200 (Mi, 27 Mai 2009) | 2 lines
  
  upgpkg: qt3 3.3.8-11
      fix FS#{14531,14834,13194}
........

Modified:
  qt3/repos/extra-i686/	(properties)
  qt3/repos/extra-i686/PKGBUILD
  qt3/repos/extra-i686/qt-patches.tar.bz2

----------+
 PKGBUILD |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)


Property changes on: qt3/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /qt3/trunk:1-31913
   + /qt3/trunk:1-40103

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-05-28 07:14:32 UTC (rev 40103)
+++ extra-i686/PKGBUILD	2009-05-28 07:24:48 UTC (rev 40104)
@@ -4,7 +4,7 @@
 
 pkgname=qt3
 pkgver=3.3.8
-pkgrel=10
+pkgrel=11
 pkgdesc="The QT gui toolkit."
 arch=(i686 x86_64)
 license=('GPL')
@@ -22,7 +22,7 @@
 md5sums=('cf3c43a7dfde5bfb76f8001102fe6e85'
          'f72d1eb4eb49b9a9467c1f6035194266'
          'f2a2dbdbfee9422c90efc3ef3f86197c'
-         'c8937968e9807b3cdcdf0505728d99ce'
+         '2f00e5c0c1e2c2a23dddc982cd79f3e0'
          'f6b3b39040f2b8f19ba1cf1445468c28'
          '9370d82e85f2c799335ed0dcc1d53189'
          '7d40ed1bd40d33d8b9b27a2076a5d22a'
@@ -62,6 +62,8 @@
   rm -rf doc/html examples tutorial
   sed -i "s|sub-tutorial sub-examples||" Makefile
   sed -i "s|-O2|$CXXFLAGS|" mkspecs/linux-g++/qmake.conf
+  sed -i "s|-O2|$CXXFLAGS|" mkspecs/linux-g++-32/qmake.conf
+  sed -i "s|-O2|$CXXFLAGS|" mkspecs/linux-g++-64/qmake.conf
   sed -i "s|-I. |$CXXFLAGS -I. |" qmake/Makefile.unix
   sed -i "s|read acceptance|acceptance=yes|" configure
 
@@ -75,7 +77,7 @@
 
   ./configure -prefix /opt/qt -platform linux-g++$ARCH \
     -system-zlib -qt-gif -release -shared -sm -nis -thread -stl \
-    -{system-lib,plugin-imgfmt-}{png,jpeg,mng} \
+    -system-lib{png,jpeg,mng} \
     -no-g++-exceptions -plugin-sql-{mysql,psql,sqlite,odbc}
 
   # fix /opt/qt/lib path

Modified: extra-i686/qt-patches.tar.bz2
===================================================================
(Binary files differ)