Date: Thursday, June 13, 2013 @ 16:11:19 Author: andrea Revision: 188251
KDE 4.11 fixes Modified: kdeadmin-ksystemlog/kde-unstable/PKGBUILD kdebase-workspace/kde-unstable/PKGBUILD kdenetwork-filesharing/kde-unstable/PKGBUILD kdepim/kde-unstable/PKGBUILD kdeplasma-addons/kde-unstable/PKGBUILD kdesdk-kate/kde-unstable/PKGBUILD kdesdk-kate/kde-unstable/pkgbuild-syntax-highlight.patch ----------------------------------------------------------+ kdeadmin-ksystemlog/kde-unstable/PKGBUILD | 2 - kdebase-workspace/kde-unstable/PKGBUILD | 4 +- kdenetwork-filesharing/kde-unstable/PKGBUILD | 2 - kdepim/kde-unstable/PKGBUILD | 20 +++++++------ kdeplasma-addons/kde-unstable/PKGBUILD | 9 ----- kdesdk-kate/kde-unstable/PKGBUILD | 2 - kdesdk-kate/kde-unstable/pkgbuild-syntax-highlight.patch | 8 ++--- 7 files changed, 20 insertions(+), 27 deletions(-) Modified: kdeadmin-ksystemlog/kde-unstable/PKGBUILD =================================================================== --- kdeadmin-ksystemlog/kde-unstable/PKGBUILD 2013-06-13 13:52:03 UTC (rev 188250) +++ kdeadmin-ksystemlog/kde-unstable/PKGBUILD 2013-06-13 14:11:19 UTC (rev 188251) @@ -17,7 +17,7 @@ '20095ce6e0f3e5b6800a7c6e52de6fddba62c031') prepare() { - cd ksystemlog + cd ksystemlog-${pkgver} patch -p2 -i "${srcdir}"/syslog-path.patch } Modified: kdebase-workspace/kde-unstable/PKGBUILD =================================================================== --- kdebase-workspace/kde-unstable/PKGBUILD 2013-06-13 13:52:03 UTC (rev 188250) +++ kdebase-workspace/kde-unstable/PKGBUILD 2013-06-13 14:11:19 UTC (rev 188251) @@ -18,7 +18,8 @@ 'qimageblitz' 'polkit-kde' 'xorg-xprop' 'libxdamage' 'libqalculate' 'libxklavier' 'xorg-xsetroot' 'libxcomposite' 'libxinerama' 'xorg-xrdb' 'libxres' 'xorg-xrandr' 'xorg-xmessage' 'libusb-compat' - 'kde-base-artwork' 'xcb-util-renderutil' 'xcb-util-image' 'ttf-font') + 'kde-base-artwork' 'xcb-util-renderutil' 'xcb-util-image' 'ttf-font' + 'xcb-util-keysyms' 'xcb-util-wm' 'pciutils') makedepends=('cmake' 'automoc4' 'boost' 'kdebindings-python2' 'networkmanager') optdepends=('kde-wallpapers: wallpapers for KDE Plasma Workspaces' 'appmenu-qt: menu applications over dbus') @@ -58,7 +59,6 @@ -DCMAKE_SKIP_RPATH=ON \ -DCMAKE_INSTALL_PREFIX=/usr \ -DWITH_Xmms=OFF \ - -DWITH_Googlegadgets=OFF \ -DWITH_libgps=OFF \ -DPYTHON_EXECUTABLE=/usr/bin/python2 \ -DWITH_CkConnector=OFF Modified: kdenetwork-filesharing/kde-unstable/PKGBUILD =================================================================== --- kdenetwork-filesharing/kde-unstable/PKGBUILD 2013-06-13 13:52:03 UTC (rev 188250) +++ kdenetwork-filesharing/kde-unstable/PKGBUILD 2013-06-13 14:11:19 UTC (rev 188251) @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/unstable/${pkgver}/src/kdenetwork-filesharing-${pkgver}.tar.xz") -sha1sums=('a55be61ce34fa7f7c9c64cda7abe5023ad34330b') +sha1sums=('e1b54d8da2357dec4908b7c7f011567097d932a1') build() { mkdir build Modified: kdepim/kde-unstable/PKGBUILD =================================================================== --- kdepim/kde-unstable/PKGBUILD 2013-06-13 13:52:03 UTC (rev 188250) +++ kdepim/kde-unstable/PKGBUILD 2013-06-13 14:11:19 UTC (rev 188251) @@ -27,8 +27,8 @@ license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdepim') makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'libxss' 'pilot-link' - 'kde-agent' 'nepomuk-widgets') - source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz") + 'kde-agent' 'nepomuk-widgets' 'link-grammar') +source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz") sha1sums=('a629378ad51cf0e5c86090fadc4fcaf1b8fa8b15') build() { @@ -67,7 +67,7 @@ package_kdepim-blogilo() { pkgdesc='A KDE Blogging Client' - depends=('kdepim-runtime') + depends=('kdepim-libkdepim') url="http://kde.org/applications/internet/blogilo/" replaces=('blogilo') conflicts=('blogilo') @@ -76,6 +76,8 @@ make DESTDIR="${pkgdir}" install cd "${srcdir}"/build/doc/blogilo make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/composereditor-ng + make DESTDIR="${pkgdir}" install } package_kdepim-console() { @@ -152,7 +154,7 @@ 'kdepim-mimelib' 'kdepim-plugins') for i in kmail doc/kmail kmailcvt archivemailagent \ importwizard ksendemail libksieve messagelist mailfilteragent \ - ontologies kontact/plugins/kmail; do + ontologies kontact/plugins/kmail headerthemeeditor sendlateragent; do cd "${srcdir}"/build/${i} make DESTDIR="${pkgdir}" install done @@ -245,17 +247,17 @@ package_kdepim-libkdepim() { pkgdesc='Library for KDE PIM' groups=() - depends=('kde-agent' 'kdepim-runtime') + depends=('kde-agent' 'kdepim-runtime' 'link-grammar') url='http://pim.kde.org' conflicts=('kdepim-icons' 'kdepim-libkleo' 'kdepim-libkpgp' - 'kdepim-strigi-analyzer' 'kdepim-akonadi') + 'kdepim-akonadi') replaces=('kdepim-icons' 'kdepim-libkleo' 'kdepim-libkpgp' - 'kdepim-strigi-analyzer' 'kdepim-akonadi') + 'kdepim-akonadi') for i in akonadi_next calendarsupport incidenceeditor-ng \ kdgantt2 libkdepim libkdepimdbusinterfaces libkleo libkpgp \ mailcommon mailimporter messagecomposer messagecore messageviewer \ - icons strigi-analyzer templateparser plugins/messageviewer \ - plugins/ktexteditor pimcommon pimsettingexporter; do + icons templateparser plugins/messageviewer grammar \ + plugins/ktexteditor pimactivity pimcommon pimsettingexporter; do cd "${srcdir}"/build/${i} make DESTDIR="${pkgdir}" install done Modified: kdeplasma-addons/kde-unstable/PKGBUILD =================================================================== --- kdeplasma-addons/kde-unstable/PKGBUILD 2013-06-13 13:52:03 UTC (rev 188250) +++ kdeplasma-addons/kde-unstable/PKGBUILD 2013-06-13 14:11:19 UTC (rev 188251) @@ -20,7 +20,6 @@ 'kdeplasma-addons-applets-fuzzy-clock' 'kdeplasma-addons-applets-icontasks' 'kdeplasma-addons-applets-incomingmsg' - 'kdeplasma-addons-applets-kdeobservatory' 'kdeplasma-addons-applets-kimpanel' 'kdeplasma-addons-applets-knowledgebase' 'kdeplasma-addons-applets-kolourpicker' @@ -224,14 +223,6 @@ make DESTDIR=$pkgdir install } -package_kdeplasma-addons-applets-kdeobservatory() { - pkgdesc='Visualize the KDE ecosystem' - depends=('kdeplasma-addons-libs' 'qwt') - install='kdeplasma-addons.install' - cd $srcdir/build/applets/kdeobservatory - make DESTDIR=$pkgdir install -} - package_kdeplasma-addons-applets-kimpanel() { pkgdesc='A generic input method panel for Oriental languages' depends=('kdeplasma-addons-libs') Modified: kdesdk-kate/kde-unstable/PKGBUILD =================================================================== --- kdesdk-kate/kde-unstable/PKGBUILD 2013-06-13 13:52:03 UTC (rev 188250) +++ kdesdk-kate/kde-unstable/PKGBUILD 2013-06-13 14:11:19 UTC (rev 188251) @@ -13,7 +13,7 @@ source=("http://download.kde.org/unstable/${pkgver}/src/kate-${pkgver}.tar.xz" 'pkgbuild-syntax-highlight.patch') sha1sums=('fa89b1859ff9f05d5c772d881285928677580c57' - 'dc70306c507083cf9b4bb1c536858742292fa1bf') + '80c324c9db81c07a02374e7a092d75e0bdd6b4ea') prepare() { cd kate-${pkgver} Modified: kdesdk-kate/kde-unstable/pkgbuild-syntax-highlight.patch =================================================================== --- kdesdk-kate/kde-unstable/pkgbuild-syntax-highlight.patch 2013-06-13 13:52:03 UTC (rev 188250) +++ kdesdk-kate/kde-unstable/pkgbuild-syntax-highlight.patch 2013-06-13 14:11:19 UTC (rev 188251) @@ -1,11 +1,11 @@ ---- kate-4.9.97/part/syntax/data/bash.xml~ 2013-01-04 08:47:46.157286867 +0000 -+++ kate-4.9.97/part/syntax/data/bash.xml 2013-01-04 08:48:06.097144127 +0000 +--- kate-4.10.80/part/syntax/data/bash.xml~ 2013-06-13 09:46:51.569245577 +0000 ++++ kate-4.10.80/part/syntax/data/bash.xml 2013-06-13 09:47:31.745637790 +0000 @@ -8,7 +8,7 @@ <!ENTITY noword "(?![\w$+-])"> <!-- no word, $, + or - following --> <!ENTITY pathpart "([\w_@.%*?+-]|\\ )"> <!-- valid character in a file name --> ]> --<language name="Bash" version="2.16" kateversion="2.4" section="Scripts" extensions="*.sh;*.bash;*.ebuild;*.eclass;.bashrc;.bash_profile;.bash_login;.profile" mimetype="application/x-shellscript" casesensitive="1" author="Wilbert Berendsen (wilb...@kde.nl)" license="LGPL"> -+<language name="Bash" version="2.16" kateversion="2.4" section="Scripts" extensions="*.sh;*.bash;*.ebuild;*.eclass;.bashrc;.bash_profile;.bash_login;.profile;PKGBUILD" mimetype="application/x-shellscript" casesensitive="1" author="Wilbert Berendsen (wilb...@kde.nl)" license="LGPL"> +-<language name="Bash" version="2.17" kateversion="2.4" section="Scripts" extensions="*.sh;*.bash;*.ebuild;*.eclass;.bashrc;.bash_profile;.bash_login;.profile" mimetype="application/x-shellscript" casesensitive="1" author="Wilbert Berendsen (wilb...@kde.nl)" license="LGPL"> ++<language name="Bash" version="2.17" kateversion="2.4" section="Scripts" extensions="*.sh;*.bash;*.ebuild;*.eclass;.bashrc;.bash_profile;.bash_login;.profile;PKGBUILD" mimetype="application/x-shellscript" casesensitive="1" author="Wilbert Berendsen (wilb...@kde.nl)" license="LGPL"> <!-- (c) 2004 by Wilbert Berendsen (wilb...@kde.nl) Changes by Matthew Woehlke (mw_tr...@users.sourceforge.net)