Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=lotesting.git;a=commitdiff;h=c9173e68d06a9c1ba57684f3c0ff8e970a0bed1e
commit c9173e68d06a9c1ba57684f3c0ff8e970a0bed1e Merge: 836e60f c9503ca Author: Miklos Vajna <[email protected]> Date: Wed Jan 11 00:10:18 2012 +0100 Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current Conflicts: source/xapps/libreoffice/FrugalBuild diff --cc source/xapps/libreoffice/FrugalBuild index b89bf6b,747e9d1..78b9090 --- a/source/xapps/libreoffice/FrugalBuild +++ b/source/xapps/libreoffice/FrugalBuild @@@ -14,15 -14,15 +14,15 @@@ Finclude gnome-scriptlet kd unset install depends=('libxml2' 'libart_lgpl' 'libsndfile' 'openjre' 'nas' 'fontconfig' 'libpng>=1.4.1' 'imagemagick' \ 'flex' 'neon>=0.26.1' 'bison' 'zip' 'unzip' 'expat' 'cups' 'desktop-file-utils' 'perl-archive-zip' \ - 'unixodbc' 'libxaw>=1.0.5' 'libxslt' 'startup-notification>=0.9-3' 'libwpd>=0.8.13' 'poppler-glib>=0.18' \ - 'sane-backends' 'lp_solve' 'silgraphite' 'libtextcat' 'librdf' 'graphite2') + 'unixodbc' 'libxaw>=1.0.5' 'libxslt' 'startup-notification>=0.9-3' 'libvisio' 'poppler-glib>=0.18' \ + 'sane-backends' 'lp_solve' 'silgraphite' 'libexttextcat' 'librdf' 'graphite2' 'libcmis') # this is here as gstreamer is only a makedepend rodepends=('flac' 'dejavu-ttf') -makedepends=('curl>=7.20.0-2' 'intltool' 'tcsh' 'ecj' 'apache-ant' \ +makedepends=('intltool' 'tcsh' 'ecj' 'apache-ant' \ - 'boost' 'icu4c' 'hunspell>=1.3.2' 'imake' 'gccmakedep' 'xalan-j' \ + 'boost' 'icu4c>=4.8.1.1' 'hunspell>=1.3.2' 'imake' 'gccmakedep' 'xalan-j' \ 'patch>=2.5.9' 'xorg-server' 'gstreamer>=0.10.30-2' 'gst-plugins-base' \ 'procps' 'openldap' 'gperf' 'xulrunner' 'kdelibs-compiletime' 'libwps' \ - 'libwpg' 'mdbtools' 'mdds' 'junit' 'lucene' 'cppunit' 'bsh' 'vigra' \ + 'mdbtools' 'mdds' 'junit' 'lucene' 'cppunit' 'bsh' 'vigra' \ 'mythes' 'hyphen' 'translate-toolkit' 'urw-fonts') groups=('xapps') archs=('i686' 'x86_64') _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
