[arch-commits] Commit in qt/trunk (5 files)
Andrea Scarpino
andrea at nymeria.archlinux.org
Sun Feb 24 14:31:55 UTC 2013
Date: Sunday, February 24, 2013 @ 15:31:55
Author: andrea
Revision: 178498
Use the qt5 prefix for the modules; Fix deps
Added:
qt/trunk/qt5-base.install
qt/trunk/qt5-tools.install
Modified:
qt/trunk/PKGBUILD
Deleted:
qt/trunk/qtbase.install
qt/trunk/qttools.install
-------------------+
PKGBUILD | 56 ++++++++++++++++++++++++++--------------------------
qt5-base.install | 11 ++++++++++
qt5-tools.install | 12 +++++++++++
qtbase.install | 11 ----------
qttools.install | 12 -----------
5 files changed, 51 insertions(+), 51 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-02-24 14:29:04 UTC (rev 178497)
+++ PKGBUILD 2013-02-24 14:31:55 UTC (rev 178498)
@@ -2,12 +2,12 @@
# Maintainer: Andrea Scarpino <andrea at archlinux.org>
pkgbase=qt
-pkgname=('qtbase'
- 'qtdeclarative'
- 'qtmultimedia'
- 'qt-addons'
- 'qttools'
- 'qtwebkit')
+pkgname=('qt5-base'
+ 'qt5-declarative'
+ 'qt5-multimedia'
+ 'qt5-addons'
+ 'qt5-tools'
+ 'qt5-webkit')
pkgver=5.0.1
pkgrel=1
arch=('i686' 'x86_64')
@@ -67,7 +67,7 @@
make
}
-package_qtbase() {
+package_qt5-base() {
pkgdesc=('A cross-platform application and UI framework (Qt Core, Qt GUI, Qt Network, Qt SQL, Qt Widgets)')
depends=('libjpeg-turbo' 'xcb-util-keysyms' 'libgl' 'dbus' 'fontconfig' 'systemd'
'xcb-util-wm' 'libxrender' 'libxi' 'sqlite' 'libpng' 'xcb-util-image'
@@ -77,7 +77,7 @@
'unixodbc: ODBC driver'
'libfbclient: Firebird/iBase driver')
conflicts=('qt' 'qt-private-headers')
- install='qtbase.install'
+ install='qt5-base.install'
cd ${_pkgfqn}/qtbase
make INSTALL_ROOT="${pkgdir}" install
@@ -97,22 +97,28 @@
-exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \;
}
-package_qtdeclarative() {
+package_qt5-declarative() {
pkgdesc=('A cross-platform application and UI framework (Qt QML)')
- depends=('qtbase')
+ depends=('qt5-base')
conflicts=('qt' 'qt-private-headers')
cd ${_pkgfqn}/qtdeclarative
make INSTALL_ROOT="${pkgdir}" install
+
+ cd ../../${_pkgfqn}/qtjsbackend
+ make INSTALL_ROOT="${pkgdir}" install
+
+ cd ../../${_pkgfqn}/qtxmlpatterns
+ make INSTALL_ROOT="${pkgdir}" install
# 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_qtmultimedia() {
+package_qt5-multimedia() {
pkgdesc=('A cross-platform application and UI framework (Qt Multimedia)')
- depends=('qtbase' 'libpulse' 'gstreamer0.10-base' 'qtdeclarative')
+ depends=('qt5-declarative' 'libpulse' 'gstreamer0.10-base')
conflicts=('qt')
cd ${_pkgfqn}/qtmultimedia
@@ -123,10 +129,10 @@
-exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \;
}
-package_qt-addons() {
+package_qt5-addons() {
pkgdesc=('A cross-platform application and UI framework (Qt Add-ons Modules)')
- depends=('qtbase' 'qtwebkit' 'libtiff')
- conflicts=('qt')
+ depends=('qt5-webkit' 'libtiff')
+ conflicts=('qt' 'qtwebkit')
cd ${_pkgfqn}/qtgraphicaleffects
make INSTALL_ROOT="${pkgdir}" install
@@ -134,9 +140,6 @@
cd ../../${_pkgfqn}/qtimageformats
make INSTALL_ROOT="${pkgdir}" install
- cd ../../${_pkgfqn}/qtjsbackend
- make INSTALL_ROOT="${pkgdir}" install
-
cd ../../${_pkgfqn}/qtquick1
make INSTALL_ROOT="${pkgdir}" install
@@ -146,20 +149,17 @@
cd ../../${_pkgfqn}/qtsvg
make INSTALL_ROOT="${pkgdir}" install
- cd ../../${_pkgfqn}/qtxmlpatterns
- make INSTALL_ROOT="${pkgdir}" install
-
# 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_qttools() {
+package_qt5-tools() {
pkgdesc=('A cross-platform application and UI framework (Development Tools)')
- depends=('qtbase' 'qtwebkit' 'desktop-file-utils')
- optdepends=('qt-doc: documentation')
- conflicts=('qt')
- install='qttools.install'
+ depends=('qt5-webkit' 'desktop-file-utils')
+ optdepends=('qt5-doc: documentation')
+ conflicts=('qt' 'qtwebkit')
+ install='qt5-tools.install'
cd ${_pkgfqn}/qttools
make INSTALL_ROOT="${pkgdir}" install
@@ -186,9 +186,9 @@
-exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \;
}
-package_qtwebkit() {
+package_qt5-webkit() {
pkgdesc=('An open source web browser engine (Qt port of WebKit)')
- depends=('qtbase' 'gstreamer0.10-base' 'icu')
+ depends=('qt5-declarative' 'gstreamer0.10-base' 'icu')
cd ${_pkgfqn}/qtwebkit
make INSTALL_ROOT="${pkgdir}" install
Added: qt5-base.install
===================================================================
--- qt5-base.install (rev 0)
+++ qt5-base.install 2013-02-24 14:31:55 UTC (rev 178498)
@@ -0,0 +1,11 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Added: qt5-tools.install
===================================================================
--- qt5-tools.install (rev 0)
+++ qt5-tools.install 2013-02-24 14:31:55 UTC (rev 178498)
@@ -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: qtbase.install
===================================================================
--- qtbase.install 2013-02-24 14:29:04 UTC (rev 178497)
+++ qtbase.install 2013-02-24 14:31:55 UTC (rev 178498)
@@ -1,11 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Deleted: qttools.install
===================================================================
--- qttools.install 2013-02-24 14:29:04 UTC (rev 178497)
+++ qttools.install 2013-02-24 14:31:55 UTC (rev 178498)
@@ -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
-}
More information about the arch-commits
mailing list