[Frugalware-git] ryuotesting: Merge ../current

Thu Apr 12 17:54:04 CEST 2012

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=ryuotesting.git;a=commitdiff;h=07f1026f6e9472866b0f94972c1fff4259c3c8c3

commit 07f1026f6e9472866b0f94972c1fff4259c3c8c3
Merge: 7bdebdc efc522e
Author: Baste <baste at frugalware.org>
Date:   Mon Jan 23 15:36:50 2012 +0100

Merge ../current

Conflicts:
source/devel-extra/guile/FrugalBuild
source/gnome/gjs/FrugalBuild
source/gnome/gnome-icon-theme-symbolic/FrugalBuild
source/gnome/gnome-shell-frugalware-theme/FrugalBuild
source/gnome/gnome-shell/FrugalBuild
source/gnome/gtkhtml/FrugalBuild
source/gnome/mutter/FrugalBuild
source/gnome/tracker/FrugalBuild
source/xlib/librsvg/FrugalBuild

diff --cc source/devel-extra/guile/FrugalBuild
index 423eabf,7b9076b..16fa2a3

--- a/source/devel-extra/guile/FrugalBuild
+++ b/source/devel-extra/guile/FrugalBuild
@@@ -4,7 -4,7 +4,7 @@@

pkgname=guile
pkgver=1.8.8
- pkgrel=3
-pkgrel=2
++pkgrel=4
pkgdesc="Guile is a portable, embeddable Scheme implementation written in C"
url="http://www.gnu.org/software/guile/"
depends=('gmp>=5.0.1' 'readline' 'libtool>=2.2.2')
diff --cc source/gnome/gjs/FrugalBuild
index 0b7a75f,62dd2cf..79b6089
--- a/source/gnome/gjs/FrugalBuild
+++ b/source/gnome/gjs/FrugalBuild
@@@ -2,13 -2,13 +2,13 @@@
# Maintainer: bouleetbil <bouleetbil at frogdev.info>

pkgname=gjs
-pkgver=1.30.1
-pkgrel=1
+pkgver=1.31.10
- pkgrel=1
++pkgrel=2
pkgdesc="Javascript Bindings for GNOME"
url="http://www.gnome.org/"
-depends=('libxml2>=2.7.8' 'xulrunner>=6.0.2' 'cairo')
+depends=('libxml2>=2.7.8' 'cairo' 'spidermonkey>=1.8.5' 'dbus-glib' 'libxmu' 'libxi')
makedepends=('intltool' 'gnome-doc-utils' 'gnome-common' 'gobject-introspection>=1.29.15')
-groups=('gnome')
+groups=('gnome' 'gnome-minimal')
archs=('i686' 'x86_64')
_F_gnome_git="n"
_F_gnome_ext=".tar.xz"
diff --cc source/gnome/gnome-icon-theme-symbolic/FrugalBuild
index 769ba39,120a43e..4525be8
--- a/source/gnome/gnome-icon-theme-symbolic/FrugalBuild
+++ b/source/gnome/gnome-icon-theme-symbolic/FrugalBuild
@@@ -2,13 -2,14 +2,14 @@@
# Maintainer: bouleetbil <bouleetbil at frogdev.info>

pkgname=gnome-icon-theme-symbolic
- pkgver=3.2.1
- pkgrel=3
+ pkgver=3.2.2
-pkgrel=1
++pkgrel=2
pkgdesc="Symbolic GNOME icons"
url="http://www.gnome.org/"
depends=('hicolor-icon-theme' 'gdk-pixbuf2' 'gnome-icon-theme')
makedepends=('perl-xml-parser' 'icon-naming-utils>=0.8.2' 'intltool' 'gtk+2-tools')
-groups=('gnome')
+groups=('gnome' 'gnome-minimal')
archs=('i686' 'x86_64')
+ _F_gnome_ext=".tar.xz"
Finclude gnome
- sha1sums=('ab96b4104920e411c7d681709e94abcb65db314a')
+ sha1sums=('8afe0b6ebfd48a47dc34c2dcaf3fa3b823206438')
diff --cc source/gnome/gnome-shell-frugalware-theme/FrugalBuild
index 3bc0449,c5476c6..fdd3868
--- a/source/gnome/gnome-shell-frugalware-theme/FrugalBuild
+++ b/source/gnome/gnome-shell-frugalware-theme/FrugalBuild
@@@ -3,7 -3,7 +3,7 @@@

pkgname=gnome-shell-frugalware-theme
pkgver=1.6.4
- pkgrel=2
-pkgrel=1
++pkgrel=3
pkgdesc="Frugalware theme for gnome-shell"
url="http://frugalware.org"
depends=()
diff --cc source/gnome/gnome-shell/FrugalBuild
index 13676a0,1dd2990..991433e
--- a/source/gnome/gnome-shell/FrugalBuild
+++ b/source/gnome/gnome-shell/FrugalBuild
@@@ -5,12 -5,12 +5,12 @@@ USE_FRUGALTHEME=${USE_FRUGALTHEME:-"y"
USE_REPLACEEXTENSIONS=${USE_REPLACEEXTENSIONS:-"y"}

pkgname=gnome-shell
-pkgver=3.2.2.1
-pkgrel=1
+pkgver=3.3.4
- pkgrel=1
++pkgrel=2
pkgdesc="Window management and application launching for GNOME"
url="http://www.gnome.org/"
-depends=('libxml2>=2.7.8' 'mutter>=3.2.1' 'gnome-desktop>=3.2.1' 'gjs>=1.30.0' \
-	'gnome-menus' 'librsvg' 'evolution-data-server' 'gconf' \
+depends=('libxml2>=2.7.8' 'mutter>=3.3.4' 'gnome-desktop>=3.3.2' 'gjs>=1.31.10' \
+	'gnome-menus' 'librsvg>=2.31.5' 'evolution-data-server>=3.3.2' \
'xulrunner' 'gst-plugins-base' 'pulseaudio>=1.1' \
'gnome-themes-standard' 'ca-certificates' \
'gnome-bluetooth' 'gtk+3>=3.0.8' 'telepathy-glib' 'nm-applet' \
diff --cc source/gnome/gtkhtml/FrugalBuild
index 4b2a745,fc341d8..c2b33b9
--- a/source/gnome/gtkhtml/FrugalBuild
+++ b/source/gnome/gtkhtml/FrugalBuild
@@@ -2,11 -2,11 +2,11 @@@
# Maintainer: bouleetbil <bouleetbil at frogdev.info>

pkgname=gtkhtml
-pkgver=4.2.3
-pkgrel=1
+pkgver=4.3.3
- pkgrel=1
++pkgrel=2
pkgdesc="A lightweight HTML rendering/printing/editing engine"
depends=('libxml2>=2.7.8' 'gtk+3' 'gconf' \
-	'libsoup>=2.32.0' 'gnome-icon-theme>=2.30.0' \
+	'libsoup>=2.37.1' 'gnome-icon-theme>=2.30.0' \
'enchant' 'iso-codes' 'gsettings-desktop-schemas')
makedepends=('intltool')
groups=('gnome')
diff --cc source/gnome/mutter/FrugalBuild
index 4babbeb,4f74dd0..434ee5d
--- a/source/gnome/mutter/FrugalBuild
+++ b/source/gnome/mutter/FrugalBuild
@@@ -2,8 -2,8 +2,8 @@@
# Maintainer: bouleetbil <bouleetbil at frogdev.info>

pkgname=mutter
-pkgver=3.2.2
-pkgrel=1
+pkgver=3.3.4
- pkgrel=1
++pkgrel=2
pkgdesc="A window manager for GNOME (new metacity for gnome3)"
url="http://www.gnome.org/"
depends=('libxml2>=2.7.8' 'startup-notification' 'gconf>=3.2.0' 'gnome-themes>=3.0.0' 'libcm' 'gnome-frugalware>=0.7.2' \
diff --cc source/gnome/tracker/FrugalBuild
index b7e1b8c,1be6737..6cc9cc3
--- a/source/gnome/tracker/FrugalBuild
+++ b/source/gnome/tracker/FrugalBuild
@@@ -3,14 -3,14 +3,14 @@@
# Contributor: AlexExtreme <alex at alex-smith.me.uk>

pkgname=tracker
-pkgver=0.12.9
-pkgrel=6
+pkgver=0.13.0
- pkgrel=6
++pkgrel=7
pkgdesc="Tracker is a first class object database, extensible tag/metadata database, search tool and indexer."
depends=('dbus-glib>=0.76' 'sqlite3' \
-	'poppler-glib>=0.18.0' 'libvorbis' 'libpng' 'libexif' 'libgsf' 'gstreamer' \
-	'gnome-desktop>=3.0.0' 'exempi' 'upower>=0.9.6' 'openssl>=1.0.0' 'libkrb5')
+	'poppler-glib>=0.18.1' 'libvorbis' 'libpng' 'libexif' 'libgsf' 'gstreamer' \
+	'gnome-desktop>=3.3.2' 'exempi' 'upower>=0.9.6' 'openssl>=1.0.0' 'libkrb5')
rodepends=("libtracker")
- makedepends=('intltool' 'perl-xml-parser' 'gobject-introspection' 'krb5')
+ makedepends=('intltool' 'perl-xml-parser' 'gobject-introspection' 'krb5' 'icu4c>=4.8')
groups=('gnome')
conflicts=('tracker-search-tool')
provides=('tracker-search-tool')
@@@ -42,9 -42,9 +42,9 @@@ subinstall=("${subinstall[@]}" ''

subpkgs=("${subpkgs[@]}" "libtracker")
subdescs=("${subdescs[@]}" "tracker lib")
- subdepends=("${subdepends[@]}" "gnome-keyring icu4c networkmanager gst-plugins-base gamin")
-subdepends=("${subdepends[@]}" "gnome-keyring icu4c>=4.8 networkmanager gst-plugins-base")
++subdepends=("${subdepends[@]}" "gnome-keyring icu4c>=4.8 networkmanager gst-plugins-base gamin")
subrodepends=("${subrodepends[@]}" "")
-subgroups=("${subgroups[@]}" 'gnome')
+subgroups=("${subgroups[@]}" 'gnome gnome-minimal')
subarchs=("${subarchs[@]}" 'i686 x86_64')
subinstall=("${subinstall[@]}" "$_F_gnome_scriptlet")

diff --cc source/xlib/librsvg/FrugalBuild
index 8d855c5,ed1c26d..c200edd
--- a/source/xlib/librsvg/FrugalBuild
+++ b/source/xlib/librsvg/FrugalBuild
@@@ -3,16 -3,15 +3,16 @@@
# Contributor: Miklos Vajna <vmiklos at frugalware.org>

pkgname=librsvg
-pkgver=2.34.2
-pkgrel=2
+pkgver=2.35.1
- pkgrel=2
++pkgrel=3
pkgdesc="A high performance SVG rendering library for GNOME"
-depends=('gtk+3>=2.99.3' 'gdk-pixbuf2' 'libxml2>=2.7.8' 'popt' 'libart_lgpl' 'libcroco>=0.6.1-4' 'libgsf>=1.14.8')
-makedepends=('gtk-doc')
+depends=('gdk-pixbuf2' 'libxml2>=2.7.8' 'popt' 'libart_lgpl' 'libcroco>=0.6.1-4' 'libgsf>=1.14.8')
+makedepends=('gtk-doc' 'gtk+2')
groups=('xlib')
archs=('i686' 'x86_64' 'ppc' 'arm')
+_F_gnome_ext=".tar.xz"
Finclude gnome
-sha1sums=('75d0da1136c2c515161799b5dd9d903ed34e552c')
+sha1sums=('4f3654328557af3ffd1ff6c31b2f4eddf1fab26b')
Fconfopts="$Fconfopts --with-croco --disable-static \
--with-svgz --enable-gtk-theme"
replaces=('libsvg-cairo')
