remove redundant qt4pluginpath.sh and add chakra-common as dependency.

rebuild oxygen and breeze, remove qt4 from chakra-common dependency and
add qt5-base.
This commit is contained in:
Weng Xuetian 2015-10-10 20:42:14 +02:00
parent c1f050ecf8
commit cd38e8d082
6 changed files with 10 additions and 20 deletions

View File

@ -57,6 +57,6 @@ package_breeze-kde4() {
make DESTDIR="${pkgdir}" install
# needed for pure Qt4 apps
install -d "$pkgdir"/usr/lib/qt4/plugins/styles
ln -s /usr/lib/kde4/plugins/styles/breeze.so "$pkgdir"/usr/lib/qt4/plugins/styles
install -d "$pkgdir"/usr/lib/qt/plugins/styles
ln -s /usr/lib/kde4/plugins/styles/breeze.so "$pkgdir"/usr/lib/qt/plugins/styles
}

View File

@ -4,7 +4,7 @@ source ../kdeapps.conf
pkgname=chakra-common
arch=('x86_64')
pkgver=${_kdever}
pkgrel=1
pkgrel=2
pkgdesc="Common configuration files, scripts and artwork"
url="http://www.chakraos.org"
license=('GPL'
@ -14,7 +14,7 @@ options=('!debug'
groups=("kde"
"kde-minimal"
"kde-uninstall")
depends=("${_qtpkg}>=${_qtver}"
depends=("qt5-base"
'pinentry'
'openssh'
'bash>=4.2'
@ -80,7 +80,7 @@ sha256sums=('9b2cdc947f1da2c56d0f009ff470f7aa9021f214a2470c33ee4628281b7c1163'
'2ea8bc1cbe178d66f3560d166e4158d1ce953a349d8c7658891f5600736e67b7'
'da64dc6bc248703da7eb8ad38af73b87c9836b3b35cf0529e988a69ee5922e8b'
'b20160225a990513ae58027b7e70bb958253da881be02f296e54e9ccca09b348'
'e4a44b4ed3130d1fa309a6b5c829461ec09ec595c31cd4a8715d79942fe8f0ef'
'904b6dbc2b8ed914e89a6b13ef1a6de9b5ec6c5c3bf7dbe4b3ff5ca876a4e470'
'530ecdbe32c8f33991cd6c2ccf29212f28bb4462d1844f5acba335b5984a9347'
'9e0c9408c9bc12aeca2fd66a4723b57a6878307ba956df7cca43f8112dd71429'
'0e419422afb09ccebd3f532cde784e97adfd5ad7816701c17966597f54915bfc')

View File

@ -11,7 +11,7 @@
# properly kill the agents when the session ends.
if [ -x /usr/bin/gpg-agent ]; then
eval "$(/usr/bin/gpg-agent --daemon --pinentry-program /usr/bin/pinentry-qt4)"
eval "$(/usr/bin/gpg-agent --daemon --pinentry-program /usr/bin/pinentry-qt)"
fi
#
if [ -x /usr/bin/ssh-agent ]; then

View File

@ -64,6 +64,6 @@ package_oxygen-kde4() {
make DESTDIR="${pkgdir}" install
# needed so that pure Qt4 apps are correctly themed
install -d -m755 "$pkgdir"/usr/lib/qt4/plugins/styles
ln -s /usr/lib/kde4/plugins/styles/oxygen.so "$pkgdir"/usr/lib/qt4/plugins/styles
install -d -m755 "$pkgdir"/usr/lib/qt/plugins/styles
ln -s /usr/lib/kde4/plugins/styles/oxygen.so "$pkgdir"/usr/lib/qt/plugins/styles
}

View File

@ -4,7 +4,7 @@ source ../plasma.conf
pkgbase=plasma-workspace
pkgname=('plasma-workspace' 'drkonqi')
pkgver=${PVersion}
pkgrel=2
pkgrel=3
pkgdesc='KDE Plasma Workspace'
arch=('x86_64')
url='https://projects.kde.org/projects/kde/workspace/plasma-workspace'
@ -12,18 +12,16 @@ license=('LGPL')
depends=('knewstuff' 'kjsembed' 'knotifyconfig' 'libxdamage' 'kwayland' 'kglobalaccel'
'libksysguard' 'libkscreen-kf5' 'ktexteditor' 'kxmlrpcclient' 'libqalculate' 'networkmanager-qt' 'kfilemetadata'
'qt5-tools' 'kded' 'kde-cli-tools' 'xorg-xrdb' 'xorg-xsetroot' 'xorg-apps' 'xorg-utils'
'prison-kf5' 'milou')
'prison-kf5' 'milou' 'chakra-common')
makedepends=('extra-cmake-modules' 'kdoctools' 'kwin' 'gpsd' 'baloo-kf5' 'krunner' 'kdewebkit')
groups=('plasma')
options=("debug")
source=("${PServer}/${pkgver}/${pkgname}-${PSubVersion}.tar.xz"
kde.pam
qt4pluginpath.sh
dbus-update-environment.patch
startkde.patch)
sha256sums=( $(getSum ${pkgname} | head -n1)
'44a7c7acee30547dd41d0a593486b29df4eaa5c3707287b87e23b1104de3964a'
'498aef1b2e5573d82634e9a359c5cdcc6c8b41e803aa648e02ee02cde11b53fd'
'85efd33aee50703df1afe08df1485738b7f0c6f144dd32fb3d189380d81ee313'
'850c1057e335215dc6cba4e9c713e1dc61a41570a738fa87ce06c1322dd1ae19')
@ -51,10 +49,6 @@ package_plasma-workspace() {
install -D "${srcdir}"/kde.pam \
"${pkgdir}"/etc/pam.d/kde
# enable QT4 style integration in KDE4 apps
install -D "${srcdir}"/qt4pluginpath.sh \
"${pkgdir}"/etc/profile.d/qt4pluginpath.sh
# Remove conflicts with drkonqi
rm "${pkgdir}"/usr/lib/drkonqi

View File

@ -1,4 +0,0 @@
#!/bin/sh
# https://www.mail-archive.com/debian-bugs-dist@lists.debian.org/msg1337422.html
export QT_PLUGIN_PATH=/usr/lib/qt4/plugins/:/usr/lib/kde4/plugins/