[arch-commits] Commit in qt/repos (10 files)
Pierre Schmitz
pierre at archlinux.org
Sat Mar 7 12:11:13 UTC 2009
Date: Saturday, March 7, 2009 @ 07:11:13
Author: pierre
Revision: 29249
Merged revisions 29202,29243 via svnmerge from
svn+ssh://svn.archlinux.org/srv/svn-packages/qt/trunk
........
r29202 | pierre | 2009-03-06 15:12:42 +0100 (Fr, 06 M?\195?\164r 2009) | 1 line
upgpkg: qt 4.5.0-2
........
r29243 | pierre | 2009-03-07 12:14:13 +0100 (Sa, 07 M?\195?\164r 2009) | 1 line
upgpkg: qt 4.5.0-2
........
Added:
qt/repos/testing-i686/assistant.desktop
(from rev 29243, qt/trunk/assistant.desktop)
qt/repos/testing-i686/designer.desktop
(from rev 29243, qt/trunk/designer.desktop)
qt/repos/testing-i686/linguist.desktop
(from rev 29243, qt/trunk/linguist.desktop)
qt/repos/testing-i686/qdoc3.patch
(from rev 29243, qt/trunk/qdoc3.patch)
qt/repos/testing-i686/qtconfig.desktop
(from rev 29243, qt/trunk/qtconfig.desktop)
Modified:
qt/repos/testing-i686/ (properties)
qt/repos/testing-i686/PKGBUILD
Deleted:
qt/repos/testing-i686/qt4-assistant.desktop
qt/repos/testing-i686/qt4-designer.desktop
qt/repos/testing-i686/qt4-linguist.desktop
-----------------------+
PKGBUILD | 34 +++++++++++++++++++++-------------
assistant.desktop | 8 ++++++++
designer.desktop | 9 +++++++++
linguist.desktop | 9 +++++++++
qdoc3.patch | 22 ++++++++++++++++++++++
qt4-assistant.desktop | 10 ----------
qt4-designer.desktop | 11 -----------
qt4-linguist.desktop | 11 -----------
qtconfig.desktop | 8 ++++++++
9 files changed, 77 insertions(+), 45 deletions(-)
Property changes on: qt/repos/testing-i686
___________________________________________________________________
Modified: svnmerge-integrated
- /qt/trunk:1-29017
+ /qt/trunk:1-29248
Modified: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD 2009-03-07 11:59:18 UTC (rev 29248)
+++ testing-i686/PKGBUILD 2009-03-07 12:11:13 UTC (rev 29249)
@@ -3,29 +3,32 @@
pkgname=qt
pkgver=4.5.0
-pkgrel=1
-_qtcopyver=934513
+pkgrel=2
+_qtcopyver=936035
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')
+ 'assistant.desktop' 'designer.desktop' 'linguist.desktop' 'qtconfig.desktop'
+ 'qdoc3.patch')
md5sums=('55e8c74a89e1bc128a5a6f1ff6b8b5ba'
- 'fa08fc4d226e71f125b771e7aeedd190'
- 'c95e1697bf2b923199c3b8cd7d485a17'
- '00333dca87e24767383217ba378b5980'
- '71f7ac8206c19da7ecf71cdb391f0452')
+ 'c1847bd4ba2240a849dfe34bb5486d26'
+ 'b352b4b70faba2571af3fce5d119580a'
+ '491a96682faa03407f768a53cca71db5'
+ 'cda7ed7e132689991dc2968a0043b4b0'
+ '717669b728a0a795217d2f52969e454c'
+ '868056a3edab09fbac0f82ec8b4a4be3')
build() {
unset QMAKESPEC
@@ -39,6 +42,8 @@
patch -p0 -i $i || return 1
done
+ patch -p1 -i $srcdir/qdoc3.patch || return 1
+
./configure -confirm-license \
-silent \
-prefix /usr \
@@ -46,8 +51,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 \
@@ -64,8 +71,9 @@
install -D -m644 tools/assistant/tools/assistant/images/assistant.png ${pkgdir}/usr/share/pixmaps/assistant.png
install -D -m644 tools/linguist/linguist/images/appicon.png ${pkgdir}/usr/share/pixmaps/linguist.png
install -D -m644 tools/designer/src/designer/images/designer.png ${pkgdir}/usr/share/pixmaps/designer.png
+ install -D -m644 src/gui/dialogs/images/qtlogo-64.png ${pkgdir}/usr/share/pixmaps/qtlogo.png
install -d ${pkgdir}/usr/share/applications
- install -m644 ${srcdir}/qt4-{linguist,designer,assistant}.desktop ${pkgdir}/usr/share/applications/
+ install -m644 ${srcdir}/{linguist,designer,assistant,qtconfig}.desktop ${pkgdir}/usr/share/applications/
# cleanup and path fixes
find $pkgdir/usr/lib -type f -name '*prl' -print -exec sed -i -e "/^QMAKE_PRL_BUILD_DIR/d" {} \;
Copied: qt/repos/testing-i686/assistant.desktop (from rev 29243, qt/trunk/assistant.desktop)
===================================================================
--- testing-i686/assistant.desktop (rev 0)
+++ testing-i686/assistant.desktop 2009-03-07 12:11:13 UTC (rev 29249)
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Exec=/usr/bin/assistant
+Name=Qt Assistant
+GenericName=Qt Document Browser
+Icon=/usr/share/pixmaps/assistant.png
+Terminal=false
+Type=Application
+Categories=Qt;Development;Documentation
Copied: qt/repos/testing-i686/designer.desktop (from rev 29243, qt/trunk/designer.desktop)
===================================================================
--- testing-i686/designer.desktop (rev 0)
+++ testing-i686/designer.desktop 2009-03-07 12:11:13 UTC (rev 29249)
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Exec=/usr/bin/designer
+Name=Qt Designer
+GenericName=Interface Designer
+MimeType=application/x-designer
+Icon=/usr/share/pixmaps/designer.png
+Terminal=false
+Type=Application
+Categories=Qt;Development;GUIDesigner
Copied: qt/repos/testing-i686/linguist.desktop (from rev 29243, qt/trunk/linguist.desktop)
===================================================================
--- testing-i686/linguist.desktop (rev 0)
+++ testing-i686/linguist.desktop 2009-03-07 12:11:13 UTC (rev 29249)
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Exec=/usr/bin/linguist
+Name=Qt Linguist
+GenericName=Translation Tool
+MimeType=application/x-linguist
+Terminal=false
+Type=Application
+Icon=/usr/share/pixmaps/linguist.png
+Categories=Qt;Development;Translation
Copied: qt/repos/testing-i686/qdoc3.patch (from rev 29243, qt/trunk/qdoc3.patch)
===================================================================
--- testing-i686/qdoc3.patch (rev 0)
+++ testing-i686/qdoc3.patch 2009-03-07 12:11:13 UTC (rev 29249)
@@ -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
Deleted: testing-i686/qt4-assistant.desktop
===================================================================
--- testing-i686/qt4-assistant.desktop 2009-03-07 11:59:18 UTC (rev 29248)
+++ testing-i686/qt4-assistant.desktop 2009-03-07 12:11:13 UTC (rev 29249)
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Exec=/usr/bin/assistant
-Name=Qt 4 Assistant
-GenericName=Qt4 Document Browser
-X-KDE-StartupNotify=true
-Icon=/usr/share/pixmaps/assistant.png
-Terminal=false
-Type=Application
-Categories=Qt;Development;Documentation
Deleted: testing-i686/qt4-designer.desktop
===================================================================
--- testing-i686/qt4-designer.desktop 2009-03-07 11:59:18 UTC (rev 29248)
+++ testing-i686/qt4-designer.desktop 2009-03-07 12:11:13 UTC (rev 29249)
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Exec=/usr/bin/designer
-Name=Qt 4 Designer
-GenericName=Interface Designer
-X-KDE-StartupNotify=true
-MimeType=application/x-designer
-Icon=/usr/share/pixmaps/designer.png
-Terminal=false
-Type=Application
-Categories=Qt;Development;GUIDesigner
Deleted: testing-i686/qt4-linguist.desktop
===================================================================
--- testing-i686/qt4-linguist.desktop 2009-03-07 11:59:18 UTC (rev 29248)
+++ testing-i686/qt4-linguist.desktop 2009-03-07 12:11:13 UTC (rev 29249)
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Exec=/usr/bin/linguist
-Name=Qt 4 Linguist
-GenericName=Translation Tool
-X-KDE-StartupNotify=true
-MimeType=application/x-linguist
-Terminal=false
-Type=Application
-Icon=/usr/share/pixmaps/linguist.png
-Categories=Qt;Development;Translation
Copied: qt/repos/testing-i686/qtconfig.desktop (from rev 29243, qt/trunk/qtconfig.desktop)
===================================================================
--- testing-i686/qtconfig.desktop (rev 0)
+++ testing-i686/qtconfig.desktop 2009-03-07 12:11:13 UTC (rev 29249)
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=Qt Config
+Comment=Configure Qt behavior, styles, fonts
+Exec=/usr/bin/qtconfig
+Icon=/usr/share/pixmaps/qtlogo
+Terminal=false
+Type=Application
+Categories=Qt;Settings;
More information about the arch-commits
mailing list