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

commit dc86169e0bbea0b7399dd60836c7c5c4e88f5d4a
Merge: 0a38834 db8a19e
Author: Baste <[email protected]>
Date:   Tue Feb 3 12:16:58 2015 +0100

Merge ../current

Conflicts:
source/base/glib2/FrugalBuild
source/gnome/at-spi2-core/FrugalBuild
source/gnome/evolution-data-server/FrugalBuild
source/gnome/evolution-ews/FrugalBuild
source/gnome/evolution/FrugalBuild
source/gnome/gnome-themes-standard/FrugalBuild
source/gnome/tracker/FrugalBuild
source/x11/cantarell-fonts/FrugalBuild
source/xapps/gvfs/FrugalBuild
source/xlib-extra/gtk-vnc/FrugalBuild
source/xlib/cairo/FrugalBuild
source/xlib/gobject-introspection/FrugalBuild
source/xlib/gtk+2/FrugalBuild
source/xlib/gtk+3/FrugalBuild

diff --cc source/gnome-extra/yelp-tools/FrugalBuild
index a16dca1,c5f649a..dfeaf87
--- a/source/gnome-extra/yelp-tools/FrugalBuild
+++ b/source/gnome-extra/yelp-tools/FrugalBuild
@@@ -4,12 -4,12 +4,12 @@@
options+=('asneeded')

pkgname=yelp-tools
-pkgver=3.12.1
+pkgver=3.14.1
pkgrel=1
pkgdesc="Create, manage, and publish documentation for Yelp"
-depends=('libxslt' 'itstool' 'yelp-xsl>=3.12.0')
+depends=('libxslt' 'itstool' 'yelp-xsl>=3.14.0')
groups=('gnome-extra')
- archs=('i686' 'x86_64')
+ archs=('i686' 'x86_64' 'arm')
_F_gnome_ext=".tar.xz"
_F_gnome_devel="n"
Finclude gnome
diff --cc source/gnome/at-spi2-atk/FrugalBuild
index a58534b,f41a028..f3b0000
--- a/source/gnome/at-spi2-atk/FrugalBuild
+++ b/source/gnome/at-spi2-atk/FrugalBuild
@@@ -5,13 -5,13 +5,13 @@@
options+=('asneeded')

pkgname=at-spi2-atk
-pkgver=2.12.1
+pkgver=2.14.1
pkgrel=1
pkgdesc="Gnome Accessibility Toolkit"
-depends=('atk>=2.12.0' 'dbus-glib' 'at-spi2-core>=2.12.0' 'libx11' 'libsm')
+depends=('atk>=2.14.0' 'dbus-glib' 'at-spi2-core>=2.14.0' 'libx11' 'libsm')
makedepends=('perl-xml-parser' 'intltool')
groups=('gnome')
- archs=('i686' 'x86_64')
+ archs=('i686' 'x86_64' 'arm')
_F_gnome_doc="n"
_F_gnome_glib="n"
_F_gnome_devel="n"
diff --cc source/gnome/gnome-themes-standard/FrugalBuild
index e01d3b6,15ac59b..d52396a
--- a/source/gnome/gnome-themes-standard/FrugalBuild
+++ b/source/gnome/gnome-themes-standard/FrugalBuild
@@@ -5,14 -5,14 +5,14 @@@
options+=('asneeded')

pkgname=gnome-themes-standard
-pkgver=3.12.0
-pkgrel=2
+pkgver=3.14.2.3
+pkgrel=1
pkgdesc="Default standard themes for GNOME3"
url="http://www.gnome.org/";
-depends=('libxml2>=2.7.8' 'gtk+3>=3.12.0' 'librsvg>=2.39.0' 'cantarell-fonts' 
'gtk+2')
-makedepends=('perl-xml-parser' 'icon-naming-utils' 'intltool')
+depends=('libxml2>=2.7.8' 'librsvg>=2.39.0' 'cantarell-fonts')
+makedepends=('perl-xml-parser' 'icon-naming-utils' 'intltool' 'gtk+3>=3.14.0' 
'gtk+2')
groups=('gnome' 'gnome-minimal')
- archs=('i686' 'x86_64')
+ archs=('i686' 'x86_64' 'arm')
_F_gnome_devel="n"
_F_gnome_ext=".tar.xz"
Finclude gnome
diff --cc source/gnome/gsettings-desktop-schemas/FrugalBuild
index 1c1bb48,b6ec34d..3f42a97
--- a/source/gnome/gsettings-desktop-schemas/FrugalBuild
+++ b/source/gnome/gsettings-desktop-schemas/FrugalBuild
@@@ -5,13 -5,13 +5,13 @@@
options+=('asneeded')

pkgname=gsettings-desktop-schemas
-pkgver=3.12.2
+pkgver=3.14.1
pkgrel=1
pkgdesc="Shared GSettings schemas for the desktop"
-depends=('glib2>=2.40.0')
+depends=('glib2>=2.42.0')
makedepends=('intltool' 'gobject-introspection>=1.40.0')
groups=('gnome' 'gnome-minimal')
- archs=('i686' 'x86_64')
+ archs=('i686' 'x86_64' 'arm')
_F_gnome_glib="y"
_F_gnome_ext=".tar.xz"
_F_gnome_devel="n"
diff --cc source/lib/atk/FrugalBuild
index 288d629,a1d901c..a886da7
--- a/source/lib/atk/FrugalBuild
+++ b/source/lib/atk/FrugalBuild
@@@ -11,10 -11,10 +11,10 @@@ pkgver=2.14.
pkgrel=1
pkgdesc="A library of accessibility functions"
url='http://www.gtk.org/'
-depends=('glib2>=2.40.0')
+depends=('glib2>=2.42.0')
makedepends=('gobject-introspection>=1.39.90')
groups=('lib')
- archs=('i686' 'x86_64')
+ archs=('i686' 'x86_64' 'arm')
_F_gnome_ext=".tar.xz"
_F_gnome_devel="n"
Finclude gnome
diff --cc source/lib/libgee8/FrugalBuild
index d08936f,ca75bff..0113fe7
--- a/source/lib/libgee8/FrugalBuild
+++ b/source/lib/libgee8/FrugalBuild
@@@ -15,8 -15,9 +15,9 @@@ groups=('lib'
archs=('i686' 'x86_64')
_F_gnome_devel="n"
_F_gnome_ext=".tar.xz"
+ _F_archive_name="libgee"
Finclude gnome
url="http://live.gnome.org/Libgee";
-sha1sums=('ca6531c8ba45cc865f2ce7b93a8b3f96e1c1505e')
+sha1sums=('0f7447b12e02e7123a35c1c70ad5bbf1fb2fe14a')

# optimization OK
diff --cc source/xapps/gvfs/FrugalBuild
index 840d0f0,5063b68..cfb92cf
--- a/source/xapps/gvfs/FrugalBuild
+++ b/source/xapps/gvfs/FrugalBuild
@@@ -7,14 -7,14 +7,14 @@@ USE_DEBUG=${USE_DEBUG:-"n"
options+=('asneeded')

pkgname=gvfs
-pkgver=1.20.3
-pkgrel=2
+pkgver=1.22.2
+pkgrel=1
pkgdesc="gvfs is a userspace virtual filesystem designed to work with the i/o 
abstractions of gio."
url="http://www.gnome.org/";
-depends=('glib2>=2.40.0' 'dbus' 'avahi-glib' 'udisks2' 'systemd>=188' 
'libxml2>=2.7.8' \
-       'libarchive>=3.0.3' 'libcdio' 'libsoup-gnome>=2.46.0' 'libsecret' 
'gtk+3>=3.12.0')
+depends=('glib2>=2.42.0' 'dbus' 'avahi-glib' 'udisks2' 'systemd>=188' 
'libxml2>=2.7.8' \
+       'libarchive>=3.0.3' 'libcdio' 'libsoup-gnome>=2.48.0' 'libsecret' 
'gtk+3>=3.14.0')
makedepends=('intltool' 'docbook-xsl' 'gtk-doc' 'ifuse' 'gphoto2>=2.5.0' \
-            'obexftp>=0.23-2' 'bluez>=4.61' 'fuse' 'samba>=3.6.1' 
'openssh>=5.6p1' \
+            'obexftp>=0.24' 'bluez>=4.61' 'fuse' 'samba>=3.6.1' 
'openssh>=5.6p1' \
'gnome-online-accounts>=3.11.90')
groups=('xapps')
archs=('i686' 'x86_64')
diff --cc source/xapps/vte3/FrugalBuild
index 14c20e8,52ed2cc..15ee4f4
--- a/source/xapps/vte3/FrugalBuild
+++ b/source/xapps/vte3/FrugalBuild
@@@ -16,8 -16,9 +16,9 @@@ groups=('xapps'
archs=('i686' 'x86_64')
_F_gnome_devel="n"
_F_gnome_ext=".tar.xz"
+ _F_archive_name="vte"
Finclude gnome
-sha1sums=('a7acc1594eb6fa249edccb059c21132b3aa2657b')
+sha1sums=('4a53d2bab9bde435e24f6598ca5d01f473cc71ab')
Fconfopts+=" --enable-gtk-doc --enable-introspection"

build() {
diff --cc source/xlib/colord/FrugalBuild
index 2bdec7a,05c0373..bb0b93e
--- a/source/xlib/colord/FrugalBuild
+++ b/source/xlib/colord/FrugalBuild
@@@ -9,10 -9,10 +9,10 @@@ pkgver=1.2.
pkgrel=1
pkgdesc="color daemon"
#depends=('glib2' 'polkit' 'lcms2' 'libgusb' 'systemd>=188' 'sane-backends' )
-depends=('glib2' 'polkit' 'lcms2' 'libgusb' 'systemd>=188' 'argyllcms' 
'bash-completion')
+depends=('glib2>=2.41.3' 'polkit' 'lcms2' 'libgusb' 'systemd>=188' 'argyllcms' 
'bash-completion')
makedepends=('intltool' 'vala' 'gobject-introspection' 'docbook-utils')
groups=('xlib')
- archs=('i686' 'x86_64')
+ archs=('i686' 'x86_64' 'arm')
url="http://www.freedesktop.org/software/colord/";
#source=("$url/releases/$pkgname-$pkgver.tar.xz" "sensor.rules.patch")
source=("$url/releases/$pkgname-$pkgver.tar.xz")
diff --cc source/xlib/gtk+2/FrugalBuild
index 6d0aa1a,29e5843..425a465
--- a/source/xlib/gtk+2/FrugalBuild
+++ b/source/xlib/gtk+2/FrugalBuild
@@@ -6,10 -6,10 +6,10 @@@ options+=('asneeded'
pkgname=gtk+2
_F_gnome_name=gtk+
pkgver=2.24.25
-pkgrel=2
+pkgrel=3
pkgdesc="The GTK+ Toolkit (2.x series)"
depends=('libxext' 'libxfixes' 'cairo>=1.8.10-2' 'libgcc' 'libjpeg>=8a' 
'libtiff' 'libcups>=1.3.11-4' 'gdk-pixbuf2>=2.23.0-5')
- rodepends=('gnome-icon-theme' 'shared-mime-info' 'gnome-themes-standard')
+ rodepends=('gnome-icon-theme' 'shared-mime-info')
groups=('xlib')
makedepends=('gtk-doc' 'cups' 'inputproto' 'gobject-introspection' 
'gnome-common')
archs=('i686' 'x86_64' 'arm')
diff --cc source/xlib/gtk+3/FrugalBuild
index ff761d5,98d7960..6ca532e
--- a/source/xlib/gtk+3/FrugalBuild
+++ b/source/xlib/gtk+3/FrugalBuild
@@@ -6,16 -6,15 +6,16 @@@ options+=('asneeded'

pkgname=gtk+3
_F_gnome_name=gtk+
-pkgver=3.12.2
-pkgrel=2
+pkgver=3.14.6
+pkgrel=1
pkgdesc="The GTK+ Toolkit (3.x series)"
-depends=('atk>=2.12.0' 'cairo' 'gtk+2-tools' 'libcups' 'libxcursor' 
'libxinerama' 'libxrandr' 'libxi' \
-         'libxcomposite' 'libxdamage' 'pango' 'shared-mime-info' 'colord' 
'at-spi2-atk>=2.12.0' 'wayland' 'libxkbcommon')
+depends=('atk>=2.14.0' 'cairo' 'gtk+2-tools' 'libcups' 'libxcursor' 
'libxinerama' 'libxrandr' 'libxi' \
+         'libxcomposite' 'libxdamage' 'pango' 'shared-mime-info' 'colord' 
'at-spi2-atk>=2.14.0' 'wayland>=1.6.0' 'libxkbcommon')
makedepends=('gobject-introspection' 'gtk-doc' 'cups')
-rodepends=('gnome-icon-theme' 'gtk+3-tools' 'gnome-themes-standard')
+#rodepends=('gnome-icon-theme' 'gtk+3-tools' 'gnome-themes-standard')
+rodepends=('gtk+3-tools' 'gnome-themes-standard' 'adwaita-icon-theme')
groups=('xlib')
- archs=('i686' 'x86_64')
+ archs=('i686' 'x86_64' 'arm')
_F_gnome_glib="y"
_F_gnome_ext=".tar.xz"
_F_gnome_devel="n"
@@@ -35,10 -34,10 +35,10 @@@ f

subpkgs=("${subpkgs[@]}" "$pkgname-tools")
subdescs=("${subdescs[@]}" "GTK+3 commandline tools.")
-subdepends=("${subdepends[@]}" "glib2>=2.40.0 libxrandr")
+subdepends=("${subdepends[@]}" "glib2>=2.42.0 libxrandr")
subrodepends=("${subrodepends[@]}" "$pkgname>=$pkgver")
subgroups=("${subgroups[@]}" 'xapps')
- subarchs=("${subarchs[@]}" 'i686 x86_64')
+ subarchs=("${subarchs[@]}" 'i686 x86_64 arm')

rodepends=("${rodepends[@]}" "${subpkgs[@]}")

diff --cc source/xlib/harfbuzz/FrugalBuild
index a9787c2,5c9ec0c..ab9051b
--- a/source/xlib/harfbuzz/FrugalBuild
+++ b/source/xlib/harfbuzz/FrugalBuild
@@@ -8,11 -8,11 +8,11 @@@ pkgver=0.9.3
pkgrel=1
pkgdesc="Is an implementation of the OpenType Layout engine."
url="http://freedesktop.org/wiki/Software/HarfBuzz";
-depends=('cairo' 'freetype2' 'glib2>=2.40.0' 'icu4c' 'graphite2')
+depends=('cairo' 'freetype2' 'glib2>=2.41.3' 'icu4c' 'graphite2')
groups=('xlib')
- archs=('i686' 'x86_64')
+ archs=('i686' 'x86_64' 'arm')
up2date="Flasttar http://www.freedesktop.org/software/$pkgname/release";
source=(http://www.freedesktop.org/software/$pkgname/release/$pkgname-$pkgver.tar.bz2)
-sha1sums=('e2704c0b1b76a82fb8b5c9b354526733629ee616')
+sha1sums=('6f4401af396069214be2ba15b884361ef540e501')

# optimization OK
diff --cc source/xlib/pango/FrugalBuild
index d2222eb,05eb4f0..92c73ce
--- a/source/xlib/pango/FrugalBuild
+++ b/source/xlib/pango/FrugalBuild
@@@ -8,13 -8,13 +8,13 @@@ USE_DOC=${USE_DOC:-"y"

pkgname=pango
pkgver=1.36.8
-pkgrel=1
+pkgrel=2
pkgdesc="A library for layout and rendering of text"
url="http://www.gtk.org/";
-depends=('libxml2>=2.7.8' 'cairo>=1.8.10-2' 'glib2>=2.38.0' 'libxft>=2.1.13-2' 
'libxmu' 'libxi' 'libxrender' 'harfbuzz>=0.9.21' 'libxft')
+depends=('libxml2>=2.7.8' 'cairo>=1.8.10-2' 'glib2>=2.42.0' 'libxft>=2.1.13-2' 
'libxmu' 'libxi' 'libxrender' 'harfbuzz>=0.9.35' 'libxft')
makedepends=('perl' 'gobject-introspection>=0.9.6' 'dri2proto')
groups=('xlib')
- archs=('i686' 'x86_64')
+ archs=('i686' 'x86_64' 'arm')
options+=('force')
# modules.cache find now /usr/lib/pango and not in /etc/pango/pango.modules
backup=(etc/pango/pango.modules)
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to