diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-06-27 10:55:49 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-06-27 10:55:49 -0300 |
commit | 223da899ff4ab51f5e28f9bca40f09be5a5057f5 (patch) | |
tree | 9edfa3bcdfc3c8ccf4bfab595379ea455c934503 /testing/libreoffice | |
parent | ec5fd6af2a82f918b5d75d944718986eaee51164 (diff) | |
parent | 715631caf52784c47c8ed3aeb6cbdba2715a08db (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/distcc/PKGBUILD
community/haskell-x11-xft/PKGBUILD
community/libtorrent/PKGBUILD
community/picard/PKGBUILD
community/rtorrent/PKGBUILD
community/ushare/PKGBUILD
extra/catdoc/PKGBUILD
extra/curl/PKGBUILD
extra/ethstatus/PKGBUILD
extra/ffcall/PKGBUILD
extra/ffmpeg/PKGBUILD
extra/gimp-dbp/PKGBUILD
extra/gimp-refocus/PKGBUILD
extra/gstreamer0.10-ugly/PKGBUILD
extra/haskell-cgi/PKGBUILD
extra/haskell-deepseq/PKGBUILD
extra/haskell-haskell-src/PKGBUILD
extra/haskell-html/PKGBUILD
extra/haskell-http/PKGBUILD
extra/haskell-hunit/PKGBUILD
extra/haskell-mtl/PKGBUILD
extra/haskell-network/PKGBUILD
extra/haskell-opengl/PKGBUILD
extra/haskell-parallel/PKGBUILD
extra/haskell-parsec/PKGBUILD
extra/haskell-platform/PKGBUILD
extra/haskell-quickcheck/PKGBUILD
extra/haskell-regex-base/PKGBUILD
extra/haskell-regex-compat/PKGBUILD
extra/haskell-regex-posix/PKGBUILD
extra/haskell-stm/PKGBUILD
extra/haskell-syb/PKGBUILD
extra/haskell-text/PKGBUILD
extra/haskell-transformers/PKGBUILD
extra/haskell-xhtml/PKGBUILD
extra/haskell-zlib/PKGBUILD
extra/metacity/PKGBUILD
extra/pulseaudio/PKGBUILD
extra/x2x/PKGBUILD
kde-unstable/kdeaccessibility/PKGBUILD
kde-unstable/kdeadmin/PKGBUILD
kde-unstable/kdeartwork/PKGBUILD
kde-unstable/kdebase-konsole/PKGBUILD
kde-unstable/kdebase-runtime/PKGBUILD
kde-unstable/kdebase-workspace/PKGBUILD
kde-unstable/kdebase/PKGBUILD
kde-unstable/kdebindings-kimono/PKGBUILD
kde-unstable/kdebindings-korundum/PKGBUILD
kde-unstable/kdebindings-perlkde/PKGBUILD
kde-unstable/kdebindings-perlqt/PKGBUILD
kde-unstable/kdebindings-python/PKGBUILD
kde-unstable/kdebindings-qtruby/PKGBUILD
kde-unstable/kdebindings-qyoto/PKGBUILD
kde-unstable/kdebindings-smokegen/PKGBUILD
kde-unstable/kdebindings-smokekde/PKGBUILD
kde-unstable/kdebindings-smokeqt/PKGBUILD
kde-unstable/kdeedu-blinken/PKGBUILD
kde-unstable/kdeedu-cantor/PKGBUILD
kde-unstable/kdeedu-kalgebra/PKGBUILD
kde-unstable/kdeedu-kalzium/PKGBUILD
kde-unstable/kdeedu-kanagram/PKGBUILD
kde-unstable/kdeedu-kbruch/PKGBUILD
kde-unstable/kdeedu-kgeography/PKGBUILD
kde-unstable/kdeedu-khangman/PKGBUILD
kde-unstable/kdeedu-kig/PKGBUILD
kde-unstable/kdeedu-kiten/PKGBUILD
kde-unstable/kdeedu-klettres/PKGBUILD
kde-unstable/kdeedu-kmplot/PKGBUILD
kde-unstable/kdeedu-kstars/PKGBUILD
kde-unstable/kdeedu-ktouch/PKGBUILD
kde-unstable/kdeedu-kturtle/PKGBUILD
kde-unstable/kdeedu-kwordquiz/PKGBUILD
kde-unstable/kdeedu-marble/PKGBUILD
kde-unstable/kdeedu-parley/PKGBUILD
kde-unstable/kdeedu-rocs/PKGBUILD
kde-unstable/kdeedu-step/PKGBUILD
kde-unstable/kdegames/PKGBUILD
kde-unstable/kdegraphics-gwenview/PKGBUILD
kde-unstable/kdegraphics-kamera/PKGBUILD
kde-unstable/kdegraphics-kcolorchooser/PKGBUILD
kde-unstable/kdegraphics-kgamma/PKGBUILD
kde-unstable/kdegraphics-kolourpaint/PKGBUILD
kde-unstable/kdegraphics-kruler/PKGBUILD
kde-unstable/kdegraphics-ksaneplugin/PKGBUILD
kde-unstable/kdegraphics-ksnapshot/PKGBUILD
kde-unstable/kdegraphics-strigi-analyzer/PKGBUILD
kde-unstable/kdegraphics-svgpart/PKGBUILD
kde-unstable/kdegraphics-thumbnailers/PKGBUILD
kde-unstable/kdelibs/PKGBUILD
kde-unstable/kdemultimedia/PKGBUILD
kde-unstable/kdenetwork/PKGBUILD
kde-unstable/kdepim-runtime/PKGBUILD
kde-unstable/kdepim/PKGBUILD
kde-unstable/kdepimlibs/PKGBUILD
kde-unstable/kdeplasma-addons/PKGBUILD
kde-unstable/kdesdk-kate/PKGBUILD
kde-unstable/kdesdk/PKGBUILD
kde-unstable/kdetoys/PKGBUILD
kde-unstable/kdeutils/PKGBUILD
kde-unstable/kdewebdev/PKGBUILD
kde-unstable/libkdcraw/PKGBUILD
kde-unstable/libkdeedu/PKGBUILD
kde-unstable/libkexiv2/PKGBUILD
kde-unstable/libkipi/PKGBUILD
kde-unstable/libksane/PKGBUILD
libre/kernel26-libre/PKGBUILD
libre/libretools/PKGBUILD
multilib/lib32-libpulse/PKGBUILD
multilib/wine/PKGBUILD
testing/alex/PKGBUILD
testing/ghc/PKGBUILD
testing/haskell-cgi/PKGBUILD
testing/haskell-deepseq/PKGBUILD
testing/haskell-fgl/PKGBUILD
testing/haskell-glut/PKGBUILD
testing/haskell-haskell-src/PKGBUILD
testing/haskell-html/PKGBUILD
testing/haskell-http/PKGBUILD
testing/haskell-hunit/PKGBUILD
testing/haskell-mtl/PKGBUILD
testing/haskell-network/PKGBUILD
testing/haskell-opengl/PKGBUILD
testing/haskell-parallel/PKGBUILD
testing/haskell-parsec/PKGBUILD
testing/haskell-platform/PKGBUILD
testing/haskell-quickcheck/PKGBUILD
testing/haskell-regex-base/PKGBUILD
testing/haskell-regex-compat/PKGBUILD
testing/haskell-regex-posix/PKGBUILD
testing/haskell-stm/PKGBUILD
testing/haskell-syb/PKGBUILD
testing/haskell-text/PKGBUILD
testing/haskell-transformers/PKGBUILD
testing/haskell-xhtml/PKGBUILD
testing/haskell-zlib/PKGBUILD
testing/perl/ChangeLog
testing/perl/PKGBUILD
testing/perl/perlbin.sh
testing/pidgin/PKGBUILD
testing/spamassassin/PKGBUILD
Diffstat (limited to 'testing/libreoffice')
-rw-r--r-- | testing/libreoffice/0001-fix-configure-without-the-optional-translations-modu.patch | 31 | ||||
-rw-r--r-- | testing/libreoffice/PKGBUILD | 57 |
2 files changed, 61 insertions, 27 deletions
diff --git a/testing/libreoffice/0001-fix-configure-without-the-optional-translations-modu.patch b/testing/libreoffice/0001-fix-configure-without-the-optional-translations-modu.patch new file mode 100644 index 000000000..31ad95d36 --- /dev/null +++ b/testing/libreoffice/0001-fix-configure-without-the-optional-translations-modu.patch @@ -0,0 +1,31 @@ +From 900baff9ff400a6eba034089ed69362c2c2d61e4 Mon Sep 17 00:00:00 2001 +From: Petr Mladek <pmladek@suse.cz> +Date: Wed, 22 Jun 2011 12:05:19 +0200 +Subject: [PATCH] fix configure without the optional translations module + +--- + set_soenv.in | 8 +++++--- + 1 files changed, 5 insertions(+), 3 deletions(-) + +diff --git a/set_soenv.in b/set_soenv.in +index f015bab..8e39314 100755 +--- a/set_soenv.in ++++ b/set_soenv.in +@@ -1068,9 +1068,11 @@ $XCLASSPATH = '$JAVA_HOME'.$ds.'jre'.$LIB.$ds."rt.jar".$wps.'.'; + $L10N_MODULE = PathFormat($SRC_ROOT."/translations"); + + # Check for poor help localizations, i.e. no help translation at all... +-opendir(DIR,$L10N_MODULE . "/source"); +-@languages = readdir(DIR); +-closedir(DIR); ++@languages=(); ++if (opendir(DIR,$L10N_MODULE . "/source")) ++{ @languages = readdir(DIR); ++ closedir(DIR); ++} + $WITH_POOR_HELP_LOCALIZATIONS = ""; + + foreach $language (@languages) +-- +1.7.3.4 + diff --git a/testing/libreoffice/PKGBUILD b/testing/libreoffice/PKGBUILD index 764713443..6167b1ef1 100644 --- a/testing/libreoffice/PKGBUILD +++ b/testing/libreoffice/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 127521 2011-06-15 18:45:39Z andyrtr $ +# $Id: PKGBUILD 128633 2011-06-24 19:50:33Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> pkgbase="libreoffice" @@ -24,8 +24,8 @@ pkgname=('libreoffice' 'libreoffice-sdk' 'libreoffice-extension-validator' 'libreoffice-extension-watch-window' 'libreoffice-extension-wiki-publisher') -_LOver=3.4.1.1 -pkgver=3.4.1rc1 +_LOver=3.4.1.3 +pkgver=3.4.1rc3 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') #_LO_tree="3.4" @@ -47,8 +47,8 @@ makedepends=( # makedepends # translate-toolkit - todo move them to extra to allow --with-system-foo builds # http://download.documentfoundation.org/mirrors/all.html # http://wiki.documentfoundation.org/Mirrors -_mirror="http://download.documentfoundation.org/libreoffice/src" -#_mirror="http://dev-builds.libreoffice.org/pre-releases/src/" +#_mirror="http://download.documentfoundation.org/libreoffice/src" +_mirror="http://dev-builds.libreoffice.org/pre-releases/src/" _additional_source_url="http://hg.services.openoffice.org/binaries" source=(${_mirror}/${pkgbase}-{artwork,base,bootstrap,calc,components,extensions,extras,filters,help,impress,libs-core,libs-extern,libs-extern-sys,libs-gui,postprocess,sdk,testing,ure,writer}-${_LOver}.tar.bz2 #,translations ${_additional_source_url}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz @@ -92,7 +92,8 @@ source=(${_mirror}/${pkgbase}-{artwork,base,bootstrap,calc,components,extensions http://ooo.itc.hu/oxygenoffice/download/libreoffice/b7b2d0e04e142f26dd96119c80757d1f-oooblogger_0.1.oxt buildfix_boost.diff buildfix_ct2n.diff - vbahelper.visibility.patch) + vbahelper.visibility.patch + 0001-fix-configure-without-the-optional-translations-modu.patch) noextract=(185d60944ea767075d27247c3162b3bc-unowinreg.dll b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2 7a0dcb3fe1e8c7229ab4fb868b7325e6-mdds_0.5.2.tar.bz2 @@ -131,25 +132,25 @@ noextract=(185d60944ea767075d27247c3162b3bc-unowinreg.dll b7b2d0e04e142f26dd96119c80757d1f-oooblogger_0.1.oxt 90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2 f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2) -md5sums=('a21bbbc0cf9b482a78357b7b6132e799' - 'd9ccdb2b53de8e16d7bb3215b9e97d7a' - 'd3aa4a8e05f8b5c3ccf4f945b82b32a2' - 'eb03b6627f2a2240eca089c925692259' - '190c9b25a7193b7ca98d6f6d09cd20d2' - '45b632fb71b123b699c9e89f9db6632a' - '19b3e65676e8e8839a4dd884a74e83e4' - '79a955fd38d0eedca7db146c5a985041' - '9b9b80ff14a3c6f430cc1fee4551c53e' - 'c592798d08cccfb14f6cda95eb542d7b' - '1f98cbec964a9563b72962c943af3545' - '01aa850fa07e4440706dcea0def5c27a' - '9765abf75b58c5dbdf82a953af8c6de4' - '1f07e271d64606116c84c7adbc90a324' - '877cf0733c202936f8b918b9ad423f0d' - '231f5a392ab78167a5a7ab7bc922a421' - '9452301d1eee5fc3bb4758e003829075' - '1bc390b972bbe27f513956af37e60538' - '974b73ed0add1d6e325b9da4e3ca5c5d' +md5sums=('10b3212002688e7ce49a276c68352b50' + 'c6547ec8f971284ea1e58bb39375c500' + '26328364a0804dedab94818c15e76871' + 'd26c6ab53c9404e82e04ea366d4db261' + '132aa87f2f3e7fff62d7211a86b769f3' + '801c254c28402df0c5fb5e2615817a6d' + 'b94208fdae537f0b026ee26cede9a946' + '096e3071949d1eedf73faa13a2cf7b7e' + 'e27e715b08cc6a35988aaa6efab6cc7f' + 'e94d7adb79f38d3fd8119b712b04cc6e' + '1d2e7ca24b9fffafeaf236817fc8cbe9' + '69a9af6536607340a57b54b5562077f7' + '3b4e819497ba695f5c64a0107c2aac8d' + '5a7370a79e563f649f6bf506bc71928c' + 'c480ed571703e68d851fbbcd4aa520be' + '222cec135152c108068baa4e370a3f68' + '93524298efb472503b12ae47c95de399' + '5420c40473f8bf8e5b400dd8a1e54f02' + '1516196f023bb1ae55fd1773a8db9d16' '1f24ab1d39f4a51faf22244c94a6203f' '35c94d2df8893241173de1d16b6034c0' '798b2ffdc8bcfe7bca2cf92b62caf685' @@ -191,7 +192,8 @@ md5sums=('a21bbbc0cf9b482a78357b7b6132e799' 'b7b2d0e04e142f26dd96119c80757d1f' 'bc228237108cab7745897a9f466b6d39' 'eee273f501ff45dc5f1365e78c6d57c0' - '43b145db28e6c0d73578ae6fd35e510d') + '43b145db28e6c0d73578ae6fd35e510d' + 'f8a8fdcc58f50560fbc266e28efdbbfe') build() { @@ -218,6 +220,7 @@ build() { patch -Np1 -i ${srcdir}/buildfix_boost.diff patch -Np1 -i ${srcdir}/buildfix_ct2n.diff patch -Np0 -i ${srcdir}/vbahelper.visibility.patch + patch -Np1 -i ${srcdir}/0001-fix-configure-without-the-optional-translations-modu.patch # unset C(XX)FLAGS # http://www.openoffice.org/issues/show_bug.cgi?id=103205 @@ -467,7 +470,7 @@ package_libreoffice-sdk() { sed -i -e "s,@OO_SDK_NAME@,libreoffice-sdk," \ -e "s,@OO_SDK_HOME@,/usr/lib/libreoffice/basis3.4/sdk," \ -e "s,@OFFICE_HOME@,/usr/lib/libreoffice," \ - -e "s,@OFFICE_BASE_HOME@,/usr/lib/libreoffice," \ + -e "s,@OFFICE_BASE_HOME@,/usr/lib/libreoffice/basis3.4," \ -e "s,@OO_SDK_URE_HOME@,/usr/lib/libreoffice/ure," \ -e "s,@OO_SDK_MAKE_HOME@,/usr/bin," \ -e "s,@OO_SDK_ZIP_HOME@,/usr/bin," \ |