diff options
| -rw-r--r-- | office/LibreOffice/010_testTdf87924.diff | 18 | ||||
| -rw-r--r-- | office/LibreOffice/LibreOffice.SlackBuild | 30 | ||||
| -rw-r--r-- | office/LibreOffice/LibreOffice.info | 16 | ||||
| -rw-r--r-- | office/LibreOffice/README | 5 |
4 files changed, 18 insertions, 51 deletions
diff --git a/office/LibreOffice/010_testTdf87924.diff b/office/LibreOffice/010_testTdf87924.diff deleted file mode 100644 index 595fd57b4420f..0000000000000 --- a/office/LibreOffice/010_testTdf87924.diff +++ /dev/null @@ -1,18 +0,0 @@ ---- sw/qa/extras/ooxmlimport/ooxmlimport.cxx.orig 2015-12-11 12:29:35.000000000 +1000 -+++ sw/qa/extras/ooxmlimport/ooxmlimport.cxx 2016-02-05 12:30:06.937032763 +1000 -@@ -2780,6 +2780,7 @@ - CPPUNIT_ASSERT_EQUAL(text::SizeType::MIN, getProperty<sal_Int16>(xTableRows->getByIndex(0), "SizeType")); - } - -+/* - DECLARE_OOXMLIMPORT_TEST(testTdf87924, "tdf87924.docx") - { - uno::Reference<beans::XPropertySet> xPropertySet(getShape(1), uno::UNO_QUERY); -@@ -2787,6 +2788,7 @@ - // This was -270, the text rotation angle was set when it should not be rotated. - CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(0), aGeometry["TextPreRotateAngle"].get<sal_Int32>()); - } -+*/ - - DECLARE_OOXMLIMPORT_TEST(testTdf93919, "tdf93919.docx") - { diff --git a/office/LibreOffice/LibreOffice.SlackBuild b/office/LibreOffice/LibreOffice.SlackBuild index 4e1fd0fa27622..794acc23f031d 100644 --- a/office/LibreOffice/LibreOffice.SlackBuild +++ b/office/LibreOffice/LibreOffice.SlackBuild @@ -26,7 +26,7 @@ PRGNAM=LibreOffice SRCNAM=libreoffice -VERSION=${VERSION:-5.0.4.2} +VERSION=${VERSION:-5.1.0.3} SHORT_VERSION=${VERSION%.*.*} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -36,7 +36,7 @@ HAVE_SRCS_TARBALL=${HAVE_SRCS_TARBALL:-1} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -47,7 +47,7 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then +if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then @@ -74,16 +74,6 @@ if [ "$HAVE_SRCS_TARBALL" = "1" ]; then tar xvf $CWD/$SRCNAM-${VERSION}-srcs.tar.xz fi -mkdir -p src -for aname in $SRCNAM-{dictionaries,help,translations}-$VERSION.tar.xz ; do - if [ -f $CWD/$aname ]; then - cp -p $CWD/$aname src/ - fi -done -# testTdf87924 fails on x?86 -if [ "$ARCH" != "x86_64" ]; then - patch -p0 < $CWD/010_testTdf87924.diff -fi chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -94,6 +84,7 @@ find -L . \ # Options avahi="" ; [ "${AVAHI:-yes}" != "no" ] && avahi="--enable-avahi" vlc="" ; [ "${VLC:-no}" != "no" ] && vlc="--enable-vlc" +LOLANGS=${LOLANGS:-"de es fr id it ja nl vi zh-CN"} # LibreOffice.info REQUIRES jdk [ -z $JAVA_HOME ] && . /etc/profile.d/jdk.sh @@ -110,6 +101,7 @@ vlc="" ; [ "${VLC:-no}" != "no" ] && vlc="--enable-vlc" --build=$ARCH-slackware-linux \ --with-build-version="SlackBuild for $PRGNAM-$VERSION by $PACKAGER" \ --with-vendor="Just Another Slacker" \ + --with-lang="$LOLANGS" \ --enable-release-build=yes \ --enable-python="system" \ --enable-gio \ @@ -123,6 +115,7 @@ vlc="" ; [ "${VLC:-no}" != "no" ] && vlc="--enable-vlc" --without-gssapi \ --without-junit \ --with-ant-home=lib$LIBDIRSUFFIX/apache-ant \ + --with-help=common \ --with-system-boost \ --with-system-cairo \ --with-system-curl \ @@ -140,7 +133,6 @@ vlc="" ; [ "${VLC:-no}" != "no" ] && vlc="--enable-vlc" --with-system-libwpg \ --with-system-libxml \ --with-system-mariadb \ - --with-system-mesa-headers \ --with-system-neon \ --with-system-nss \ --with-system-openssl \ @@ -151,20 +143,14 @@ vlc="" ; [ "${VLC:-no}" != "no" ] && vlc="--enable-vlc" #Create a srcs tarball if we don't already have one -# +chmod a+x bin/unpack-sources if [ "$HAVE_SRCS_TARBALL" = "0" ]; then make fetch - tar cvf - external/tarballs \ - --exclude="external/tarballs/libreoffice-help-${VERSION}*" \ - --exclude="external/tarballs/libreoffice-dictionaries-${VERSION}*" \ - --exclude="external/tarballs/libreoffice-binfilter-$VERSION}*" \ - --exclude="external/tarballs/libreoffice-translations-${VERSION}*" \ - | xz -c > $CWD/$SRCNAM-$VERSION-srcs.tar.xz + tar cvf - external/tarballs | xz -c > $CWD/$SRCNAM-$VERSION-srcs.tar.xz echo ; echo "Run build script again with HAVE_SRCS_TARBALL=1" exit 0 fi - export LDFLAGS="-lboost_system" make build make distro-pack-install DESTDIR=$PKG diff --git a/office/LibreOffice/LibreOffice.info b/office/LibreOffice/LibreOffice.info index 3427e1d7c8a8a..379e9e36b53b6 100644 --- a/office/LibreOffice/LibreOffice.info +++ b/office/LibreOffice/LibreOffice.info @@ -1,16 +1,10 @@ PRGNAM="LibreOffice" -VERSION="5.0.4.2" +VERSION="5.1.0.3" HOMEPAGE="http://libreoffice.org" -DOWNLOAD="http://download.documentfoundation.org/libreoffice/src/5.0.4/libreoffice-5.0.4.2.tar.xz \ - http://download.documentfoundation.org/libreoffice/src/5.0.4/libreoffice-dictionaries-5.0.4.2.tar.xz \ - http://download.documentfoundation.org/libreoffice/src/5.0.4/libreoffice-help-5.0.4.2.tar.xz \ - http://download.documentfoundation.org/libreoffice/src/5.0.4/libreoffice-translations-5.0.4.2.tar.xz \ - http://sourceforge.net/projects/slackbuildsdirectlinks/files/LibreOffice/libreoffice-5.0.4.2-srcs.tar.xz" -MD5SUM="0c6381581f93ef7142b00837002755dd \ - eaad734b700e4ccc2362097a84392ba0 \ - 82f2dcd28e6bfe33e0edb480b9c8f8e4 \ - 73711d36f4d16b0e2657367c823e1872 \ - 824540753046eb1bff1b2851f0d5f3c7" +DOWNLOAD="http://download.documentfoundation.org/libreoffice/src/5.1.0/libreoffice-5.1.0.3.tar.xz \ + http://sourceforge.net/projects/slackbuildsdirectlinks/files/LibreOffice/libreoffice-5.1.0.3-srcs.tar.xz" +MD5SUM="a0cbe7fe9368e35068bd619281380379 \ + 9c30af1e7ff410a663b485654e07e6a0" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="avahi python3 apache-ant perl-Archive-Zip" diff --git a/office/LibreOffice/README b/office/LibreOffice/README index 1a73fb276c1dc..73881a589547a 100644 --- a/office/LibreOffice/README +++ b/office/LibreOffice/README @@ -13,3 +13,8 @@ Build time environment variables that may set to vary features are as follows. VLC="yes" 2. disable (enabled by default) use of avahi with: AVAHI="no" +3. support additional languages by overriding the LOLANGS variable, whose + default setting is LOLANGS="de es fr id it ja nl vi zh-CN". Note that en-US + is always added to whatever LOLANGS is set. Thus building with, for example, + LOLOANGS="de" sh LibreOffice + would build LibreOffice with support for german and US english languages. |