Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gnometesting.git;a=commitdiff;h=5de43b354152620bd1db96b65585919481349efe
commit 5de43b354152620bd1db96b65585919481349efe Merge: 58d5753 2af37b1 Author: bouleetbil <bouleet...@frogdev.info> Date: Sat Feb 26 22:35:59 2011 +0100 Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current Conflicts: source/apps-extra/paco/FrugalBuild source/base/systemd/FrugalBuild source/devel/ruby/FrugalBuild source/games-extra/bsnes/FrugalBuild source/games-extra/lincity-ng/FrugalBuild source/games-extra/tmw/FrugalBuild source/gnome-extra/gnome-games/FrugalBuild source/gnome-extra/seahorse/FrugalBuild source/gnome-extra/synapse/FrugalBuild source/gnome/gdm/FrugalBuild source/gnome/libgweather/FrugalBuild source/lib-extra/libofx/FrugalBuild source/lib/rasqal/FrugalBuild source/network-extra/aria2/FrugalBuild source/network-extra/bfilter/FrugalBuild source/x11-extra/fluxbox/FrugalBuild source/xapps-extra/pinot/FrugalBuild source/xapps-extra/ufraw/FrugalBuild source/xapps/mplayer/FrugalBuild source/xfce4/xfce4-gfpm-plugin/FrugalBuild source/xfce4/xfce4-gnetconfig-plugin/FrugalBuild source/xfce4/xfce4-xkb-plugin/FrugalBuild source/xlib-extra/libunity-misc/FrugalBuild source/xlib-extra/libvirt/FrugalBuild source/xlib-extra/uim/FrugalBuild source/xlib/polkit-qt-1/FrugalBuild diff --cc source/devel/ruby/FrugalBuild index 8c97d99,14630c9..f438706 --- a/source/devel/ruby/FrugalBuild +++ b/source/devel/ruby/FrugalBuild @@@ -3,12 -3,12 +3,12 @@@ # Maintainer: voroskoi <voros...@frugalware.org> pkgname=ruby - pkgver=1.9.1 - pkgpatch=429 - pkgrel=6 + pkgver=1.9.2 + pkgpatch=180 + pkgrel=1 pkgdesc="An object-oriented programming language." url="http://www.ruby-lang.org/"; -depends=('zlib' 'db>=4.7.25-2' 'readline' 'openssl>=1.0.0' 'gdbm') +depends=('libxml2>=2.7.8' 'zlib' 'db>=4.7.25-2' 'readline' 'openssl>=1.0.0' 'gdbm') makedepends=('tk') groups=('devel') archs=('i686' 'x86_64' 'ppc') diff --cc source/games-extra/lincity-ng/FrugalBuild index a46faf2,958be6e..1aa1a3a --- a/source/games-extra/lincity-ng/FrugalBuild +++ b/source/games-extra/lincity-ng/FrugalBuild @@@ -3,7 -3,7 +3,7 @@@ pkgname=lincity-ng pkgver=2.0 --pkgrel=4 ++pkgrel=5 pkgdesc="A City Simulation Game. It is a polished and improved version of the classic LinCity game." _F_berlios_ext=".tar.bz2" Finclude berlios diff --cc source/games-extra/tmw/FrugalBuild index 5905612,e3f5ad3..e091c3e --- a/source/games-extra/tmw/FrugalBuild +++ b/source/games-extra/tmw/FrugalBuild @@@ -3,7 -3,7 +3,7 @@@ pkgname=tmw pkgver=0.0.29.1 --pkgrel=4 ++pkgrel=5 pkgdesc="The Mana World (TMW) is a serious effort to create an innovative free and open source MMORPG." _F_sourceforge_dirname="themanaworld" _F_sourceforge_realname="The Mana World" diff --cc source/gnome-extra/gnome-games/FrugalBuild index 1b186b7,12a1c71..97d2121 --- a/source/gnome-extra/gnome-games/FrugalBuild +++ b/source/gnome-extra/gnome-games/FrugalBuild @@@ -2,12 -2,12 +2,12 @@@ # Maintainer: bouleetbil <bouleet...@frogdev.info> pkgname=gnome-games -pkgver=2.32.1 -pkgrel=2 +pkgver=2.91.90 +pkgrel=1 pkgdesc="Games for GNOME" url="http://www.gnome.org/"; - depends=('guile' 'librsvg>=2.26.0-2' 'rarian>=0.8.0' \ -depends=('guile>=1.8.8' 'libgnomeui>=2.24.3-2' 'librsvg>=2.26.0-2' 'rarian>=0.8.0' \ - 'desktop-file-utils' 'libbonobo>=2.24.0' 'gnome-python-desktop>=2.32.0' \ ++depends=('guile>1.8.8' 'librsvg>=2.26.0-2' 'rarian>=0.8.0' \ + 'desktop-file-utils' 'libbonobo>=2.24.0' 'gnome-python-desktop' \ 'ggz-client-libs' 'sdl' 'sdl_mixer' 'clutter-gtk' 'libcanberra-gtk') makedepends=('intltool' 'gnome-doc-utils>=0.14.0' 'glproto') groups=('gnome-extra') diff --cc source/gnome-extra/seahorse/FrugalBuild index d446594,45a740e..ea94613 --- a/source/gnome-extra/seahorse/FrugalBuild +++ b/source/gnome-extra/seahorse/FrugalBuild @@@ -2,13 -2,13 +2,13 @@@ # Maintainer: Priyank Gosalia <priyan...@gmail.com> pkgname=seahorse -pkgver=2.32.0 -pkgrel=2 +pkgver=2.91.4 +pkgrel=1 pkgdesc="A GNOME application for managing PGP keys." url="http://www.seahorse.sourceforge.net/"; - depends=('gnutls=2.8.6-1' 'gtksourceview>=2.10.0-4' 'gnupg>=1.4.9-2' 'libldap>=2.4.16' \ + depends=('gnutls>=2.8.6-1' 'gtksourceview>=2.10.0-4' 'gnupg>=1.4.9-2' 'libldap>=2.4.16' \ 'gpgme' 'libsoup>=2.30.0' 'dbus' 'dbus-glib' 'libxml2' \ - 'libnotify>=0.4.5-2' 'libgnomeui>=2.24.3' 'openssh' 'gconf>=2.28.1' 'avahi>=0.6.24-5') + 'libnotify>=0.7' 'libgnomeui>=2.24.3' 'openssh' 'gconf>=2.28.1' 'avahi>=0.6.24-5') makedepends=('gettext' 'openldap' 'intltool' 'pkgconfig' 'gnome-doc-utils') groups=('gnome-extra') archs=('i686' 'x86_64' 'ppc') diff --cc source/gnome-extra/synapse/FrugalBuild index 241389f,db168e6..757607c --- a/source/gnome-extra/synapse/FrugalBuild +++ b/source/gnome-extra/synapse/FrugalBuild @@@ -2,13 -2,13 +2,13 @@@ # Maintainer: Devil505 <devil505li...@gmail.com> pkgname=synapse - pkgver=0.2.2.2 + pkgver=0.2.4 _pkgmainver=0.2 - pkgrel=4 -pkgrel=1 ++pkgrel=5 pkgdesc="Synapse is a semantic launcher written in Vala " url="http://launchpad.net/synapse-project"; -depends=('gtkhotkey' 'libgee' 'unique' 'indicator-application' 'libzeitgeist>=0.3.2' 'libnotify') -makedepends=('intltool') +depends=('gtkhotkey' 'libgee' 'unique1' 'indicator-application' 'libzeitgeist>=0.3.2') +makedepends=('intltool' 'vala') _F_gnome_iconcache="y" _F_gnome_desktop="y" Finclude gnome-scriptlet diff --cc source/gnome/gdm/FrugalBuild index 8d4cd6a,2c027e0..e0056fb --- a/source/gnome/gdm/FrugalBuild +++ b/source/gnome/gdm/FrugalBuild @@@ -2,8 -2,8 +2,8 @@@ # Maintainer: bouleetbil <bouleet...@frogdev.info> pkgname=gdm -pkgver=2.32.0 +pkgver=2.91.91 - pkgrel=1 + pkgrel=2 pkgdesc="GNOME Display Manager" url="http://www.gnome.org/"; backup=(etc/gdm/custom.conf etc/pam.d/gdm etc/pam.d/gdm-autologin) diff --cc source/gnome/libgweather/FrugalBuild index 15b1489,649cf26..6046ee7 --- a/source/gnome/libgweather/FrugalBuild +++ b/source/gnome/libgweather/FrugalBuild @@@ -2,17 -2,30 +2,30 @@@ # Maintainer: bouleetbil <bouleet...@frogdev.info> pkgname=libgweather -pkgver=2.30.3 -pkgrel=2 +pkgver=2.91.6 - pkgrel=4 ++pkgrel=5 pkgdesc="libgweather is a library to access weather information from online services for numerous locations." url="http://www.gnome.org/"; -depends=('gtk+2' 'gconf>=2.32.0' 'libsoup>=2.32.0') -makedepends=('perl-xml-parser' 'intltool' 'python') -groups=('gnome' 'gnome-minimal') +depends=('libxml2>=2.7.8' 'gtk+3>=2.99.2-5' 'gconf>=2.32.0' 'libsoup-gnome>=2.32.0') +makedepends=('perl-xml-parser' 'intltool' 'gobject-introspection') +groups=('gnome') archs=('i686' 'x86_64' 'ppc') _F_gnome_schemas=('/etc/gconf/schemas/gweather.schemas') -Finclude gnome gnome-scriptlet python -sha1sums=('e89aadc89d3405d1a3de12005fa839d9da5adbc1') +Finclude gnome gnome-scriptlet +sha1sums=('c23f5eb8cf3d687f5e31f597a5f48390987ebcba') unset MAKEFLAGS + subpkgs=("${subpkgs[@]}" "python-gweather") + subdescs=("${subdescs[@]}" "Python bindings for libgweather") + subdepends=("${subdepends[@]}" "python>=2.7 pygobject") + subrodepends=("${subrodepends[@]}" "libgweather>=$pkgver") + subgroups=("${subgroups[@]}" 'devel-extra') + subarchs=("${subarchs[@]}" 'i686 x86_64') + + build() { + Fbuild --enable-python + Fbuild_gnome_scriptlet + Fsplit python-gweather $_F_python_libdir + } + # optimization OK diff --cc source/lib/rasqal/FrugalBuild index d22b2d0,dba7a83..5087c3d --- a/source/lib/rasqal/FrugalBuild +++ b/source/lib/rasqal/FrugalBuild @@@ -3,10 -3,10 +3,10 @@@ pkgname=rasqal pkgver=0.9.20 --pkgrel=2 ++pkgrel=3 pkgdesc="RDF query parsing and execution library" url="http://librdf.org/rasqal/"; - depends=('raptor>=1.4.21' 'libxml2>=2.7.8' 'openssl>=1.0.0') + depends=('raptor>=1.4.21' 'mpfr>=3.0.0') groups=('lib') archs=('i686' 'x86_64' 'ppc') up2date="Flasttar $url" diff --cc source/network-extra/aria2/FrugalBuild index 9832920,396fe4f..e7e135e --- a/source/network-extra/aria2/FrugalBuild +++ b/source/network-extra/aria2/FrugalBuild @@@ -2,10 -2,10 +2,10 @@@ # Maintainer: crazy <cr...@frugalware.org> pkgname=aria2 - pkgver=1.10.6 - pkgrel=2 + pkgver=1.10.9 + pkgrel=1 pkgdesc="aria2 is an utility for downloading files." -depends=('openssl>=1.0.0' 'libxml2' 'c-ares' 'sqlite3' 'libstdc++') +depends=('openssl>=1.0.0' 'libxml2>=2.7.8' 'c-ares' 'sqlite3' 'libstdc++') makedepends=('cvs' 'gnutls' 'xmlrpc-c') license="GPL" groups=('network-extra') diff --cc source/network-extra/bfilter/FrugalBuild index a43db9f,1facb1a..472adff --- a/source/network-extra/bfilter/FrugalBuild +++ b/source/network-extra/bfilter/FrugalBuild @@@ -4,11 -4,11 +4,11 @@@ pkgname=bfilter pkgver=1.1.4 --pkgrel=2 ++pkgrel=3 pkgdesc="A realtime web filtering and ad-removing proxy that just works" url="http://bfilter.sf.net/"; groups=('network-extra') - depends=('ace' 'gtkmm2' 'libxml2' 'libstdc++') -depends=('ace>=5.7.7-2' 'gtkmm' 'libxml2' 'libstdc++') ++depends=('ace>5.7.7-2' 'gtkmm2' 'libxml2' 'libstdc++') archs=('i686' 'x86_64') Finclude sourceforge source=($source 'bfilter-gcc-4.4.0-fix.patch') diff --cc source/xapps/mplayer/FrugalBuild index e099a00,d38645d..d436e4a --- a/source/xapps/mplayer/FrugalBuild +++ b/source/xapps/mplayer/FrugalBuild @@@ -6,10 -6,10 +6,10 @@@ USE_DEVEL=${USE_DEVEL:-"n" pkgname=mplayer _F_archive_name=MPlayer - pkgver=1.0rc3 + pkgver=1.0rc4 Fuse $USE_DEVEL && pkgver=1.0rc2.29962 pkgextraver=.29962 -pkgrel=1 +pkgrel=4 Fuse $USE_DEVEL && pkgrel=1 pkgdesc="The Movie Player" url="http://www.mplayerhq.hu/"; diff --cc source/xfce4/xfce4-gfpm-plugin/FrugalBuild index 15ae5d3,0a61c51..0b8c0cd --- a/source/xfce4/xfce4-gfpm-plugin/FrugalBuild +++ b/source/xfce4/xfce4-gfpm-plugin/FrugalBuild @@@ -3,7 -3,7 +3,7 @@@ pkgname=xfce4-gfpm-plugin pkgver=0.2.0 --pkgrel=4 ++pkgrel=5 pkgdesc="GFpm plugin for the Xfce settings manager" url="http://ftp.frugalware.org/pub/other/fw-control-center"; makedepends=('intltool') diff --cc source/xfce4/xfce4-gnetconfig-plugin/FrugalBuild index ea2a6eb,39bec48..4cbead2 --- a/source/xfce4/xfce4-gnetconfig-plugin/FrugalBuild +++ b/source/xfce4/xfce4-gnetconfig-plugin/FrugalBuild @@@ -3,7 -3,7 +3,7 @@@ pkgname=xfce4-gnetconfig-plugin pkgver=0.2.0 --pkgrel=4 ++pkgrel=5 pkgdesc="GNetconfig plugin for the Xfce settings manager" url="http://ftp.frugalware.org/pub/other/fw-control-center"; makedepends=('intltool') diff --cc source/xfce4/xfce4-xkb-plugin/FrugalBuild index b0384e9,1d814e7..8020ca6 --- a/source/xfce4/xfce4-xkb-plugin/FrugalBuild +++ b/source/xfce4/xfce4-xkb-plugin/FrugalBuild @@@ -2,17 -2,21 +2,21 @@@ # Maintainer: Priyank Gosalia <priyan...@gmail.com> pkgname=xfce4-xkb-plugin - pkgver=0.4.3 - pkgrel=3 + pkgver=0.5.3.3 -pkgrel=1 ++pkgrel=2 pkgdesc="A keyboard layout plugin for the Xfce4 panel." makedepends=('intltool') - depends=('libxml2>=2.7.8' 'xfce4-panel>=4.6.1-3' 'libxpm') + depends=('xfce4-panel>=4.8.0' 'libxfcegui4>=4.8.0' 'librsvg' 'libxklavier') groups=('xfce4' 'xfce4-goodies') archs=('i686' 'x86_64' 'ppc') - Finclude xfce4 - source="http://archive.xfce.org/src/panel-plugins/$pkgname/0.4/$pkgname-$pkgver.tar.bz2"; + _F_xfce_goodies_ext=".tar.gz" + _F_xfce_category="panel-plugins" _F_gnome_iconcache="y" - Finclude gnome-scriptlet - sha1sums=('962f1fdc6b373fa5d8a886aaaa4d0fbb45c44234') + Finclude xfce4 gnome-scriptlet + source=(http://archive.xfce.org/src/panel-plugins/$pkgname/0.5/$pkgname-$pkgver.tar.gz \ + xfce4-xkb-plugin-0.5.3.3-libxklavier.patch crashfix.diff) + sha1sums=('5e83d55cd6f14a62a87ccadd0f11eee070a6f4a7' \ + '44691bd348e33ea17afe45869675c0f7c03ed32f' \ + '03c7926f3dfb43b55b033db359f48a17b8bde561') # optimization OK diff --cc source/xlib-extra/uim/FrugalBuild index bcef36e,2d69ef2..f70b31f --- a/source/xlib-extra/uim/FrugalBuild +++ b/source/xlib-extra/uim/FrugalBuild @@@ -2,10 -2,10 +2,10 @@@ # Maintainer: crazy <cr...@frugalware.org> pkgname=uim - pkgver=1.5.6 - pkgrel=4 + pkgver=1.6.1 + pkgrel=1 pkgdesc="Uim is a multilingual input method library." -depends=('gtk+2>=2.20.0-2' 'atk' 'ncurses' 'libstdc++' 'pango' 'm17n-lib') +depends=('libxml2>=2.7.8' 'gtk+2>=2.20.0-2' 'atk' 'ncurses' 'libstdc++' 'pango' 'm17n-lib') makedepends=('qt' 'libgnomeui' 'libsm' 'freetype2' 'gnome-panel' 'kdelibs' 'intltool') options=('scriptlet') groups=('xlib-extra') diff --cc source/xmultimedia/phonon/FrugalBuild index a5881ec,204c32f..220dec7 --- a/source/xmultimedia/phonon/FrugalBuild +++ b/source/xmultimedia/phonon/FrugalBuild @@@ -10,9 -10,8 +10,8 @@@ groups=('xmultimedia' archs=('i686' 'x86_64' 'ppc') _F_kde_folder="stable/$pkgname" Finclude kde - up2date="lynx -dump $_F_kde_mirror/$_F_kde_dirname|tail -n1|sed 's/.*\///'g" url='http://phonon.kde.org' -depends=("libqtdbus>=$_F_kde_qtver" "libqtgui>=$_F_kde_qtver" 'libuuid') # 'pulseaudio' +depends=('libxml2>=2.7.8' "libqtdbus>=$_F_kde_qtver" "libqtgui>=$_F_kde_qtver" 'libuuid') # 'pulseaudio' makedepends=("${makedepends[@]}" "libqttest>=$_F_kde_qtver") sha1sums=('7f31752c20efecbe63c7b312ceb28819fa337943') _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
