diff options
author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-11-06 20:10:41 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-11-06 20:10:41 -0300 |
commit | 385fda403f286573a778ee525fe56a86d11fc967 (patch) | |
tree | 1aabb3a26d366ffa745a559409bcbe91b04dc240 /extra/libreoffice | |
parent | 922fd0a3c35beb57adbef0b4c4c122dd29563c97 (diff) | |
parent | fbe5d27eadf86b85244a5ffff62c132cb9a4a158 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/adns/PKGBUILD
community/afpfs-ng/PKGBUILD
community/aqbanking/PKGBUILD
community/arp-scan/PKGBUILD
community/arpack/PKGBUILD
community/bind/PKGBUILD
community/bird/PKGBUILD
community/cairo-dock/PKGBUILD
community/cinnamon-control-center/PKGBUILD
community/commoncpp2/PKGBUILD
community/cuetools/PKGBUILD
community/erlang/PKGBUILD
community/fxdesktop/PKGBUILD
community/gavl/PKGBUILD
community/google-gadgets/PKGBUILD
community/gpicview/PKGBUILD
community/gtk-aurora-engine/PKGBUILD
community/icewm-utils/PKGBUILD
community/inotify-tools/PKGBUILD
community/jack2/PKGBUILD
community/judy/PKGBUILD
community/lash/PKGBUILD
community/libdlna/PKGBUILD
community/libgexiv2/PKGBUILD
community/libgig/PKGBUILD
community/liblinebreak/PKGBUILD
community/liblockfile/PKGBUILD
community/libopenraw/PKGBUILD
community/librcd/PKGBUILD
community/librsync/PKGBUILD
community/libvirt/PKGBUILD
community/libyaml/PKGBUILD
community/linux-tools/PKGBUILD
community/lomoco/PKGBUILD
community/luasec/PKGBUILD
community/luasocket/PKGBUILD
community/lwp/PKGBUILD
community/lxappearance-obconf/PKGBUILD
community/lxappearance/PKGBUILD
community/lxsplit/PKGBUILD
community/metamail/PKGBUILD
community/mg/PKGBUILD
community/nemo-fileroller/PKGBUILD
community/nsd/PKGBUILD
community/obby/PKGBUILD
community/openarena/PKGBUILD
community/opensc/PKGBUILD
community/osmo/PKGBUILD
community/perl-json-xs/PKGBUILD
community/pyqt3/PKGBUILD
community/python-pymongo/PKGBUILD
community/python-pytables/PKGBUILD
community/qscintilla-qt3/PKGBUILD
community/qtcurve-gtk2/PKGBUILD
community/qtcurve-kde4/PKGBUILD
community/rxvt-unicode/PKGBUILD
community/smalltalk/PKGBUILD
community/xmlrpc-c/PKGBUILD
community/xpad/PKGBUILD
community/xsettings-client/PKGBUILD
community/yaws/PKGBUILD
core/bzip2/PKGBUILD
core/gcc/PKGBUILD
core/glibc/PKGBUILD
core/keyutils/PKGBUILD
core/ldns/PKGBUILD
core/libmpc/PKGBUILD
core/librpcsecgss/PKGBUILD
core/libtool/PKGBUILD
core/lvm2/PKGBUILD
core/lzo2/PKGBUILD
core/openssl/PKGBUILD
core/systemd/PKGBUILD
core/sysvinit-tools/PKGBUILD
cross/mips64el-unknown-linux-gnu-linux-libre-api-headers/PKGBUILD
extra/aalib/PKGBUILD
extra/aiksaurus/PKGBUILD
extra/alsa-oss/PKGBUILD
extra/alsa-tools/PKGBUILD
extra/apache/PKGBUILD
extra/autopano-sift-c/PKGBUILD
extra/avahi/PKGBUILD
extra/cfitsio/PKGBUILD
extra/clamav/PKGBUILD
extra/compface/PKGBUILD
extra/dotconf/PKGBUILD
extra/enca/PKGBUILD
extra/eventlog/PKGBUILD
extra/exiv2/PKGBUILD
extra/faad2/PKGBUILD
extra/fcgi/PKGBUILD
extra/ffcall/PKGBUILD
extra/ffmpeg/PKGBUILD
extra/flac/PKGBUILD
extra/fltk/PKGBUILD
extra/freealut/PKGBUILD
extra/freetds/PKGBUILD
extra/gc/PKGBUILD
extra/gdome2/PKGBUILD
extra/giblib/PKGBUILD
extra/gmime/PKGBUILD
extra/gnome-python-desktop/PKGBUILD
extra/gnome-python-extras/PKGBUILD
extra/gnome-speech/PKGBUILD
extra/graphviz/PKGBUILD
extra/gsasl/PKGBUILD
extra/gsl/PKGBUILD
extra/gtkspell/PKGBUILD
extra/gupnp-igd/PKGBUILD
extra/htdig/PKGBUILD
extra/hugin/PKGBUILD
extra/id3lib/PKGBUILD
extra/ilmbase/PKGBUILD
extra/imagemagick/PKGBUILD
extra/iptraf-ng/PKGBUILD
extra/jade/PKGBUILD
extra/jasper/PKGBUILD
extra/kdesdk-thumbnailers/PKGBUILD
extra/kdevelop-php/PKGBUILD
extra/lablgtk/PKGBUILD
extra/lame/PKGBUILD
extra/lcms2/PKGBUILD
extra/lesstif/PKGBUILD
extra/libaio/PKGBUILD
extra/libart-lgpl/PKGBUILD
extra/libass/PKGBUILD
extra/libasyncns/PKGBUILD
extra/libavc1394/PKGBUILD
extra/libbluray/PKGBUILD
extra/libcaca/PKGBUILD
extra/libcddb/PKGBUILD
extra/libchamplain/PKGBUILD
extra/libdca/PKGBUILD
extra/libdv/PKGBUILD
extra/libglade/PKGBUILD
extra/libgtkhtml/PKGBUILD
extra/libice/PKGBUILD
extra/libid3tag/PKGBUILD
extra/libidl2/PKGBUILD
extra/libieee1284/PKGBUILD
extra/libjpeg-turbo/PKGBUILD
extra/liblo/PKGBUILD
extra/libmad/PKGBUILD
extra/libmikmod/PKGBUILD
extra/libmowgli/PKGBUILD
extra/libmpd/PKGBUILD
extra/libmpdclient/PKGBUILD
extra/libofa/PKGBUILD
extra/liboil/PKGBUILD
extra/libotf/PKGBUILD
extra/libpeas/PKGBUILD
extra/libqalculate/PKGBUILD
extra/libraw1394/PKGBUILD
extra/libsndfile/PKGBUILD
extra/libstroke/PKGBUILD
extra/libvncserver/PKGBUILD
extra/libxkbui/PKGBUILD
extra/libxss/PKGBUILD
extra/libytnef/PKGBUILD
extra/libzvt/PKGBUILD
extra/lynx/PKGBUILD
extra/lzo/PKGBUILD
extra/mariadb/PKGBUILD
extra/mesa/PKGBUILD
extra/mhash/PKGBUILD
extra/musicbrainz/PKGBUILD
extra/ocaml/PKGBUILD
extra/openal/PKGBUILD
extra/openmpi/PKGBUILD
extra/pavucontrol/PKGBUILD
extra/perl-dbi/PKGBUILD
extra/phonon-vlc/PKGBUILD
extra/phonon/PKGBUILD
extra/ppl/PKGBUILD
extra/progsreiserfs/PKGBUILD
extra/pulseaudio/PKGBUILD
extra/pycurl/PKGBUILD
extra/pyopenssl/PKGBUILD
extra/pyxml/PKGBUILD
extra/qt4/PKGBUILD
extra/qt5/PKGBUILD
extra/qtwebkit/PKGBUILD
extra/schroedinger/PKGBUILD
extra/sdl_gfx/PKGBUILD
extra/signon/PKGBUILD
extra/slang/PKGBUILD
extra/sofia-sip/PKGBUILD
extra/spandsp/PKGBUILD
extra/speech-dispatcher/PKGBUILD
extra/sqlite/PKGBUILD
extra/t1lib/PKGBUILD
extra/taglib/PKGBUILD
extra/tidyhtml/PKGBUILD
extra/totem/PKGBUILD
extra/unixodbc/PKGBUILD
extra/vigra/PKGBUILD
extra/virtuoso/PKGBUILD
extra/wavpack/PKGBUILD
extra/webkitgtk/PKGBUILD
extra/webrtc-audio-processing/PKGBUILD
extra/xfce4-mailwatch-plugin/PKGBUILD
extra/xine-lib/PKGBUILD
extra/xmms/PKGBUILD
extra/xorg-server/PKGBUILD
extra/yajl/PKGBUILD
extra/yasm/PKGBUILD
extra/zenity/PKGBUILD
extra/zziplib/PKGBUILD
libre/blackbox-libre/PKGBUILD
libre/linux-libre/PKGBUILD
libre/sdl-libre/PKGBUILD
Diffstat (limited to 'extra/libreoffice')
-rw-r--r-- | extra/libreoffice/PKGBUILD | 45 |
1 files changed, 22 insertions, 23 deletions
diff --git a/extra/libreoffice/PKGBUILD b/extra/libreoffice/PKGBUILD index 36ebc53ff..d1c61c515 100644 --- a/extra/libreoffice/PKGBUILD +++ b/extra/libreoffice/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 196169 2013-10-07 14:33:01Z andyrtr $ +# $Id: PKGBUILD 198659 2013-11-01 15:09:06Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> @@ -19,8 +19,8 @@ pkgname=('libreoffice-common' 'libreoffice-extension-presentation-minimizer' 'libreoffice-extension-wiki-publisher' 'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built) -_LOver=4.1.2.3 -pkgver=4.1.2 +_LOver=4.1.3.2 +pkgver=4.1.3 pkgrel=1 arch=('i686' 'x86_64') license=('LGPL3') @@ -33,10 +33,14 @@ makedepends=( # makedepends 'clucene' 'bluez-libs' 'harfbuzz-icu' # the runtime dependencies "curl>=7.20.0" "hunspell>=1.2.8" "python>=3.3" 'libwpd>=0.9.2' 'libwps' 'libxaw' "neon>=0.28.6" - 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' 'libxslt' 'librsvg' "icu>=51.1" + 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' 'libxslt' 'librsvg' "icu>=52.1" 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'libtextcat' 'graphite' 'lcms2' 'poppler>=0.24.0' 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2' 'translate-toolkit' 'xdg-utils' 'ttf-dejavu') # to satisfy regression tests +# there's only one single static library in libreoffice-sdk, +# the next build that removes it may lead to trouble if people may use it +# -rw-r--r-- 1 root root 5,1K 12. Okt 23:34 /usr/lib/libreoffice/sdk/lib/libsalcpprt.a +# options=('staticlibs') # http://download.documentfoundation.org/mirrors/all.html # http://wiki.documentfoundation.org/Mirrors @@ -78,7 +82,7 @@ source=(${_mirror}/${pkgbase}{,-help,-translations}-${_LOver}.tar.xz ${_additional_source_url}/8473296c671b6e3dd8197f4145e0854b-libodfgen-0.0.2.tar.bz2 ${_additional_source_url}/libcdr-0.0.14.tar.bz2 ${_additional_source_url}/libmspub-0.0.6.tar.bz2 - ${_additional_source_url}/libmwaw-0.1.10.tar.bz2 + ${_additional_source_url}/libmwaw-0.1.11.tar.bz2 ${_additional_source_url}/libvisio-0.0.31.tar.bz2 make-pyuno-work-with-system-wide-module-install.diff libreoffice-common.sh libreoffice-common.csh) @@ -114,11 +118,11 @@ noextract=(f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 8473296c671b6e3dd8197f4145e0854b-libodfgen-0.0.2.tar.bz2 libcdr-0.0.14.tar.bz2 libmspub-0.0.6.tar.bz2 - libmwaw-0.1.10.tar.bz2 + libmwaw-0.1.11.tar.bz2 libvisio-0.0.31.tar.bz2 ) -md5sums=('bb2fe0056ae92e70ee8816a36dd0696c' - '761323fae73ef156f5cf188d8bd983f1' - '54f36cf305ae018ad685c331587d83e3' +md5sums=('7c5248b9141df6c4844c81515a41942f' + 'c5a692983c429a142b1c109fd28425fa' + 'f5131da6395034246eb26aa94c7de8b2' 'f02578f5218f217a9f20e9c30e119c6a' '1f24ab1d39f4a51faf22244c94a6203f' '35c94d2df8893241173de1d16b6034c0' @@ -151,7 +155,7 @@ md5sums=('bb2fe0056ae92e70ee8816a36dd0696c' '8473296c671b6e3dd8197f4145e0854b' 'd88f9b94df880d2c05be943b000ca112' '1120705cd0f0d9bd5506360bf57b6c2e' - '2289bb137bbba9b473ce60168895c036' + '828dd03510791fbe037081a2b4a1a8ff' '82628333418f101a20cd21f980cf9f40' '07d2bf5ad839a394cca008b3ec6e7bb1' '4195735a80876ae812fca5736b50192a' @@ -160,7 +164,7 @@ md5sums=('bb2fe0056ae92e70ee8816a36dd0696c' prepare() { cd libreoffice-$_LOver - + # fix exttextcat build error # /usr/include/features.h:330:4: error: #warning _FORTIFY_SOURCE requires compiling with optimization (-O) [-Werror=cpp] unset CPPFLAGS @@ -284,7 +288,7 @@ package_libreoffice-common() { pkgdesc="common files for LibreOffice - a productivity suite that is compatible with other major office suites" install=libreoffice-common.install depends=('libreoffice-langpack' "hunspell>=1.2.8" "python>=3.3" "neon>=0.28.6" 'dbus-glib' 'librsvg' 'libcups' - 'nss' 'libsm' 'redland' 'hyphen' 'graphite' "icu>=51.1" 'clucene' 'lcms2' "poppler>=0.24.0" + 'nss' 'libsm' 'redland' 'hyphen' 'graphite' "icu>=52.1" 'clucene' 'lcms2' "poppler>=0.24.0" 'harfbuzz-icu' 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'xdg-utils') optdepends=('libreoffice-langpack: additional language support' 'java-runtime: adds java support' @@ -300,7 +304,9 @@ package_libreoffice-common() { 'gtk2: for browser plugin') backup=(etc/libreoffice/sofficerc etc/libreoffice/bootstraprc - etc/libreoffice/psprint.conf) + etc/libreoffice/psprint.conf + etc/profile.d/libreoffice-common.sh + etc/profile.d/libreoffice-common.csh) groups=('libreoffice') provides=('go-openoffice' 'libreoffice-extension-pdfimport' 'libreoffice-extension-presenter-screen' 'libreoffice-scripting-beanshell' 'libreoffice-scripting-javascript' 'libreoffice-extension-scripting-python' @@ -354,10 +360,6 @@ package_libreoffice-common() { # workaround all packages now depend on that file cp ${srcdir}/fakeinstall/usr/lib/libreoffice/share/registry/writer.xcd ${pkgdir}/usr/lib/libreoffice/share/registry/writer.xcd - - # move dicts to en-US langpack to avoid file conflicts with en-GBen-ZA packages - mv ${pkgdir}/usr/lib/libreoffice/share/wordbook/en-GB.dic ${srcdir}/ - mv ${pkgdir}/usr/lib/libreoffice/share/wordbook/en-US.dic ${srcdir}/ } package_libreoffice-base() { @@ -451,7 +453,9 @@ package_libreoffice-draw() { package_libreoffice-gnome() { pkgdesc="Plug-in for LibreOffice that enables integration into the Gnome and other gtk desktop environment." - depends=('libreoffice-common' 'gconf' 'gtk3') + depends=('libreoffice-common' 'gconf') + optdepends=('gtk3: for gtk3 Gnome integration' + 'gtk2: for older gtk2 desktop integration') groups=('libreoffice') # create directories from *list.txt file @@ -620,11 +624,6 @@ package_libreoffice-en-US() { # mv file from fakeinstall to pkgdir mv ${srcdir}/fakeinstall${file} ${pkgdir}$file done - - # move dicts to en-US langpack to avoid file conflicts with en-GBen-ZA packages - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/wordbook - mv ${srcdir}/en-GB.dic ${pkgdir}/usr/lib/libreoffice/share/wordbook/en-GB.dic - mv ${srcdir}/en-US.dic ${pkgdir}/usr/lib/libreoffice/share/wordbook/en-US.dic } package_libreoffice-extension-presentation-minimizer() { |