diff options
Diffstat (limited to 'extra')
-rw-r--r-- | extra/boost/PKGBUILD | 29 | ||||
-rw-r--r-- | extra/gtk3/PKGBUILD | 17 | ||||
-rw-r--r-- | extra/pidgin/PKGBUILD | 14 | ||||
-rw-r--r-- | extra/qt/PKGBUILD | 13 | ||||
-rw-r--r-- | extra/qt/qtbug-16292.patch | 62 |
5 files changed, 103 insertions, 32 deletions
diff --git a/extra/boost/PKGBUILD b/extra/boost/PKGBUILD index 9329f188a..c79772354 100644 --- a/extra/boost/PKGBUILD +++ b/extra/boost/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 126149 2011-06-01 20:01:54Z ibiru $ +# $Id: PKGBUILD 126799 2011-06-07 11:40:27Z ibiru $ # Maintainer: kevin <kevin@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Kritoke <kritoke@gamebox.net> @@ -8,7 +8,7 @@ pkgbase=boost pkgname=('boost-libs' 'boost') pkgver=1.46.1 _boostver=${pkgver//./_} -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') url="http://www.boost.org/" makedepends=('icu' 'python' 'python2' 'bzip2' 'zlib' 'openmpi') @@ -39,11 +39,19 @@ build() { install -d "${_stagedir}"/usr/bin install ${_bindir}/bjam "${_stagedir}"/usr/bin/bjam - # build bcp - cd "${srcdir}/${pkgbase}_${_boostver}/tools/bcp" - ../build/v2/engine/src/${_bindir}/bjam --toolset=gcc - install -m755 "${srcdir}/${pkgbase}_${_boostver}/dist/bin/bcp" \ - ${_stagedir}/usr/bin/bcp + # build tools + cd "${srcdir}/${pkgbase}_${_boostver}/tools/" + "${_stagedir}"/usr/bin/bjam --toolset=gcc + + # copy the tools + cd "${srcdir}/${pkgbase}_${_boostver}/dist/bin" + for i in *;do + install -m755 "${i}" "${_stagedir}/usr/bin/${i}" + done + + #boostbook needed by quickbook + cd "${srcdir}/${pkgbase}_${_boostver}/dist/" + cp -r share "${_stagedir}" # build libs cd "${srcdir}/${pkgbase}_${_boostver}" @@ -59,7 +67,7 @@ build() { # --layout=system no longer adds the -mt suffix for multi-threaded libs. # install to ${_stagedir} in preparation for split packaging - ./tools/build/v2/engine/src/${_bindir}/bjam \ + "${_stagedir}"/usr/bin/bjam \ release debug-symbols=off threading=multi \ runtime-link=shared link=shared,static \ cflags=-fno-strict-aliasing \ @@ -82,7 +90,7 @@ package_boost() { optdepends=('python: for python bindings' 'python2: for python2 bindings') - install -d "${pkgdir}"/usr/{include,lib} + install -d "${pkgdir}"/usr/{include,lib,share} # headers/source files cp -r "${_stagedir}"/include/ "${pkgdir}"/usr/ @@ -92,6 +100,9 @@ package_boost() { # utilities (bjam, bcp, pyste) cp -r "${_stagedir}"/usr/* "${pkgdir}"/usr/ + #boostbook + cp -r "${_stagedir}"/share/* "${pkgdir}"/usr/share + # license install -D -m644 "${srcdir}/${pkgbase}_${_boostver}/LICENSE_1_0.txt" \ "${pkgdir}"/usr/share/licenses/boost/LICENSE_1_0.txt diff --git a/extra/gtk3/PKGBUILD b/extra/gtk3/PKGBUILD index 4cff80b52..bd05b7cdd 100644 --- a/extra/gtk3/PKGBUILD +++ b/extra/gtk3/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 125375 2011-05-26 12:54:23Z ibiru $ +# $Id: PKGBUILD 126728 2011-06-06 21:19:26Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gtk3 -pkgver=3.0.10 -pkgrel=2 +pkgver=3.0.11 +pkgrel=1 pkgdesc="The GTK+ Toolkit (v3)" arch=('i686' 'x86_64') url="http://www.gtk.org/" @@ -13,16 +13,13 @@ makedepends=('gobject-introspection') options=('!libtool' '!docs') backup=(etc/gtk-3.0/settings.ini) license=('LGPL') -source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/3.0/gtk+-${pkgver}.tar.bz2 - settings.ini - only_draw_resize_grip_if_its_window_exists.patch) -sha256sums=('a217ed31aed9843810eabb241239e0f2c5ca0e14bd91687cf4180b3e346abc30' - 'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621' - 'fa2bd8085cae6cdb4f3b8baae11d3c0b38afec2eb4503f5bacabf87aee15313a') +source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/3.0/gtk+-${pkgver}.tar.xz + settings.ini) +sha256sums=('e2e38b316c4657df0cf376c3b6aad63158a9068c557ad41033a677f29967001b' + 'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621') build() { cd "${srcdir}/gtk+-${pkgver}" - patch -Np1 -i "${srcdir}/only_draw_resize_grip_if_its_window_exists.patch" CXX=/bin/false ./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ diff --git a/extra/pidgin/PKGBUILD b/extra/pidgin/PKGBUILD index 05883a1d8..d7930f9f7 100644 --- a/extra/pidgin/PKGBUILD +++ b/extra/pidgin/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 124929 2011-05-25 09:33:46Z foutrelis $ +# $Id: PKGBUILD 126832 2011-06-07 15:43:55Z foutrelis $ # Maintainer: Evangelos Foutras <foutrelis@gmail.com> # Contributor: Ionut Biru <ibiru@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> @@ -6,8 +6,8 @@ # Contributor: Lucien Immink <l.immink@student.fnt.hvu.nl> pkgname=('pidgin' 'libpurple' 'finch') -pkgver=2.7.11 -pkgrel=5 +pkgver=2.8.0 +pkgrel=1 arch=('i686' 'x86_64') url="http://pidgin.im/" license=('GPL') @@ -17,19 +17,15 @@ makedepends=('startup-notification' 'gtkspell' 'libxss' 'nss' 'libsasl' 'libsm' 'networkmanager') options=('!libtool') source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2 - nm09-pidgin.patch nm09-more.patch) -md5sums=('07c2a2535b4d7436b5ec7685fe063fec' - '744a21b4dbaf949dba7cd3b75b12b4fe' +md5sums=('d1656c443a5d91f4aa0d95915f1f50c3' 'a673659d86c7a65aa710f7c8c7feda82') build() { cd "$srcdir/$pkgname-$pkgver" - # Update for NetworkManager 0.9 connection states - # (http://developer.pidgin.im/ticket/13505) + # Further fixes for NetworkManager 0.9 # (http://developer.pidgin.im/ticket/13859) - patch -Np1 -i "$srcdir/nm09-pidgin.patch" patch -Np1 -i "$srcdir/nm09-more.patch" # Use Python 2 diff --git a/extra/qt/PKGBUILD b/extra/qt/PKGBUILD index 1bec2cbf5..89e96034f 100644 --- a/extra/qt/PKGBUILD +++ b/extra/qt/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 122539 2011-05-04 13:21:18Z andrea $ +# $Id: PKGBUILD 125344 2011-05-26 00:12:04Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgbase=qt pkgname=('qt' 'qt-private-headers') pkgver=4.7.3 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url='http://qt.nokia.com/' license=('GPL3' 'LGPL') @@ -17,12 +17,14 @@ options=('!libtool') _pkgfqn="qt-everywhere-opensource-src-${pkgver}" source=("ftp://ftp.qt.nokia.com/qt/source/${_pkgfqn}.tar.gz" 'assistant.desktop' 'designer.desktop' 'linguist.desktop' - 'qtconfig.desktop') + 'qtconfig.desktop' + 'qtbug-16292.patch') md5sums=('49b96eefb1224cc529af6fe5608654fe' 'fc211414130ab2764132e7370f8e5caa' '85179f5e0437514f8639957e1d8baf62' 'f11852b97583610f3dbb669ebc3e21bc' - '6b771c8a81dd90b45e8a79afa0e5bbfd') + '6b771c8a81dd90b45e8a79afa0e5bbfd' + 'dc7ed8c2e8c68a175f7f05a34dccc937') build() { unset QMAKESPEC @@ -31,6 +33,9 @@ build() { export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH} cd $srcdir/$_pkgfqn + + # Already fixed upstream + patch -p1 -i "${srcdir}"/qtbug-16292.patch sed -i "s|-O2|$CXXFLAGS|" mkspecs/common/g++.conf sed -i "/^QMAKE_RPATH/s| -Wl,-rpath,||g" mkspecs/common/g++.conf diff --git a/extra/qt/qtbug-16292.patch b/extra/qt/qtbug-16292.patch new file mode 100644 index 000000000..9728e28f5 --- /dev/null +++ b/extra/qt/qtbug-16292.patch @@ -0,0 +1,62 @@ +From e340844bd614add505a39a3a6b915632476f6305 Mon Sep 17 00:00:00 2001 +From: Gabriel de Dietrich <gabriel.dietrich-de@nokia.com> +Date: Tue, 15 Feb 2011 11:19:26 +0100 +Subject: [PATCH] Fix crash in KPackageKit + +QTreeViewPrivate::itemHeight() may refer to an invalid QModelIndex +after calling QTreeView::indexRowSizeHint(). + +Same thing inside QTreeView::indexRowSizeHint(), since +QHeaderView::count() will call +QAbstractItemViewPrivate::executePostedLayout() which may invalidate +all the QModelIndex. + +Reviewed-by: Olivier +Task-number: QTBUG-16292 +--- + src/gui/itemviews/qtreeview.cpp | 11 ++++++----- + 1 files changed, 6 insertions(+), 5 deletions(-) + +diff --git a/src/gui/itemviews/qtreeview.cpp b/src/gui/itemviews/qtreeview.cpp +index f1f3236..c0573bb 100644 +--- a/src/gui/itemviews/qtreeview.cpp ++++ b/src/gui/itemviews/qtreeview.cpp +@@ -2753,6 +2753,7 @@ int QTreeView::indexRowSizeHint(const QModelIndex &index) const + + int start = -1; + int end = -1; ++ int indexRow = index.row(); + int count = d->header->count(); + bool emptyHeader = (count == 0); + QModelIndex parent = index.parent(); +@@ -2789,7 +2790,7 @@ int QTreeView::indexRowSizeHint(const QModelIndex &index) const + int logicalColumn = emptyHeader ? column : d->header->logicalIndex(column); + if (d->header->isSectionHidden(logicalColumn)) + continue; +- QModelIndex idx = d->model->index(index.row(), logicalColumn, parent); ++ QModelIndex idx = d->model->index(indexRow, logicalColumn, parent); + if (idx.isValid()) { + QWidget *editor = d->editorForIndex(idx).editor; + if (editor && d->persistent.contains(editor)) { +@@ -3224,14 +3225,14 @@ int QTreeViewPrivate::itemHeight(int item) const + if (viewItems.isEmpty()) + return 0; + const QModelIndex &index = viewItems.at(item).index; ++ if (!index.isValid()) ++ return 0; + int height = viewItems.at(item).height; +- if (height <= 0 && index.isValid()) { ++ if (height <= 0) { + height = q_func()->indexRowSizeHint(index); + viewItems[item].height = height; + } +- if (!index.isValid() || height < 0) +- return 0; +- return height; ++ return qMax(height, 0); + } + + +-- +1.6.1 + |