Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gnometesting.git;a=commitdiff;h=a506646678c3b56b90f473cea471622622c32f0b
commit a506646678c3b56b90f473cea471622622c32f0b Merge: f10d40d 1a466e3 Author: Baste <[email protected]> Date: Mon Feb 20 11:47:38 2012 +0100 Merge ../current Conflicts: source/gnome/totem/FrugalBuild source/lib/gmime/FrugalBuild source/xlib/sdl/FrugalBuild diff --cc source/base/kmod/FrugalBuild index 619cb5a,619cb5a..60e15b6 --- a/source/base/kmod/FrugalBuild +++ b/source/base/kmod/FrugalBuild @@@ -3,7 -3,7 +3,7 @@@ pkgname=kmod pkgver=5 --pkgrel=1 ++pkgrel=2 pkgdesc="Utilities for inserting and removing modules from the Linux kernel" url="http://git.profusion.mobi/cgit.cgi/kmod.git"; depends=('zlib' 'xz') diff --cc source/gnome-extra/gnome-system-monitor/FrugalBuild index b2b07b5,14f00c6..d9f4e6e --- a/source/gnome-extra/gnome-system-monitor/FrugalBuild +++ b/source/gnome-extra/gnome-system-monitor/FrugalBuild @@@ -15,7 -14,7 +15,8 @@@ _F_gnome_ext=".tar.xz _F_gnome_scrollkeeper="y" _F_gnome_desktop="y" _F_gnome_glib="y" ++#_F_make_opts="V=1" Finclude gnome gnome-scriptlet -sha1sums=('c57b01dfc37282c4ce7e13acc1bb2fb5581890f7') +sha1sums=('4cd501d96d4193fda6f5a412b13bc9d9c84105fb') # optimization OK diff --cc source/gnome/cheese/FrugalBuild index c26cb8d,47af32f..18678ce --- a/source/gnome/cheese/FrugalBuild +++ b/source/gnome/cheese/FrugalBuild @@@ -10,23 -10,10 +10,23 @@@ depends=('librsvg>=2.26.0-2' 'gst-plugi 'xf86vidmodeproto' 'evolution-data-server>=3.1.92' 'dbus' 'gnome-video-effects' \ 'gst-plugins-good-video4linux2' 'db>=4.7.25-2' 'gnome-desktop>=3.2.1' \ 'gst-plugins-bad-mpeg2enc' 'gst-plugins-base-ogg' 'gst-plugins-base-theora' 'gst-plugins-base-vorbis' 'gst-plugins-good-gconf' \ - 'libgudev' 'libcanberra-gtk' 'clutter-gst' 'libgee' 'clutter-gtk>=1.0.2-3' 'mx') - 'libgudev' 'libcanberra-gtk' 'clutter-gst' 'libgee' 'clutter-gtk' 'mx') -makedepends=('intltool' 'gnome-doc-utils' 'samba=3.6.1' 'fuse' 'libsoup' 'gconf>=2.28.0' 'krb5') ++ 'libgudev' 'libcanberra-gtk' 'clutter-gst' 'libgee' 'clutter-gtk>=1.0.2-3' 'mx' 'gst-plugins-bad-vp8enc') +makedepends=('intltool' 'gnome-doc-utils' 'samba' 'fuse' 'libsoup' 'gconf>=2.28.0' 'krb5' 'gobject-introspection' 'itstool') +rodepends=('cheese-devel') groups=('gnome') archs=('i686' 'x86_64') + +subpkgs=('cheese-devel') +subdescs=('Developement files for cheese') +subdepends=('clutter-gst mx libgudev gnome-desktop librsvg clutter-gtk libgee libcanberra-gtk') +subgroups=('gnome gnome-minimal') +subarchs=('i686 x86_64') +subreplaces=('') +subprovides=('') +subrodepends=('') + +_F_gnome_ext=".tar.xz" +_F_gnome_doc="y" _F_gnome_iconcache="y" _F_gnome_desktop="y" _F_gnome_glib="y" diff --cc source/gnome/evolution-data-server/FrugalBuild index 3d13012,3e94b11..166f526 --- a/source/gnome/evolution-data-server/FrugalBuild +++ b/source/gnome/evolution-data-server/FrugalBuild @@@ -2,19 -2,18 +2,19 @@@ # Maintainer: bouleetbil <[email protected]> pkgname=evolution-data-server - pkgver=3.3.5 -pkgver=3.2.2 ++pkgver=3.3.90 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.37.0' 'libgweather>=3.1-3' \ - 'libkrb5' 'db>=4.7.25' 'gnutls>=2.12.12' 'libical' 'gnome-keyring>=3.1.1' \ -depends=('nss>=3.12.9' 'libsoup-gnome>=2.32.0' 'libgweather>=3.1-3' \ - 'libkrb5' 'db>=4.7.25' 'gnutls>=2.12.12' 'libical' 'gnome-keyring>=3.1.1' \ ++depends=('nss>=3.12.9' 'libsoup-gnome>=2.37.5' 'libgweather>=3.1-3' \ ++ 'libkrb5' 'db>=4.7.25' 'gnutls>=2.12.12' 'libical' 'gnome-keyring>=3.3.5' \ 'libgdata' 'gtk+3' 'libxml2>=2.7.8' 'gnome-online-accounts') makedepends=('intltool' 'krb5' 'gperf' 'gobject-introspection' 'openldap' 'vala') -groups=('gnome') +groups=('gnome' 'gnome-minimal') archs=('i686' 'x86_64') _F_gnome_git="n" +_F_gnome_ext=".tar.xz" Finclude gnome - sha1sums=('623aa6bccdef97cd8ca835819e44f6d881be9a09') -sha1sums=('2ffb43caf45a44a302b3573b069dcc737f7d3d1d') ++sha1sums=('4e6d2bd9678a63a4684a1f3641004ab61c7e26db') if [ "$_F_gnome_git" != "n" ]; then unset sha1sums fi diff --cc source/gnome/totem/FrugalBuild index 43510d3,7b6c1fc..43c75f1 --- a/source/gnome/totem/FrugalBuild +++ b/source/gnome/totem/FrugalBuild @@@ -41,10 -38,8 +41,10 @@@ subdepends=("${subdepends[@]}" "nautilu subrodepends=("${subrodepends[@]}" "$pkgname=$pkgver") subgroups=("${subgroups[@]}" 'gnome') subarchs=("${subarchs[@]}" 'i686 x86_64') +subreplaces=("${subreplaces[@]}" '') +subprovides=("${subprovides[@]}" '') - sha1sums=('37cbc77f14a5a11de0afe7b6b30caf77eb4bde73') + sha1sums=('65d1b267f1521432e6a7a7ba21ed186a8951b52a') build() { Fcd diff --cc source/xlib/sdl/FrugalBuild index adda0fd,809ac5d..8eb98b7 --- a/source/xlib/sdl/FrugalBuild +++ b/source/xlib/sdl/FrugalBuild @@@ -2,8 -2,8 +2,13 @@@ # Maintainer: Miklos Vajna <[email protected]> pkgname=sdl ++<<<<<<< HEAD +pkgver=1.2.14 +pkgrel=4 ++======= + pkgver=1.2.15 + pkgrel=1 ++>>>>>>> 1a466e3f8b38763be2c4b4cc19b97b0799dda9a2 pkgdesc="Simple DirectMedia Layer library" url="http://www.libsdl.org"; depends=('glibc') _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
