[Frugalware-git] gcc6: Merge current , conflicts in openssl and Slown stuff ...

2016-09-27 Thread crazy 
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc6.git;a=commitdiff;h=2a57240589d35dbaa715543b9f6eb083b384898d

commit 2a57240589d35dbaa715543b9f6eb083b384898d
Merge: 7c9e6c1 99287c9
Author: crazy 
Date:   Wed Sep 28 01:11:43 2016 +0200

Merge current , conflicts in openssl and Slown stuff ...
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

[Frugalware-git] gcc6: Merge current and resolv cups conflicts

2016-09-25 Thread crazy 
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc6.git;a=commitdiff;h=b9263b3888b2ce26e903b704552e774eca589b17

commit b9263b3888b2ce26e903b704552e774eca589b17
Merge: 2e91527 69ed01b
Author: crazy 
Date:   Sun Sep 25 17:40:20 2016 +0200

Merge current and resolv cups conflicts

diff --cc source/xapps/cups/FrugalBuild
index 1dcfa3a,4befa84..40b82c4
--- a/source/xapps/cups/FrugalBuild
+++ b/source/xapps/cups/FrugalBuild
@@@ -14,12 -14,11 +14,12 @@@ archs=('i686' 'x86_64'
backup=(etc/cups/{printers.conf,classes.conf,client.conf,cupsd.conf,mime.types,mime.convs})
_F_github_author="apple"
_F_github_tag=y
- _F_github_tag_v=y
+ _F_github_ver="release-$pkgver"
Finclude github
-up2date="$up2date | sed 's/release_//'"
+source+=(cups-cpu-hammering.patch)
url="http://www.cups.org/";
-sha1sums=('14de8309d4a19bb2550054c87d453a52b07b7682')
+sha1sums=('03d549775e595ca52e1ec8cf1e7d2501392ececb' \
+  'cd42f20cee1c13001a1f2dfabc8f84a2d0a8831a')

provides=('cupsddk')
replaces=("${provides[@]}")
@@@ -28,9 -27,10 +28,10 @@@ conflicts=("${provides[@]}"
subpkgs=('libcups')
subdescs=('Main library of the CUPS printing system.')
subgroups=('lib')
-subdepends=('gnutls>=3.4.9 avahi>=0.6.31-7')
-subarchs=('i686 x86_64 arm')
+subdepends=('gnutls>=3.4.15-2 avahi>=0.6.31-9')
+subarchs=('i686 x86_64')

+ options+=('force' 'noccache')
# Do NOT remove --libdir option, needed for x86_64 to put libs into /usr/lib
Fconfopts+="--with-cups-user=lp \
--with-cups-group=lp \
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

[Frugalware-git] gcc6: Merge current..

2016-09-22 Thread crazy 
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc6.git;a=commitdiff;h=763552785e02327698d3d03a5d2d0d2b9e6e6fbe

commit 763552785e02327698d3d03a5d2d0d2b9e6e6fbe
Merge: 58b86cf 629c72c
Author: crazy 
Date:   Thu Sep 22 20:17:02 2016 +0200

Merge current..
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

[Frugalware-git] gcc6: Merge current

2016-09-20 Thread crazy 
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc6.git;a=commitdiff;h=48e77c5c93bc817e8a5b079629e218731c3cec6b

commit 48e77c5c93bc817e8a5b079629e218731c3cec6b
Merge: 2c3b407 cb522d7
Author: crazy 
Date:   Tue Sep 20 20:55:43 2016 +0200

Merge current
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

[Frugalware-git] gcc6: Merge current

2016-09-14 Thread crazy 
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc6.git;a=commitdiff;h=012427db7420e46d6154ab14c72d62d305d1c40c

commit 012427db7420e46d6154ab14c72d62d305d1c40c
Merge: a98b847 8b264ae
Author: crazy 
Date:   Thu Sep 15 06:15:37 2016 +0200

Merge current
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git