[arch-commits] Commit in qt (5 files)
Pierre Schmitz
pierre at archlinux.org
Wed Dec 2 23:26:40 UTC 2009
Date: Wednesday, December 2, 2009 @ 18:26:40
Author: pierre
Revision: 60303
prepare Qt 4.6 for future versions of KDE
Added:
qt/kde-unstable/
Modified:
qt/kde-unstable/PKGBUILD
Deleted:
qt/kde-unstable/gstreamer-logo.png
qt/kde-unstable/phonon.patch
qt/kde-unstable/qdoc3.patch
--------------+
PKGBUILD | 51 ++++++++++++---------------------------------------
phonon.patch | 38 --------------------------------------
qdoc3.patch | 21 ---------------------
3 files changed, 12 insertions(+), 98 deletions(-)
Modified: kde-unstable/PKGBUILD
===================================================================
--- trunk/PKGBUILD 2009-12-02 23:07:17 UTC (rev 60302)
+++ kde-unstable/PKGBUILD 2009-12-02 23:26:40 UTC (rev 60303)
@@ -2,52 +2,29 @@
# Maintainer: Pierre Schmitz <pierre at archlinux.de>
pkgname=qt
-pkgver=4.5.3
-pkgrel=3
-_kdeqtver=063bded33b417cdf92fd51366fc7fdb06dea00ba
+pkgver=4.6.0
+pkgrel=2
pkgdesc='A cross-platform application and UI framework'
arch=('i686' 'x86_64')
-url='http://www.qtsoftware.com/'
+url='http://qt.nokia.com/'
license=('GPL3' 'LGPL')
-depends=('libpng' 'mesa' 'fontconfig' 'libtiff>=3.8.2-5' 'libmng>=1.0.10-2' 'sqlite3' 'xdg-utils' 'hicolor-icon-theme'
- 'libxrandr' 'glib2' 'libxi' 'dbus' 'libxcursor' 'libxinerama' 'libxrender' 'gstreamer0.10-base-plugins'
- 'ca-certificates')
+depends=('libpng' 'mesa' 'fontconfig' 'libtiff' 'libmng' 'sqlite3' 'xdg-utils' 'hicolor-icon-theme' 'alsa-lib'
+ 'libxrandr' 'glib2' 'libxi' 'dbus' 'libxcursor' 'libxinerama' 'libxrender' 'ca-certificates')
optdepends=('postgresql-libs' 'libmysqlclient' 'unixodbc')
makedepends=('inputproto' 'postgresql-libs' 'mysql' 'unixodbc' 'cups' 'libxfixes' 'gtk2')
install=qt.install
-provides=("qt4=${pkgver}" 'phonon')
-replaces=('qt4' 'phonon')
-conflicts=('qt4' 'phonon')
options=('!libtool')
-_pkgfqn="qt-x11-opensource-src-${pkgver}"
-source=("ftp://ftp.qtsoftware.com/qt/source/${_pkgfqn}.tar.gz"
- "ftp://ftp.archlinux.org/other/kde-qt/kde-qt-${_kdeqtver}.patch.gz"
- 'gstreamer-logo.png'
+_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'
- 'qdoc3.patch' 'phonon.patch' 'ca-certificates.patch')
-md5sums=('3988cf9af68be2df8a8000ede231de9b'
- 'a8b984c95ea658116a7b4f632ae93596'
- 'f0c26f76acf8b6a3297cfb31f872b0b7'
+ 'ca-certificates.patch')
+md5sums=('2a7b5126f2450d8525af355fc4c12ad6'
'a445c6917086d80f1cfc1e40cb6b0132'
'd457f0a0ad68a3861c3cadefe3b42ded'
'668331d9798a0e2b94381efb7be4c513'
'c29f2993d6a0f73d756d2fa36e130e1c'
- 'a7e450751f42bdff17e57fdc4af72a18'
- 'ca0debc49d3505423e3b5742fdbfd852'
'd5c4cad7af93f1d736d4569a207bd739')
-_create-kdeqt-patch() {
- local codir=$(mktemp -d)
- mkdir -p "${codir}/kde-qt"
- git clone git://gitorious.org/+kde-developers/qt/kde-qt.git "${codir}/kde-qt"
- pushd "${codir}/kde-qt"
- local kdeqtver=$(git --no-pager show --format='%H' "${pkgver}-patched" | head -1)
- git diff "v${pkgver}..${pkgver}-patched" | gzip > "${codir}/kde-qt-${kdeqtver}.patch.gz"
- popd
- mv "${codir}/kde-qt-${kdeqtver}.patch.gz" .
- rm -rf "${codir}"
-}
-
build() {
unset QMAKESPEC
export QT4DIR=$srcdir/$_pkgfqn
@@ -55,13 +32,8 @@
export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH}
cd $srcdir/$_pkgfqn
- patch -p1 -i $srcdir/kde-qt-${_kdeqtver}.patch || return 1
# see http://cvs.fedoraproject.org/viewvc/rpms/qt/devel/
- # enable qdoc3
- patch -p1 -i $srcdir/qdoc3.patch || return 1
- # install service files needed by KDE
- patch -p1 -i $srcdir/phonon.patch || return 1
# use system ssl cert bundle
patch -p1 -i $srcdir/ca-certificates.patch || return 1
@@ -81,7 +53,8 @@
-plugin-sql-{psql,mysql,sqlite,odbc} \
-system-sqlite \
-xmlpatterns \
- -phonon \
+ -no-phonon \
+ -no-phonon-backend \
-svg \
-webkit \
-scripttools \
@@ -102,6 +75,7 @@
-no-separate-debug-info \
-gtkstyle \
-opengl \
+ -no-openvg \
-glib
make
}
@@ -118,7 +92,6 @@
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 -p -D -m644 ${srcdir}/gstreamer-logo.png ${pkgdir}/usr/share/icons/hicolor/128x128/apps/phonon-gstreamer.png
install -d ${pkgdir}/usr/share/applications
install -m644 ${srcdir}/{linguist,designer,assistant,qtconfig}.desktop ${pkgdir}/usr/share/applications/
Deleted: kde-unstable/gstreamer-logo.png
===================================================================
(Binary files differ)
Deleted: kde-unstable/phonon.patch
===================================================================
--- trunk/phonon.patch 2009-12-02 23:07:17 UTC (rev 60302)
+++ kde-unstable/phonon.patch 2009-12-02 23:26:40 UTC (rev 60303)
@@ -1,38 +0,0 @@
-diff -ur qt-orig/src/phonon/phonon.pro qt-x11-opensource-src-4.5.2/src/phonon/phonon.pro
---- qt-orig/src/phonon/phonon.pro 2009-06-20 06:57:57.000000000 +0200
-+++ qt-x11-opensource-src-4.5.2/src/phonon/phonon.pro 2009-06-25 19:30:00.000000000 +0200
-@@ -112,4 +112,9 @@
- DEFINES += QT_NO_DBUS
- }
-
-+# install dbus service file
-+sources.files = $$PHONON_DIR/org.kde.Phonon.AudioOutput.xml
-+sources.path = /usr/share/dbus-1/interfaces
-+INSTALLS += sources
-+
- contains(QT_CONFIG, reduce_exports): CONFIG += hide_symbols
-diff -ur qt-orig/src/plugins/phonon/gstreamer/gstreamer.pro qt-x11-opensource-src-4.5.2/src/plugins/phonon/gstreamer/gstreamer.pro
---- qt-orig/src/plugins/phonon/gstreamer/gstreamer.pro 2009-06-20 06:57:58.000000000 +0200
-+++ qt-x11-opensource-src-4.5.2/src/plugins/phonon/gstreamer/gstreamer.pro 2009-06-25 19:31:36.000000000 +0200
-@@ -62,6 +62,8 @@
- }
-
- target.path = $$[QT_INSTALL_PLUGINS]/phonon_backend
--INSTALLS += target
-+services.files = $$PHONON_GSTREAMER_DIR/gstreamer.desktop
-+services.path = /usr/share/kde4/services/phononbackends
-+INSTALLS += target services
-
- include(../../qpluginbase.pri)
-diff -ur qt-orig/src/3rdparty/phonon/gstreamer/gstreamer.desktop qt-x11-opensource-src-4.5.2/src/3rdparty/phonon/gstreamer/gstreamer.desktop
---- qt-orig/src/3rdparty/phonon/gstreamer/gstreamer.desktop 2009-06-20 06:57:54.000000000 +0200
-+++ qt-x11-opensource-src-4.5.2/src/3rdparty/phonon/gstreamer/gstreamer.desktop 2009-06-25 19:30:00.000000000 +0200
-@@ -2,7 +2,7 @@
- Type=Service
- X-KDE-ServiceTypes=PhononBackend
- MimeType=application/x-annodex;video/quicktime;video/x-quicktime;audio/x-m4a;application/x-quicktimeplayer;video/mkv;video/msvideo;video/x-msvideo;video/x-flic;audio/x-aiff;audio/aiff;audio/x-pn-aiff;audio/x-realaudio;audio/basic;audio/x-basic;audio/x-pn-au;audio/x-8svx;audio/8svx;audio/x-16sv;audio/168sv;image/x-ilbm;image/ilbm;video/x-anim;video/anim;image/png;image/x-png;video/mng;video/x-mng;audio/x-ogg;audio/x-speex+ogg;application/ogg;application/ogg;audio/vnd.rn-realaudio;audio/x-pn-realaudio-plugin;audio/x-real-audio;application/vnd.rn-realmedia;video/mpeg;video/x-mpeg;audio/x-wav;audio/wav;audio/x-pn-wav;audio/x-pn-windows-acm;audio/mpeg2;audio/x-mpeg2;audio/mpeg3;audio/x-mpeg3;audio/mpeg;audio/x-mpeg;x-mpegurl;audio/x-mpegurl;audio/mp3;audio/mpeg;
--X-KDE-Library=phonon_gstreamer
-+X-KDE-Library=libphonon_gstreamer
- X-KDE-PhononBackendInfo-InterfaceVersion=1
- X-KDE-PhononBackendInfo-Version=0.1
- X-KDE-PhononBackendInfo-Website=http://gstreamer.freedesktop.org/
Deleted: kde-unstable/qdoc3.patch
===================================================================
--- trunk/qdoc3.patch 2009-12-02 23:07:17 UTC (rev 60302)
+++ kde-unstable/qdoc3.patch 2009-12-02 23:26:40 UTC (rev 60303)
@@ -1,21 +0,0 @@
-diff -ur qt-orig/tools/qdoc3/qdoc3.pro qt-4.5.2/tools/qdoc3/qdoc3.pro
---- qt-orig/tools/qdoc3/qdoc3.pro 2009-06-20 06:57:59.000000000 +0200
-+++ qt-4.5.2/tools/qdoc3/qdoc3.pro 2009-06-25 20:00:12.000000000 +0200
-@@ -99,3 +99,6 @@
- webxmlgenerator.cpp \
- yyindent.cpp
-
-+TARGET= qdoc3
-+target.path = $$[QT_INSTALL_BINS]
-+INSTALLS += target
-diff -ur qt-orig/tools/tools.pro qt-4.5.2/tools/tools.pro
---- qt-orig/tools/tools.pro 2009-06-20 06:57:59.000000000 +0200
-+++ qt-4.5.2/tools/tools.pro 2009-06-25 19:59:19.000000000 +0200
-@@ -13,6 +13,7 @@
- SUBDIRS += designer
- }
- SUBDIRS += linguist
-+ SUBDIRS += qdoc3
- wince*: SUBDIRS = qtestlib designer
- unix:!mac:!embedded:contains(QT_CONFIG, qt3support):SUBDIRS += qtconfig
- win32:!wince*:SUBDIRS += activeqt
More information about the arch-commits
mailing list