Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=lotesting.git;a=commitdiff;h=872006cab83db233240b711b0e683d57695792ac
commit 872006cab83db233240b711b0e683d57695792ac Merge: b3021cd 75f1a1d Author: Miklos Vajna <[email protected]> Date: Wed May 29 07:42:21 2013 +0200 Merge remote-tracking branch 'current/master' Conflicts: source/xapps/libreoffice/FrugalBuild diff --cc source/xapps/libreoffice/FrugalBuild index 6a933f7,8c669a2..97115d3 --- a/source/xapps/libreoffice/FrugalBuild +++ b/source/xapps/libreoffice/FrugalBuild @@@ -17,11 -18,11 +17,11 @@@ depends=('libxml2' 'libsndfile' 'openjr 'flex' 'neon>=0.26.1' 'zip' 'unzip' 'expat' 'cups' 'desktop-file-utils' 'perl-archive-zip' \ 'unixodbc>=2.3.1' 'libxaw>=1.0.5' 'libxslt' 'startup-notification>=0.9-3' 'libvisio>=0.0.24-2' 'libcdr>=0.0.10' 'libmspub' 'liborcus' \ 'sane-backends' 'lp_solve' 'silgraphite' 'libexttextcat>=3.4.0' 'librdf' 'graphite2' 'libcmis>=0.3.0-2' 'clucene' \ - 'bluez' 'liblangtag' 'python-3.0' 'poppler-glib>=0.18' 'libodfgen' 'libmwaw') - 'bluez' 'liblangtag' 'python-3.0' 'poppler-glib>=0.18' 'hyphen' 'mythes') ++ 'bluez' 'liblangtag' 'python-3.0' 'poppler-glib>=0.18' 'libodfgen' 'libmwaw' 'hyphen' 'mythes') makedepends=('apache-ant' 'boost>=1.50.0' 'hunspell>=1.3.2' \ 'xalan-j' 'xorg-server' 'gstreamer1' 'gst1-plugins-base' 'procps' \ 'xulrunner' "kdelibs-compiletime>=$_F_kde_ver" 'libwps>=0.2.7-2' 'mdbtools' \ -- 'mdds>=0.6.1-2' 'junit' 'cppunit' 'vigra>=1.9.0-2' 'mythes' 'hyphen' \ ++ 'mdds>=0.6.1-2' 'junit' 'cppunit' 'vigra>=1.9.0-2' \ 'postgresql' 'krb5' \ # required by e.g. the DOCX importer 'gperf' \ _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
