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

commit cafd10c2318582fb469ee4dad33fbc0420b506ed
Merge: 12e1997 164b008
Author: Devil505 <devil505li...@gmail.com>
Date:   Fri Aug 26 08:40:33 2011 +0200

Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current

Conflicts:
source/ayatana-extra/indicator-sound/FrugalBuild
source/xlib/gtk+3/FrugalBuild

diff --cc source/ayatana-extra/indicator-sound/FrugalBuild
index 5f62473,331977d..68aa5a0
--- a/source/ayatana-extra/indicator-sound/FrugalBuild
+++ b/source/ayatana-extra/indicator-sound/FrugalBuild
@@@ -2,11 -2,11 +2,11 @@@
# Maintainer: Devil505 <devil505li...@gmail.com>

pkgname=indicator-sound
-pkgver=0.7.1
-pkgrel=2
+pkgver=0.7.6
+pkgrel=1
pkgdesc="A unified sound menu"
- depends=('pulseaudio' 'libdbusmenu-gtk>=0.3.98-3' 'libindicator>=0.3.19' 
'dconf' 'libuuid' \
+ depends=('pulseaudio>=0.9.23' 'libdbusmenu-gtk>=0.3.98-3' 
'libindicator>=0.3.19' 'dconf' 'libuuid' \
-    'ido>=0.2.0' 'libindicate>=0.4.93' 'libgee' 'glib2>=2.28.1-2' 
'libnotify>=0.7.1')
+    'ido>=0.2.0' 'libindicate>=0.5.91' 'libgee' 'glib2>=2.28.1-2' 
'libnotify>=0.7.1')
makedepends=('intltool'  'vala' 'gconf')
groups=('ayatana-extra')
archs=('i686' 'x86_64')
diff --cc source/xlib/gtk+3/FrugalBuild
index 3510231,001308d..255e98b
--- a/source/xlib/gtk+3/FrugalBuild
+++ b/source/xlib/gtk+3/FrugalBuild
@@@ -14,20 -14,13 +14,21 @@@ groups=('xlib'
makedepends=('gtk-doc' 'cups' 'inputproto' 'gobject-introspection')
archs=('i686' 'x86_64' 'ppc' 'arm')
_F_gnome_git="n"
- Finclude gnome
+ _F_gnome_glib="y"
+ Finclude gnome gnome-scriptlet
url="http://www.gtk.org/";
_F_cd_path="gtk+-$pkgver"
-source=($source im-cedilla.conf)
-sha1sums=('bb2d294d6cbe9f7e71de67ab4892217085a47d97' \
-          'f8a64241bcc873c1f1110e16306e48577a41852b')
+source=($source im-cedilla.conf \
+        043_ubuntu_menu_proxy.patch \
+        062_ubuntu-set-grab-add.patch \
+        072_indicator_menu_update.patch \
+        100_overlay_scrollbar_loading.patch)
+sha1sums=('30bf6240b3df62d6032c939d0eddbcae228ab7e2' \
+          'f8a64241bcc873c1f1110e16306e48577a41852b' \
+          'a96b2be5f4cae4a9591bebfdbaae1bb504b569d4' \
+          'f4f56d3d79d0f84f5f882efd901d7951b412391d' \
+          '430896c9631da8d12b240fc0a9f47fe054da89eb' \
+          '67fe5f488339fb94cb6830ce285241b5fea8e590')

if [ "$_F_gnome_git" != "n" ]; then
unset sha1sums
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to