diff --git a/knemo/PKGBUILD b/knemo/PKGBUILD index cb9d2177d..5c1434fb0 100644 --- a/knemo/PKGBUILD +++ b/knemo/PKGBUILD @@ -1,28 +1,34 @@ pkgname=knemo -pkgver=0.7.7 +pkgver=0.7.7.f3afe2e pkgrel=1 pkgdesc="The KDE Network Monitor" -arch=('i686' 'x86_64') +arch=('x86_64') url="http://www.kde-apps.org/content/show.php?content=12956" license=('GPL') -depends=('kde-runtime' 'wireless_tools' 'iw' 'networkmanager' 'libnl' 'libksysguard4') -makedepends=('cmake' 'automoc4' 'kde-workspace') -install=${pkgname}.install +depends=('kdelibs4support' 'libksysguard' 'knotifyconfig' 'wireless_tools' 'iw' 'plasma-framework' 'hicolor-icon-theme') +makedepends=('extra-cmake-modules' 'kcmutils' 'plasma-framework' 'kdoctools' 'git' 'kdesignerplugin') categories=('network') -options=('libtool') -source=(http://kde-apps.org/CONTENT/content-files/12956-knemo-0.7.7.tar.xz) -sha512sums=('4a5214c2f0146aae60bbcf4bb09230823f13c53eab13489b67fb7eab6c19cac80a036b3e920bf2d99430f98144fae935448915953de785126bc05fcd4ed93065') +_commit=f3afe2e4b6f091f21a64905965abafd2ef46826d # frameworks +source=("git://git.kde.org/knemo.git#commit=$_commit" knemo-gcc6.patch) +sha256sums=('SKIP' + '5da88c3c60bf7ab924c85ee2c1159a12d4c376ad726eab784972abc36295a4fc') + +prepare() { + mkdir build + cd knemo +# Fix build with GCC 6 + patch -p1 -i ../knemo-gcc6.patch +} build() { - cd ${srcdir} - mkdir build cd build - cmake ../${pkgname}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=ON \ - -DCMAKE_INSTALL_PREFIX=/usr - make + cmake ../${pkgname} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_TESTING=OFF + make } package() { diff --git a/knemo/knemo-gcc6.patch b/knemo/knemo-gcc6.patch new file mode 100644 index 000000000..f47428a2a --- /dev/null +++ b/knemo/knemo-gcc6.patch @@ -0,0 +1,20 @@ +--- knemo.orig/src/common/utils.cpp 2016-05-07 14:30:45.888889978 +0000 ++++ knemo/src/common/utils.cpp 2016-05-07 14:32:06.985290816 +0000 +@@ -41,6 +41,7 @@ + #include + #include + #include "data.h" ++#include "math.h" + #include "utils.h" + + #ifdef __linux__ +--- knemo.orig/src/knemod/trayicon.cpp 2015-10-03 17:22:07.000000000 +0000 ++++ knemo/src/knemo/src/knemod/trayicon.cpp 2016-05-07 14:42:30.796566437 +0000 +@@ -22,6 +22,7 @@ + #include "global.h" + #include "interface.h" + #include "knemodaemon.h" ++#include "math.h" + #include "utils.h" + + #ifdef __linux__ diff --git a/knemo/knemo.install b/knemo/knemo.install deleted file mode 100644 index 8ac54a271..000000000 --- a/knemo/knemo.install +++ /dev/null @@ -1,88 +0,0 @@ -post_install() { - if [ -e "/etc/chakra/updates.conf" ] ; then - - . /etc/chakra/updates.conf - - if [ "$UPDATE_XDG_ICON_DB" = "yes" ]; then - /usr/bin/chakra-update-icons - fi - - if [ "$UPDATE_GLOBAL_CONFIG" = "yes" ]; then - /usr/bin/chakra-update-sycoca - fi - - if [ "$UPDATE_USER_CONFIG" = "yes" ]; then - /usr/bin/chakra-update-user-sycoca - fi - else - echo " > WARNING" - echo " The package kde-common seems not to be installed," - echo " this can possibly break the installation. Just install it" - echo " manually after this installation/update, run the following" - echo " commands and restart KDE afterwards:" - echo " sudo chakra-config-updater" - echo " kbuildsycoca4" - echo " " - fi -} - -post_upgrade() { - if [ -e "/etc/chakra/updates.conf" ] ; then - - . /etc/chakra/updates.conf - - if [ "$UPDATE_XDG_ICON_DB" = "yes" ]; then - /usr/bin/chakra-update-icons - fi - - if [ "$UPDATE_GLOBAL_CONFIG" = "yes" ]; then - /usr/bin/chakra-update-sycoca - fi - - if [ "$UPDATE_USER_CONFIG" = "yes" ]; then - /usr/bin/chakra-update-user-sycoca - fi - else - echo " > WARNING" - echo " The package kde-common seems not to be installed," - echo " this can possibly break the installation. Just install it" - echo " manually after this installation/update, run the following" - echo " commands and restart KDE afterwards:" - echo " sudo chakra-config-updater" - echo " kbuildsycoca4" - echo " " - fi -} - -post_remove() { - if [ -e "/etc/chakra/updates.conf" ] ; then - - . /etc/chakra/updates.conf - - if [ "$UPDATE_XDG_ICON_DB" = "yes" ]; then - /usr/bin/chakra-update-icons - fi - - if [ "$UPDATE_GLOBAL_CONFIG" = "yes" ]; then - /usr/bin/chakra-update-sycoca - fi - - if [ "$UPDATE_USER_CONFIG" = "yes" ]; then - /usr/bin/chakra-update-user-sycoca - fi - else - echo " > WARNING" - echo " The package kde-common seems not to be installed," - echo " this can possibly break the installation. Just install it" - echo " manually after this installation/update, run the following" - echo " commands and restart KDE afterwards:" - echo " sudo chakra-config-updater" - echo " kbuildsycoca4" - echo " " - fi -} - -op=$1 -shift - -$op $* diff --git a/kwooty/PKGBUILD b/kwooty/PKGBUILD deleted file mode 100644 index 29b1cedc0..000000000 --- a/kwooty/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# Maintainer: Adrián Chaves Fernández (Gallaecio) - -pkgname=kwooty -pkgver=1.1.0 -pkgrel=2 -pkgdesc="A friendly nzb usenet binary downloader." -arch=('x86_64') -url="http://kde-apps.org/content/show.php/Kwooty?content=114385" -license=('GPL2') -depends=('kde-runtime' 'libkworkspace4') -makedepends=('cmake' 'automoc4' 'kde-workspace') -optdepends=('unrar: automatic RAR-archive extraction.' - 'p7zip: automatic zip and 7z archive extraction.' - 'par2cmdline: automatic file repairing.') -categories=('network') -source=("http://kde-apps.org/CONTENT/content-files/114385-$pkgname-$pkgver.tar.gz") -md5sums=('b572b685c7f07af1a1c1f78b499c8830') -install=${pkgname}.install - -build() { - cd $srcdir/$pkgname-$pkgver - cd build - cmake -DCMAKE_INSTALL_PREFIX=`kde4-config --prefix` \ - -DCMAKE_BUILD_TYPE=Release \ - .. - make -} - -package() { - cd $srcdir/$pkgname-$pkgver/build - make DESTDIR=$pkgdir install -} diff --git a/kwooty/kwooty.install b/kwooty/kwooty.install deleted file mode 100644 index 2a30a8da5..000000000 --- a/kwooty/kwooty.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - update-desktop-database -q &> /dev/null - xdg-icon-resource forceupdate --theme hicolor &> /dev/null -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -}