diff options
| author |   Eric Hameleers <alien@slackware.com> | 2014-09-28 12:13:19 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2014-09-28 12:13:19 +0000 |
| commit | 2f1694c29d98e685e2e3c7a678e081468b459a67 (patch) | |
| tree | b673ee6672f3616cc585a62393afdd4f4105f27c /libreoffice | |
| parent | b5761ff4380e4cb7b3b4e7400339a2d6ee7ab189 (diff) | |
| download | asb-2f1694c29d98e685e2e3c7a678e081468b459a67.tar.gz asb-2f1694c29d98e685e2e3c7a678e081468b459a67.tar.xz | |
Update to 4.3.2.2
Diffstat (limited to 'libreoffice')
| -rwxr-xr-x | libreoffice/build/libreoffice.SlackBuild | 24 | ||||
| -rwxr-xr-x | libreoffice/build/libreoffice43.SlackBuild | 24 |
2 files changed, 26 insertions, 22 deletions
diff --git a/libreoffice/build/libreoffice.SlackBuild b/libreoffice/build/libreoffice.SlackBuild index 8b93d468..52d86f0b 100755 --- a/libreoffice/build/libreoffice.SlackBuild +++ b/libreoffice/build/libreoffice.SlackBuild @@ -183,6 +183,8 @@ # on Slackware 14.1 but want to use it on slackware-current. # 4.3.1-1: 29/aug/2014 by Eric Hameleers <alien@slackware.com> # * Update. +# 4.3.2-1: 28/sep/2014 by Eric Hameleers <alien@slackware.com> +# * Update. # # Run 'sh libreoffice.SlackBuild' to build a Slackware package. # The package (.txz) and .txt file as well as build logs are created in /tmp . @@ -212,7 +214,7 @@ TAG=${TAG:-alien} #SRCVER=${SRCVER:-HEAD} #SRCVER=${SRCVER:-3.3.0.4} -SRCVER=${SRCVER:-4.3.1} +SRCVER=${SRCVER:-4.3.2} SUBVER=".2" PKG_SUBVER="" @@ -319,7 +321,7 @@ SOURCE[7]="$SRCDIR/sources/8ab049135b2d15313da5d9f0656894a1-commons-lang3-3.3.1- SRCURL[7]="http://dev-www.libreoffice.org/src/8ab049135b2d15313da5d9f0656894a1-commons-lang3-3.3.1-src.tar.gz" # --- Start of section generated by gensrc.sh --- -# External sources for libreoffice-4.3.1.2 +# External sources for libreoffice-4.3.2.2 SOURCE[8]="$SRCDIR/sources/185d60944ea767075d27247c3162b3bc-unowinreg.dll" SRCURL[8]="http://dev-www.libreoffice.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll" @@ -444,8 +446,8 @@ SRCURL[47]="http://dev-www.libreoffice.org/src/harfbuzz-0.9.23.tar.bz2" SOURCE[48]="$SRCDIR/sources/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip" SRCURL[48]="http://dev-www.libreoffice.org/src/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip" -SOURCE[49]="$SRCDIR/sources/3121aaf3e13e5d88dfff13fb4a5f1ab8-hunspell-1.3.2.tar.gz" -SRCURL[49]="http://dev-www.libreoffice.org/src/3121aaf3e13e5d88dfff13fb4a5f1ab8-hunspell-1.3.2.tar.gz" +SOURCE[49]="$SRCDIR/sources/4967da60b23413604c9e563beacc63b4-hunspell-1.3.3.tar.gz" +SRCURL[49]="http://dev-www.libreoffice.org/src/4967da60b23413604c9e563beacc63b4-hunspell-1.3.3.tar.gz" SOURCE[50]="$SRCDIR/sources/a2f6010987e1c601274ab5d63b72c944-hyphen-2.8.4.tar.gz" SRCURL[50]="http://dev-www.libreoffice.org/src/a2f6010987e1c601274ab5d63b72c944-hyphen-2.8.4.tar.gz" @@ -507,8 +509,8 @@ SRCURL[68]="http://dev-www.libreoffice.org/src/libeot-0.01.tar.bz2" SOURCE[69]="$SRCDIR/sources/ae330b9493bd4503ac390106ff6060d7-libexttextcat-3.4.3.tar.bz2" SRCURL[69]="http://dev-www.libreoffice.org/src/ae330b9493bd4503ac390106ff6060d7-libexttextcat-3.4.3.tar.bz2" -SOURCE[70]="$SRCDIR/sources/libgltf-0.0.0.tar.bz2" -SRCURL[70]="http://dev-www.libreoffice.org/src/libgltf/libgltf-0.0.0.tar.bz2" +SOURCE[70]="$SRCDIR/sources/libgltf-0.0.1.tar.bz2" +SRCURL[70]="http://dev-www.libreoffice.org/src/libgltf/libgltf-0.0.1.tar.bz2" SOURCE[71]="$SRCDIR/sources/36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.1.tar.bz2" SRCURL[71]="http://dev-www.libreoffice.org/src/36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.1.tar.bz2" @@ -856,16 +858,16 @@ else KDEOPTS="--disable-kde4" fi -# Regular build flags: -export LDFLAGS="$SLKLDFLAGS" -export CXXFLAGS="$SLKCFLAGS" -export CFLAGS="$SLKCFLAGS" - # Make it install into proper directories: export OOInBase="/usr/lib${LIBDIRSUFFIX}/libreoffice" export OOInstall="/usr/lib${LIBDIRSUFFIX}/libreoffice" export OODESTDIR="$PKG" +# Regular build flags: +export LDFLAGS="$SLKLDFLAGS -Wl,-rpath,/usr/lib${LIBDIRSUFFIX}/libreoffice/program/" +export CXXFLAGS="$SLKCFLAGS" +export CFLAGS="$SLKCFLAGS" + # If this local directory does not exist during configuration, # support for Open Clip Art will be disabled: mkdir -p /usr/share/openclipart diff --git a/libreoffice/build/libreoffice43.SlackBuild b/libreoffice/build/libreoffice43.SlackBuild index 8b93d468..52d86f0b 100755 --- a/libreoffice/build/libreoffice43.SlackBuild +++ b/libreoffice/build/libreoffice43.SlackBuild @@ -183,6 +183,8 @@ # on Slackware 14.1 but want to use it on slackware-current. # 4.3.1-1: 29/aug/2014 by Eric Hameleers <alien@slackware.com> # * Update. +# 4.3.2-1: 28/sep/2014 by Eric Hameleers <alien@slackware.com> +# * Update. # # Run 'sh libreoffice.SlackBuild' to build a Slackware package. # The package (.txz) and .txt file as well as build logs are created in /tmp . @@ -212,7 +214,7 @@ TAG=${TAG:-alien} #SRCVER=${SRCVER:-HEAD} #SRCVER=${SRCVER:-3.3.0.4} -SRCVER=${SRCVER:-4.3.1} +SRCVER=${SRCVER:-4.3.2} SUBVER=".2" PKG_SUBVER="" @@ -319,7 +321,7 @@ SOURCE[7]="$SRCDIR/sources/8ab049135b2d15313da5d9f0656894a1-commons-lang3-3.3.1- SRCURL[7]="http://dev-www.libreoffice.org/src/8ab049135b2d15313da5d9f0656894a1-commons-lang3-3.3.1-src.tar.gz" # --- Start of section generated by gensrc.sh --- -# External sources for libreoffice-4.3.1.2 +# External sources for libreoffice-4.3.2.2 SOURCE[8]="$SRCDIR/sources/185d60944ea767075d27247c3162b3bc-unowinreg.dll" SRCURL[8]="http://dev-www.libreoffice.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll" @@ -444,8 +446,8 @@ SRCURL[47]="http://dev-www.libreoffice.org/src/harfbuzz-0.9.23.tar.bz2" SOURCE[48]="$SRCDIR/sources/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip" SRCURL[48]="http://dev-www.libreoffice.org/src/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip" -SOURCE[49]="$SRCDIR/sources/3121aaf3e13e5d88dfff13fb4a5f1ab8-hunspell-1.3.2.tar.gz" -SRCURL[49]="http://dev-www.libreoffice.org/src/3121aaf3e13e5d88dfff13fb4a5f1ab8-hunspell-1.3.2.tar.gz" +SOURCE[49]="$SRCDIR/sources/4967da60b23413604c9e563beacc63b4-hunspell-1.3.3.tar.gz" +SRCURL[49]="http://dev-www.libreoffice.org/src/4967da60b23413604c9e563beacc63b4-hunspell-1.3.3.tar.gz" SOURCE[50]="$SRCDIR/sources/a2f6010987e1c601274ab5d63b72c944-hyphen-2.8.4.tar.gz" SRCURL[50]="http://dev-www.libreoffice.org/src/a2f6010987e1c601274ab5d63b72c944-hyphen-2.8.4.tar.gz" @@ -507,8 +509,8 @@ SRCURL[68]="http://dev-www.libreoffice.org/src/libeot-0.01.tar.bz2" SOURCE[69]="$SRCDIR/sources/ae330b9493bd4503ac390106ff6060d7-libexttextcat-3.4.3.tar.bz2" SRCURL[69]="http://dev-www.libreoffice.org/src/ae330b9493bd4503ac390106ff6060d7-libexttextcat-3.4.3.tar.bz2" -SOURCE[70]="$SRCDIR/sources/libgltf-0.0.0.tar.bz2" -SRCURL[70]="http://dev-www.libreoffice.org/src/libgltf/libgltf-0.0.0.tar.bz2" +SOURCE[70]="$SRCDIR/sources/libgltf-0.0.1.tar.bz2" +SRCURL[70]="http://dev-www.libreoffice.org/src/libgltf/libgltf-0.0.1.tar.bz2" SOURCE[71]="$SRCDIR/sources/36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.1.tar.bz2" SRCURL[71]="http://dev-www.libreoffice.org/src/36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.1.tar.bz2" @@ -856,16 +858,16 @@ else KDEOPTS="--disable-kde4" fi -# Regular build flags: -export LDFLAGS="$SLKLDFLAGS" -export CXXFLAGS="$SLKCFLAGS" -export CFLAGS="$SLKCFLAGS" - # Make it install into proper directories: export OOInBase="/usr/lib${LIBDIRSUFFIX}/libreoffice" export OOInstall="/usr/lib${LIBDIRSUFFIX}/libreoffice" export OODESTDIR="$PKG" +# Regular build flags: +export LDFLAGS="$SLKLDFLAGS -Wl,-rpath,/usr/lib${LIBDIRSUFFIX}/libreoffice/program/" +export CXXFLAGS="$SLKCFLAGS" +export CFLAGS="$SLKCFLAGS" + # If this local directory does not exist during configuration, # support for Open Clip Art will be disabled: mkdir -p /usr/share/openclipart |