Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=dex77stuff.git;a=commitdiff;h=8df32a6556a24155716d0c566f22b088d84d2b80
commit 8df32a6556a24155716d0c566f22b088d84d2b80 Author: kikadf <[email protected]> Date: Thu Feb 26 13:14:22 2015 +0100 Fix conflict in aegisub diff --git a/source/xapps-extra/aegisub/FrugalBuild b/source/xapps-extra/aegisub/FrugalBuild index 5e65a37..140347e 100644 --- a/source/xapps-extra/aegisub/FrugalBuild +++ b/source/xapps-extra/aegisub/FrugalBuild @@ -5,21 +5,12 @@ options+=('asneeded') pkgname=aegisub pkgver=3.1.3 -<<<<<<< HEAD pkgrel=6 pkgdesc="Aegisub is a cross-platform subtitle editor." url="http://www.aegisub.org/"; depends=('hunspell' 'libass' 'portaudio' 'libpulse>=6.0' 'intltool' 'libgl'\ 'ffmpegsource>=2.20' 'wxwidget>=3.0.0-3' 'x264>=20120904' 'libboost>=1.50-4') makedepends=('boost>=1.50.0-4') -======= -pkgrel=3 -pkgdesc="Aegisub is a cross-platform subtitle editor." -url="http://www.aegisub.org/"; -depends=('hunspell' 'libass' 'portaudio' 'libpulse>=6.0' 'intltool' 'libgl'\ - 'ffmpegsource>=2.17-3' 'wxwidget>=3.0.0-3' 'x264>=20120904' 'libboost') -makedepends=('boost>=1.50.0') ->>>>>>> 341de97fb84524accfccd92fe4920d9c75511903 Fconfopts+=" --with-wx-config=/usr/lib/wx/config/gtk2-unicode-3.0 --without-openal" groups=('xapps-extra') archs=('i686' 'x86_64') _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
