Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=ryuotesting5.git;a=commitdiff;h=29cd46135fbaac1a4f4917ee216ba7afb9a557f3
commit 29cd46135fbaac1a4f4917ee216ba7afb9a557f3 Merge: 0983cee b3dab78 Author: James Buren <[email protected]> Date: Thu Aug 30 19:59:56 2012 -0500 Merge branch 'master' of ../current Conflicts: source/gnome-extra/dvdstyler/FrugalBuild source/gnome-extra/shotwell/FrugalBuild diff --cc source/gnome-extra/cinnamon/FrugalBuild index d02d8f4,4000adc..4864725 --- a/source/gnome-extra/cinnamon/FrugalBuild +++ b/source/gnome-extra/cinnamon/FrugalBuild @@@ -8,8 -8,9 +8,9 @@@ pkgver=1.4. pkgrel=3 pkgdesc="Linux desktop which provides advanced innovative features and a traditional user experience" url="http://cinnamon.linuxmint.com/"; -depends=('muffin' 'folks' 'telepathy-logger' 'gnome-menus' 'gjs' 'gnome-desktop' 'libpulse' 'krb5' 'gnome-bluetooth') +depends=('muffin' 'folks' 'telepathy-logger' 'gnome-menus' 'gjs' 'gnome-desktop' 'libpulse' 'krb5' 'gnome-bluetooth' 'systemd>=188') makedepends=('intltool' 'gnome-common' 'gobject-introspection' 'automake') + rodepends=('caribou') if Fuse $USE_FRUGALTHEME; then rodepends=("${rodepends[@]}" "cinnamon-frugalware-theme") else diff --cc source/gnome-extra/dvdstyler/FrugalBuild index 482e330,82b1610..71af0a0 --- a/source/gnome-extra/dvdstyler/FrugalBuild +++ b/source/gnome-extra/dvdstyler/FrugalBuild @@@ -13,11 -12,10 +12,10 @@@ _F_sourceforge_name="DVDStyler _F_sourceforge_ext=.tar.bz2 _F_cd_path="$_F_sourceforge_name-$pkgver" makedepends=('dvdauthor' 'netpbm') - depends=('mpgtx' 'wxgtk>=2.8.12' 'wxsvg>=1.1.8' 'mjpegtools>=1.9.0' 'cdrtools' \ + depends=('mpgtx' 'wxgtk>=2.8.12' 'wxsvg>=1.1.9' 'mjpegtools>=1.9.0' 'cdrtools' \ 'dvd+rw-tools' 'libexif' 'ffmpeg>=0.10.3' 'xine-ui' \ - 'gettext' 'xmlto' 'zip' 'libgnomeui' 'gst-plugins-base') + 'gettext' 'xmlto' 'zip' 'libgnomeui' 'gst-plugins-base' 'systemd>=188') Finclude sourceforge - source=($source use_ffmpeg_instead_of_libav.patch) options=('scriptlet') groups=('gnome-extra') archs=('i686' 'x86_64') diff --cc source/gnome-extra/shotwell/FrugalBuild index 9d40234,1ae302d..00b43b7 --- a/source/gnome-extra/shotwell/FrugalBuild +++ b/source/gnome-extra/shotwell/FrugalBuild @@@ -6,8 -6,8 +6,8 @@@ pkgver=0.12. pkgrel=2 pkgdesc="A digital photo organizer designed for the GNOME desktop environment" url="http://yorba.org/shotwell/"; - depends=('gconf' 'libgee' 'libgphoto2' 'unique' 'webkit' 'libgexiv2>=0.4.1-2' \ + depends=('gconf' 'libgee' 'libgphoto2>=2.5.0' 'unique' 'webkit' 'libgexiv2>=0.4.1-2' \ - 'libraw>=0.14.3' 'librsvg' 'json-glib' 'libgudev' 'webkit-gtk3' 'librest') + 'libraw>=0.14.3' 'librsvg' 'json-glib' 'systemd>=188' 'webkit-gtk3' 'librest') makedepends=('vala>=0.11' 'intltool') options=('scriptlet') _F_gnome_schemas=('/etc/gconf/schemas/shotwell.schemas') _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
