Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=kde5.git;a=commitdiff;h=84506b2d88e56d344bb8aac55b99fb1ab133a6d8
commit 84506b2d88e56d344bb8aac55b99fb1ab133a6d8
Merge: 9988c1a 0c58dc7
Author: crazy <cr...@frugalware.org>
Date: Sun Jun 4 20:14:48 2017 +0200
Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current
Conflicts:
source/xapps-extra/qtox/FrugalBuild
source/xapps-extra/scudcloud/FrugalBuild
diff --cc source/xapps-extra/qtox/FrugalBuild
index 8de0581,3d8c489..701e24a
--- a/source/xapps-extra/qtox/FrugalBuild
+++ b/source/xapps-extra/qtox/FrugalBuild
@@@ -1,9 -1,9 +1,8 @@@
--# Compiling Time: 0.46 SBU
--# Maintainer: DeX77 <de...@frugalware.org>
++# Compiling Time: 0.46 SBU Maintainer: DeX77 <de...@frugalware.org>
pkgname=qtox
- pkgver=1.10.1
+ pkgver=1.10.2
-pkgrel=1
+pkgrel=2
archs=('x86_64')
groups=('xapps-extra')
depends=('tox-core>=0.1.5' 'qrencode' 'libxscrnsaver' 'ffmpeg>=3.2' \
diff --cc source/xapps-extra/scudcloud/FrugalBuild
index 92ca76b,93ba8f0..a79ee83
--- a/source/xapps-extra/scudcloud/FrugalBuild
+++ b/source/xapps-extra/scudcloud/FrugalBuild
@@@ -2,13 -2,13 +2,13 @@@
# Maintainer: DeX77 <de...@frugalware.org>
pkgname=scudcloud
- pkgver=1.59
- pkgrel=1
+ pkgver=1.60
-pkgrel=1
++pkgrel=2
pkgdesc='A Slack client for Linux'
-depends=('dbus-python3' 'pyqt5-python3' 'qt5-webkit' 'hunspell-en')
+depends=('dbus-python3' 'pyqt5-python3' 'qt5-webkit>=5.9.0' 'hunspell-en')
groups=('xapps-extra')
archs=('x86_64')
- sha1sums=('73e2dc25428a717f6512d1493712858cbba1f2cd')
+ sha1sums=('03508de325fcc4e1e0557c7b7999e5d6b58e5318')
_F_github_author="raelgc"
_F_github_tag_v=yes
_F_python_version=python3
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
