From d1ea49c8721a7f9fe21a0b9f87930717a8e91913 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 21 Mar 2014 17:16:32 +0100 Subject: [PATCH] wxWidgets: move development files to -devel; -devel conflicts with wxGTK-devel. --- srcpkgs/wxWidgets/template | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/srcpkgs/wxWidgets/template b/srcpkgs/wxWidgets/template index 3aa98f26c8d..f1be23db4a3 100644 --- a/srcpkgs/wxWidgets/template +++ b/srcpkgs/wxWidgets/template @@ -2,23 +2,26 @@ pkgname="wxWidgets" version="2.8.12" -revision=1 +revision=2 build_style=gnu-configure -short_desc="Cross-Platform Gui Library" +short_desc="Cross-Platform GUI Library" maintainer="Martin Riese " license="wxWindows Library Licence" homepage="http://www.wxwidgets.org/" hostmakedepends="pkg-config" makedepends="gtk+-devel libjpeg-turbo-devel tiff-devel libSM-devel libXinerama-devel libmspack-devel" -distfiles="${SOURCEFORGE_SITE}/wxwindows/${version}/wxWidgets-${version}.tar.bz2" +distfiles="${SOURCEFORGE_SITE}/wxwindows/${version}/${pkgname}-${version}.tar.bz2" checksum="3b0ac1d2d017683851841501c8e1b744b97242d684a1668ded61809b0504f707" wxWidgets-devel_package() { - depends="wxWidgets>=${version}_${revision}" - short_desc+=" - development files" - pkg_install() { + conflicts="wxGTK-devel>=0" + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() { vmove usr/include vmove "usr/lib/*.so" vmove usr/share - } + vmove usr/bin + vmove usr/lib/wx + } }