From 2a57223e6111af57b814056967b804ded5525a93 Mon Sep 17 00:00:00 2001 From: Phil Date: Sun, 3 Jul 2011 11:40:03 +0000 Subject: [PATCH] fix quirks in kde 465 --- kde-plasma-themes/PKGBUILD | 15 ++++++++++----- kde-sc.md5 | 20 ++++++++++---------- kdegraphics/PKGBUILD | 2 ++ kdelibs/PKGBUILD | 2 +- kdemultimedia/PKGBUILD | 2 +- kdepim/PKGBUILD | 16 ++-------------- 6 files changed, 26 insertions(+), 31 deletions(-) diff --git a/kde-plasma-themes/PKGBUILD b/kde-plasma-themes/PKGBUILD index 8e4524647..6c0da4bbd 100644 --- a/kde-plasma-themes/PKGBUILD +++ b/kde-plasma-themes/PKGBUILD @@ -14,20 +14,25 @@ pkgver=1.0 pkgrel=1 arch=('any') -source=('http://chakra-project.org/sources/neda/NEDA.tar.gz' +source=('http://chakra-project.org/sources/neda/Neda-1.6.5-1.tar.gz' 'http://chakra-project.org/sources/kneda/Kneda-0.6.4.tar.gz') -md5sums=('83686866b1e7313b77b3cf98c5c4ddc3' +md5sums=('b42e53b244b30a5ba15172d366d79066' '149b1ace8fa3d2d7f981bc6841749f83') package_kde-plasma-themes-neda() { -pkgver=1.0 +pkgver=1.6.5 pkgrel=1 pkgdesc="Chakra NEDA Plasma theme" url="http://www.chakra-project.org" license=('GPL') +replaces=('kde-plasma-themes-kneda') mkdir -p $pkgdir/usr/share/apps/desktoptheme - cd $startdir/src/NEDA/Plasma - cp -Rv NEDA $pkgdir/usr/share/apps/desktoptheme + cd $startdir/src + cp -R Neda $pkgdir/usr/share/apps/desktoptheme + # fix file rights + chmod 755 -R $pkgdir/usr/share/apps/desktoptheme + # remove nasty files + find $pkgdir/ -name ".directory" -type f -exec rm -fr {} + } package_kde-plasma-themes-kneda() { diff --git a/kde-sc.md5 b/kde-sc.md5 index 35a970f52..f3e5ef5c3 100644 --- a/kde-sc.md5 +++ b/kde-sc.md5 @@ -1,13 +1,3 @@ -f604fb4ae9a368d8b4ff0aeab0cfa52e kdeaccessibility-4.6.5.tar.bz2 -1fd4e8aa47815beb1714b914e80b2e5b kdeadmin-4.6.5.tar.bz2 -3d9ce16601b168afdc3b66f7ade73571 kdeartwork-4.6.5.tar.bz2 -153bd43c3b1159c2e6b06fc4f3f0ad87 kdebase-4.6.5.tar.bz2 -c2d8462eaee975b0109a34dac5640d5a kdebase-runtime-4.6.5.tar.bz2 -105faa1f1a0c4d79afec08a2dc7b5e0d kdebase-workspace-4.6.5.tar.bz2 -c16e25613296edd82819b6e490360201 kdebindings-4.6.5.tar.bz2 -44f21523890d8e0fa3d30da2d5c4d082 kdeedu-4.6.5.tar.bz2 -5086119ff1c30cacd0ab31ab2f92c71a kdegames-4.6.5.tar.bz2 -1495ce71f689b238f626ad7fbc53d83b kdegraphics-4.6.5.tar.bz2 7079468fcbf80bfe748b0e43a0327f9b kde-l10n-ar-4.6.5.tar.bz2 8c7ce47c2319e58767b47a4fe03f7411 kde-l10n-bg-4.6.5.tar.bz2 5e4f6a29a1bf134fda18d780c94d5a94 kde-l10n-ca-4.6.5.tar.bz2 @@ -61,6 +51,16 @@ be02d663091e1adecaa025eb29c363e5 kde-l10n-uk-4.6.5.tar.bz2 de325340e84cc2e656b88da7b7eeb76f kde-l10n-wa-4.6.5.tar.bz2 8298395faf95eab898bea1a461babf27 kde-l10n-zh_CN-4.6.5.tar.bz2 e48466f9d81e03530a5299dded9353cc kde-l10n-zh_TW-4.6.5.tar.bz2 +f604fb4ae9a368d8b4ff0aeab0cfa52e kdeaccessibility-4.6.5.tar.bz2 +1fd4e8aa47815beb1714b914e80b2e5b kdeadmin-4.6.5.tar.bz2 +3d9ce16601b168afdc3b66f7ade73571 kdeartwork-4.6.5.tar.bz2 +153bd43c3b1159c2e6b06fc4f3f0ad87 kdebase-4.6.5.tar.bz2 +c2d8462eaee975b0109a34dac5640d5a kdebase-runtime-4.6.5.tar.bz2 +105faa1f1a0c4d79afec08a2dc7b5e0d kdebase-workspace-4.6.5.tar.bz2 +c16e25613296edd82819b6e490360201 kdebindings-4.6.5.tar.bz2 +44f21523890d8e0fa3d30da2d5c4d082 kdeedu-4.6.5.tar.bz2 +5086119ff1c30cacd0ab31ab2f92c71a kdegames-4.6.5.tar.bz2 +9054b67c661847e7b41c57a19492ade8 kdegraphics-4.6.5.tar.bz2 8ca933c00bb5089e0793756e69bd1275 kdelibs-4.6.5.tar.bz2 7198fc277b1b98920c0e970a23559e53 kdemultimedia-4.6.5.tar.bz2 21724bf54030705f26305b403b14db81 kdenetwork-4.6.5.tar.bz2 diff --git a/kdegraphics/PKGBUILD b/kdegraphics/PKGBUILD index 169d9e577..2c2d0f953 100644 --- a/kdegraphics/PKGBUILD +++ b/kdegraphics/PKGBUILD @@ -212,4 +212,6 @@ package_kdegraphics-okular() cd ${srcdir}/${pkgbase}-${pkgver}/${i} make DESTDIR=${pkgdir} install || return 1 done + # fix conflicting files + rm -vr ${pkgdir}/usr/share/doc } diff --git a/kdelibs/PKGBUILD b/kdelibs/PKGBUILD index da1fa3399..ad3be9b09 100644 --- a/kdelibs/PKGBUILD +++ b/kdelibs/PKGBUILD @@ -26,7 +26,7 @@ options=('docs' '!splithdr' 'splitdbg' 'log') makedepends=("${_qtpkg}>=${_qtver}" "kde-common>=${_kdever}" "oxygen-icons>=${_kdever}" 'pkgconfig' 'cmake' 'automoc4' 'intltool' 'avahi' 'libgl' 'aspell' 'hspell' 'libxslt' - 'shared-mime-info' 'upower' 'udisks' 'hal' 'xz>=5.0.0' 'enchant' 'jasper' 'openexr' 'giflib' + 'shared-mime-info' 'upower' 'udisks' 'xz>=5.0.0' 'enchant' 'jasper' 'openexr' 'giflib' 'strigi' 'libxtst' 'soprano' 'ca-certificates' 'xdg-utils' 'qca' 'polkit-qt>=0.98.1' 'libxss' 'phonon' 'shared-desktop-ontologies>=0.5' 'attica>=0.2.0' 'heimdal' 'libxcursor' 'hicolor-icon-theme' 'docbook-xsl' 'docbook-xml' 'dbusmenu-qt-git' 'grantlee-git' 'bzip2>=1.0.6' 'libzip') diff --git a/kdemultimedia/PKGBUILD b/kdemultimedia/PKGBUILD index 89541f089..4879a9118 100644 --- a/kdemultimedia/PKGBUILD +++ b/kdemultimedia/PKGBUILD @@ -183,7 +183,7 @@ package_kdemultimedia-kmix() package_kdemultimedia-kscd() { pkgdesc="Audio CD player" - depends=("${pkgbase}-common>=${_kdever}" 'musicbrainz' 'tunepimp') + depends=("${pkgbase}-common>=${_kdever}" 'musicbrainz') groups=("kde" "${pkgbase}" "kde-uninstall") install=${pkgbase}.install diff --git a/kdepim/PKGBUILD b/kdepim/PKGBUILD index 977926fc5..c7bcc0289 100644 --- a/kdepim/PKGBUILD +++ b/kdepim/PKGBUILD @@ -31,7 +31,7 @@ pkgname=('kdepim-common' arch=('i686' 'x86_64') #pkgver=${_kdever} pkgver=4.6.0 -pkgrel=1 +pkgrel=2 pkgdesc="split package" url="http://www.kde.org" license=('GPL' 'LGPL' 'FDL') @@ -59,18 +59,6 @@ build() -DCMAKE_{SHARED,MODULE,EXE}_LINKER_FLAGS='-Wl,--no-undefined -Wl,--as-needed' make || return 1 - - # Fix translations - msg "Fixing translations..." - for i in ${srcdir}/${pkgbase}-${pkgver}/po/* ; do - if [ -d "$i" ] && [ "$(echo "$i" | grep "CMake")" == "" ] ; then - cd $i - for po in ${i}/*.po ; do - msgfmt -o $(echo ${po/.po/.mo}) $po - done - fi - done - } @@ -85,7 +73,7 @@ package_kdepim-common() groups=("kde" "kdepim" "kde" "kde-uninstall") install=${pkgbase}.install - splitdirs="akonadi_next icons calendarsupport calendarviews console incidenceeditor-ng kdgantt2 kleopatra kresources ksendemail libkdepim libkdepimdbusinterfaces libkleo libkpgp libksieve mailcommon messagecore messagecomposer messagecore messagelist messageviewer nepomuk_email_feeder ontologies plugins strigi-analyzer templateparser po" + splitdirs="akonadi_next icons calendarsupport calendarviews console incidenceeditor-ng kdgantt2 kleopatra kresources ksendemail libkdepim libkdepimdbusinterfaces libkleo libkpgp libksieve mailcommon messagecore messagecomposer messagecore messagelist messageviewer nepomuk_email_feeder ontologies plugins strigi-analyzer templateparser" for i in ${splitdirs} ; do cd ${srcdir}/${pkgbase}-${pkgver}/${i} make DESTDIR=${pkgdir} install || return 1