Wed Feb 8 23:15:20 UTC 2012

2 files changed, 11 insertions, 20 deletions

diff --git a/extra/qt3/PKGBUILD b/extra/qt3/PKGBUILD
index 0145907e8..cdd4ac7f1 100644
--- a/extra/qt3/PKGBUILD
+++ b/extra/qt3/PKGBUILD
@@ -1,9 +1,10 @@
-# $Id: PKGBUILD 148906 2012-02-05 11:55:17Z ibiru $
+# $Id: PKGBUILD 149356 2012-02-07 05:40:02Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=qt3
-pkgver=3.3.8
-pkgrel=22
+pkgver=3.3.8b
+pkgrel=1
+epoch=1
 pkgdesc="The QT3 gui toolkit"
 arch=('i686' 'x86_64')
 url="http://www.trolltech.com/products/qt/index.html"
@@ -14,18 +15,14 @@ makedepends=('mysql' 'postgresql' 'unixodbc' 'sqlite3')
 optdepends=('libmysqlclient' 'postgresql-libs' 'unixodbc')
 options=('!libtool')
 install=qt.install
-source=(ftp://ftp.trolltech.com/qt/source/qt-x11-free-${pkgver}.tar.bz2
-        qt.profile qt3-png15.patch qt-copy-kde-patches.tar.bz2
-        qt-patches.tar.bz2 utf8-bug-qt3.diff qt-font-default-subst.diff
-        mysql.patch eastern_asian_languagues.diff qt-odbc.patch gcc-4.6.patch)
-sha1sums=('91b192cb8e80679607d24ae35d6e20ed68d149d7'
+source=(ftp://ftp.trolltech.com/qt/source/qt-x11-free-${pkgver}.tar.gz
+        qt.profile qt3-png15.patch qt-copy-kde-patches.tar.bz2 qt-patches.tar.bz2
+        eastern_asian_languagues.diff qt-odbc.patch gcc-4.6.patch)
+sha1sums=('745def6250dc7f337dbb265e20bf38dcb41fd854'
           'd2e257a9011208b2cb81b9cf47915b9a2f9dab83'
           '3d19510c46016a1a211d97bf8f82b01498b1b33c'
-          '9cb2e5bec782069692ee337cfa171539d9d73753'
+          '33418e5b117458af23c72cdbffc0c339bc34bdc4'
           '116afa0e737bdf27ea27f9b3653aeb56db9ec151'
-          'ca5ecb29c7f1c826d48703339a3371038e306bb7'
-          'd928ff55adb52c4bab2fb268df022651551cd70c'
-          'bb6aad81cce143c23ff7840b1d79f6b2007a0c04'
           '40c7b8f06a21f809ddeb8b5560e9da63ccac6a17'
           '1346320614f6f86fbeb10b9fbad721dea29f5b61'
           'd9b83b8f6f9c8bd98d290dc1d0e9913a00b62c3f')
@@ -42,18 +39,12 @@ build() {
   cd "${srcdir}"/qt-x11-free-${pkgver}
   # apply qt patches from kde.org
   for i in ../qt-copy-kde-patches/*; do
-    patch -Np0 -i $i 
+    patch -p0 -i $i 
   done
   # apply other qt patches and one security fix from debian/gentoo
   for i in ../qt-patches/*; do
-    patch -Np1 -i $i 
+    patch -p1 -i $i 
   done
-  # fix utf8 bug
-  patch -p0 -i "${srcdir}"/utf8-bug-qt3.diff 
-  # fix asia fonts
-  patch -p0 -i "${srcdir}"/qt-font-default-subst.diff 
-  # fix segfaults on exit when using mysql DB driver
-  patch -p0 -i "${srcdir}"/mysql.patch 
   # fix CJK font/chars select error (FS#11245)
   patch -p1 -i "${srcdir}"/eastern_asian_languagues.diff 
   # fix build problem against new unixODBC
diff --git a/extra/qt3/qt-copy-kde-patches.tar.bz2 b/extra/qt3/qt-copy-kde-patches.tar.bz2
index 19d899963..519f7173a 100644
--- a/extra/qt3/qt-copy-kde-patches.tar.bz2
+++ b/extra/qt3/qt-copy-kde-patches.tar.bz2