diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2012-06-29 11:15:16 +0200 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-06-29 11:15:16 +0200 |
commit | 95e1f7f04a6cd0145a5fa4e8cc6a698b255d584c (patch) | |
tree | 7e5893269a832394426769ad6e62eb78884481f0 /extra/qt | |
parent | 3d78c697bec82866c6871b610d15fb9d1f82440f (diff) | |
parent | a9811800fb65ca331655a1bbe22e67e7564099f8 (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
extra/claws-mail-extra-plugins/PKGBUILD
extra/gcin/PKGBUILD
extra/qt/PKGBUILD
kde-unstable/kactivities/PKGBUILD
kde-unstable/kdeaccessibility-jovie/PKGBUILD
kde-unstable/kdeaccessibility-kaccessible/PKGBUILD
kde-unstable/kdeaccessibility-kmag/PKGBUILD
kde-unstable/kdeaccessibility-kmousetool/PKGBUILD
kde-unstable/kdeaccessibility-kmouth/PKGBUILD
kde-unstable/kdeadmin/PKGBUILD
kde-unstable/kdeartwork/PKGBUILD
kde-unstable/kdebase-konsole/PKGBUILD
kde-unstable/kdebase-runtime/PKGBUILD
kde-unstable/kdebase-workspace/PKGBUILD
kde-unstable/kdebase/PKGBUILD
kde-unstable/kdebindings-kimono/PKGBUILD
kde-unstable/kdebindings-korundum/PKGBUILD
kde-unstable/kdebindings-kross/PKGBUILD
kde-unstable/kdebindings-perlkde/PKGBUILD
kde-unstable/kdebindings-perlqt/PKGBUILD
kde-unstable/kdebindings-python/PKGBUILD
kde-unstable/kdebindings-qtruby/PKGBUILD
kde-unstable/kdebindings-qyoto/PKGBUILD
kde-unstable/kdebindings-smokegen/PKGBUILD
kde-unstable/kdebindings-smokekde/PKGBUILD
kde-unstable/kdebindings-smokeqt/PKGBUILD
kde-unstable/kdeedu-analitza/PKGBUILD
kde-unstable/kdeedu-blinken/PKGBUILD
kde-unstable/kdeedu-cantor/PKGBUILD
kde-unstable/kdeedu-kalgebra/PKGBUILD
kde-unstable/kdeedu-kalzium/PKGBUILD
kde-unstable/kdeedu-kanagram/PKGBUILD
kde-unstable/kdeedu-kbruch/PKGBUILD
kde-unstable/kdeedu-kgeography/PKGBUILD
kde-unstable/kdeedu-khangman/PKGBUILD
kde-unstable/kdeedu-kig/PKGBUILD
kde-unstable/kdeedu-kiten/PKGBUILD
kde-unstable/kdeedu-klettres/PKGBUILD
kde-unstable/kdeedu-kmplot/PKGBUILD
kde-unstable/kdeedu-kstars/PKGBUILD
kde-unstable/kdeedu-ktouch/PKGBUILD
kde-unstable/kdeedu-kturtle/PKGBUILD
kde-unstable/kdeedu-kwordquiz/PKGBUILD
kde-unstable/kdeedu-marble/PKGBUILD
kde-unstable/kdeedu-pairs/PKGBUILD
kde-unstable/kdeedu-parley/PKGBUILD
kde-unstable/kdeedu-rocs/PKGBUILD
kde-unstable/kdeedu-step/PKGBUILD
kde-unstable/kdegames/PKGBUILD
kde-unstable/kdegraphics-gwenview/PKGBUILD
kde-unstable/kdegraphics-kamera/PKGBUILD
kde-unstable/kdegraphics-kcolorchooser/PKGBUILD
kde-unstable/kdegraphics-kgamma/PKGBUILD
kde-unstable/kdegraphics-kolourpaint/PKGBUILD
kde-unstable/kdegraphics-kruler/PKGBUILD
kde-unstable/kdegraphics-ksaneplugin/PKGBUILD
kde-unstable/kdegraphics-ksnapshot/PKGBUILD
kde-unstable/kdegraphics-mobipocket/PKGBUILD
kde-unstable/kdegraphics-okular/PKGBUILD
kde-unstable/kdegraphics-strigi-analyzer/PKGBUILD
kde-unstable/kdegraphics-svgpart/PKGBUILD
kde-unstable/kdegraphics-thumbnailers/PKGBUILD
kde-unstable/kdemultimedia-audiocd-kio/PKGBUILD
kde-unstable/kdemultimedia-dragonplayer/PKGBUILD
kde-unstable/kdemultimedia-ffmpegthumbs/PKGBUILD
kde-unstable/kdemultimedia-juk/PKGBUILD
kde-unstable/kdemultimedia-kmix/PKGBUILD
kde-unstable/kdemultimedia-kscd/PKGBUILD
kde-unstable/kdemultimedia-mplayerthumbs/PKGBUILD
kde-unstable/kdenetwork/PKGBUILD
kde-unstable/kdepim-runtime/PKGBUILD
kde-unstable/kdepim/PKGBUILD
kde-unstable/kdepimlibs/PKGBUILD
kde-unstable/kdeplasma-addons/PKGBUILD
kde-unstable/kdesdk-kate/PKGBUILD
kde-unstable/kdesdk/PKGBUILD
kde-unstable/kdetoys/PKGBUILD
kde-unstable/kdeutils-filelight/PKGBUILD
kde-unstable/kdeutils-kcalc/PKGBUILD
kde-unstable/kdeutils-kcharselect/PKGBUILD
kde-unstable/kdeutils-kdf/PKGBUILD
kde-unstable/kdeutils-kfloppy/PKGBUILD
kde-unstable/kdeutils-kgpg/PKGBUILD
kde-unstable/kdeutils-kremotecontrol/PKGBUILD
kde-unstable/kdeutils-ktimer/PKGBUILD
kde-unstable/kdeutils-kwallet/PKGBUILD
kde-unstable/kdeutils-superkaramba/PKGBUILD
kde-unstable/kdeutils-sweeper/PKGBUILD
kde-unstable/kdewebdev/PKGBUILD
kde-unstable/libkcddb/PKGBUILD
kde-unstable/libkcompactdisc/PKGBUILD
kde-unstable/libkdcraw/PKGBUILD
kde-unstable/libkdeedu/PKGBUILD
kde-unstable/libkexiv2/PKGBUILD
kde-unstable/libkipi/PKGBUILD
kde-unstable/libksane/PKGBUILD
kde-unstable/nepomuk-core/PKGBUILD
kde-unstable/soprano/PKGBUILD
testing/systemd/PKGBUILD
Diffstat (limited to 'extra/qt')
-rw-r--r-- | extra/qt/PKGBUILD | 17 | ||||
-rw-r--r-- | extra/qt/fix-assistant-crash.patch | 12 |
2 files changed, 23 insertions, 6 deletions
diff --git a/extra/qt/PKGBUILD b/extra/qt/PKGBUILD index 6c5d12d48..a13a3ece1 100644 --- a/extra/qt/PKGBUILD +++ b/extra/qt/PKGBUILD @@ -1,32 +1,34 @@ -# $Id: PKGBUILD 159391 2012-05-23 12:59:51Z andrea $ +# $Id: PKGBUILD 162529 2012-06-27 06:33:44Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgbase=qt pkgname=('qt' 'qt-private-headers') pkgver=4.8.2 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') 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' - 'declarative-fix-sigbus.patch') + 'declarative-fix-sigbus.patch' + 'fix-assistant-crash.patch') md5sums=('3c1146ddf56247e16782f96910a8423b' 'fc211414130ab2764132e7370f8e5caa' '85179f5e0437514f8639957e1d8baf62' 'f11852b97583610f3dbb669ebc3e21bc' '6b771c8a81dd90b45e8a79afa0e5bbfd' 'c439c7731c25387352d8453ca7574971' - 'aac963d05a9d5733e2bfce9e26607f51') + 'aac963d05a9d5733e2bfce9e26607f51' + 'e9c11e4606b7f55ae405e3e76f863dc1') build() { cd "${srcdir}"/${_pkgfqn} @@ -36,6 +38,8 @@ build() { # (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} @@ -56,7 +60,7 @@ build() { -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 \ @@ -83,6 +87,7 @@ package_qt() { optdepends=('postgresql-libs: PostgreSQL driver' 'libmysqlclient: MySQL driver' 'unixodbc: ODBC driver' + 'libfbclient: Firebird/iBase driver' 'libxinerama: Xinerama support' 'libxcursor: Xcursor support' 'libxfixes: Xfixes support') diff --git a/extra/qt/fix-assistant-crash.patch b/extra/qt/fix-assistant-crash.patch new file mode 100644 index 000000000..67bbbc48b --- /dev/null +++ b/extra/qt/fix-assistant-crash.patch @@ -0,0 +1,12 @@ +--- qt-everywhere-opensource-src-4.8.2/tools/assistant/tools/assistant/mainwindow.cpp 2012-06-26 17:37:47.334536023 +0000 ++++ qt-everywhere-opensource-src-4.8.2/tools/assistant/tools/assistant/mainwindow.cpp~ 2012-06-26 17:37:08.531487286 +0000 +@@ -944,8 +944,7 @@ + if (helpEngine.usesAppFont()) + font = helpEngine.appFont(); + +- const QWidgetList &widgets = qApp->allWidgets(); +- foreach (QWidget* widget, widgets) ++ foreach (QWidget* widget, QApplication::allWidgets()) + widget->setFont(font); + } + |