Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gnometesting.git;a=commitdiff;h=212ab94670f36ada2292b2c968d483be63eea0c7
commit 212ab94670f36ada2292b2c968d483be63eea0c7 Merge: 5a973ce 0f55f9c Author: Baste <[email protected]> Date: Mon Mar 31 09:11:31 2014 +0200 Merge ../current Conflicts: source/gnome-extra/grilo-plugins/FrugalBuild source/gnome/brasero/FrugalBuild source/gnome/empathy/FrugalBuild source/gnome/epiphany/FrugalBuild source/gnome/evolution-data-server/FrugalBuild source/gnome/evolution/FrugalBuild source/gnome/gcr/FrugalBuild source/gnome/gnome-disk-utility/FrugalBuild source/gnome/gnome-documents/FrugalBuild source/gnome/gnome-keyring/FrugalBuild source/gnome/gnome-online-accounts/FrugalBuild source/gnome/gnome-online-miners/FrugalBuild source/gnome/gnome-shell/FrugalBuild source/gnome/libgdata/FrugalBuild source/gnome/libsecret/FrugalBuild source/gnome/sushi/FrugalBuild source/gnome/totem/FrugalBuild source/gnome/tracker/FrugalBuild source/gnome/vino/FrugalBuild source/gnome/yelp/FrugalBuild source/lib/glib-networking/FrugalBuild source/lib/libsoup/FrugalBuild source/lib/p11-kit/FrugalBuild source/xapps/gvfs/FrugalBuild source/xlib/webkit-gtk3/FrugalBuild diff --cc source/gnome-extra/grilo-plugins/FrugalBuild index e8c904b,0cdecb2..6b0208f --- a/source/gnome-extra/grilo-plugins/FrugalBuild +++ b/source/gnome-extra/grilo-plugins/FrugalBuild @@@ -5,11 -5,11 +5,11 @@@ options+=('asneeded') pkgname=grilo-plugins -pkgver=0.2.11 -pkgrel=2 +pkgver=0.2.12 +pkgrel=1 pkgdesc="Grilo plugins" - depends=('grilo' 'gupnp-av' 'libdmapsharing' 'libgdata' 'quvi' \ - 'totem-pl-parser' 'libtracker') + depends=('grilo' 'gupnp-av' 'libdmapsharing' 'libgdata>=0.14.1-2' 'quvi>=0.9.4-3' \ + 'totem-pl-parser>=3.10.1-2' 'libtracker>=0.16.4-2') makedepends=('gnome-doc-utils>=0.10.3' 'gobject-introspection' 'intltool' 'itstool') groups=('gnome-extra') archs=('i686' 'x86_64') diff --cc source/gnome/brasero/FrugalBuild index 5e996bf,74d3535..7134188 --- a/source/gnome/brasero/FrugalBuild +++ b/source/gnome/brasero/FrugalBuild @@@ -5,12 -5,12 +5,12 @@@ options+=('asneeded') pkgname=brasero -pkgver=3.10.0 -pkgrel=2 +pkgver=3.11.3 +pkgrel=3 pkgdesc="A CD/DVD Burning application for the GNOME desktop." url="http://www.gnome.org/projects/brasero/"; - depends=('gst1-plugins-base' 'gtk+3' 'libnotify' 'libcanberra-gtk' 'libtracker' \ - 'totem-pl-parser' 'libisofs>=1.2.4' 'libburn>=1.2.4' 'libdvdcss') + depends=('gst1-plugins-base' 'gtk+3' 'libnotify' 'libcanberra-gtk' 'libtracker>=0.16.4-2' \ + 'totem-pl-parser>=3.10.1-2' 'libisofs>=1.2.4' 'libburn>=1.2.4' 'libdvdcss') makedepends=('intltool' 'gobject-introspection' 'itstool' 'gnome-common') rodepends=('cdrdao' 'cdrkit' 'dvd+rw-tools') groups=('gnome') diff --cc source/gnome/epiphany/FrugalBuild index bc51d88,0cbbdc7..0dccc7b --- a/source/gnome/epiphany/FrugalBuild +++ b/source/gnome/epiphany/FrugalBuild @@@ -5,12 -5,12 +5,12 @@@ options+=('asneeded') pkgname=epiphany -pkgver=3.10.3 -pkgrel=3 +pkgver=3.11.92 +pkgrel=1 pkgdesc="GNOME webbrowser based on the WebKit rendering engine" url="http://www.gnome.org/projects/epiphany/"; - depends=('gcr' 'webkit-gtk3' 'gnome-desktop>=3.6.0' 'startup-notification' \ - 'libsoup-gnome' 'libnotify' 'nss' 'avahi-glib' 'libwnck') + depends=('gcr>=3.10.1-2' 'webkit-gtk3>=2.2.3-4' 'gnome-desktop>=3.6.0' 'startup-notification' \ + 'libsoup-gnome>=2.44.2-2' 'libnotify' 'nss' 'avahi-glib' 'libwnck') #depends=('libstdc++' 'dbus-x11' 'atk' 'libxslt' 'icu4c>=4.8' \ # 'docbook-xsl' 'ca-certificates') #makedepends=('gtk-doc>=1.9' 'perl-xml-parser' 'icu4c>=4.8' 'geoclue') diff --cc source/gnome/evolution-data-server/FrugalBuild index a4dcd47,483f218..14166ce --- a/source/gnome/evolution-data-server/FrugalBuild +++ b/source/gnome/evolution-data-server/FrugalBuild @@@ -5,12 -5,12 +5,12 @@@ options+=('asneeded') pkgname=evolution-data-server -pkgver=3.10.4 -pkgrel=2 +pkgver=3.11.92 +pkgrel=1 pkgdesc="Evolution Data Server provides a central location for addressbook and calendar in the GNOME Desktop" -depends=('nss>=3.12.9' 'libsoup-gnome>=2.44.2-2' 'libgweather>=3.10.0' \ - 'libkrb5' 'db>=4.7.25' 'gnutls>=3.2.12.1' 'libical' 'libsecret>=0.16-5' \ - 'libgdata>=0.14.1-2' 'gtk+3>=3.10.0' 'libxml2>=2.7.8' 'gnome-online-accounts>=3.10.2-3') +depends=('nss>=3.12.9' 'libsoup-gnome>=2.45.92' 'libgweather>=3.11.92' \ - 'libkrb5' 'db>=4.7.25' 'gnutls>=2.12.12' 'libical' 'libsecret' \ ++ 'libkrb5' 'db>=4.7.25' 'gnutls>=3.2.12.1' 'libical' 'libsecret' \ + 'libgdata>=0.15.0' 'gtk+3>=3.11.9' 'libxml2>=2.7.8' 'gnome-online-accounts>=3.11.92') makedepends=('intltool' 'krb5' 'gperf' 'gobject-introspection' 'openldap' 'vala') groups=('gnome' 'gnome-minimal') archs=('i686' 'x86_64') diff --cc source/gnome/gnome-disk-utility/FrugalBuild index 035a349,ef9b630..96c6275 --- a/source/gnome/gnome-disk-utility/FrugalBuild +++ b/source/gnome/gnome-disk-utility/FrugalBuild @@@ -3,10 -3,10 +3,10 @@@ # Contributor: bouleetbil <[email protected]> pkgname=gnome-disk-utility -pkgver=3.10.0 -pkgrel=2 +pkgver=3.11.0 +pkgrel=1 pkgdesc="Disk Utility for GNOME using devicekit-disks" - depends=('udisks2' 'gtk+3' 'libsecret' 'libpwquality' 'systemd' \ + depends=('udisks2' 'gtk+3' 'libsecret>=0.16-5' 'libpwquality' 'systemd' \ 'libcanberra-gtk' 'libdvdread' 'gnome-settings-daemon') makedepends=('intltool' 'docbook-xsl') groups=('gnome') diff --cc source/gnome/gnome-documents/FrugalBuild index 4407ad0,e080ab4..d76d55a --- a/source/gnome/gnome-documents/FrugalBuild +++ b/source/gnome/gnome-documents/FrugalBuild @@@ -5,11 -5,11 +5,11 @@@ options+=('asneeded') pkgname=gnome-documents -pkgver=3.10.2 -pkgrel=2 +pkgver=3.11.92 +pkgrel=1 pkgdesc="Document manager for gnome" - depends=('evince' 'gjs' 'gtk+3' 'gnome-online-accounts' 'gnome-desktop' \ - 'liboauth' 'libgdata' 'tracker' 'libzapojit' 'gnome-online-miners') + depends=('evince' 'gjs' 'gtk+3' 'gnome-online-accounts>=3.10.2-3' 'gnome-desktop' \ + 'liboauth' 'libgdata>=0.14.1-2' 'tracker>=0.16.4-2' 'libzapojit' 'gnome-online-miners>=3.10.3-2') makedepends=('gobject-introspection' 'itstool' 'intltool' 'docbook-xsl') groups=('gnome') archs=('i686' 'x86_64') diff --cc source/gnome/gnome-keyring/FrugalBuild index da6bfc2,e63c24d..009c0da --- a/source/gnome/gnome-keyring/FrugalBuild +++ b/source/gnome/gnome-keyring/FrugalBuild @@@ -10,8 -10,7 +10,7 @@@ pkgrel= pkgdesc="Password and keyring managing daemon for GNOME" url="http://www.gnome.org/"; depends=('libxml2>=2.7.8' 'dbus-glib>=0.76-1' \ - 'libtasn1>=1.4' 'pam' \ - 'p11-kit' 'ca-certificates' 'gcr>=3.11.91') - 'pam' 'ca-certificates' 'gcr>=3.10.1-2') ++ 'pam' 'ca-certificates' 'gcr') makedepends=('intltool' 'gtk-doc') groups=('gnome' 'gnome-minimal') archs=('i686' 'x86_64') diff --cc source/gnome/libsecret/FrugalBuild index 4d648e4,08017fd..3539330 --- a/source/gnome/libsecret/FrugalBuild +++ b/source/gnome/libsecret/FrugalBuild @@@ -4,10 -4,10 +4,10 @@@ options+=('asneeded') pkgname=libsecret -pkgver=0.16 -pkgrel=5 +pkgver=0.18 +pkgrel=1 pkgdesc="Library for storing and retrieving passwords and other secrets" - depends=('libgcrypt') + depends=('libgcrypt>=1.6.1') makedepends=('intltool' 'gobject-introspection') groups=('gnome') archs=('i686' 'x86_64') diff --cc source/gnome/sushi/FrugalBuild index 7824db2,5892ef7..d0aa11e --- a/source/gnome/sushi/FrugalBuild +++ b/source/gnome/sushi/FrugalBuild @@@ -5,11 -5,11 +5,11 @@@ options+=('asneeded') pkgname=sushi -pkgver=3.10.0 -pkgrel=3 +pkgver=3.11.90 +pkgrel=1 pkgdesc="A quick previewer for Nautilus" depends=('clutter-gtk>=1.0.2-3' 'clutter-gst' 'gjs' 'libmusicbrainz5' \ - 'webkit-gtk3' 'gtksourceview3' 'evince' 'libkrb5') + 'webkit-gtk3>=2.2.3-4' 'gtksourceview3' 'evince' 'libkrb5') makedepends=('intltool' 'gobject-introspection' 'krb5') groups=('gnome') archs=('i686' 'x86_64') diff --cc source/gnome/vino/FrugalBuild index 0e3287f,f7044e0..c9f4bbc --- a/source/gnome/vino/FrugalBuild +++ b/source/gnome/vino/FrugalBuild @@@ -5,10 -5,10 +5,10 @@@ options+=('asneeded') pkgname=vino -pkgver=3.10.1 -pkgrel=2 +pkgver=3.11.92 +pkgrel=1 pkgdesc="An integrated VNC server for GNOME" - depends=('libxtst' 'libxdamage' 'libnotify' 'gtk+3' 'libsoup-gnome') + depends=('libxtst' 'libxdamage' 'libnotify' 'gtk+3' 'libsoup-gnome>=2.44.2-2') #depends=('gnutls>=2.12.12' 'libgcrypt' 'telepathy-glib' \ # 'avahi-glib' # 'libsecret' 'networkmanager' 'libgnome-keyring') diff --cc source/gnome/yelp/FrugalBuild index 07b201b,44e7bad..e0e7f9a --- a/source/gnome/yelp/FrugalBuild +++ b/source/gnome/yelp/FrugalBuild @@@ -5,11 -5,11 +5,11 @@@ options+=('asneeded') pkgname=yelp -pkgver=3.10.2 -pkgrel=2 +pkgver=3.11.91 +pkgrel=1 pkgdesc="The default help browser for GNOME" url="http://www.gnome.org/"; - depends=('webkit-gtk3' 'yelp-xsl') + depends=('webkit-gtk3>=2.2.3-4' 'yelp-xsl') makedepends=('intltool' 'itstool') groups=('gnome') archs=('i686' 'x86_64') diff --cc source/lib/glib-networking/FrugalBuild index 892d648,b521749..2a0f081 --- a/source/lib/glib-networking/FrugalBuild +++ b/source/lib/glib-networking/FrugalBuild @@@ -5,11 -5,11 +5,11 @@@ options+=('asneeded') pkgname=glib-networking -pkgver=2.38.2 +pkgver=2.39.90 pkgrel=2 pkgdesc="Network extensions for GLib" - depends=('glib2>=2.39.90' 'gnutls>=2.12.12' 'ca-certificates') -depends=('glib2>=2.38.0' 'gnutls>=3.2.12.1' 'ca-certificates') -makedepends=('intltool' 'gsettings-desktop-schemas') ++depends=('glib2>=2.39.90' 'gnutls>=3.2.12.1' 'ca-certificates') +makedepends=('intltool' 'gsettings-desktop-schemas>=3.11.90') groups=('lib') archs=('i686' 'x86_64' 'arm') options+=('scriptlet') diff --cc source/lib/libsoup/FrugalBuild index 2a743e3,845e4de..b2c551b --- a/source/lib/libsoup/FrugalBuild +++ b/source/lib/libsoup/FrugalBuild @@@ -5,18 -5,18 +5,18 @@@ options+=('asneeded') pkgname=libsoup -pkgver=2.44.2 -pkgrel=2 +pkgver=2.45.92 +pkgrel=1 pkgdesc="An HTTP library implementation in C" url="http://www.gnome.org/"; - depends=('glib2>=2.39.92' 'gnutls>=2.12.12' 'libxml2>=2.7.8' 'sqlite3') -depends=('glib2>=2.38.0' 'gnutls>=3.2.12.1' 'libxml2>=2.7.8' 'libgcrypt>=1.6.1' 'sqlite3') -makedepends=('gobject-introspection>=1.36.0' 'intltool') ++depends=('glib2>=2.39.92' 'gnutls>=3.2.12.1' 'libxml2>=2.7.8' 'libgcrypt>=1.6.1' 'sqlite3') +makedepends=('gobject-introspection>=1.39.90' 'intltool') groups=('lib') archs=('i686' 'x86_64') -_F_gnome_devel="n" +_F_gnome_devel="y" _F_gnome_ext=".tar.xz" Finclude gnome -sha1sums=('d469abbeaffca9b157f50ce079662078e239d962') +sha1sums=('3fc923c939eca01bf0226c0ea117f9d3a762e5cb') subpkgs=("libsoup-gnome") subdescs=('libsoup with gnome support') _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
