[Frugalware-git] ayatana: Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current

2011-10-13 Thread Devil505 
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=ayatana.git;a=commitdiff;h=084b6ec38ecc8ed99a611c3372c77a5991e831a0

commit 084b6ec38ecc8ed99a611c3372c77a5991e831a0
Merge: 938e1eb d885aee
Author: Devil505 devil505li...@gmail.com
Date:   Thu Oct 13 18:13:47 2011 +0200

Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

[Frugalware-git] ayatana: Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current

2011-10-04 Thread Devil505 
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=ayatana.git;a=commitdiff;h=938e1eb682b78aac1c3f5912f3cd9c6400920876

commit 938e1eb682b78aac1c3f5912f3cd9c6400920876
Merge: 65b30a9 74f
Author: Devil505 devil505li...@gmail.com
Date:   Tue Oct 4 08:51:32 2011 +0200

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

Conflicts:
source/ayatana-extra/bamf/FrugalBuild
source/base/glib2/FrugalBuild
source/devel/json-glib/FrugalBuild
source/xapps-extra/marlin/FrugalBuild
source/xlib-extra/qt4/FrugalBuild
source/xlib/gdk-pixbuf2/FrugalBuild
source/xlib/gtk+3/FrugalBuild
source/xlib/pango/FrugalBuild

diff --cc source/xlib-extra/qt4/FrugalBuild
index dde2254,75c63cf..0993eae
--- a/source/xlib-extra/qt4/FrugalBuild
+++ b/source/xlib-extra/qt4/FrugalBuild
@@@ -6,8 -6,8 +6,8 @@@ USE_DETECTDEPENDS=${USE_DETECTDEPENDS:-

pkgname=qt4
_F_archive_name=qt-everywhere-opensource-src
- pkgver=4.7.3
- pkgrel=5
+ pkgver=4.7.4
-pkgrel=1
++pkgrel=2
pkgdesc=The QT4 GUI toolkit.
url=http://qt.nokia.com/products/;
depends=()
@@@ -21,23 -21,11 +21,21 @@@ options=('scriptlet' 'nodocs'
_F_archive_grepv=-tp
up2date=Flasttar ftp://ftp.qt.nokia.com/qt/source/;
source=(ftp://ftp.qt.nokia.com/qt/source/$_F_archive_name-$pkgver.tar.gz \
+qtbug-16292.patch \
+14_systemtrayicon.diff \
+15_appmenu.diff \
+16_qt-designer-toplevel-mode-menubar.diff \
+26_dbusconnection_pointer.diff \
+27_dbus_signal_filter_passes_not_handled.diff \
frugalware.patch \
fix-config.tests.patch)
- sha1sums=('765eb70d9779f93fefda5e6ddb33f4c0b71e' \
+ sha1sums=('af9016aa924a577f7b06ffd28c9773b56d74c939' \
-  '8d65e6bff36eb0b3219d30101ea7d062504aaaf8' \
-  'e2522839807839f1af77de7ccd4c9e8c7df4acd0')
+  'ec8607cca4b4f71f6fab7309fd59f059f47d5f52' \
+  'b13575e295829fa26ccaf6b11eafa394955ae073' \
+  'db49f3fb3b7711a61cc6009347e455ef4030e91f' \
+  '2391d180dea337fd5230273e0f1adda43491cc19' \
+  '88c4b4c59718b237cebbff4925d8361d0c24db64' \
+  '95d384a06306b0f545c90364a12e4a70efc2f99d' \
-   '8d65e6bff36eb0b3219d30101ea7d062504aaaf8' \
-   'e2522839807839f1af77de7ccd4c9e8c7df4acd0')
export LD_LIBRARY_PATH=$Fsrcdir/$_F_archive_name-$pkgver/lib:${LD_LIBRARY_PATH}
export YACC='yacc -d'

diff --cc source/xlib/gtk+3/FrugalBuild
index 255e98b,95a9622..e9d825e
--- a/source/xlib/gtk+3/FrugalBuild
+++ b/source/xlib/gtk+3/FrugalBuild
@@@ -18,17 -19,9 +19,17 @@@ _F_gnome_glib=y
Finclude gnome gnome-scriptlet
url=http://www.gtk.org/;
_F_cd_path=gtk+-$pkgver
-source=($source im-cedilla.conf)
+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' \
+ sha1sums=('907962ce042827cd6db89ba16cbfa72c2d3942a2' \
-  'f8a64241bcc873c1f1110e16306e48577a41852b')
+  '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

[Frugalware-git] ayatana: Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current

2011-09-01 Thread Devil505 
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=ayatana.git;a=commitdiff;h=3bb06faa68e4cb5678e099124d35a19b23cfdce8

commit 3bb06faa68e4cb5678e099124d35a19b23cfdce8
Merge: 65356c0 51950c6
Author: Devil505 devil505li...@gmail.com
Date:   Thu Sep 1 22:06:24 2011 +0200

Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

[Frugalware-git] ayatana: Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current

2011-08-26 Thread Devil505 
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

[Frugalware-git] ayatana: Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current

2011-07-23 Thread Devil505 
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=ayatana.git;a=commitdiff;h=b3ac37ea089deeca31bde655d4725a885aa55f37

commit b3ac37ea089deeca31bde655d4725a885aa55f37
Merge: 13eb77a 07fbe6b
Author: Devil505 devil505li...@gmail.com
Date:   Sat Jul 23 10:49:58 2011 +0200

Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

[Frugalware-git] ayatana: Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current

2011-07-22 Thread Devil505 
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=ayatana.git;a=commitdiff;h=672c944313bfdadb662e995f5ad3455ecad6fd9d

commit 672c944313bfdadb662e995f5ad3455ecad6fd9d
Merge: 302220b f2d72f0
Author: Devil505 devil505li...@gmail.com
Date:   Fri Jul 22 10:46:15 2011 +0200

Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

[Frugalware-git] ayatana: Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current

2011-07-20 Thread Devil505 
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=ayatana.git;a=commitdiff;h=5084bcae97c8d140fa09f0de956997c43bfed480

commit 5084bcae97c8d140fa09f0de956997c43bfed480
Merge: 78a8257 3aa5ba8
Author: Devil505 devil505li...@gmail.com
Date:   Wed Jul 20 17:26:41 2011 +0200

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

Conflicts:
source/xlib/gdk-pixbuf2/FrugalBuild
source/xlib/libdbusmenu/FrugalBuild
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

[Frugalware-git] ayatana: Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current

2011-01-05 Thread Devil505 
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=ayatana.git;a=commitdiff;h=93ffbad1d8af335220d23d05ae7453e09ef9eb07

commit 93ffbad1d8af335220d23d05ae7453e09ef9eb07
Merge: d23cde4 97f59e5
Author: Devil505 devil505li...@gmail.com
Date:   Wed Jan 5 10:10:26 2011 +0100

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

Conflicts:
source/devel-extra/vala/FrugalBuild

diff --cc source/devel-extra/vala/FrugalBuild
index af2e8a7,eea1fb4..6245e5a
--- a/source/devel-extra/vala/FrugalBuild
+++ b/source/devel-extra/vala/FrugalBuild
@@@ -3,15 -3,15 +3,16 @@@
# Contributor: jedifox j3d1...@free.fr

pkgname=vala
-pkgver=0.10.2
-pkgrel=2
+pkgver=0.11.2
+pkgrel=1
pkgdesc=Vala is a prgramming language that aims to bring modern programming 
language features to GNOME developers
depends=('glib2=2.20.1')
+ makedepends=('libxslt')
groups=('devel-extra')
archs=('i686' 'x86_64' 'ppc')
+_F_gnome_devel=y
Finclude gnome
-sha1sums=('3ace6a7789d3596df5869d69ff33b8ee20a88dc6')
+sha1sums=('722129c8c98bedd74be90c298b591b0da249e85b')
Fconfopts=${fconfop...@]} --enable-vapigen

# optimization OK
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

[Frugalware-git] ayatana: Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current

2011-01-01 Thread Devil505 
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=ayatana.git;a=commitdiff;h=02027636d93fe3d7e1f2d477757ce62df884aba4

commit 02027636d93fe3d7e1f2d477757ce62df884aba4
Merge: 361441c 2b17e92
Author: Devil505 devil505li...@gmail.com
Date:   Sat Jan 1 16:25:07 2011 +0100

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

Conflicts:
source/gnome-extra/empathy/FrugalBuild
source/gnome-extra/indicator-application/FrugalBuild

diff --cc source/gnome-extra/empathy/FrugalBuild
index e244541,c5c8d35..f13d540
--- a/source/gnome-extra/empathy/FrugalBuild
+++ b/source/gnome-extra/empathy/FrugalBuild
@@@ -12,7 -12,8 +12,8 @@@ depends=('gconf=2.32.0' 'telepathy-gli
'libsm' 'gail' 'libart_lgpl' 'libffi' 'telepathy-stream-engine' \
'aspell' 'iso-codes' 'telepathy-mission-control' 'telepathy-gabble'\
'evolution-data-server=2.30.2' 'libcanberra-gtk' 'telepathy-farsight' \
-   'webkit' 'geoclue' 'unique' 'libkrb5' 'folks=0.2.1' 'telepathy-logger' 
'libchamplain' 'libindicate' 'libindicate-gtk+2')
-   'webkit' 'geoclue' 'unique' 'libkrb5' 'folks=0.2.1' 'telepathy-logger' 
'libchamplain' \
++  'webkit' 'geoclue' 'unique' 'libkrb5' 'folks=0.2.1' 'telepathy-logger' 
'libchamplain' 'libindicate-gtk' \
+   'ca-certificates')
makedepends=('gnome-common' 'intltool' 'gtk-doc' 'gnome-doc-utils' 'krb5')
groups=('gnome-extra')
archs=('i686' 'x86_64' 'ppc')
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

[Frugalware-git] ayatana: Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current

2011-01-01 Thread Devil505 
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=ayatana.git;a=commitdiff;h=777d31d120b2c3843418386e32197d5e5b5ec36e

commit 777d31d120b2c3843418386e32197d5e5b5ec36e
Merge: 0202763 55506f9
Author: Devil505 devil505li...@gmail.com
Date:   Sat Jan 1 20:49:15 2011 +0100

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

Conflicts:
source/gnome-extra/indicator-application/FrugalBuild
source/gnome-extra/pidgin-libnotify/FrugalBuild
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git