[arch-commits] Commit in knemo/repos (8 files)
Antonio Rojas
arojas at archlinux.org
Sat May 7 14:49:29 UTC 2016
Date: Saturday, May 7, 2016 @ 16:49:28
Author: arojas
Revision: 174123
archrelease: copy trunk to community-i686, community-x86_64
Added:
knemo/repos/community-i686/PKGBUILD
(from rev 174122, knemo/trunk/PKGBUILD)
knemo/repos/community-i686/knemo-gcc6.patch
(from rev 174122, knemo/trunk/knemo-gcc6.patch)
knemo/repos/community-x86_64/PKGBUILD
(from rev 174122, knemo/trunk/PKGBUILD)
knemo/repos/community-x86_64/knemo-gcc6.patch
(from rev 174122, knemo/trunk/knemo-gcc6.patch)
Deleted:
knemo/repos/community-i686/PKGBUILD
knemo/repos/community-i686/knemo.install
knemo/repos/community-x86_64/PKGBUILD
knemo/repos/community-x86_64/knemo.install
-----------------------------------+
/PKGBUILD | 88 ++++++++++++++++++++++++++++++++++++
community-i686/PKGBUILD | 40 ----------------
community-i686/knemo-gcc6.patch | 20 ++++++++
community-i686/knemo.install | 11 ----
community-x86_64/PKGBUILD | 40 ----------------
community-x86_64/knemo-gcc6.patch | 20 ++++++++
community-x86_64/knemo.install | 11 ----
7 files changed, 128 insertions(+), 102 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2016-05-07 14:48:46 UTC (rev 174122)
+++ community-i686/PKGBUILD 2016-05-07 14:49:28 UTC (rev 174123)
@@ -1,40 +0,0 @@
-# $Id$
-# Maintainer: Laurent Carlier <lordheavym at gmail.com>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Contributor: Stefano Zamprogno <stefano dot zamprogno at gmail dot com>
-
-pkgname=knemo
-pkgver=0.7.7.git20151003
-pkgrel=1
-pkgdesc="The KDE Network Monitor"
-arch=('i686' 'x86_64')
-url="http://www.kde-apps.org/content/show.php?content=12956"
-license=('GPL')
-depends=('kdelibs4support' 'libksysguard' 'knotifyconfig' 'wireless_tools' 'iw' 'gtk-update-icon-cache')
-makedepends=('extra-cmake-modules' 'plasma-framework' 'kdoctools')
-install=${pkgname}.install
-options=('libtool')
-#source=(http://kde-apps.org/CONTENT/content-files/12956-${pkgname}-${pkgver}.tar.xz)
-source=("http://quickgit.kde.org/?p=knemo.git&a=snapshot&h=7efb4f62344c245e9eb6822df284f8c7f4e97f2f&fmt=tgz")
-md5sums=('ab1f02cd06647278141c609fba5f61fb')
-
-prepare() {
- mkdir build
-}
-
-build() {
- cd build
-
- cmake ../${pkgname} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_INSTALL_LIBDIR=lib \
- -DKDE_INSTALL_USE_QT_SYS_PATHS=ON
- make
-}
-
-package() {
- cd build
- make DESTDIR="${pkgdir}" install
-}
Copied: knemo/repos/community-i686/PKGBUILD (from rev 174122, knemo/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2016-05-07 14:49:28 UTC (rev 174123)
@@ -0,0 +1,44 @@
+# $Id$
+# Maintainer: Laurent Carlier <lordheavym at gmail.com>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: Stefano Zamprogno <stefano dot zamprogno at gmail dot com>
+
+pkgname=knemo
+pkgver=0.7.7.git20151003
+pkgrel=2
+pkgdesc="The KDE Network Monitor"
+arch=('i686' 'x86_64')
+url="http://www.kde-apps.org/content/show.php?content=12956"
+license=('GPL')
+depends=('kdelibs4support' 'libksysguard' 'knotifyconfig' 'wireless_tools' 'iw' 'gtk-update-icon-cache')
+makedepends=('extra-cmake-modules' 'kcmutils' 'plasma-framework' 'kdoctools' 'python')
+options=('libtool')
+#source=(http://kde-apps.org/CONTENT/content-files/12956-${pkgname}-${pkgver}.tar.xz)
+source=("http://quickgit.kde.org/?p=knemo.git&a=snapshot&h=7efb4f62344c245e9eb6822df284f8c7f4e97f2f&fmt=tgz" knemo-gcc6.patch)
+md5sums=('ab1f02cd06647278141c609fba5f61fb'
+ 'd243b851c8124a4e6d84221a2fb15215')
+
+prepare() {
+ mkdir build
+
+ cd knemo
+# Fix build with GCC 6
+ patch -p1 -i ../knemo-gcc6.patch
+}
+
+build() {
+ cd build
+
+ cmake ../${pkgname} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_INSTALL_LIBDIR=lib \
+ -DKDE_INSTALL_USE_QT_SYS_PATHS=ON
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR="${pkgdir}" install
+}
Copied: knemo/repos/community-i686/knemo-gcc6.patch (from rev 174122, knemo/trunk/knemo-gcc6.patch)
===================================================================
--- community-i686/knemo-gcc6.patch (rev 0)
+++ community-i686/knemo-gcc6.patch 2016-05-07 14:49:28 UTC (rev 174123)
@@ -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 <KSharedConfig>
+ #include <Plasma/Theme>
+ #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__
Deleted: community-i686/knemo.install
===================================================================
--- community-i686/knemo.install 2016-05-07 14:48:46 UTC (rev 174122)
+++ community-i686/knemo.install 2016-05-07 14:49:28 UTC (rev 174123)
@@ -1,11 +0,0 @@
-post_install() {
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2016-05-07 14:48:46 UTC (rev 174122)
+++ community-x86_64/PKGBUILD 2016-05-07 14:49:28 UTC (rev 174123)
@@ -1,40 +0,0 @@
-# $Id$
-# Maintainer: Laurent Carlier <lordheavym at gmail.com>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Contributor: Stefano Zamprogno <stefano dot zamprogno at gmail dot com>
-
-pkgname=knemo
-pkgver=0.7.7.git20151003
-pkgrel=1
-pkgdesc="The KDE Network Monitor"
-arch=('i686' 'x86_64')
-url="http://www.kde-apps.org/content/show.php?content=12956"
-license=('GPL')
-depends=('kdelibs4support' 'libksysguard' 'knotifyconfig' 'wireless_tools' 'iw' 'gtk-update-icon-cache')
-makedepends=('extra-cmake-modules' 'plasma-framework' 'kdoctools')
-install=${pkgname}.install
-options=('libtool')
-#source=(http://kde-apps.org/CONTENT/content-files/12956-${pkgname}-${pkgver}.tar.xz)
-source=("http://quickgit.kde.org/?p=knemo.git&a=snapshot&h=7efb4f62344c245e9eb6822df284f8c7f4e97f2f&fmt=tgz")
-md5sums=('ab1f02cd06647278141c609fba5f61fb')
-
-prepare() {
- mkdir build
-}
-
-build() {
- cd build
-
- cmake ../${pkgname} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_INSTALL_LIBDIR=lib \
- -DKDE_INSTALL_USE_QT_SYS_PATHS=ON
- make
-}
-
-package() {
- cd build
- make DESTDIR="${pkgdir}" install
-}
Copied: knemo/repos/community-x86_64/PKGBUILD (from rev 174122, knemo/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2016-05-07 14:49:28 UTC (rev 174123)
@@ -0,0 +1,44 @@
+# $Id$
+# Maintainer: Laurent Carlier <lordheavym at gmail.com>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: Stefano Zamprogno <stefano dot zamprogno at gmail dot com>
+
+pkgname=knemo
+pkgver=0.7.7.git20151003
+pkgrel=2
+pkgdesc="The KDE Network Monitor"
+arch=('i686' 'x86_64')
+url="http://www.kde-apps.org/content/show.php?content=12956"
+license=('GPL')
+depends=('kdelibs4support' 'libksysguard' 'knotifyconfig' 'wireless_tools' 'iw' 'gtk-update-icon-cache')
+makedepends=('extra-cmake-modules' 'kcmutils' 'plasma-framework' 'kdoctools' 'python')
+options=('libtool')
+#source=(http://kde-apps.org/CONTENT/content-files/12956-${pkgname}-${pkgver}.tar.xz)
+source=("http://quickgit.kde.org/?p=knemo.git&a=snapshot&h=7efb4f62344c245e9eb6822df284f8c7f4e97f2f&fmt=tgz" knemo-gcc6.patch)
+md5sums=('ab1f02cd06647278141c609fba5f61fb'
+ 'd243b851c8124a4e6d84221a2fb15215')
+
+prepare() {
+ mkdir build
+
+ cd knemo
+# Fix build with GCC 6
+ patch -p1 -i ../knemo-gcc6.patch
+}
+
+build() {
+ cd build
+
+ cmake ../${pkgname} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_INSTALL_LIBDIR=lib \
+ -DKDE_INSTALL_USE_QT_SYS_PATHS=ON
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR="${pkgdir}" install
+}
Copied: knemo/repos/community-x86_64/knemo-gcc6.patch (from rev 174122, knemo/trunk/knemo-gcc6.patch)
===================================================================
--- community-x86_64/knemo-gcc6.patch (rev 0)
+++ community-x86_64/knemo-gcc6.patch 2016-05-07 14:49:28 UTC (rev 174123)
@@ -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 <KSharedConfig>
+ #include <Plasma/Theme>
+ #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__
Deleted: community-x86_64/knemo.install
===================================================================
--- community-x86_64/knemo.install 2016-05-07 14:48:46 UTC (rev 174122)
+++ community-x86_64/knemo.install 2016-05-07 14:49:28 UTC (rev 174123)
@@ -1,11 +0,0 @@
-post_install() {
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
More information about the arch-commits
mailing list