Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=dex77stuff.git;a=commitdiff;h=b0da0ec9ffb3d0d8e2cdae1f82bc1687edb4fe34

commit b0da0ec9ffb3d0d8e2cdae1f82bc1687edb4fe34
Merge: 628ffae 020c6d8
Author: Baste <[email protected]>
Date:   Mon Feb 23 09:30:16 2015 +0100

Merge ../current

Conflicts:
source/base/glib2/FrugalBuild
source/gnome/gnome-control-center/FrugalBuild
source/x11/libinput/FrugalBuild

diff --cc source/gnome/gnome-control-center/FrugalBuild
index 13974e0,05901c5..7f74003
--- a/source/gnome/gnome-control-center/FrugalBuild
+++ b/source/gnome/gnome-control-center/FrugalBuild
@@@ -7,12 -7,12 +7,12 @@@ USE_CHEESE=${USE_CHEESE:-"y"
options+=('asneeded')

pkgname=gnome-control-center
-pkgver=3.12.1
-pkgrel=4
+pkgver=3.14.2
+pkgrel=3
pkgdesc="GNOME Control Center"
-depends=('gnome-desktop>=3.12.0' 'gnome-menus>=3.8.0' 
'gnome-online-accounts>=3.12.0' 'libgtop' 'gnome-settings-daemon>=3.12.0' 
'systemd>=188' \
+depends=('gnome-desktop>=3.14.0' 'gnome-menus>=3.8.0' 
'gnome-online-accounts>=3.12.0' 'libgtop' 'gnome-settings-daemon>=3.14.0' 
'systemd>=188' \
'mesademos' 'libpwquality' 'gst1-plugins-bad' 'ibus' 'cups-pk-helper' 
'colord-gtk' 'accountsservice' \
-       'nm-connection-editor' 'libsmbclient' 'talloc' 'grilo' 
'gnome-bluetooth' 'libpulse>=5.0')
+       'nm-connection-editor' 'libsmbclient' 'talloc' 'grilo' 
'gnome-bluetooth' 'libpulse>=6.0')
makedepends=('intltool' 'gnome-doc-utils' 'cups' 'krb5' 'icu4c>=4.8' 
'docbook-xsl' 'gobject-introspection')
# 'gnome-common')
rodepends=('gst1-plugins-base-alsa>=0.10.19-2' 'sound-theme-freedesktop' 
'system-config-printer')
diff --cc source/x11/libinput/FrugalBuild
index 9d0afa6,7e821fc..28a54f6
--- a/source/x11/libinput/FrugalBuild
+++ b/source/x11/libinput/FrugalBuild
@@@ -4,13 -4,14 +4,15 @@@
options+=('asneeded')

pkgname=libinput
- pkgver=0.6.0
+ pkgver=0.9.0
pkgrel=1
- pkgdesc="Input device library"
- url="http://www.freedesktop.org/wiki/Software/libinput/";
+ pkgdesc="X.Org Xau library"
+ url="http://xorg.freedesktop.org";
+ groups=('x11' 'xorg-core' 'xorg-libs')
+ archs=('i686' 'x86_64' 'arm')
depends=('mtdev' 'libevdev')
- groups=('x11')
- archs=('i686' 'x86_64')
source=(http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz)
up2date="Flasttar http://www.freedesktop.org/software/$pkgname/";
- sha1sums=('6c0dacd5f99a2f0f163c8a5da93a201062289c17')
+ sha1sums=('81ed051e2107c183205912f993e4650fae4767c2')
+ # optimization OK
++
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to