move qt5 to libxkbcommon-x11

This commit is contained in:
Weng Xuetian 2015-07-09 17:37:45 +00:00
parent a22ac6b2af
commit 75291d6ed8
2 changed files with 6 additions and 4 deletions

View File

@ -45,6 +45,8 @@ package_libxkbcommon() {
package_libxkbcommon-x11() {
pkgdesc="Keyboard handling library using XKB data for X11 XCB clients"
depends=(libxkbcommon libxcb)
conflicts=('libxkbcommon<=0.5.0-1')
replaces=('libxkbcommon<=0.5.0-1')
mv x11/* "$pkgdir"

View File

@ -30,7 +30,7 @@ pkgname=('qt5-base'
'qt5-x11extras'
'qt5-xmlpatterns')
pkgver=5.4.2
pkgrel=1
pkgrel=2
arch=('x86_64')
url='http://qt-project.org/'
license=('GPL3' 'LGPL' 'FDL' 'custom')
@ -39,7 +39,7 @@ makedepends=('libxcb' 'xcb-proto' 'xcb-util' 'xcb-util-image' 'xcb-util-wm' 'xcb
'libjpeg-turbo' 'cups' 'libpulse' 'hicolor-icon-theme' 'desktop-file-utils'
'postgresql-libs' 'libmariadbclient' 'sqlite3' 'unixodbc' 'libmng'
'python2' 'ruby' 'gperf' 'libxslt' 'libxcomposite' 'fontconfig' 'bluez'
'openal' 'libxkbcommon' 'mtdev' 'harfbuzz' 'libwebp' 'leveldb'
'openal' 'libxkbcommon-x11' 'mtdev' 'harfbuzz' 'libwebp' 'leveldb'
'libxcursor' 'libsm' 'libxrandr' 'libxv' 'libxi'
'xdg-utils' 'desktop-file-utils' 'libxinerama' 'libxfixes'
'geoclue' 'pciutils' 'nss'
@ -152,7 +152,7 @@ package_qt5-base() {
'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils' 'libxinerama' 'libxcursor'
'pulseaudio' 'gstreamer' 'gst-plugins-base' 'gst-plugins-ugly' 'gst-plugins-good'
'xcb-util-image' 'xcb-util-keysyms'
'xcb-util-renderutil' 'xcb-util-wm' 'libxkbcommon')
'xcb-util-renderutil' 'xcb-util-wm' 'libxkbcommon-x11')
optdepends=('postgresql-libs: PostgreSQL driver'
'libmariadbclient: MariaDB driver'
'unixodbc: ODBC driver'
@ -197,7 +197,7 @@ package_qt5-connectivity() {
package_qt5-declarative() {
pkgdesc='Classes for QML and JavaScript languages'
depends=('qt5-xmlpatterns' 'libxkbcommon')
depends=('qt5-xmlpatterns' 'libxkbcommon-x11')
options=("debug")
conflicts=('qt5')