From c4914f39901488ccfd8baa92ac7c129d405df9c1 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 15 Dec 2011 20:15:06 +0100 Subject: [PATCH] {chromium,wine}-unstable: required xbps-src>=11 to build. --- srcpkgs/chromium-unstable/template | 3 ++- srcpkgs/wine-unstable/libwine-unstable.template | 1 + srcpkgs/wine-unstable/template | 2 ++ srcpkgs/wine/libwine.template | 6 ++---- srcpkgs/wine/template | 7 ++----- 5 files changed, 9 insertions(+), 10 deletions(-) diff --git a/srcpkgs/chromium-unstable/template b/srcpkgs/chromium-unstable/template index bcf3a6768a..00992914e6 100644 --- a/srcpkgs/chromium-unstable/template +++ b/srcpkgs/chromium-unstable/template @@ -2,7 +2,7 @@ __pkgname=chromium pkgname=${__pkgname}-unstable version=17.0.916.0 -revision=4 +revision=5 distfiles="http://build.chromium.org/official/${__pkgname}-$version.tar.bz2" short_desc="Google's attempt at creating a safer, faster, and more stable browser" maintainer="davehome " @@ -21,6 +21,7 @@ long_desc=" replaces="chromium>=0" provides="chromium-$version" +build_requires=11 gtk_iconcache_dirs="/usr/share/icons/hicolor" diff --git a/srcpkgs/wine-unstable/libwine-unstable.template b/srcpkgs/wine-unstable/libwine-unstable.template index 2ee780cf57..ce104f30ea 100644 --- a/srcpkgs/wine-unstable/libwine-unstable.template +++ b/srcpkgs/wine-unstable/libwine-unstable.template @@ -6,6 +6,7 @@ long_desc="${long_desc} This package contains the wine runtime." only_for_archs=i686 +revision=1 replaces="libwine>=0" provides="libwine-$version" conflicts="libwine>=0" diff --git a/srcpkgs/wine-unstable/template b/srcpkgs/wine-unstable/template index 3906086f84..f553413294 100644 --- a/srcpkgs/wine-unstable/template +++ b/srcpkgs/wine-unstable/template @@ -2,6 +2,7 @@ __pkgname=wine pkgname=${__pkgname}-unstable version=1.3.33 +revision=1 wrksrc=${__pkgname}-$version build_style=gnu-configure configure_args="--with-x" @@ -17,6 +18,7 @@ long_desc=" Windows. (unstable)" only_for_archs=i686 +build_requires=11 replaces="wine>=0" provides="wine-$version" conflicts="wine>=0" diff --git a/srcpkgs/wine/libwine.template b/srcpkgs/wine/libwine.template index ba56f7ce77..713834220a 100644 --- a/srcpkgs/wine/libwine.template +++ b/srcpkgs/wine/libwine.template @@ -5,12 +5,10 @@ long_desc="${long_desc} This package contains the wine runtime." -revision=5 +revision=6 only_for_archs=i686 -replaces="libwine-unstable>=0" -provides="libwine-$version" -conflicts="libwine-unstable>=0" +replaces="libwine>=0" do_install() { diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template index af6c3e817a..483ffc9077 100644 --- a/srcpkgs/wine/template +++ b/srcpkgs/wine/template @@ -1,7 +1,7 @@ # Template file for 'wine' pkgname=wine version=1.2.3 -revision=4 +revision=5 build_style=gnu-configure homepage="http://www.winehq.org/" distfiles="http://ibiblio.org/pub/linux/system/emulators/${pkgname}/${pkgname}-${version}.tar.bz2" @@ -15,10 +15,7 @@ long_desc=" Windows." only_for_archs=i686 -replaces="wine-unstable>=0" -provides="wine-$version" -conflicts="wine-unstable>=0" - +replaces="wine>=0" subpackages="lib$pkgname $pkgname-devel" gtk_iconcache_dirs="/usr/share/icons/hicolor"