Date: Thursday, September 1, 2011 @ 19:43:27
Author: andrea
Revision: 136831
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
qt/repos/extra-i686/PKGBUILD
(from rev 136830, qt/trunk/PKGBUILD)
qt/repos/extra-i686/assistant.desktop
(from rev 136830, qt/trunk/assistant.desktop)
qt/repos/extra-i686/designer.desktop
(from rev 136830, qt/trunk/designer.desktop)
qt/repos/extra-i686/linguist.desktop
(from rev 136830, qt/trunk/linguist.desktop)
qt/repos/extra-i686/qt.install
(from rev 136830, qt/trunk/qt.install)
qt/repos/extra-i686/qtconfig.desktop
(from rev 136830, qt/trunk/qtconfig.desktop)
qt/repos/extra-x86_64/PKGBUILD
(from rev 136830, qt/trunk/PKGBUILD)
qt/repos/extra-x86_64/assistant.desktop
(from rev 136830, qt/trunk/assistant.desktop)
qt/repos/extra-x86_64/designer.desktop
(from rev 136830, qt/trunk/designer.desktop)
qt/repos/extra-x86_64/linguist.desktop
(from rev 136830, qt/trunk/linguist.desktop)
qt/repos/extra-x86_64/qt.install
(from rev 136830, qt/trunk/qt.install)
qt/repos/extra-x86_64/qtconfig.desktop
(from rev 136830, qt/trunk/qtconfig.desktop)
Deleted:
qt/repos/extra-i686/PKGBUILD
qt/repos/extra-i686/assistant.desktop
qt/repos/extra-i686/designer.desktop
qt/repos/extra-i686/linguist.desktop
qt/repos/extra-i686/qt.install
qt/repos/extra-i686/qtbug-16292.patch
qt/repos/extra-i686/qtconfig.desktop
qt/repos/extra-x86_64/PKGBUILD
qt/repos/extra-x86_64/assistant.desktop
qt/repos/extra-x86_64/designer.desktop
qt/repos/extra-x86_64/linguist.desktop
qt/repos/extra-x86_64/qt.install
qt/repos/extra-x86_64/qtbug-16292.patch
qt/repos/extra-x86_64/qtconfig.desktop
--------------------------------+
extra-i686/PKGBUILD | 279 +++++++++++++++++++--------------------
extra-i686/assistant.desktop | 18 +-
extra-i686/designer.desktop | 22 +--
extra-i686/linguist.desktop | 20 +-
extra-i686/qt.install | 24 +--
extra-i686/qtbug-16292.patch | 62 --------
extra-i686/qtconfig.desktop | 20 +-
extra-x86_64/PKGBUILD | 279 +++++++++++++++++++--------------------
extra-x86_64/assistant.desktop | 18 +-
extra-x86_64/designer.desktop | 22 +--
extra-x86_64/linguist.desktop | 20 +-
extra-x86_64/qt.install | 24 +--
extra-x86_64/qtbug-16292.patch | 62 --------
extra-x86_64/qtconfig.desktop | 20 +-
14 files changed, 378 insertions(+), 512 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2011-09-01 23:40:36 UTC (rev 136830)
+++ extra-i686/PKGBUILD 2011-09-01 23:43:27 UTC (rev 136831)
@@ -1,142 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <and...@archlinux.org>
-# Contributor: Pierre Schmitz <pie...@archlinux.de>
-
-pkgbase=qt
-pkgname=('qt' 'qt-private-headers')
-pkgver=4.7.3
-pkgrel=3
-arch=('i686' 'x86_64')
-url='http://qt.nokia.com/'
-license=('GPL3' 'LGPL')
-makedepends=('libtiff' 'libpng' 'libmng' 'sqlite3' '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')
-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'
- 'qtbug-16292.patch')
-md5sums=('49b96eefb1224cc529af6fe5608654fe'
- 'fc211414130ab2764132e7370f8e5caa'
- '85179f5e0437514f8639957e1d8baf62'
- 'f11852b97583610f3dbb669ebc3e21bc'
- '6b771c8a81dd90b45e8a79afa0e5bbfd'
- 'dc7ed8c2e8c68a175f7f05a34dccc937')
-
-build() {
- unset QMAKESPEC
- export QT4DIR=$srcdir/$_pkgfqn
- export PATH=${QT4DIR}/bin:${PATH}
- export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH}
-
- # FS#24601
- export CXXFLAGS="$CXXFLAGS -fno-strict-aliasing"
-
- 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
- sed -i "/^QMAKE_LFLAGS\s/s|+=|+= $LDFLAGS|g" mkspecs/common/g++.conf
-
- ./configure -confirm-license -opensource \
- -prefix /usr \
- -docdir /usr/share/doc/qt \
- -plugindir /usr/lib/qt/plugins \
- -importdir /usr/lib/qt/imports \
- -datadir /usr/share/qt \
- -translationdir /usr/share/qt/translations \
- -sysconfdir /etc \
- -examplesdir /usr/share/doc/qt/examples \
- -demosdir /usr/share/doc/qt/demos \
- -largefile \
- -plugin-sql-{psql,mysql,sqlite,odbc} \
- -system-sqlite \
- -xmlpatterns \
- -no-phonon \
- -no-phonon-backend \
- -svg \
- -webkit \
- -script \
- -scripttools \
- -system-zlib \
- -system-libtiff \
- -system-libpng \
- -system-libmng \
- -system-libjpeg \
- -nomake demos \
- -nomake examples \
- -nomake docs \
- -no-rpath \
- -openssl-linked \
- -silent \
- -optimized-qmake \
- -dbus \
- -reduce-relocations \
- -no-separate-debug-info \
- -gtkstyle \
- -opengl \
- -no-openvg \
- -glib
- make
-}
-
-package_qt() {
- pkgdesc='A cross-platform application and UI framework'
- depends=('libtiff' 'libpng' 'libmng' 'sqlite3' 'ca-certificates' 'glib2'
'dbus'
- 'fontconfig' 'libgl' 'libsm' 'libxrandr' 'libxv' 'libxi' 'alsa-lib'
- 'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils')
- optdepends=('postgresql-libs: PostgreSQL driver'
- 'libmysqlclient: MySQL driver'
- 'unixodbc: ODBC driver'
- 'libxinerama: Xinerama support'
- 'libxcursor: Xcursor support'
- 'libxfixes: Xfixes support')
- install='qt.install'
-
- cd $srcdir/$_pkgfqn
- make INSTALL_ROOT=$pkgdir install
-
- # install missing icons and desktop files
- for icon in tools/linguist/linguist/images/icons/linguist-*-32.png ; do
- size=$(echo $(basename ${icon}) | cut -d- -f2)
- install -p -D -m644 ${icon}
${pkgdir}/usr/share/icons/hicolor/${size}x${size}/apps/linguist.png
- done
- install -p -D -m644 src/gui/dialogs/images/qtlogo-64.png
${pkgdir}/usr/share/icons/hicolor/64x64/apps/qtlogo.png
- install -p -D -m644
tools/assistant/tools/assistant/images/assistant.png
${pkgdir}/usr/share/icons/hicolor/32x32/apps/assistant.png
- install -p -D -m644 tools/designer/src/designer/images/designer.png
${pkgdir}/usr/share/icons/hicolor/128x128/apps/designer.png
- install -d ${pkgdir}/usr/share/applications
- install -m644 ${srcdir}/{linguist,designer,assistant,qtconfig}.desktop
${pkgdir}/usr/share/applications/
-
- # install license addition
- install -D -m644 LGPL_EXCEPTION.txt
${pkgdir}/usr/share/licenses/qt/LGPL_EXCEPTION.txt
-
- # Fix wrong path in pkgconfig files
- find ${pkgdir}/usr/lib/pkgconfig -type f -name '*.pc' \
- -exec perl -pi -e "s, -L${srcdir}/?\S+,,g" {} \;
- # Fix wrong path in prl files
- find ${pkgdir}/usr/lib -type f -name '*.prl' \
- -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS
=\).*/\1/' {} \;
-}
-
-package_qt-private-headers(){
- pkgdesc="Qt private headers for development"
- depends=("qt=${pkgver}")
-
- install -d ${pkgdir}/usr/include/{QtCore,QtDeclarative,QtGui,QtScript}
- install -d ${pkgdir}/usr/src/{corelib,declarative,gui,script}
-
- for i in QtCore QtDeclarative QtGui QtScript; do
- cp -r ${srcdir}/$_pkgfqn/include/${i}/private/ \
- ${pkgdir}/usr/include/${i}/
- done
-
- for i in corelib declarative gui script; do
- cp -r ${srcdir}/$_pkgfqn/src/${i} ${pkgdir}/usr/src/
- done
-}
Copied: qt/repos/extra-i686/PKGBUILD (from rev 136830, qt/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2011-09-01 23:43:27 UTC (rev 136831)
@@ -0,0 +1,137 @@
+# $Id$
+# Maintainer: Andrea Scarpino <and...@archlinux.org>
+# Contributor: Pierre Schmitz <pie...@archlinux.de>
+
+pkgbase=qt
+pkgname=('qt' 'qt-private-headers')
+pkgver=4.7.4
+pkgrel=1
+arch=('i686' 'x86_64')
+url='http://qt.nokia.com/'
+license=('GPL3' 'LGPL')
+makedepends=('libtiff' 'libpng' 'libmng' 'sqlite3' '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')
+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')
+md5sums=('ddf7d83f912cf1283aa066368464fa22'
+ 'fc211414130ab2764132e7370f8e5caa'
+ '85179f5e0437514f8639957e1d8baf62'
+ 'f11852b97583610f3dbb669ebc3e21bc'
+ '6b771c8a81dd90b45e8a79afa0e5bbfd')
+
+build() {
+ unset QMAKESPEC
+ export QT4DIR=$srcdir/$_pkgfqn
+ export PATH=${QT4DIR}/bin:${PATH}
+ export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH}
+
+ # FS#24601
+ export CXXFLAGS="$CXXFLAGS -fno-strict-aliasing"
+
+ cd $srcdir/$_pkgfqn
+
+ sed -i "s|-O2|$CXXFLAGS|" mkspecs/common/g++.conf
+ sed -i "/^QMAKE_RPATH/s| -Wl,-rpath,||g" mkspecs/common/g++.conf
+ sed -i "/^QMAKE_LFLAGS\s/s|+=|+= $LDFLAGS|g" mkspecs/common/g++.conf
+
+ ./configure -confirm-license -opensource \
+ -prefix /usr \
+ -docdir /usr/share/doc/qt \
+ -plugindir /usr/lib/qt/plugins \
+ -importdir /usr/lib/qt/imports \
+ -datadir /usr/share/qt \
+ -translationdir /usr/share/qt/translations \
+ -sysconfdir /etc \
+ -examplesdir /usr/share/doc/qt/examples \
+ -demosdir /usr/share/doc/qt/demos \
+ -largefile \
+ -plugin-sql-{psql,mysql,sqlite,odbc} \
+ -system-sqlite \
+ -xmlpatterns \
+ -no-phonon \
+ -no-phonon-backend \
+ -svg \
+ -webkit \
+ -script \
+ -scripttools \
+ -system-zlib \
+ -system-libtiff \
+ -system-libpng \
+ -system-libmng \
+ -system-libjpeg \
+ -nomake demos \
+ -nomake examples \
+ -nomake docs \
+ -no-rpath \
+ -openssl-linked \
+ -silent \
+ -optimized-qmake \
+ -dbus \
+ -reduce-relocations \
+ -no-separate-debug-info \
+ -gtkstyle \
+ -opengl \
+ -no-openvg \
+ -glib
+ make
+}
+
+package_qt() {
+ pkgdesc='A cross-platform application and UI framework'
+ depends=('libtiff' 'libpng' 'libmng' 'sqlite3' 'ca-certificates' 'glib2'
'dbus'
+ 'fontconfig' 'libgl' 'libsm' 'libxrandr' 'libxv' 'libxi' 'alsa-lib'
+ 'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils')
+ optdepends=('postgresql-libs: PostgreSQL driver'
+ 'libmysqlclient: MySQL driver'
+ 'unixodbc: ODBC driver'
+ 'libxinerama: Xinerama support'
+ 'libxcursor: Xcursor support'
+ 'libxfixes: Xfixes support')
+ install='qt.install'
+
+ cd $srcdir/$_pkgfqn
+ make INSTALL_ROOT=$pkgdir install
+
+ # install missing icons and desktop files
+ for icon in tools/linguist/linguist/images/icons/linguist-*-32.png ; do
+ size=$(echo $(basename ${icon}) | cut -d- -f2)
+ install -p -D -m644 ${icon}
${pkgdir}/usr/share/icons/hicolor/${size}x${size}/apps/linguist.png
+ done
+ install -p -D -m644 src/gui/dialogs/images/qtlogo-64.png
${pkgdir}/usr/share/icons/hicolor/64x64/apps/qtlogo.png
+ install -p -D -m644
tools/assistant/tools/assistant/images/assistant.png
${pkgdir}/usr/share/icons/hicolor/32x32/apps/assistant.png
+ install -p -D -m644 tools/designer/src/designer/images/designer.png
${pkgdir}/usr/share/icons/hicolor/128x128/apps/designer.png
+ install -d ${pkgdir}/usr/share/applications
+ install -m644 ${srcdir}/{linguist,designer,assistant,qtconfig}.desktop
${pkgdir}/usr/share/applications/
+
+ # install license addition
+ install -D -m644 LGPL_EXCEPTION.txt
${pkgdir}/usr/share/licenses/qt/LGPL_EXCEPTION.txt
+
+ # Fix wrong path in pkgconfig files
+ find ${pkgdir}/usr/lib/pkgconfig -type f -name '*.pc' \
+ -exec perl -pi -e "s, -L${srcdir}/?\S+,,g" {} \;
+ # Fix wrong path in prl files
+ find ${pkgdir}/usr/lib -type f -name '*.prl' \
+ -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS
=\).*/\1/' {} \;
+}
+
+package_qt-private-headers(){
+ pkgdesc="Qt private headers for development"
+ depends=("qt=${pkgver}")
+
+ install -d ${pkgdir}/usr/include/{QtCore,QtDeclarative,QtGui,QtScript}
+ install -d ${pkgdir}/usr/src/{corelib,declarative,gui,script}
+
+ for i in QtCore QtDeclarative QtGui QtScript; do
+ cp -r ${srcdir}/$_pkgfqn/include/${i}/private/ \
+ ${pkgdir}/usr/include/${i}/
+ done
+
+ for i in corelib declarative gui script; do
+ cp -r ${srcdir}/$_pkgfqn/src/${i} ${pkgdir}/usr/src/
+ done
+}
Deleted: extra-i686/assistant.desktop
===================================================================
--- extra-i686/assistant.desktop 2011-09-01 23:40:36 UTC (rev 136830)
+++ extra-i686/assistant.desktop 2011-09-01 23:43:27 UTC (rev 136831)
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Qt Assistant
-Comment=Shows Qt documentation and examples
-Exec=/usr/bin/assistant
-Icon=assistant
-Terminal=false
-Encoding=UTF-8
-Type=Application
-Categories=Qt;Development;Documentation;
Copied: qt/repos/extra-i686/assistant.desktop (from rev 136830,
qt/trunk/assistant.desktop)
===================================================================
--- extra-i686/assistant.desktop (rev 0)
+++ extra-i686/assistant.desktop 2011-09-01 23:43:27 UTC (rev 136831)
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Qt Assistant
+Comment=Shows Qt documentation and examples
+Exec=/usr/bin/assistant
+Icon=assistant
+Terminal=false
+Encoding=UTF-8
+Type=Application
+Categories=Qt;Development;Documentation;
Deleted: extra-i686/designer.desktop
===================================================================
--- extra-i686/designer.desktop 2011-09-01 23:40:36 UTC (rev 136830)
+++ extra-i686/designer.desktop 2011-09-01 23:43:27 UTC (rev 136831)
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Name=Qt Designer
-GenericName=Interface Designer
-Comment=Design GUIs for Qt applications
-Exec=/usr/bin/designer
-Icon=designer
-MimeType=application/x-designer;
-Terminal=false
-Encoding=UTF-8
-Type=Application
-Categories=Qt;Development;
Copied: qt/repos/extra-i686/designer.desktop (from rev 136830,
qt/trunk/designer.desktop)
===================================================================
--- extra-i686/designer.desktop (rev 0)
+++ extra-i686/designer.desktop 2011-09-01 23:43:27 UTC (rev 136831)
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Name=Qt Designer
+GenericName=Interface Designer
+Comment=Design GUIs for Qt applications
+Exec=/usr/bin/designer
+Icon=designer
+MimeType=application/x-designer;
+Terminal=false
+Encoding=UTF-8
+Type=Application
+Categories=Qt;Development;
Deleted: extra-i686/linguist.desktop
===================================================================
--- extra-i686/linguist.desktop 2011-09-01 23:40:36 UTC (rev 136830)
+++ extra-i686/linguist.desktop 2011-09-01 23:43:27 UTC (rev 136831)
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=Qt Linguist
-Comment=Add translations to Qt applications
-Exec=/usr/bin/linguist
-Icon=linguist
-MimeType=text/vnd.trolltech.linguist;application/x-linguist;
-Terminal=false
-Encoding=UTF-8
-Type=Application
-Categories=Qt;Development;
Copied: qt/repos/extra-i686/linguist.desktop (from rev 136830,
qt/trunk/linguist.desktop)
===================================================================
--- extra-i686/linguist.desktop (rev 0)
+++ extra-i686/linguist.desktop 2011-09-01 23:43:27 UTC (rev 136831)
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=Qt Linguist
+Comment=Add translations to Qt applications
+Exec=/usr/bin/linguist
+Icon=linguist
+MimeType=text/vnd.trolltech.linguist;application/x-linguist;
+Terminal=false
+Encoding=UTF-8
+Type=Application
+Categories=Qt;Development;
Deleted: extra-i686/qt.install
===================================================================
--- extra-i686/qt.install 2011-09-01 23:40:36 UTC (rev 136830)
+++ extra-i686/qt.install 2011-09-01 23:43:27 UTC (rev 136831)
@@ -1,12 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: qt/repos/extra-i686/qt.install (from rev 136830, qt/trunk/qt.install)
===================================================================
--- extra-i686/qt.install (rev 0)
+++ extra-i686/qt.install 2011-09-01 23:43:27 UTC (rev 136831)
@@ -0,0 +1,12 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Deleted: extra-i686/qtbug-16292.patch
===================================================================
--- extra-i686/qtbug-16292.patch 2011-09-01 23:40:36 UTC (rev 136830)
+++ extra-i686/qtbug-16292.patch 2011-09-01 23:43:27 UTC (rev 136831)
@@ -1,62 +0,0 @@
-From e340844bd614add505a39a3a6b915632476f6305 Mon Sep 17 00:00:00 2001
-From: Gabriel de Dietrich <gabriel.dietrich...@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
-
Deleted: extra-i686/qtconfig.desktop
===================================================================
--- extra-i686/qtconfig.desktop 2011-09-01 23:40:36 UTC (rev 136830)
+++ extra-i686/qtconfig.desktop 2011-09-01 23:43:27 UTC (rev 136831)
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=Qt Config
-Comment=Configure Qt behavior, styles, fonts
-Exec=/usr/bin/qtconfig
-Icon=qtlogo
-Terminal=false
-Encoding=UTF-8
-Type=Application
-Categories=Qt;Settings;
-NoDisplay=true
Copied: qt/repos/extra-i686/qtconfig.desktop (from rev 136830,
qt/trunk/qtconfig.desktop)
===================================================================
--- extra-i686/qtconfig.desktop (rev 0)
+++ extra-i686/qtconfig.desktop 2011-09-01 23:43:27 UTC (rev 136831)
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=Qt Config
+Comment=Configure Qt behavior, styles, fonts
+Exec=/usr/bin/qtconfig
+Icon=qtlogo
+Terminal=false
+Encoding=UTF-8
+Type=Application
+Categories=Qt;Settings;
+NoDisplay=true
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2011-09-01 23:40:36 UTC (rev 136830)
+++ extra-x86_64/PKGBUILD 2011-09-01 23:43:27 UTC (rev 136831)
@@ -1,142 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <and...@archlinux.org>
-# Contributor: Pierre Schmitz <pie...@archlinux.de>
-
-pkgbase=qt
-pkgname=('qt' 'qt-private-headers')
-pkgver=4.7.3
-pkgrel=3
-arch=('i686' 'x86_64')
-url='http://qt.nokia.com/'
-license=('GPL3' 'LGPL')
-makedepends=('libtiff' 'libpng' 'libmng' 'sqlite3' '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')
-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'
- 'qtbug-16292.patch')
-md5sums=('49b96eefb1224cc529af6fe5608654fe'
- 'fc211414130ab2764132e7370f8e5caa'
- '85179f5e0437514f8639957e1d8baf62'
- 'f11852b97583610f3dbb669ebc3e21bc'
- '6b771c8a81dd90b45e8a79afa0e5bbfd'
- 'dc7ed8c2e8c68a175f7f05a34dccc937')
-
-build() {
- unset QMAKESPEC
- export QT4DIR=$srcdir/$_pkgfqn
- export PATH=${QT4DIR}/bin:${PATH}
- export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH}
-
- # FS#24601
- export CXXFLAGS="$CXXFLAGS -fno-strict-aliasing"
-
- 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
- sed -i "/^QMAKE_LFLAGS\s/s|+=|+= $LDFLAGS|g" mkspecs/common/g++.conf
-
- ./configure -confirm-license -opensource \
- -prefix /usr \
- -docdir /usr/share/doc/qt \
- -plugindir /usr/lib/qt/plugins \
- -importdir /usr/lib/qt/imports \
- -datadir /usr/share/qt \
- -translationdir /usr/share/qt/translations \
- -sysconfdir /etc \
- -examplesdir /usr/share/doc/qt/examples \
- -demosdir /usr/share/doc/qt/demos \
- -largefile \
- -plugin-sql-{psql,mysql,sqlite,odbc} \
- -system-sqlite \
- -xmlpatterns \
- -no-phonon \
- -no-phonon-backend \
- -svg \
- -webkit \
- -script \
- -scripttools \
- -system-zlib \
- -system-libtiff \
- -system-libpng \
- -system-libmng \
- -system-libjpeg \
- -nomake demos \
- -nomake examples \
- -nomake docs \
- -no-rpath \
- -openssl-linked \
- -silent \
- -optimized-qmake \
- -dbus \
- -reduce-relocations \
- -no-separate-debug-info \
- -gtkstyle \
- -opengl \
- -no-openvg \
- -glib
- make
-}
-
-package_qt() {
- pkgdesc='A cross-platform application and UI framework'
- depends=('libtiff' 'libpng' 'libmng' 'sqlite3' 'ca-certificates' 'glib2'
'dbus'
- 'fontconfig' 'libgl' 'libsm' 'libxrandr' 'libxv' 'libxi' 'alsa-lib'
- 'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils')
- optdepends=('postgresql-libs: PostgreSQL driver'
- 'libmysqlclient: MySQL driver'
- 'unixodbc: ODBC driver'
- 'libxinerama: Xinerama support'
- 'libxcursor: Xcursor support'
- 'libxfixes: Xfixes support')
- install='qt.install'
-
- cd $srcdir/$_pkgfqn
- make INSTALL_ROOT=$pkgdir install
-
- # install missing icons and desktop files
- for icon in tools/linguist/linguist/images/icons/linguist-*-32.png ; do
- size=$(echo $(basename ${icon}) | cut -d- -f2)
- install -p -D -m644 ${icon}
${pkgdir}/usr/share/icons/hicolor/${size}x${size}/apps/linguist.png
- done
- install -p -D -m644 src/gui/dialogs/images/qtlogo-64.png
${pkgdir}/usr/share/icons/hicolor/64x64/apps/qtlogo.png
- install -p -D -m644
tools/assistant/tools/assistant/images/assistant.png
${pkgdir}/usr/share/icons/hicolor/32x32/apps/assistant.png
- install -p -D -m644 tools/designer/src/designer/images/designer.png
${pkgdir}/usr/share/icons/hicolor/128x128/apps/designer.png
- install -d ${pkgdir}/usr/share/applications
- install -m644 ${srcdir}/{linguist,designer,assistant,qtconfig}.desktop
${pkgdir}/usr/share/applications/
-
- # install license addition
- install -D -m644 LGPL_EXCEPTION.txt
${pkgdir}/usr/share/licenses/qt/LGPL_EXCEPTION.txt
-
- # Fix wrong path in pkgconfig files
- find ${pkgdir}/usr/lib/pkgconfig -type f -name '*.pc' \
- -exec perl -pi -e "s, -L${srcdir}/?\S+,,g" {} \;
- # Fix wrong path in prl files
- find ${pkgdir}/usr/lib -type f -name '*.prl' \
- -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS
=\).*/\1/' {} \;
-}
-
-package_qt-private-headers(){
- pkgdesc="Qt private headers for development"
- depends=("qt=${pkgver}")
-
- install -d ${pkgdir}/usr/include/{QtCore,QtDeclarative,QtGui,QtScript}
- install -d ${pkgdir}/usr/src/{corelib,declarative,gui,script}
-
- for i in QtCore QtDeclarative QtGui QtScript; do
- cp -r ${srcdir}/$_pkgfqn/include/${i}/private/ \
- ${pkgdir}/usr/include/${i}/
- done
-
- for i in corelib declarative gui script; do
- cp -r ${srcdir}/$_pkgfqn/src/${i} ${pkgdir}/usr/src/
- done
-}
Copied: qt/repos/extra-x86_64/PKGBUILD (from rev 136830, qt/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2011-09-01 23:43:27 UTC (rev 136831)
@@ -0,0 +1,137 @@
+# $Id$
+# Maintainer: Andrea Scarpino <and...@archlinux.org>
+# Contributor: Pierre Schmitz <pie...@archlinux.de>
+
+pkgbase=qt
+pkgname=('qt' 'qt-private-headers')
+pkgver=4.7.4
+pkgrel=1
+arch=('i686' 'x86_64')
+url='http://qt.nokia.com/'
+license=('GPL3' 'LGPL')
+makedepends=('libtiff' 'libpng' 'libmng' 'sqlite3' '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')
+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')
+md5sums=('ddf7d83f912cf1283aa066368464fa22'
+ 'fc211414130ab2764132e7370f8e5caa'
+ '85179f5e0437514f8639957e1d8baf62'
+ 'f11852b97583610f3dbb669ebc3e21bc'
+ '6b771c8a81dd90b45e8a79afa0e5bbfd')
+
+build() {
+ unset QMAKESPEC
+ export QT4DIR=$srcdir/$_pkgfqn
+ export PATH=${QT4DIR}/bin:${PATH}
+ export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH}
+
+ # FS#24601
+ export CXXFLAGS="$CXXFLAGS -fno-strict-aliasing"
+
+ cd $srcdir/$_pkgfqn
+
+ sed -i "s|-O2|$CXXFLAGS|" mkspecs/common/g++.conf
+ sed -i "/^QMAKE_RPATH/s| -Wl,-rpath,||g" mkspecs/common/g++.conf
+ sed -i "/^QMAKE_LFLAGS\s/s|+=|+= $LDFLAGS|g" mkspecs/common/g++.conf
+
+ ./configure -confirm-license -opensource \
+ -prefix /usr \
+ -docdir /usr/share/doc/qt \
+ -plugindir /usr/lib/qt/plugins \
+ -importdir /usr/lib/qt/imports \
+ -datadir /usr/share/qt \
+ -translationdir /usr/share/qt/translations \
+ -sysconfdir /etc \
+ -examplesdir /usr/share/doc/qt/examples \
+ -demosdir /usr/share/doc/qt/demos \
+ -largefile \
+ -plugin-sql-{psql,mysql,sqlite,odbc} \
+ -system-sqlite \
+ -xmlpatterns \
+ -no-phonon \
+ -no-phonon-backend \
+ -svg \
+ -webkit \
+ -script \
+ -scripttools \
+ -system-zlib \
+ -system-libtiff \
+ -system-libpng \
+ -system-libmng \
+ -system-libjpeg \
+ -nomake demos \
+ -nomake examples \
+ -nomake docs \
+ -no-rpath \
+ -openssl-linked \
+ -silent \
+ -optimized-qmake \
+ -dbus \
+ -reduce-relocations \
+ -no-separate-debug-info \
+ -gtkstyle \
+ -opengl \
+ -no-openvg \
+ -glib
+ make
+}
+
+package_qt() {
+ pkgdesc='A cross-platform application and UI framework'
+ depends=('libtiff' 'libpng' 'libmng' 'sqlite3' 'ca-certificates' 'glib2'
'dbus'
+ 'fontconfig' 'libgl' 'libsm' 'libxrandr' 'libxv' 'libxi' 'alsa-lib'
+ 'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils')
+ optdepends=('postgresql-libs: PostgreSQL driver'
+ 'libmysqlclient: MySQL driver'
+ 'unixodbc: ODBC driver'
+ 'libxinerama: Xinerama support'
+ 'libxcursor: Xcursor support'
+ 'libxfixes: Xfixes support')
+ install='qt.install'
+
+ cd $srcdir/$_pkgfqn
+ make INSTALL_ROOT=$pkgdir install
+
+ # install missing icons and desktop files
+ for icon in tools/linguist/linguist/images/icons/linguist-*-32.png ; do
+ size=$(echo $(basename ${icon}) | cut -d- -f2)
+ install -p -D -m644 ${icon}
${pkgdir}/usr/share/icons/hicolor/${size}x${size}/apps/linguist.png
+ done
+ install -p -D -m644 src/gui/dialogs/images/qtlogo-64.png
${pkgdir}/usr/share/icons/hicolor/64x64/apps/qtlogo.png
+ install -p -D -m644
tools/assistant/tools/assistant/images/assistant.png
${pkgdir}/usr/share/icons/hicolor/32x32/apps/assistant.png
+ install -p -D -m644 tools/designer/src/designer/images/designer.png
${pkgdir}/usr/share/icons/hicolor/128x128/apps/designer.png
+ install -d ${pkgdir}/usr/share/applications
+ install -m644 ${srcdir}/{linguist,designer,assistant,qtconfig}.desktop
${pkgdir}/usr/share/applications/
+
+ # install license addition
+ install -D -m644 LGPL_EXCEPTION.txt
${pkgdir}/usr/share/licenses/qt/LGPL_EXCEPTION.txt
+
+ # Fix wrong path in pkgconfig files
+ find ${pkgdir}/usr/lib/pkgconfig -type f -name '*.pc' \
+ -exec perl -pi -e "s, -L${srcdir}/?\S+,,g" {} \;
+ # Fix wrong path in prl files
+ find ${pkgdir}/usr/lib -type f -name '*.prl' \
+ -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS
=\).*/\1/' {} \;
+}
+
+package_qt-private-headers(){
+ pkgdesc="Qt private headers for development"
+ depends=("qt=${pkgver}")
+
+ install -d ${pkgdir}/usr/include/{QtCore,QtDeclarative,QtGui,QtScript}
+ install -d ${pkgdir}/usr/src/{corelib,declarative,gui,script}
+
+ for i in QtCore QtDeclarative QtGui QtScript; do
+ cp -r ${srcdir}/$_pkgfqn/include/${i}/private/ \
+ ${pkgdir}/usr/include/${i}/
+ done
+
+ for i in corelib declarative gui script; do
+ cp -r ${srcdir}/$_pkgfqn/src/${i} ${pkgdir}/usr/src/
+ done
+}
Deleted: extra-x86_64/assistant.desktop
===================================================================
--- extra-x86_64/assistant.desktop 2011-09-01 23:40:36 UTC (rev 136830)
+++ extra-x86_64/assistant.desktop 2011-09-01 23:43:27 UTC (rev 136831)
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Qt Assistant
-Comment=Shows Qt documentation and examples
-Exec=/usr/bin/assistant
-Icon=assistant
-Terminal=false
-Encoding=UTF-8
-Type=Application
-Categories=Qt;Development;Documentation;
Copied: qt/repos/extra-x86_64/assistant.desktop (from rev 136830,
qt/trunk/assistant.desktop)
===================================================================
--- extra-x86_64/assistant.desktop (rev 0)
+++ extra-x86_64/assistant.desktop 2011-09-01 23:43:27 UTC (rev 136831)
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Qt Assistant
+Comment=Shows Qt documentation and examples
+Exec=/usr/bin/assistant
+Icon=assistant
+Terminal=false
+Encoding=UTF-8
+Type=Application
+Categories=Qt;Development;Documentation;
Deleted: extra-x86_64/designer.desktop
===================================================================
--- extra-x86_64/designer.desktop 2011-09-01 23:40:36 UTC (rev 136830)
+++ extra-x86_64/designer.desktop 2011-09-01 23:43:27 UTC (rev 136831)
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Name=Qt Designer
-GenericName=Interface Designer
-Comment=Design GUIs for Qt applications
-Exec=/usr/bin/designer
-Icon=designer
-MimeType=application/x-designer;
-Terminal=false
-Encoding=UTF-8
-Type=Application
-Categories=Qt;Development;
Copied: qt/repos/extra-x86_64/designer.desktop (from rev 136830,
qt/trunk/designer.desktop)
===================================================================
--- extra-x86_64/designer.desktop (rev 0)
+++ extra-x86_64/designer.desktop 2011-09-01 23:43:27 UTC (rev 136831)
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Name=Qt Designer
+GenericName=Interface Designer
+Comment=Design GUIs for Qt applications
+Exec=/usr/bin/designer
+Icon=designer
+MimeType=application/x-designer;
+Terminal=false
+Encoding=UTF-8
+Type=Application
+Categories=Qt;Development;
Deleted: extra-x86_64/linguist.desktop
===================================================================
--- extra-x86_64/linguist.desktop 2011-09-01 23:40:36 UTC (rev 136830)
+++ extra-x86_64/linguist.desktop 2011-09-01 23:43:27 UTC (rev 136831)
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=Qt Linguist
-Comment=Add translations to Qt applications
-Exec=/usr/bin/linguist
-Icon=linguist
-MimeType=text/vnd.trolltech.linguist;application/x-linguist;
-Terminal=false
-Encoding=UTF-8
-Type=Application
-Categories=Qt;Development;
Copied: qt/repos/extra-x86_64/linguist.desktop (from rev 136830,
qt/trunk/linguist.desktop)
===================================================================
--- extra-x86_64/linguist.desktop (rev 0)
+++ extra-x86_64/linguist.desktop 2011-09-01 23:43:27 UTC (rev 136831)
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=Qt Linguist
+Comment=Add translations to Qt applications
+Exec=/usr/bin/linguist
+Icon=linguist
+MimeType=text/vnd.trolltech.linguist;application/x-linguist;
+Terminal=false
+Encoding=UTF-8
+Type=Application
+Categories=Qt;Development;
Deleted: extra-x86_64/qt.install
===================================================================
--- extra-x86_64/qt.install 2011-09-01 23:40:36 UTC (rev 136830)
+++ extra-x86_64/qt.install 2011-09-01 23:43:27 UTC (rev 136831)
@@ -1,12 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: qt/repos/extra-x86_64/qt.install (from rev 136830, qt/trunk/qt.install)
===================================================================
--- extra-x86_64/qt.install (rev 0)
+++ extra-x86_64/qt.install 2011-09-01 23:43:27 UTC (rev 136831)
@@ -0,0 +1,12 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Deleted: extra-x86_64/qtbug-16292.patch
===================================================================
--- extra-x86_64/qtbug-16292.patch 2011-09-01 23:40:36 UTC (rev 136830)
+++ extra-x86_64/qtbug-16292.patch 2011-09-01 23:43:27 UTC (rev 136831)
@@ -1,62 +0,0 @@
-From e340844bd614add505a39a3a6b915632476f6305 Mon Sep 17 00:00:00 2001
-From: Gabriel de Dietrich <gabriel.dietrich...@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
-
Deleted: extra-x86_64/qtconfig.desktop
===================================================================
--- extra-x86_64/qtconfig.desktop 2011-09-01 23:40:36 UTC (rev 136830)
+++ extra-x86_64/qtconfig.desktop 2011-09-01 23:43:27 UTC (rev 136831)
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=Qt Config
-Comment=Configure Qt behavior, styles, fonts
-Exec=/usr/bin/qtconfig
-Icon=qtlogo
-Terminal=false
-Encoding=UTF-8
-Type=Application
-Categories=Qt;Settings;
-NoDisplay=true
Copied: qt/repos/extra-x86_64/qtconfig.desktop (from rev 136830,
qt/trunk/qtconfig.desktop)
===================================================================
--- extra-x86_64/qtconfig.desktop (rev 0)
+++ extra-x86_64/qtconfig.desktop 2011-09-01 23:43:27 UTC (rev 136831)
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=Qt Config
+Comment=Configure Qt behavior, styles, fonts
+Exec=/usr/bin/qtconfig
+Icon=qtlogo
+Terminal=false
+Encoding=UTF-8
+Type=Application
+Categories=Qt;Settings;
+NoDisplay=true
