prep RC2, pkrel reset, remove workspace reverse patch, kdelibs dep on qtwebkit, start of removing circular qt dep

This commit is contained in:
abveritas 2012-07-11 17:23:49 +00:00
parent f68de7b016
commit cb382e4853
5 changed files with 10 additions and 12 deletions

View File

@ -3,7 +3,7 @@
# #
post_install() { post_install() {
echo " " echo " "
echo " > KDE Software Compilation 4.8.95 (Rc1)" echo " > KDE Software Compilation 4.8.98 (Rc2)"
echo " > packaged by The Chakra Project" echo " > packaged by The Chakra Project"
echo " " echo " "
echo " Installation Prefix : /usr" echo " Installation Prefix : /usr"

View File

@ -12,7 +12,7 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
pkgname="kde-runtime" pkgname="kde-runtime"
arch=('i686' 'x86_64') arch=('i686' 'x86_64')
pkgver=${_kdever} pkgver=${_kdever}
pkgrel=2 pkgrel=1
pkgdesc="KDE Runtime" pkgdesc="KDE Runtime"
url="http://www.kde.org" url="http://www.kde.org"
license=('GPL' 'LGPL' 'FDL') license=('GPL' 'LGPL' 'FDL')

View File

@ -16,7 +16,7 @@ _default_wp="Ariya"
pkgname="kde-workspace" pkgname="kde-workspace"
arch=('i686' 'x86_64') arch=('i686' 'x86_64')
pkgver=${_kdever} pkgver=${_kdever}
pkgrel=2 pkgrel=1
pkgdesc="KDE Workspace" pkgdesc="KDE Workspace"
url="http://www.kde.org" url="http://www.kde.org"
license=('GPL' 'LGPL' 'FDL') license=('GPL' 'LGPL' 'FDL')
@ -73,8 +73,7 @@ source=($_mirror/${pkgname}-$_kdever.tar.xz
# "fix" some sytemsettings modules that need root access # "fix" some sytemsettings modules that need root access
fix_root-only-kcms.patch fix_root-only-kcms.patch
# shutdown-fix.patch # shutdown-fix.patch
sensors-fix.patch sensors-fix.patch)
workspace1.diff)
md5sums=(`grep ${pkgname}-$_kdever.tar.xz ../kde-sc.md5 | cut -d" " -f1` md5sums=(`grep ${pkgname}-$_kdever.tar.xz ../kde-sc.md5 | cut -d" " -f1`
`grep kde-wallpapers-$_kdever.tar.xz ../kde-sc.md5 | cut -d" " -f1` # kde-wallpapers `grep kde-wallpapers-$_kdever.tar.xz ../kde-sc.md5 | cut -d" " -f1` # kde-wallpapers
@ -99,8 +98,7 @@ md5sums=(`grep ${pkgname}-$_kdever.tar.xz ../kde-sc.md5 | cut -d" " -f1`
'814350c52c135d6f7bdada1e29223d38' # fix_terminate-server.patch '814350c52c135d6f7bdada1e29223d38' # fix_terminate-server.patch
'97a5eb51e6f9d460f0d61bb322a1db5e' # fix_kdm_configdef.patch '97a5eb51e6f9d460f0d61bb322a1db5e' # fix_kdm_configdef.patch
'5f963f80a026f0600edae1b1c70411e5' # fix_root-only-kcms.patch '5f963f80a026f0600edae1b1c70411e5' # fix_root-only-kcms.patch
'ecf3a9d6af9bdd3db0189e06ddf21034' # sensors-fix.patch 'ecf3a9d6af9bdd3db0189e06ddf21034') # sensors-fix.patch
'7d45f3d643910f989714a496722be4a9')
# #
# build function # build function
@ -122,8 +120,8 @@ build() {
patch -p0 -N -i ${srcdir}/fix_kdm_configdef.patch patch -p0 -N -i ${srcdir}/fix_kdm_configdef.patch
patch -Np1 -i ${srcdir}/fix_root-only-kcms.patch patch -Np1 -i ${srcdir}/fix_root-only-kcms.patch
msg "Upstream fixes" #msg "Upstream fixes"
patch -RNp1 -i ${srcdir}/workspace1.diff #patch -RNp1 -i ${srcdir}/workspace1.diff
msg "starting workspace build ..." msg "starting workspace build ..."
cmake . -DCMAKE_BUILD_TYPE=${_build_type} \ cmake . -DCMAKE_BUILD_TYPE=${_build_type} \

View File

@ -54,7 +54,7 @@ pkgname=('kdegames-common'
arch=('i686' 'x86_64') arch=('i686' 'x86_64')
pkgver=${_kdever} pkgver=${_kdever}
pkgrel=2 pkgrel=1
pkgdesc="split package" pkgdesc="split package"
url="http://www.kde.org" url="http://www.kde.org"

View File

@ -13,7 +13,7 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
pkgname="kdelibs" pkgname="kdelibs"
arch=('i686' 'x86_64') arch=('i686' 'x86_64')
pkgver=${_kdever} pkgver=${_kdever}
pkgrel=2 pkgrel=1
pkgdesc="KDE Core Libraries" pkgdesc="KDE Core Libraries"
url="http://www.kde.org" url="http://www.kde.org"
license=('GPL' 'LGPL' 'FDL') license=('GPL' 'LGPL' 'FDL')
@ -22,7 +22,7 @@ depends=("${_qtpkg}>=${_qtver}" "kde-common>=${_kdever}" "oxygen-icons>=${_kdeve
'shared-mime-info' 'upower' 'udisks' 'xz>=5.0.0' 'enchant' 'jasper' 'openexr' 'giflib' 'shared-mime-info' 'upower' 'udisks' 'xz>=5.0.0' 'enchant' 'jasper' 'openexr' 'giflib'
'strigi' 'libxtst' 'soprano>=2.7.56' 'ca-certificates' 'xdg-utils' 'qca' 'polkit-qt>=0.98.1' 'strigi' 'libxtst' 'soprano>=2.7.56' 'ca-certificates' 'xdg-utils' 'qca' 'polkit-qt>=0.98.1'
'libxss' 'phonon' 'shared-desktop-ontologies>=0.7' 'attica>=0.2.0' 'krb5' 'libxcursor' 'libxss' 'phonon' 'shared-desktop-ontologies>=0.7' 'attica>=0.2.0' 'krb5' 'libxcursor'
'hicolor-icon-theme' 'libdbusmenu-qt' 'grantlee-git' 'media-player-info') 'hicolor-icon-theme' 'libdbusmenu-qt' 'grantlee-git' 'media-player-info' 'qtwebkit')
makedepends=('pkg-config' 'cmake' 'automoc4' 'intltool' 'avahi' 'libgl' 'aspell' 'hspell' 'shared-mime-info' makedepends=('pkg-config' 'cmake' 'automoc4' 'intltool' 'avahi' 'libgl' 'aspell' 'hspell' 'shared-mime-info'
'hal' 'docbook-xsl' 'docbook-xml' 'bzip2>=1.0.6' 'libzip') 'hal' 'docbook-xsl' 'docbook-xml' 'bzip2>=1.0.6' 'libzip')
optdepends=('phonon-gstreamer: GStreamer Phonon backend (default)' optdepends=('phonon-gstreamer: GStreamer Phonon backend (default)'