Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=4ff15e682fc36e1f17b3c0a2a9b0c1dc7f97a9b3
commit 4ff15e682fc36e1f17b3c0a2a9b0c1dc7f97a9b3 Merge: e1cd528 b1aa102 Author: bouleetbil <bouleet...@frogdev.info> Date: Sat Mar 12 17:01:50 2011 +0100 Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current Conflicts: source/apps/polkit/FrugalBuild source/base/glib2/FrugalBuild source/lib/libxslt/FrugalBuild source/x11/libxft/FrugalBuild diff --cc source/apps/docbook-xml/FrugalBuild index 955d27e,b5617ee..170b239 --- a/source/apps/docbook-xml/FrugalBuild +++ b/source/apps/docbook-xml/FrugalBuild @@@ -3,13 -3,13 +3,13 @@@ pkgname=docbook-xml pkgver=4.5 -pkgrel=7 +pkgrel=8 pkgdesc="A widely used XML scheme for writing documentation and help" url="http://www.oasis-open.org/docbook/xml/"; -depends=('libxml2') +depends=('libxml2>=2.7.8') rodepends=('sed') groups=('apps') - archs=('i686' 'x86_64' 'ppc') + archs=('i686' 'x86_64' 'ppc' 'arm') up2date="lynx -dump "${url}index.1.shtml"|grep current|sed 's/.*V\([0-9\.]\+\) .*/\1/'" source=("${url}$pkgver/$pkgname-$pkgver.zip") sha1sums=('b9124233b50668fb508773aa2b3ebc631d7c1620') diff --cc source/apps/polkit/FrugalBuild index d24586c,be751b0..02ff37d --- a/source/apps/polkit/FrugalBuild +++ b/source/apps/polkit/FrugalBuild @@@ -12,9 -12,10 +12,10 @@@ groups=('apps' archs=('i686' 'x86_64' 'ppc') up2date="Flasttar http://hal.freedesktop.org/releases/"; source=(http://hal.freedesktop.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('4c1fcabfa51bb3f716258a855a22366e7ed1ee22') +sha1sums=('9d1f58a99d40889ceebbde142f93c305471fc151') replaces=('policykit') conflicts=('policykit') + options=('scriptlet') build() { Fbuild --with-authdb=default --with-authfw=pam --with-os-type=FrugalWare \ diff --cc source/base/gettext/FrugalBuild index d6b0b66,0d69ce0..01b479f --- a/source/base/gettext/FrugalBuild +++ b/source/base/gettext/FrugalBuild @@@ -3,12 -3,12 +3,12 @@@ pkgname=gettext pkgver=0.18.1.1 -pkgrel=1 +pkgrel=2 pkgdesc="GNU internationalization library" url="http://www.gnu.org/software/gettext"; -depends=('glibc>=2.8-3') +depends=('glibc>=2.8-3' 'libxml2>=2.7.8') groups=('base' 'chroot-core') - archs=('i686' 'x86_64' 'ppc') + archs=('i686' 'x86_64' 'ppc' 'arm') Fup2gnugz source=(ftp://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.gz) signatures=($source.sig) diff --cc source/devel-extra/vala/FrugalBuild index c4f824f,6542ed4..c3c94fb --- a/source/devel-extra/vala/FrugalBuild +++ b/source/devel-extra/vala/FrugalBuild @@@ -9,9 -9,9 +9,9 @@@ pkgdesc="Vala is a prgramming language depends=('glib2>=2.20.1') makedepends=('libxslt') groups=('devel-extra') - archs=('i686' 'x86_64' 'ppc') + archs=('i686' 'x86_64' 'ppc' 'arm') Finclude gnome -sha1sums=('c01f907d722d3e3cb95fbd823f8bc7923daeaee9') +sha1sums=('3f070ecfb500c8c7174abae52a518c5be26e40f7') Fconfopts="${Fconfopts[@]} --enable-vapigen" # optimization OK diff --cc source/lib/fontconfig/FrugalBuild index 14ba9a8,3aa3724..ecc57b3 --- a/source/lib/fontconfig/FrugalBuild +++ b/source/lib/fontconfig/FrugalBuild @@@ -4,12 -4,12 +4,12 @@@ pkgname=fontconfig pkgver=2.8.0 -pkgrel=3 +pkgrel=4 pkgdesc="A library for configuring and customizing font access" url="http://fontconfig.org/"; -depends=('libxml2' 'freetype2>=2.3.1' 'frugalware') +depends=('libxml2>=2.7.8' 'freetype2>=2.3.1' 'frugalware') groups=('lib' 'misc-fonts') - archs=('i686' 'x86_64' 'ppc') + archs=('i686' 'x86_64' 'ppc' 'arm') up2date="lynx -dump http://fontconfig.org/release|Flasttar" options=('force') source=($url/release/$pkgname-$pkgver.tar.gz \ diff --cc source/x11/libxft/FrugalBuild index 3e5905f,4a62787..84606be --- a/source/x11/libxft/FrugalBuild +++ b/source/x11/libxft/FrugalBuild @@@ -4,11 -4,11 +4,11 @@@ pkgname=libxft _F_xorg_name=libXft pkgver=2.2.0 -pkgrel=1 +pkgrel=2 pkgdesc="X FreeType library" groups=('x11' 'xorg-core' 'xorg-libs') - archs=('i686' 'x86_64' 'ppc') - depends=('libxml2>=2.7.8' 'libx11>=1.3' 'libxext>=1.0.5-3' 'libxrender>=0.9.4-3' 'freetype2>=2.3.8-2' 'fontconfig') + archs=('i686' 'x86_64' 'ppc' 'arm') + depends=('libx11>=1.3' 'libxext>=1.0.5-3' 'libxrender>=0.9.4-3' 'freetype2>=2.3.8-2' 'fontconfig') makedepends=('pkgconfig' 'xproto>=7.0.15' 'inputproto>=2.0') Finclude xorg source=(${source[@]} $pkgname-lcd-filter.patch) diff --cc source/x11/xcb-proto/FrugalBuild index 36b3e44,e7e5d96..ca56234 --- a/source/x11/xcb-proto/FrugalBuild +++ b/source/x11/xcb-proto/FrugalBuild @@@ -8,9 -8,9 +8,9 @@@ pkgdesc="X.org X protocol descriptions url="http://xcb.freedesktop.org"; groups=('x11' 'xorg-core' 'xorg-proto') depends=() - archs=('i686' 'x86_64' 'ppc') + archs=('i686' 'x86_64' 'ppc' 'arm') options=('nostrip') -makedepends=('pkgconfig' 'libxml2') +makedepends=('pkgconfig' 'libxml2>=2.7.8') up2date=("lynx -dump 'http://xcb.freedesktop.org/dist/?C=M;O=A' | grep xcb-proto | Flasttar") source=(http://xcb.freedesktop.org/dist/$pkgname-$pkgver.tar.bz2) sha1sums=('e82418557c7f59f29da9ec18e0906d6d78e3a164') diff --cc source/xapps/firefox/FrugalBuild index 0912e12,a43a01c..123160a --- a/source/xapps/firefox/FrugalBuild +++ b/source/xapps/firefox/FrugalBuild @@@ -3,12 -3,12 +3,12 @@@ # Contributor: VMiklos <vmik...@frugalware.org> pkgname=firefox - pkgver=3.6.14 + pkgver=3.6.15 pathver=${pkgver} # version used in path names -pkgrel=1 +pkgrel=2 pkgdesc="Mozilla Firefox web browser" url="http://www.mozilla.org/products/firefox/"; -depends=('gtk+2>=2.20.0-2' 'libidl' 'desktop-file-utils' 'nss>=3.12' 'glibc>=2.6' 'dbus-glib' 'curl>=7.19.0' 'nspr>=4.8.6' \ +depends=('libxml2>=2.7.8' 'gtk+2>=2.20.0-2' 'libidl' 'desktop-file-utils' 'nss>=3.12' 'glibc>=2.6' 'dbus-glib' 'curl>=7.19.0' 'nspr>=4.8.6' \ 'lcms' 'libxau>=1.0.4' 'libxdmcp' 'libxft>=2.1.13-2' 'libxt' 'libstdc++' 'libxdamage' 'libice' 'bzip2' 'alsa-lib' \ 'libnotify' 'wireless_tools') makedepends=('zip') diff --cc source/xlib/tk/FrugalBuild index 4ee6ec8,c840348..1d8756f --- a/source/xlib/tk/FrugalBuild +++ b/source/xlib/tk/FrugalBuild @@@ -10,9 -10,9 +10,9 @@@ _F_sourceforge_dirname="tcl _F_sourceforge_ext="-src.tar.gz" Finclude sourceforge url="http://tcl.sourceforge.net"; -depends=("tcl>=$pkgver" 'libx11>=1.2.1' 'glibc' 'libxscrnsaver' 'libxft' 'zlib') +depends=('libxml2>=2.7.8' "tcl>=$pkgver" 'libx11>=1.2.1' 'glibc' 'libxscrnsaver' 'libxft' 'zlib') groups=('xlib') - archs=('i686' 'x86_64' 'ppc') + archs=('i686' 'x86_64' 'ppc' 'arm') up2date="lynx -dump http://www.tcl.tk/|grep 'Tcl/Tk [0-9]'|sed 's/.*Tk \([^ ]*\) .*/\1/;q'" source=(${source/tk-/tk}) sha1sums=('161a133e0b653d5fdf6fcff47bdbf768d73f3238') _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
