[arch-commits] Commit in qt/trunk (PKGBUILD qdoc3.patch)
Pierre Schmitz
pierre at archlinux.org
Fri Mar 6 14:12:42 UTC 2009
Date: Friday, March 6, 2009 @ 09:12:42
Author: pierre
Revision: 29202
upgpkg: qt 4.5.0-2
Added:
qt/trunk/qdoc3.patch
Modified:
qt/trunk/PKGBUILD
-------------+
PKGBUILD | 22 ++++++++++++++--------
qdoc3.patch | 22 ++++++++++++++++++++++
2 files changed, 36 insertions(+), 8 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2009-03-06 14:03:30 UTC (rev 29201)
+++ PKGBUILD 2009-03-06 14:12:42 UTC (rev 29202)
@@ -3,29 +3,31 @@
pkgname=qt
pkgver=4.5.0
-pkgrel=1
+pkgrel=2
_qtcopyver=934513
pkgdesc='A cross-platform application and UI framework'
arch=('i686' 'x86_64')
url='http://www.qtsoftware.com/'
license=('GPL3' 'LGPL')
-depends=('libpng' 'mesa' 'fontconfig' 'libtiff' 'libmng' 'sqlite3' 'libxrandr' 'glib2' 'libxi' 'dbus' 'libxcursor' 'libxinerama')
+depends=('libpng' 'mesa' 'fontconfig' 'libtiff' 'libmng' 'sqlite3' 'libxrandr' 'glib2' 'libxi' 'dbus' 'libxcursor' 'libxinerama' 'libxrender' 'gstreamer0.10-base')
optdepends=('postgresql-libs' 'libmysqlclient' 'unixodbc')
makedepends=('inputproto' 'postgresql-libs' 'mysql' 'unixodbc' 'cups' 'libxfixes')
-provides=("qt4=${pkgver}")
-replaces=('qt4')
-conflicts=('qt4')
+provides=("qt4=${pkgver}" 'phonon')
+replaces=('qt4' 'phonon')
+conflicts=('qt4' 'phonon')
options=('!libtool')
_pkgfqn="qt-x11-opensource-src-${pkgver}"
# svn export -r${_qtcopyver} svn://anonsvn.kde.org/home/kde/trunk/qt-copy/patches/ qt-copy-patches-${_qtcopyver}
source=("ftp://ftp.qtsoftware.com/qt/source/${_pkgfqn}.tar.bz2"
"ftp://ftp.archlinux.org/other/qt/qt-copy-patches-${_qtcopyver}.tar.bz2"
- 'qt4-assistant.desktop' 'qt4-designer.desktop' 'qt4-linguist.desktop')
+ 'qt4-assistant.desktop' 'qt4-designer.desktop' 'qt4-linguist.desktop'
+ 'qdoc3.patch')
md5sums=('55e8c74a89e1bc128a5a6f1ff6b8b5ba'
'fa08fc4d226e71f125b771e7aeedd190'
'c95e1697bf2b923199c3b8cd7d485a17'
'00333dca87e24767383217ba378b5980'
- '71f7ac8206c19da7ecf71cdb391f0452')
+ '71f7ac8206c19da7ecf71cdb391f0452'
+ '868056a3edab09fbac0f82ec8b4a4be3')
build() {
unset QMAKESPEC
@@ -39,6 +41,8 @@
patch -p0 -i $i || return 1
done
+ patch -p1 -i $srcdir/qdoc3.patch || return 1
+
./configure -confirm-license \
-silent \
-prefix /usr \
@@ -46,8 +50,10 @@
-plugindir /usr/lib/qt/plugins \
-translationdir /usr/share/qt/translations \
-datadir /usr/share/qt \
+ -docdir /usr/share/doc/qt \
+ -examplesdir /usr/share/doc/qt/examples \
+ -demosdir /usr/share/doc/qt/demos \
-no-separate-debug-info \
- -no-phonon \
-plugin-sql-{psql,mysql,sqlite,odbc} \
-system-sqlite \
-openssl-linked \
Added: qdoc3.patch
===================================================================
--- qdoc3.patch (rev 0)
+++ qdoc3.patch 2009-03-06 14:12:42 UTC (rev 29202)
@@ -0,0 +1,22 @@
+diff -up qt-x11-opensource-src-4.5.0/tools/qdoc3/qdoc3.pro.qdoc3 qt-x11-opensource-src-4.5.0/tools/qdoc3/qdoc3.pro
+--- qt-x11-opensource-src-4.5.0/tools/qdoc3/qdoc3.pro.qdoc3 2009-02-25 15:09:26.000000000 -0600
++++ qt-x11-opensource-src-4.5.0/tools/qdoc3/qdoc3.pro 2009-03-04 09:30:05.000000000 -0600
+@@ -106,3 +106,7 @@ win32 {
+ QT_WINCONFIG = debug
+ }
+ }
++
++TARGET= qdoc3
++target.path = $$[QT_INSTALL_BINS]
++INSTALLS += target
+diff -up qt-x11-opensource-src-4.5.0/tools/tools.pro.qdoc3 qt-x11-opensource-src-4.5.0/tools/tools.pro
+--- qt-x11-opensource-src-4.5.0/tools/tools.pro.qdoc3 2009-02-25 15:09:27.000000000 -0600
++++ qt-x11-opensource-src-4.5.0/tools/tools.pro 2009-03-04 09:44:18.000000000 -0600
+@@ -13,6 +13,7 @@ no-png {
+ SUBDIRS += designer
+ }
+ SUBDIRS += linguist
++ SUBDIRS += qdoc3
+ wince*: SUBDIRS = qtestlib designer
+ unix:!mac:!embedded:contains(QT_CONFIG, qt3support):SUBDIRS += qtconfig
+ win32:!wince*:!contains(QT_EDITION, OpenSource|Console):SUBDIRS += activeqt
More information about the arch-commits
mailing list