summaryrefslogtreecommitdiff
path: root/kde-unstable
diff options
context:
space:
mode:
authorParabola <dev@list.parabolagnulinux.org>2011-06-10 17:30:25 +0000
committerParabola <dev@list.parabolagnulinux.org>2011-06-10 17:30:25 +0000
commitdd5222c4ae447eb7a6bda08ec5a3c2339852dc16 (patch)
treef868384a6a3676025bac736d7a688aefae8acddd /kde-unstable
parent622de23541903f9b6f85fe0a96d61de08372d23b (diff)
Fri Jun 10 17:30:25 UTC 2011
Diffstat (limited to 'kde-unstable')
-rw-r--r--kde-unstable/qt/PKGBUILD222
-rw-r--r--kde-unstable/qt/assistant.desktop9
-rw-r--r--kde-unstable/qt/designer.desktop11
-rw-r--r--kde-unstable/qt/linguist.desktop10
-rw-r--r--kde-unstable/qt/qt.install12
-rw-r--r--kde-unstable/qt/qtbug-16292.patch62
-rw-r--r--kde-unstable/qt/qtconfig.desktop10
7 files changed, 0 insertions, 336 deletions
diff --git a/kde-unstable/qt/PKGBUILD b/kde-unstable/qt/PKGBUILD
deleted file mode 100644
index 89e96034f..000000000
--- a/kde-unstable/qt/PKGBUILD
+++ /dev/null
@@ -1,222 +0,0 @@
-# $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=2
-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}
-
- 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/phonon/private
- cd ${srcdir}/$_pkgfqn/src/3rdparty/phonon/phonon/
- find . -name "*_p.h" -exec install -m644 {} \
- ${pkgdir}/usr/include/phonon/private/ \; &> /dev/null
-
- install -d ${pkgdir}/usr/include/Qt3Support/private
- cd ${srcdir}/$_pkgfqn/src/qt3support/
- find . -name "*_p.h" -exec install -m644 {} \
- ${pkgdir}/usr/include/Qt3Support/private/ \; &> /dev/null
-
- install -d ${pkgdir}/usr/include/QtCore/private
- cd ${srcdir}/$_pkgfqn/src/corelib/
- find . -name "*_p.h" -exec install -m644 {} \
- ${pkgdir}/usr/include/QtCore/private/ \; &> /dev/null
-
- install -d ${pkgdir}/usr/include/QtDBus/private
- cd ${srcdir}/$_pkgfqn/src/dbus/
- find . -name "*_p.h" -exec install -m644 {} \
- ${pkgdir}/usr/include/QtDBus/private/ \; &> /dev/null
-
- install -d ${pkgdir}/usr/include/QtDeclarative/private
- cd ${srcdir}/$_pkgfqn/src/declarative/
- find . -name "*_p.h" -exec install -m644 {} \
- ${pkgdir}/usr/include/QtDeclarative/private/ \; &> /dev/null
-
- install -d ${pkgdir}/usr/include/QtDesigner/private
- cd ${srcdir}/$_pkgfqn/tools/designer/
- find . -name "*_p.h" -exec install -m644 {} \
- ${pkgdir}/usr/include/QtDesigner/private/ \; &> /dev/null
-
- install -d ${pkgdir}/usr/include/QtGui/private
- cd ${srcdir}/$_pkgfqn/src/gui/
- find . -name "*_p.h" -exec install -m644 {} \
- ${pkgdir}/usr/include/QtGui/private/ \; &> /dev/null
-
- install -d ${pkgdir}/usr/include/QtHelp/private
- cd ${srcdir}/$_pkgfqn/tools/assistant/
- find . -name "*_p.h" -exec install -m644 {} \
- ${pkgdir}/usr/include/QtHelp/private/ \; &> /dev/null
-
- install -d ${pkgdir}/usr/include/QtMultimedia/private
- cd ${srcdir}/$_pkgfqn/src/multimedia/
- find . -name "*_p.h" -exec install -m644 {} \
- ${pkgdir}/usr/include/QtMultimedia/private/ \; &> /dev/null
-
- install -d ${pkgdir}/usr/include/QtNetwork/private
- cd ${srcdir}/$_pkgfqn/src/network/
- find . -name "*_p.h" -exec install -m644 {} \
- ${pkgdir}/usr/include/QtNetwork/private/ \; &> /dev/null
-
- install -d ${pkgdir}/usr/include/QtOpenGL/private
- cd ${srcdir}/$_pkgfqn/src/opengl/
- find . -name "*_p.h" -exec install -m644 {} \
- ${pkgdir}/usr/include/QtOpenGL/private/ \; &> /dev/null
-
- install -d ${pkgdir}/usr/include/QtScript/private
- cd ${srcdir}/$_pkgfqn/src/script/
- find . -name "*_p.h" -exec install -m644 {} \
- ${pkgdir}/usr/include/QtScript/private/ \; &> /dev/null
-
- install -d ${pkgdir}/usr/include/QtScriptTools/private
- cd ${srcdir}/$_pkgfqn/src/scripttools/
- find . -name "*_p.h" -exec install -m644 {} \
- ${pkgdir}/usr/include/QtScriptTools/private/ \; &> /dev/null
-
- install -d ${pkgdir}/usr/include/QtSql/private
- cd ${srcdir}/$_pkgfqn/src/sql/
- find . -name "*_p.h" -exec install -m644 {} \
- ${pkgdir}/usr/include/QtSql/private/ \; &> /dev/null
-
- install -d ${pkgdir}/usr/include/QtSvg/private
- cd ${srcdir}/$_pkgfqn/src/svg/
- find . -name "*_p.h" -exec install -m644 {} \
- ${pkgdir}/usr/include/QtSvg/private/ \; &> /dev/null
-
- install -d ${pkgdir}/usr/include/QtTest/private
- cd ${srcdir}/$_pkgfqn/src/testlib/
- find . -name "*_p.h" -exec install -m644 {} \
- ${pkgdir}/usr/include/QtTest/private/ \; &> /dev/null
-
- install -d ${pkgdir}/usr/include/QtUiTools/private
- cd ${srcdir}/$_pkgfqn/tools/designer/src/uitools
- find . -name "*_p.h" -exec install -m644 {} \
- ${pkgdir}/usr/include/QtUiTools/private/ \; &> /dev/null
-
- install -d ${pkgdir}/usr/include/QtWebKit/private
- cd ${srcdir}/$_pkgfqn/src/3rdparty/webkit
- find . -name "*_p.h" -exec install -m644 {} \
- ${pkgdir}/usr/include/QtWebKit/private/ \; &> /dev/null
-
- install -d ${pkgdir}/usr/include/QtXmlPatterns/private
- cd ${srcdir}/$_pkgfqn/src/xmlpatterns/
- find . -name "*_p.h" -exec install -m644 {} \
- ${pkgdir}/usr/include/QtXmlPatterns/private/ \; &> /dev/null
-}
diff --git a/kde-unstable/qt/assistant.desktop b/kde-unstable/qt/assistant.desktop
deleted file mode 100644
index a9e98c44b..000000000
--- a/kde-unstable/qt/assistant.desktop
+++ /dev/null
@@ -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;
diff --git a/kde-unstable/qt/designer.desktop b/kde-unstable/qt/designer.desktop
deleted file mode 100644
index 9b7b6e9aa..000000000
--- a/kde-unstable/qt/designer.desktop
+++ /dev/null
@@ -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;
diff --git a/kde-unstable/qt/linguist.desktop b/kde-unstable/qt/linguist.desktop
deleted file mode 100644
index 8cbe86599..000000000
--- a/kde-unstable/qt/linguist.desktop
+++ /dev/null
@@ -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;
diff --git a/kde-unstable/qt/qt.install b/kde-unstable/qt/qt.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/kde-unstable/qt/qt.install
+++ /dev/null
@@ -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
-}
diff --git a/kde-unstable/qt/qtbug-16292.patch b/kde-unstable/qt/qtbug-16292.patch
deleted file mode 100644
index 9728e28f5..000000000
--- a/kde-unstable/qt/qtbug-16292.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-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
-
diff --git a/kde-unstable/qt/qtconfig.desktop b/kde-unstable/qt/qtconfig.desktop
deleted file mode 100644
index 46dcf9e3d..000000000
--- a/kde-unstable/qt/qtconfig.desktop
+++ /dev/null
@@ -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