[arch-commits] Commit in qt/trunk (PKGBUILD)

[Andrea Scarpino]

    Date: Tuesday, June 26, 2012 @ 19:05:16
  Author: andrea
Revision: 162420

Add ibase support (FS#30062); Fix Assistant crash (FS#29469)

Modified:
  qt/trunk/PKGBUILD

----------+
 PKGBUILD |   15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-06-26 20:24:30 UTC (rev 162419)
+++ PKGBUILD	2012-06-26 23:05:16 UTC (rev 162420)
@@ -5,32 +5,36 @@
 pkgbase=qt
 pkgname=('qt' 'qt-private-headers')
 pkgver=4.8.2
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL')
 makedepends=('libtiff' 'libpng' 'libmng' 'sqlite' 'ca-certificates' 'glib2' 'dbus'
     'fontconfig' 'libgl' 'libsm' 'libxrandr' 'libxv' 'libxi' 'alsa-lib'
     'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils' 'mesa' 'postgresql-libs'
-    'mysql' 'unixodbc' 'cups' 'gtk2')
+    'mysql' 'unixodbc' 'cups' 'gtk2' 'libfbclient')
 options=('!libtool')
 _pkgfqn="${pkgbase}-everywhere-opensource-src-${pkgver}"
 source=("http://releases.qt-project.org/qt4/source/${_pkgfqn}.tar.gz"
         'assistant.desktop' 'designer.desktop' 'linguist.desktop'
         'qtconfig.desktop'
-        'improve-cups-support.patch')
+        'improve-cups-support.patch'
+        'fix-assistant-crash.patch')
 md5sums=('3c1146ddf56247e16782f96910a8423b'
          'fc211414130ab2764132e7370f8e5caa'
          '85179f5e0437514f8639957e1d8baf62'
          'f11852b97583610f3dbb669ebc3e21bc'
          '6b771c8a81dd90b45e8a79afa0e5bbfd'
-         'c439c7731c25387352d8453ca7574971')
+         'c439c7731c25387352d8453ca7574971'
+         'e9c11e4606b7f55ae405e3e76f863dc1')
 
 build() {
   cd "${srcdir}"/${_pkgfqn}
 
   # (FS#28381) (KDEBUG#180051)
   patch -p1 -i "${srcdir}"/improve-cups-support.patch
+  
+  patch -p1 -i "${srcdir}"/fix-assistant-crash.patch
 
   export QT4DIR="${srcdir}"/${_pkgfqn}
   export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH}
@@ -49,7 +53,7 @@
     -sysconfdir /etc/xdg \
     -examplesdir /usr/share/doc/qt/examples \
     -demosdir /usr/share/doc/qt/demos \
-    -plugin-sql-{psql,mysql,sqlite,odbc} \
+    -plugin-sql-{psql,mysql,sqlite,odbc,ibase} \
     -system-sqlite \
     -no-phonon \
     -no-phonon-backend \
@@ -76,6 +80,7 @@
     optdepends=('postgresql-libs: PostgreSQL driver'
                 'libmysqlclient: MySQL driver'
                 'unixodbc: ODBC driver'
+                'libfbclient: Firebird/iBase driver'
                 'libxinerama: Xinerama support'
                 'libxcursor: Xcursor support'
                 'libxfixes: Xfixes support')