From 01a25dea35ad8bef6bdaab1a880d960b46738ed2 Mon Sep 17 00:00:00 2001 From: totte Date: Sun, 12 Jan 2014 17:22:06 +0100 Subject: [PATCH] multiple: Partial update and cleaning for KDE SC 4.12.1 --- .gitignore | 2 + kactivities/PKGBUILD | 7 ++- kde-baseapps-kate/PKGBUILD | 47 +++++++++++-------- .../{kdebase-kwrite.install => kate.install} | 0 ...base-katepart.install => katepart.install} | 0 .../{kdesdk-kate.install => kwrite.install} | 0 kde-baseapps-konsole/PKGBUILD | 2 + kdeadmin-kcron/PKGBUILD | 2 + kdeadmin-print-manager/PKGBUILD | 2 + kdeedu-blinken/PKGBUILD | 2 + kdeedu-cantor/PKGBUILD | 2 + kdeedu-kbruch/PKGBUILD | 2 + kdeedu-kgeography/PKGBUILD | 2 + kdeedu-kiten/PKGBUILD | 2 + kdeedu-klettres/PKGBUILD | 2 + kdeedu-kmplot/PKGBUILD | 2 + kdeedu-kstars/PKGBUILD | 2 + kdeedu-kturtle/PKGBUILD | 2 + kdeedu-kwordquiz/PKGBUILD | 2 + kdeedu-marble/PKGBUILD | 2 + kdeedu-rocs/PKGBUILD | 2 + kdeedu-step/PKGBUILD | 2 + kdegames-bomber/PKGBUILD | 2 + kdegames-bovo/PKGBUILD | 2 + kdegames-granatier/PKGBUILD | 2 + kdegames-kapman/PKGBUILD | 2 + kdegames-katomic/PKGBUILD | 2 + kdegames-kblackbox/PKGBUILD | 2 + kdegames-kblocks/PKGBUILD | 2 + kdegames-kbounce/PKGBUILD | 2 + kdegames-kbreakout/PKGBUILD | 2 + kdegames-kdiamond/PKGBUILD | 2 + kdegames-kfourinline/PKGBUILD | 2 + kdegames-killbots/PKGBUILD | 2 + kdegames-kiriki/PKGBUILD | 2 + kdegames-kjumpingcube/PKGBUILD | 2 + kdegames-klines/PKGBUILD | 2 + kdegames-kmines/PKGBUILD | 2 + kdegames-knetwalk/PKGBUILD | 2 + kdegames-kollision/PKGBUILD | 2 + kdegames-kpat/PKGBUILD | 2 + kdegames-kshisen/PKGBUILD | 2 + kdegames-ksquares/PKGBUILD | 2 + kdegames-picmi/PKGBUILD | 4 +- kdegraphics-gwenview/PKGBUILD | 2 + kdegraphics-kruler/PKGBUILD | 14 +++--- kdemultimedia-dragonplayer/PKGBUILD | 34 ++++++-------- kdemultimedia-kmix/PKGBUILD | 31 ++++++------ kdenetwork-kdnssd/PKGBUILD | 2 + kdesdk-dolphin-plugins/PKGBUILD | 2 + kdesdk-kompare/PKGBUILD | 2 + kdesdk-lokalize/PKGBUILD | 2 + kdesdk-umbrello/PKGBUILD | 2 + kdetoys-kteatime/PKGBUILD | 2 + kdeutils-ark/PKGBUILD | 2 + kdeutils-filelight/PKGBUILD | 2 + kdeutils-kcalc/PKGBUILD | 2 + kdeutils-kcharselect/PKGBUILD | 2 + kdeutils-ktimer/PKGBUILD | 2 + kdeutils-kwallet/PKGBUILD | 2 + oxygen-icons/PKGBUILD | 45 ++++++++++-------- 61 files changed, 196 insertions(+), 88 deletions(-) rename kde-baseapps-kate/{kdebase-kwrite.install => kate.install} (100%) rename kde-baseapps-kate/{kdebase-katepart.install => katepart.install} (100%) rename kde-baseapps-kate/{kdesdk-kate.install => kwrite.install} (100%) diff --git a/.gitignore b/.gitignore index e67e497c2..486b66745 100644 --- a/.gitignore +++ b/.gitignore @@ -49,3 +49,5 @@ user.conf *.log *.log* +foo.sh +*.bz2 diff --git a/kactivities/PKGBUILD b/kactivities/PKGBUILD index 3d8eaf6e7..2f6973a8f 100644 --- a/kactivities/PKGBUILD +++ b/kactivities/PKGBUILD @@ -1,12 +1,12 @@ -# Maintainer: Manuel Tortosa -# Contributors: H W Tovetjärn (totte) +# Maintainer: H W Tovetjärn (totte) +# Contributors: Manuel Tortosa # Include global configuration source ../_buildscripts/${current_repo}-${_arch}-cfg.conf pkgname="kactivities" pkgver=${_kdever} -pkgrel=3 +pkgrel=1 arch=('x86_64') pkgdesc='API for using and interacting with Activities' url='http://kde.org/' @@ -38,4 +38,3 @@ package() { cd $srcdir/$pkgname-$pkgver/build make DESTDIR=$pkgdir install } -sha256sums=('120205fec14856b46be7bab3f48a0b30591aee0caac431c12e09845d64ad4ebd') diff --git a/kde-baseapps-kate/PKGBUILD b/kde-baseapps-kate/PKGBUILD index 4ff2fca97..e74bcebd3 100644 --- a/kde-baseapps-kate/PKGBUILD +++ b/kde-baseapps-kate/PKGBUILD @@ -1,16 +1,16 @@ -# Maintainer: Manuel Tortosa -# Contributors: H W Tovetjarn (totte) +# Maintainer: H W Tovetjarn (totte) +# Contributors: Manuel Tortosa # Andrea Scarpino # Include global configuration source ../_buildscripts/${current_repo}-${_arch}-cfg.conf pkgbase='kate' -pkgname=('kde-baseapps-kate' - 'kde-baseapps-kwrite' - 'kde-baseapps-katepart') +pkgname=('kate' + 'kwrite' + 'katepart') pkgver=${_kdever} -pkgrel=2 +pkgrel=1 arch=('x86_64') license=('GPL' 'LGPL' @@ -40,31 +40,36 @@ build() { cd "${srcdir}/build" cmake "../${pkgbase}-${pkgver}" \ -DCMAKE_BUILD_TYPE=${_build_type} \ - -DKDE4_BUILD_TESTS=OFF \ + -DKDE4_BUILD_TESTS=ON \ -DCMAKE_INSTALL_PREFIX=${_installprefix} \ -DCMAKE_{SHARED,MODULE,EXE}_LINKER_FLAGS='-Wl,--no-undefined -Wl,--as-needed' make } -package_kde-baseapps-katepart() { +package_katepart() { pkgdesc='A fast and feature-rich text editor component' - depends=('kdelibs') url='http://kate-editor.org/about-katepart/' - install='kdebase-katepart.install' + depends=('kdelibs') + provides=("kdebase-katepart") + replaces=("kdebase-katepart") + conflicts=("kdebase-katepart") + install='katepart.install' cd "${srcdir}/build/part" make DESTDIR="${pkgdir}" install } -package_kde-baseapps-kwrite() { +package_kwrite() { pkgdesc='KDE text editor' depends=('kde-runtime' - 'kde-baseapps-katepart') + 'katepart') groups=('kde' - 'kde-baseapps' 'kde-uninstall') + provides=("kdebase-kwrite") + replaces=("kdebase-kwrite") + conflicts=("kdebase-kwrite") url='http://www.kde.org/applications/utilities/kwrite/' - install='kdebase-kwrite.install' + install='kwrite.install' cd "${srcdir}/build/kwrite" make DESTDIR="${pkgdir}" install @@ -73,17 +78,19 @@ package_kde-baseapps-kwrite() { make DESTDIR="${pkgdir}" install } -package_kde-baseapps-kate() { - pkgdesc='KDE advanced text editor' +package_kate() { + pkgdesc='KDE Advanced Text Editor' depends=('kde-runtime' - 'kde-baseapps-katepart' + 'katepart' 'qjson') groups=('kde' - 'kde-baseapps' 'kde-uninstall') + provides=("kdesdk-kate") + replaces=("kdesdk-kate") + conflicts=("kdesdk-kate") url='http://www.kde.org/applications/utilities/kate/' - install='kdesdk-kate.install' - optdepends=('kdebase-konsole: Open a terminal in Kate' + install='kate.install' + optdepends=('konsole: Open a terminal in Kate' 'kdebindings-python2: Python 2 bindings' 'kdebindings-python3: Python 3 bindings') diff --git a/kde-baseapps-kate/kdebase-kwrite.install b/kde-baseapps-kate/kate.install similarity index 100% rename from kde-baseapps-kate/kdebase-kwrite.install rename to kde-baseapps-kate/kate.install diff --git a/kde-baseapps-kate/kdebase-katepart.install b/kde-baseapps-kate/katepart.install similarity index 100% rename from kde-baseapps-kate/kdebase-katepart.install rename to kde-baseapps-kate/katepart.install diff --git a/kde-baseapps-kate/kdesdk-kate.install b/kde-baseapps-kate/kwrite.install similarity index 100% rename from kde-baseapps-kate/kdesdk-kate.install rename to kde-baseapps-kate/kwrite.install diff --git a/kde-baseapps-konsole/PKGBUILD b/kde-baseapps-konsole/PKGBUILD index 3293061a3..6a8d636ac 100644 --- a/kde-baseapps-konsole/PKGBUILD +++ b/kde-baseapps-konsole/PKGBUILD @@ -1,3 +1,5 @@ +# Maintainer: H W Tovetjärn (totte) +# Contributors: Manuel Tortosa diff --git a/kdeadmin-kcron/PKGBUILD b/kdeadmin-kcron/PKGBUILD index aa9c2ec5f..dd810bf5f 100644 --- a/kdeadmin-kcron/PKGBUILD +++ b/kdeadmin-kcron/PKGBUILD @@ -1,3 +1,5 @@ +# Maintainer: H W Tovetjärn (totte) +# Contributors: Manuel Tortosa diff --git a/kdeadmin-print-manager/PKGBUILD b/kdeadmin-print-manager/PKGBUILD index 3d69a4e9f..915313f43 100644 --- a/kdeadmin-print-manager/PKGBUILD +++ b/kdeadmin-print-manager/PKGBUILD @@ -1,3 +1,5 @@ +# Maintainer: H W Tovetjärn (totte) +# Contributors: Manuel Tortosa diff --git a/kdeedu-blinken/PKGBUILD b/kdeedu-blinken/PKGBUILD index 08887528d..0d7eec612 100644 --- a/kdeedu-blinken/PKGBUILD +++ b/kdeedu-blinken/PKGBUILD @@ -1,3 +1,5 @@ +# Maintainer: H W Tovetjärn (totte) +# Contributors: Manuel Tortosa diff --git a/kdeedu-cantor/PKGBUILD b/kdeedu-cantor/PKGBUILD index 8617c67f7..050195258 100644 --- a/kdeedu-cantor/PKGBUILD +++ b/kdeedu-cantor/PKGBUILD @@ -1,3 +1,5 @@ +# Maintainer: H W Tovetjärn (totte) +# Contributors: Manuel Tortosa diff --git a/kdeedu-kbruch/PKGBUILD b/kdeedu-kbruch/PKGBUILD index 821275b2f..453beb542 100644 --- a/kdeedu-kbruch/PKGBUILD +++ b/kdeedu-kbruch/PKGBUILD @@ -1,3 +1,5 @@ +# Maintainer: H W Tovetjärn (totte) +# Contributors: Manuel Tortosa diff --git a/kdeedu-kgeography/PKGBUILD b/kdeedu-kgeography/PKGBUILD index f36cd3422..f9a8783c2 100644 --- a/kdeedu-kgeography/PKGBUILD +++ b/kdeedu-kgeography/PKGBUILD @@ -1,3 +1,5 @@ +# Maintainer: H W Tovetjärn (totte) +# Contributors: Manuel Tortosa diff --git a/kdeedu-kiten/PKGBUILD b/kdeedu-kiten/PKGBUILD index 34efeb54c..cfc1831d2 100644 --- a/kdeedu-kiten/PKGBUILD +++ b/kdeedu-kiten/PKGBUILD @@ -1,3 +1,5 @@ +# Maintainer: H W Tovetjärn (totte) +# Contributors: Manuel Tortosa diff --git a/kdeedu-klettres/PKGBUILD b/kdeedu-klettres/PKGBUILD index 1c26f3275..9fb37a05b 100644 --- a/kdeedu-klettres/PKGBUILD +++ b/kdeedu-klettres/PKGBUILD @@ -1,3 +1,5 @@ +# Maintainer: H W Tovetjärn (totte) +# Contributors: Manuel Tortosa diff --git a/kdeedu-kmplot/PKGBUILD b/kdeedu-kmplot/PKGBUILD index 6362724a6..f3ffd0034 100644 --- a/kdeedu-kmplot/PKGBUILD +++ b/kdeedu-kmplot/PKGBUILD @@ -1,3 +1,5 @@ +# Maintainer: H W Tovetjärn (totte) +# Contributors: Manuel Tortosa diff --git a/kdeedu-kstars/PKGBUILD b/kdeedu-kstars/PKGBUILD index 369f5edcd..06cc63559 100644 --- a/kdeedu-kstars/PKGBUILD +++ b/kdeedu-kstars/PKGBUILD @@ -1,3 +1,5 @@ +# Maintainer: H W Tovetjärn (totte) +# Contributors: Manuel Tortosa diff --git a/kdeedu-kturtle/PKGBUILD b/kdeedu-kturtle/PKGBUILD index 3ad62ef7b..368e8e943 100644 --- a/kdeedu-kturtle/PKGBUILD +++ b/kdeedu-kturtle/PKGBUILD @@ -1,3 +1,5 @@ +# Maintainer: H W Tovetjärn (totte) +# Contributors: Manuel Tortosa diff --git a/kdeedu-kwordquiz/PKGBUILD b/kdeedu-kwordquiz/PKGBUILD index 64c68ee92..d8f484616 100644 --- a/kdeedu-kwordquiz/PKGBUILD +++ b/kdeedu-kwordquiz/PKGBUILD @@ -1,3 +1,5 @@ +# Maintainer: H W Tovetjärn (totte) +# Contributors: Manuel Tortosa diff --git a/kdeedu-marble/PKGBUILD b/kdeedu-marble/PKGBUILD index a8c76de82..b83889683 100644 --- a/kdeedu-marble/PKGBUILD +++ b/kdeedu-marble/PKGBUILD @@ -1,3 +1,5 @@ +# Maintainer: H W Tovetjärn (totte) +# Contributors: Manuel Tortosa diff --git a/kdeedu-rocs/PKGBUILD b/kdeedu-rocs/PKGBUILD index 8c437a279..7d7c06a7a 100644 --- a/kdeedu-rocs/PKGBUILD +++ b/kdeedu-rocs/PKGBUILD @@ -1,3 +1,5 @@ +# Maintainer: H W Tovetjärn (totte) +# Contributors: Manuel Tortosa diff --git a/kdeedu-step/PKGBUILD b/kdeedu-step/PKGBUILD index 9d05edc2e..2dfb215c4 100644 --- a/kdeedu-step/PKGBUILD +++ b/kdeedu-step/PKGBUILD @@ -1,3 +1,5 @@ +# Maintainer: H W Tovetjärn (totte) +# Contributors: Manuel Tortosa diff --git a/kdegames-bomber/PKGBUILD b/kdegames-bomber/PKGBUILD index 1d6ec230f..c8ccfbb6b 100644 --- a/kdegames-bomber/PKGBUILD +++ b/kdegames-bomber/PKGBUILD @@ -1,3 +1,5 @@ +# Maintainer: H W Tovetjärn (totte) +# Contributors: Manuel Tortosa diff --git a/kdegames-bovo/PKGBUILD b/kdegames-bovo/PKGBUILD index 8497697d1..2144c34f2 100644 --- a/kdegames-bovo/PKGBUILD +++ b/kdegames-bovo/PKGBUILD @@ -1,3 +1,5 @@ +# Maintainer: H W Tovetjärn (totte) +# Contributors: Manuel Tortosa diff --git a/kdegames-granatier/PKGBUILD b/kdegames-granatier/PKGBUILD index ff4b33abb..adfc06906 100644 --- a/kdegames-granatier/PKGBUILD +++ b/kdegames-granatier/PKGBUILD @@ -1,3 +1,5 @@ +# Maintainer: H W Tovetjärn (totte) +# Contributors: Manuel Tortosa diff --git a/kdegames-kapman/PKGBUILD b/kdegames-kapman/PKGBUILD index caaa7bf4c..d0095f59b 100644 --- a/kdegames-kapman/PKGBUILD +++ b/kdegames-kapman/PKGBUILD @@ -1,3 +1,5 @@ +# Maintainer: H W Tovetjärn (totte) +# Contributors: Manuel Tortosa diff --git a/kdegames-katomic/PKGBUILD b/kdegames-katomic/PKGBUILD index c1cab8559..8ba20b310 100644 --- a/kdegames-katomic/PKGBUILD +++ b/kdegames-katomic/PKGBUILD @@ -1,3 +1,5 @@ +# Maintainer: H W Tovetjärn (totte) +# Contributors: Manuel Tortosa diff --git a/kdegames-kblackbox/PKGBUILD b/kdegames-kblackbox/PKGBUILD index a22cf8914..7fc918735 100644 --- a/kdegames-kblackbox/PKGBUILD +++ b/kdegames-kblackbox/PKGBUILD @@ -1,3 +1,5 @@ +# Maintainer: H W Tovetjärn (totte) +# Contributors: Manuel Tortosa diff --git a/kdegames-kblocks/PKGBUILD b/kdegames-kblocks/PKGBUILD index 16cb8859a..1a9d0bebe 100644 --- a/kdegames-kblocks/PKGBUILD +++ b/kdegames-kblocks/PKGBUILD @@ -1,3 +1,5 @@ +# Maintainer: H W Tovetjärn (totte) +# Contributors: Manuel Tortosa diff --git a/kdegames-kbounce/PKGBUILD b/kdegames-kbounce/PKGBUILD index 8802576a3..00c215c7d 100644 --- a/kdegames-kbounce/PKGBUILD +++ b/kdegames-kbounce/PKGBUILD @@ -1,3 +1,5 @@ +# Maintainer: H W Tovetjärn (totte) +# Contributors: Manuel Tortosa diff --git a/kdegames-kbreakout/PKGBUILD b/kdegames-kbreakout/PKGBUILD index 7c5fcedab..3ec10d907 100644 --- a/kdegames-kbreakout/PKGBUILD +++ b/kdegames-kbreakout/PKGBUILD @@ -1,3 +1,5 @@ +# Maintainer: H W Tovetjärn (totte) +# Contributors: Manuel Tortosa diff --git a/kdegames-kdiamond/PKGBUILD b/kdegames-kdiamond/PKGBUILD index eccd95d30..a92137cbd 100644 --- a/kdegames-kdiamond/PKGBUILD +++ b/kdegames-kdiamond/PKGBUILD @@ -1,3 +1,5 @@ +# Maintainer: H W Tovetjärn (totte) +# Contributors: Manuel Tortosa diff --git a/kdegames-kfourinline/PKGBUILD b/kdegames-kfourinline/PKGBUILD index 4b722af55..9e4613ab0 100644 --- a/kdegames-kfourinline/PKGBUILD +++ b/kdegames-kfourinline/PKGBUILD @@ -1,3 +1,5 @@ +# Maintainer: H W Tovetjärn (totte) +# Contributors: Manuel Tortosa diff --git a/kdegames-killbots/PKGBUILD b/kdegames-killbots/PKGBUILD index fe7b5ea20..135a11e6a 100644 --- a/kdegames-killbots/PKGBUILD +++ b/kdegames-killbots/PKGBUILD @@ -1,3 +1,5 @@ +# Maintainer: H W Tovetjärn (totte) +# Contributors: Manuel Tortosa diff --git a/kdegames-kiriki/PKGBUILD b/kdegames-kiriki/PKGBUILD index 6d1f1094c..cc6f144d2 100644 --- a/kdegames-kiriki/PKGBUILD +++ b/kdegames-kiriki/PKGBUILD @@ -1,3 +1,5 @@ +# Maintainer: H W Tovetjärn (totte) +# Contributors: Manuel Tortosa diff --git a/kdegames-kjumpingcube/PKGBUILD b/kdegames-kjumpingcube/PKGBUILD index 7517c1c1e..65756e748 100644 --- a/kdegames-kjumpingcube/PKGBUILD +++ b/kdegames-kjumpingcube/PKGBUILD @@ -1,3 +1,5 @@ +# Maintainer: H W Tovetjärn (totte) +# Contributors: Manuel Tortosa diff --git a/kdegames-klines/PKGBUILD b/kdegames-klines/PKGBUILD index ea5aadb53..e3cf9b80b 100644 --- a/kdegames-klines/PKGBUILD +++ b/kdegames-klines/PKGBUILD @@ -1,3 +1,5 @@ +# Maintainer: H W Tovetjärn (totte) +# Contributors: Manuel Tortosa diff --git a/kdegames-kmines/PKGBUILD b/kdegames-kmines/PKGBUILD index 2b7007f82..8bfd182d5 100644 --- a/kdegames-kmines/PKGBUILD +++ b/kdegames-kmines/PKGBUILD @@ -1,3 +1,5 @@ +# Maintainer: H W Tovetjärn (totte) +# Contributors: Manuel Tortosa diff --git a/kdegames-knetwalk/PKGBUILD b/kdegames-knetwalk/PKGBUILD index 5ef833b0c..4281f3acd 100644 --- a/kdegames-knetwalk/PKGBUILD +++ b/kdegames-knetwalk/PKGBUILD @@ -1,3 +1,5 @@ +# Maintainer: H W Tovetjärn (totte) +# Contributors: Manuel Tortosa diff --git a/kdegames-kollision/PKGBUILD b/kdegames-kollision/PKGBUILD index 39e207fc5..b8414cfa8 100644 --- a/kdegames-kollision/PKGBUILD +++ b/kdegames-kollision/PKGBUILD @@ -1,3 +1,5 @@ +# Maintainer: H W Tovetjärn (totte) +# Contributors: Manuel Tortosa diff --git a/kdegames-kpat/PKGBUILD b/kdegames-kpat/PKGBUILD index ff5dfe2fd..2faa37cd0 100644 --- a/kdegames-kpat/PKGBUILD +++ b/kdegames-kpat/PKGBUILD @@ -1,3 +1,5 @@ +# Maintainer: H W Tovetjärn (totte) +# Contributors: Manuel Tortosa diff --git a/kdegames-kshisen/PKGBUILD b/kdegames-kshisen/PKGBUILD index ad8318a0c..e6b088b5e 100644 --- a/kdegames-kshisen/PKGBUILD +++ b/kdegames-kshisen/PKGBUILD @@ -1,3 +1,5 @@ +# Maintainer: H W Tovetjärn (totte) +# Contributors: Manuel Tortosa diff --git a/kdegames-ksquares/PKGBUILD b/kdegames-ksquares/PKGBUILD index f0f17bacc..081dbfb86 100644 --- a/kdegames-ksquares/PKGBUILD +++ b/kdegames-ksquares/PKGBUILD @@ -1,3 +1,5 @@ +# Maintainer: H W Tovetjärn (totte) +# Contributors: Manuel Tortosa diff --git a/kdegames-picmi/PKGBUILD b/kdegames-picmi/PKGBUILD index 8c95e9298..a5708c9b2 100644 --- a/kdegames-picmi/PKGBUILD +++ b/kdegames-picmi/PKGBUILD @@ -1,3 +1,5 @@ +# Maintainer: H W Tovetjärn (totte) +# Contributors: Manuel Tortosa # Maintainer: Manuel Tortosa # Include global configuration @@ -24,7 +26,7 @@ build() { cd build cmake "../${_pkgname}-${pkgver}" \ -DCMAKE_BUILD_TYPE=${_build_type} \ - -DKDE4_BUILD_TESTS=OFF \ + -DKDE4_BUILD_TESTS=ON \ -DCMAKE_INSTALL_PREFIX=${_installprefix} # -DCMAKE_SKIP_RPATH=ON \ # -DCMAKE_{SHARED,MODULE,EXE}_LINKER_FLAGS='-Wl,--no-undefined -Wl,--as-needed' diff --git a/kdegraphics-gwenview/PKGBUILD b/kdegraphics-gwenview/PKGBUILD index ff25bfb45..394822f2b 100644 --- a/kdegraphics-gwenview/PKGBUILD +++ b/kdegraphics-gwenview/PKGBUILD @@ -1,3 +1,5 @@ +# Maintainer: H W Tovetjärn (totte) +# Contributors: Manuel Tortosa diff --git a/kdegraphics-kruler/PKGBUILD b/kdegraphics-kruler/PKGBUILD index 2d3603664..d74f85b00 100644 --- a/kdegraphics-kruler/PKGBUILD +++ b/kdegraphics-kruler/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer: Manuel Tortosa -# Contributors: H W Tovetjärn (totte) +# Maintainer: H W Tovetjärn (totte) +# Contributors: Manuel Tortosa # Include global configuration source ../_buildscripts/${current_repo}-${_arch}-cfg.conf @@ -7,7 +7,7 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf pkgname=kdegraphics-kruler _pkgname=kruler pkgver=${_kdever} -pkgrel=3 +pkgrel=1 pkgdesc='Screen ruler for measuring pixels' url='http://kde.org/applications/graphics/kruler/' arch=('x86_64') @@ -17,9 +17,6 @@ license=('GPL' depends=("kde-runtime>=${_kdever}") makedepends=('cmake' 'automoc4') -source=("$_mirror/${_pkgname}-$_kdever.tar.xz") -sha256sums=(`grep ${_pkgname}-$_kdever.tar.xz ../checksums.txt | cut -d " " -f1`) -install=${pkgname}.install groups=('kde' 'kdegraphics' 'kde-uninstall') @@ -28,6 +25,9 @@ options=('docs' '!header' 'debug' 'log') +install=${pkgname}.install +source=("$_mirror/${_pkgname}-$_kdever.tar.xz") +sha256sums=(`grep ${_pkgname}-$_kdever.tar.xz ../checksums.txt | cut -d " " -f1`) build() { cd ${srcdir}/${_pkgname}-${pkgver} @@ -35,7 +35,7 @@ build() { -DCMAKE_BUILD_TYPE=${_build_type} \ -DCMAKE_INSTALL_PREFIX=${_installprefix} \ -DCMAKE_SKIP_RPATH=ON \ - -DKDE4_BUILD_TESTS=OFF \ + -DKDE4_BUILD_TESTS=ON \ -DCMAKE_{SHARED,MODULE,EXE}_LINKER_FLAGS='-Wl,--no-undefined -Wl,--as-needed' make } diff --git a/kdemultimedia-dragonplayer/PKGBUILD b/kdemultimedia-dragonplayer/PKGBUILD index 3236bb60b..d63f5f770 100644 --- a/kdemultimedia-dragonplayer/PKGBUILD +++ b/kdemultimedia-dragonplayer/PKGBUILD @@ -1,7 +1,5 @@ - - - -# Maintainer: Manuel Tortosa +# Maintainer: H W Tovetjärn (totte) +# Contributors: Manuel Tortosa # Include global configuration source ../_buildscripts/${current_repo}-${_arch}-cfg.conf @@ -9,32 +7,30 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf pkgname=kdemultimedia-dragonplayer _pkgname=dragon pkgver=${_kdever} -pkgrel=3 -pkgdesc="A multimedia player where the focus is on simplicity, instead of -features" +pkgrel=1 +pkgdesc="A simple multimedia player" url='http://kde.org/applications/multimedia/dragonplayer/' arch=('x86_64') license=('GPL' 'LGPL' 'FDL') depends=("kde-runtime>=${_kdever}") makedepends=('cmake' 'automoc4') -source=("$_mirror/${_pkgname}-$_kdever.tar.xz") -sha256sums=(`grep ${_pkgname}-$_kdever.tar.xz ../checksums.txt | cut -d " " -f1`) groups=("kde" "kdemultimedia" "kde-uninstall") provides=('dragonplayer') options=('docs' '!header' 'debug' 'log') +source=("$_mirror/${_pkgname}-$_kdever.tar.xz") +sha256sums=(`grep ${_pkgname}-$_kdever.tar.xz ../checksums.txt | cut -d " " -f1`) build() { - cd ${srcdir}/${_pkgname}-${pkgver} - cmake . -DCMAKE_BUILD_TYPE=${_build_type} \ - -DCMAKE_INSTALL_PREFIX=${_installprefix} \ - -DCMAKE_SKIP_RPATH=ON \ - -DCMAKE_{SHARED,MODULE,EXE}_LINKER_FLAGS='-Wl,--no-undefined -Wl,--as-needed' - make + cd ${srcdir}/${_pkgname}-${pkgver} + cmake . \ + -DCMAKE_BUILD_TYPE=${_build_type} \ + -DCMAKE_INSTALL_PREFIX=${_installprefix} \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_{SHARED,MODULE,EXE}_LINKER_FLAGS='-Wl,--no-undefined -Wl,--as-needed' + make } package() { - cd ${srcdir}/${_pkgname}-${pkgver} - make DESTDIR=${pkgdir} install || return 1 - + cd ${srcdir}/${_pkgname}-${pkgver} + make DESTDIR=${pkgdir} install } -sha256sums=('b95e31e96bbf501c1a9579608befede0041b52c88adbda1608a5b3e56de05c5c') diff --git a/kdemultimedia-kmix/PKGBUILD b/kdemultimedia-kmix/PKGBUILD index cfbf378b5..32486a586 100644 --- a/kdemultimedia-kmix/PKGBUILD +++ b/kdemultimedia-kmix/PKGBUILD @@ -1,7 +1,5 @@ - - - -# Maintainer: Manuel Tortosa +# Maintainer: H W Tovetjärn (totte) +# Contributors: Manuel Tortosa # Include global configuration source ../_buildscripts/${current_repo}-${_arch}-cfg.conf @@ -9,30 +7,29 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf pkgname=kdemultimedia-kmix _pkgname=kmix pkgver=${_kdever} -pkgrel=3 -pkgdesc="KDE volume control program" +pkgrel=1 +pkgdesc="KDE volume control utility" url='http://kde.org/applications/multimedia/kmix/' arch=('x86_64') license=('GPL' 'LGPL' 'FDL') depends=("kde-runtime>=${_kdever}" 'libcanberra') makedepends=('cmake' 'automoc4' 'libpulse') -source=("$_mirror/${_pkgname}-$_kdever.tar.xz") -sha256sums=(`grep ${_pkgname}-$_kdever.tar.xz ../checksums.txt | cut -d " " -f1`) groups=("kde" "kdemultimedia" "kde-uninstall") provides=('kmix') options=('docs' '!header' 'debug' 'log') +source=("$_mirror/${_pkgname}-$_kdever.tar.xz") +sha256sums=(`grep ${_pkgname}-$_kdever.tar.xz ../checksums.txt | cut -d " " -f1`) build() { - cd ${srcdir}/${_pkgname}-${pkgver} - cmake . -DCMAKE_BUILD_TYPE=${_build_type} \ - -DCMAKE_INSTALL_PREFIX=${_installprefix} \ - -DCMAKE_{SHARED,MODULE,EXE}_LINKER_FLAGS='-Wl,--no-undefined -Wl,--as-needed' - make + cd ${srcdir}/${_pkgname}-${pkgver} + cmake . \ + -DCMAKE_BUILD_TYPE=${_build_type} \ + -DCMAKE_INSTALL_PREFIX=${_installprefix} \ + -DCMAKE_{SHARED,MODULE,EXE}_LINKER_FLAGS='-Wl,--no-undefined -Wl,--as-needed' + make } package() { - cd ${srcdir}/${_pkgname}-${pkgver} - make DESTDIR=${pkgdir} install || return 1 - + cd ${srcdir}/${_pkgname}-${pkgver} + make DESTDIR=${pkgdir} install } -sha256sums=('a74337d4a935cd506321ec6c6efe39b8acbcc6f75bc34de68b89b9fbeb7020a1') diff --git a/kdenetwork-kdnssd/PKGBUILD b/kdenetwork-kdnssd/PKGBUILD index d33663bc1..6f1f55ba8 100644 --- a/kdenetwork-kdnssd/PKGBUILD +++ b/kdenetwork-kdnssd/PKGBUILD @@ -1,3 +1,5 @@ +# Maintainer: H W Tovetjärn (totte) +# Contributors: Manuel Tortosa diff --git a/kdesdk-dolphin-plugins/PKGBUILD b/kdesdk-dolphin-plugins/PKGBUILD index 52e14b7d1..8c7c6c3d7 100644 --- a/kdesdk-dolphin-plugins/PKGBUILD +++ b/kdesdk-dolphin-plugins/PKGBUILD @@ -1,3 +1,5 @@ +# Maintainer: H W Tovetjärn (totte) +# Contributors: Manuel Tortosa diff --git a/kdesdk-kompare/PKGBUILD b/kdesdk-kompare/PKGBUILD index c8d4daa1a..ac0c6b780 100644 --- a/kdesdk-kompare/PKGBUILD +++ b/kdesdk-kompare/PKGBUILD @@ -1,3 +1,5 @@ +# Maintainer: H W Tovetjärn (totte) +# Contributors: Manuel Tortosa # Maintainer Manuel Tortosa # Include global configuration diff --git a/kdesdk-lokalize/PKGBUILD b/kdesdk-lokalize/PKGBUILD index e8a7a153a..8086b3991 100644 --- a/kdesdk-lokalize/PKGBUILD +++ b/kdesdk-lokalize/PKGBUILD @@ -1,3 +1,5 @@ +# Maintainer: H W Tovetjärn (totte) +# Contributors: Manuel Tortosa diff --git a/kdesdk-umbrello/PKGBUILD b/kdesdk-umbrello/PKGBUILD index 8dce568e2..9ad797d59 100644 --- a/kdesdk-umbrello/PKGBUILD +++ b/kdesdk-umbrello/PKGBUILD @@ -1,3 +1,5 @@ +# Maintainer: H W Tovetjärn (totte) +# Contributors: Manuel Tortosa diff --git a/kdetoys-kteatime/PKGBUILD b/kdetoys-kteatime/PKGBUILD index be581055e..6d467d875 100644 --- a/kdetoys-kteatime/PKGBUILD +++ b/kdetoys-kteatime/PKGBUILD @@ -1,3 +1,5 @@ +# Maintainer: H W Tovetjärn (totte) +# Contributors: Manuel Tortosa diff --git a/kdeutils-ark/PKGBUILD b/kdeutils-ark/PKGBUILD index c5966a79b..5ffe2e574 100644 --- a/kdeutils-ark/PKGBUILD +++ b/kdeutils-ark/PKGBUILD @@ -1,3 +1,5 @@ +# Maintainer: H W Tovetjärn (totte) +# Contributors: Manuel Tortosa diff --git a/kdeutils-filelight/PKGBUILD b/kdeutils-filelight/PKGBUILD index 35e8bd244..fb3c3bb05 100644 --- a/kdeutils-filelight/PKGBUILD +++ b/kdeutils-filelight/PKGBUILD @@ -1,3 +1,5 @@ +# Maintainer: H W Tovetjärn (totte) +# Contributors: Manuel Tortosa diff --git a/kdeutils-kcalc/PKGBUILD b/kdeutils-kcalc/PKGBUILD index e52e89e23..5ac15def1 100644 --- a/kdeutils-kcalc/PKGBUILD +++ b/kdeutils-kcalc/PKGBUILD @@ -1,3 +1,5 @@ +# Maintainer: H W Tovetjärn (totte) +# Contributors: Manuel Tortosa diff --git a/kdeutils-kcharselect/PKGBUILD b/kdeutils-kcharselect/PKGBUILD index 7b3483bcf..2197908fe 100644 --- a/kdeutils-kcharselect/PKGBUILD +++ b/kdeutils-kcharselect/PKGBUILD @@ -1,3 +1,5 @@ +# Maintainer: H W Tovetjärn (totte) +# Contributors: Manuel Tortosa diff --git a/kdeutils-ktimer/PKGBUILD b/kdeutils-ktimer/PKGBUILD index 88ca72d26..fa9e0cddd 100644 --- a/kdeutils-ktimer/PKGBUILD +++ b/kdeutils-ktimer/PKGBUILD @@ -1,3 +1,5 @@ +# Maintainer: H W Tovetjärn (totte) +# Contributors: Manuel Tortosa diff --git a/kdeutils-kwallet/PKGBUILD b/kdeutils-kwallet/PKGBUILD index 3ebf7d1ac..a20ba19ad 100644 --- a/kdeutils-kwallet/PKGBUILD +++ b/kdeutils-kwallet/PKGBUILD @@ -1,3 +1,5 @@ +# Maintainer: H W Tovetjärn (totte) +# Contributors: Manuel Tortosa diff --git a/oxygen-icons/PKGBUILD b/oxygen-icons/PKGBUILD index 11bee6e21..2f26caf53 100644 --- a/oxygen-icons/PKGBUILD +++ b/oxygen-icons/PKGBUILD @@ -1,9 +1,10 @@ -# Maintainer: Manuel Tortosa +# Maintainer: H W Tovetjärn (totte) +# Contributors: Manuel Tortosa # Include global configuration source ../_buildscripts/${current_repo}-${_arch}-cfg.conf -_origname=oxygen-icons +pkgbase=oxygen-icons pkgname=('oxygen-icons' 'oxygen-icons-svg') arch=('x86_64') pkgver=${_kdever} @@ -13,36 +14,40 @@ license=('GPL' 'LGPL' 'FDL') install=oxygen-icons.install options=('log') makedepends=('pkg-config' 'cmake' 'automoc4') -source=($_mirror/${_origname}-$_kdever.tar.xz) -#sha256sums=(`grep ${_origname}-$_kdever.tar.xz ../checksums.txt | cut -d " " -f1`) -sha1sums=('SKIP') +source=($_mirror/$pkgbase-$_kdever.tar.xz) +sha256sums=(`grep $pkgbase-$_kdever.tar.xz ../checksums.txt | cut -d " " -f1`) + +prepare() { + mkdir -p "${srcdir}/svg" + cd "${srcdir}/$pkgbase-$pkgver" + patch -Np0 -i "${srcdir}/install_svg_icons_too.patch" +} build() { - cd $srcdir/$_origname-$pkgver - patch -Np0 -i $startdir/install_svg_icons_too.patch || return 1 - cmake . -DCMAKE_BUILD_TYPE=Release \ + cd "${srcdir}/$pkgbase-$pkgver" + cmake . \ + -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=${_installprefix} make } package_oxygen-icons() { - pkgdesc="Oxygen (Emot)Icons" + pkgdesc="Oxygen icons" groups=("kde" "kde-minimal" "kde-uninstall") - cd $srcdir/$_origname-$pkgver - make DESTDIR=$pkgdir install || return 1 - # move out some svg icons - mkdir -p $srcdir/svg - mv $pkgdir/usr/share/icons/oxygen/scalable $srcdir/svg + cd "${srcdir}/$pkgbase-$pkgver" + make DESTDIR=${pkgdir} install + + # Move SVG files + mv "${pkgdir}/usr/share/icons/oxygen/scalable" "${srcdir}/svg" } package_oxygen-icons-svg() { - pkgdesc="Oxygen (Emot)Icons - SVG Sources" + pkgdesc="Oxygen icons (SVG sources)" groups=("kde-uninstall") - depends=("${_origname}") + depends=("oxygen-icons") - mkdir -p $pkgdir/usr/share/icons/oxygen - mv $srcdir/svg/scalable $pkgdir/usr/share/icons/oxygen - rm -rf $pkgdir/usr/share/icons/oxygen/scalable/apps/clock.svgz + mkdir -p "${pkgdir}/usr/share/icons/oxygen" + mv "${srcdir}/svg/scalable" "${pkgdir}/usr/share/icons/oxygen" + rm -rf "$pkgdir/usr/share/icons/oxygen/scalable/apps/clock.svgz" } -sha1sums=('ee5d1658c9880e556b7e9304844fee026fab8c12')