diff options
| -rwxr-xr-x | libreoffice/build/libreoffice.SlackBuild | 43 | ||||
| -rwxr-xr-x | libreoffice/build/libreoffice41.SlackBuild | 43 | ||||
| -rwxr-xr-x | libreoffice/build/libreoffice42.SlackBuild | 43 | ||||
| -rwxr-xr-x | libreoffice/build/libreoffice43.SlackBuild | 43 |
4 files changed, 20 insertions, 152 deletions
diff --git a/libreoffice/build/libreoffice.SlackBuild b/libreoffice/build/libreoffice.SlackBuild index ce8359e1..aad6d73c 100755 --- a/libreoffice/build/libreoffice.SlackBuild +++ b/libreoffice/build/libreoffice.SlackBuild @@ -135,8 +135,8 @@ # * New release, still built for Slackware 13.37. # 3.6.4-1: 06/dec/2012 by Eric Hameleers <alien@slackware.com> # * New release. Refreshed the swedish dictionary. -# 4.0.0-1: 28/jan/2013 by Eric Hameleers <alien@slackware.com> -# * Preview of the new 4.0.0 release. +# 4.0.0-1: 29/jan/2013 by Eric Hameleers <alien@slackware.com> +# * New 4.0.0 release built for Slackware 14. # # Run 'sh libreoffice.SlackBuild' to build a Slackware package. # The package (.txz) and .txt file as well as build logs are created in /tmp . @@ -726,24 +726,8 @@ cd $BUILDDIR echo Building ... -# Apply our own (borrowed) patches. -touch $OUTPUT/patch-$PRGNAM.log - -## Fix compilation of hsqldb using java 1.7: -#cat $SRCDIR/hsqldb.jdk7.patch | patch -p1 --verbose \ -# 2>&1 | tee -a $OUTPUT/patch-$PRGNAM.log -## Fix building on armv7hl: -#cat $SRCDIR/libreoffice.gcc3_linux_arm.patch | patch -p1 --verbose \ -# 2>&1 | tee -a $OUTPUT/patch-$PRGNAM.log -## Fix general input/output error on save/open password-protected file: -#cat $SRCDIR/libreoffice.nss_init.patch | patch -p1 --verbose \ -# 2>&1 | tee -a $OUTPUT/patch-$PRGNAM.log -#cat $SRCDIR/libreoffice.mozprofile.patch | patch -p1 --verbose \ -# 2>&1 | tee -a $OUTPUT/patch-$PRGNAM.log -## LO would not start on secondary monitor (hopefully fixed in LO 3.5.4), -## see also https://bugs.freedesktop.org/show_bug.cgi?id=49365 : -#cat $SRCDIR/libreoffice.multimonitor.patch | patch -p1 --verbose \ -# 2>&1 | tee -a $OUTPUT/patch-$PRGNAM.log +## Apply our own (borrowed) patches. +#touch $OUTPUT/patch-$PRGNAM.log if [ -z "$SRCURL[0]" ]; then # Git build; find out what this version of LibreOffice calls itself: @@ -927,24 +911,6 @@ make DESTDIR=$PKG distro-pack-install \ # Remove cruft: rm -f $PKG/gid_Module* -## Copy the omitted math file into the package (seems that my packages never -## shipped with a functional math module???) -#if [ ! -f $PKG/usr/lib${LIBDIRSUFFIX}/libreoffice/share/registry/math.xcd ] -#then -# cp -a postprocess/unxl*.pro/misc/math.xcd $PKG/usr/lib${LIBDIRSUFFIX}/libreoffice/share/registry/ -#fi - -## Move the SDK files to sane locations: -#mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/sdk -#mv $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/sdk/{docs,examples,index.html} \ -# $PKG/usr/doc/$PRGNAM-$VERSION/sdk/ -#ln -sf /usr/doc/$PRGNAM-$VERSION/sdk/docs \ -# $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/sdk/ -#ln -sf /usr/doc/$PRGNAM-$VERSION/sdk/index.html \ -# $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/sdk/ -#ln -sf /usr/doc/$PRGNAM-$VERSION/sdk/examples \ -# $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/sdk/ - if [ ! -L $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/sdk/classes ]; then mkdir -p $PKG/usr/share/${PRGNAM}/sdk mv $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/sdk/classes \ @@ -1273,6 +1239,7 @@ find $PKG/usr/doc -type f -exec chmod 644 {} \; # Fix permissions of license files: chmod 0644 $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/*.odt +chmod 0644 $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/{LICENSE,NOTICE} # Fix weird permissions: find ${PKG} -perm 444 -exec chmod 644 {} \; diff --git a/libreoffice/build/libreoffice41.SlackBuild b/libreoffice/build/libreoffice41.SlackBuild index ce8359e1..aad6d73c 100755 --- a/libreoffice/build/libreoffice41.SlackBuild +++ b/libreoffice/build/libreoffice41.SlackBuild @@ -135,8 +135,8 @@ # * New release, still built for Slackware 13.37. # 3.6.4-1: 06/dec/2012 by Eric Hameleers <alien@slackware.com> # * New release. Refreshed the swedish dictionary. -# 4.0.0-1: 28/jan/2013 by Eric Hameleers <alien@slackware.com> -# * Preview of the new 4.0.0 release. +# 4.0.0-1: 29/jan/2013 by Eric Hameleers <alien@slackware.com> +# * New 4.0.0 release built for Slackware 14. # # Run 'sh libreoffice.SlackBuild' to build a Slackware package. # The package (.txz) and .txt file as well as build logs are created in /tmp . @@ -726,24 +726,8 @@ cd $BUILDDIR echo Building ... -# Apply our own (borrowed) patches. -touch $OUTPUT/patch-$PRGNAM.log - -## Fix compilation of hsqldb using java 1.7: -#cat $SRCDIR/hsqldb.jdk7.patch | patch -p1 --verbose \ -# 2>&1 | tee -a $OUTPUT/patch-$PRGNAM.log -## Fix building on armv7hl: -#cat $SRCDIR/libreoffice.gcc3_linux_arm.patch | patch -p1 --verbose \ -# 2>&1 | tee -a $OUTPUT/patch-$PRGNAM.log -## Fix general input/output error on save/open password-protected file: -#cat $SRCDIR/libreoffice.nss_init.patch | patch -p1 --verbose \ -# 2>&1 | tee -a $OUTPUT/patch-$PRGNAM.log -#cat $SRCDIR/libreoffice.mozprofile.patch | patch -p1 --verbose \ -# 2>&1 | tee -a $OUTPUT/patch-$PRGNAM.log -## LO would not start on secondary monitor (hopefully fixed in LO 3.5.4), -## see also https://bugs.freedesktop.org/show_bug.cgi?id=49365 : -#cat $SRCDIR/libreoffice.multimonitor.patch | patch -p1 --verbose \ -# 2>&1 | tee -a $OUTPUT/patch-$PRGNAM.log +## Apply our own (borrowed) patches. +#touch $OUTPUT/patch-$PRGNAM.log if [ -z "$SRCURL[0]" ]; then # Git build; find out what this version of LibreOffice calls itself: @@ -927,24 +911,6 @@ make DESTDIR=$PKG distro-pack-install \ # Remove cruft: rm -f $PKG/gid_Module* -## Copy the omitted math file into the package (seems that my packages never -## shipped with a functional math module???) -#if [ ! -f $PKG/usr/lib${LIBDIRSUFFIX}/libreoffice/share/registry/math.xcd ] -#then -# cp -a postprocess/unxl*.pro/misc/math.xcd $PKG/usr/lib${LIBDIRSUFFIX}/libreoffice/share/registry/ -#fi - -## Move the SDK files to sane locations: -#mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/sdk -#mv $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/sdk/{docs,examples,index.html} \ -# $PKG/usr/doc/$PRGNAM-$VERSION/sdk/ -#ln -sf /usr/doc/$PRGNAM-$VERSION/sdk/docs \ -# $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/sdk/ -#ln -sf /usr/doc/$PRGNAM-$VERSION/sdk/index.html \ -# $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/sdk/ -#ln -sf /usr/doc/$PRGNAM-$VERSION/sdk/examples \ -# $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/sdk/ - if [ ! -L $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/sdk/classes ]; then mkdir -p $PKG/usr/share/${PRGNAM}/sdk mv $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/sdk/classes \ @@ -1273,6 +1239,7 @@ find $PKG/usr/doc -type f -exec chmod 644 {} \; # Fix permissions of license files: chmod 0644 $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/*.odt +chmod 0644 $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/{LICENSE,NOTICE} # Fix weird permissions: find ${PKG} -perm 444 -exec chmod 644 {} \; diff --git a/libreoffice/build/libreoffice42.SlackBuild b/libreoffice/build/libreoffice42.SlackBuild index ce8359e1..aad6d73c 100755 --- a/libreoffice/build/libreoffice42.SlackBuild +++ b/libreoffice/build/libreoffice42.SlackBuild @@ -135,8 +135,8 @@ # * New release, still built for Slackware 13.37. # 3.6.4-1: 06/dec/2012 by Eric Hameleers <alien@slackware.com> # * New release. Refreshed the swedish dictionary. -# 4.0.0-1: 28/jan/2013 by Eric Hameleers <alien@slackware.com> -# * Preview of the new 4.0.0 release. +# 4.0.0-1: 29/jan/2013 by Eric Hameleers <alien@slackware.com> +# * New 4.0.0 release built for Slackware 14. # # Run 'sh libreoffice.SlackBuild' to build a Slackware package. # The package (.txz) and .txt file as well as build logs are created in /tmp . @@ -726,24 +726,8 @@ cd $BUILDDIR echo Building ... -# Apply our own (borrowed) patches. -touch $OUTPUT/patch-$PRGNAM.log - -## Fix compilation of hsqldb using java 1.7: -#cat $SRCDIR/hsqldb.jdk7.patch | patch -p1 --verbose \ -# 2>&1 | tee -a $OUTPUT/patch-$PRGNAM.log -## Fix building on armv7hl: -#cat $SRCDIR/libreoffice.gcc3_linux_arm.patch | patch -p1 --verbose \ -# 2>&1 | tee -a $OUTPUT/patch-$PRGNAM.log -## Fix general input/output error on save/open password-protected file: -#cat $SRCDIR/libreoffice.nss_init.patch | patch -p1 --verbose \ -# 2>&1 | tee -a $OUTPUT/patch-$PRGNAM.log -#cat $SRCDIR/libreoffice.mozprofile.patch | patch -p1 --verbose \ -# 2>&1 | tee -a $OUTPUT/patch-$PRGNAM.log -## LO would not start on secondary monitor (hopefully fixed in LO 3.5.4), -## see also https://bugs.freedesktop.org/show_bug.cgi?id=49365 : -#cat $SRCDIR/libreoffice.multimonitor.patch | patch -p1 --verbose \ -# 2>&1 | tee -a $OUTPUT/patch-$PRGNAM.log +## Apply our own (borrowed) patches. +#touch $OUTPUT/patch-$PRGNAM.log if [ -z "$SRCURL[0]" ]; then # Git build; find out what this version of LibreOffice calls itself: @@ -927,24 +911,6 @@ make DESTDIR=$PKG distro-pack-install \ # Remove cruft: rm -f $PKG/gid_Module* -## Copy the omitted math file into the package (seems that my packages never -## shipped with a functional math module???) -#if [ ! -f $PKG/usr/lib${LIBDIRSUFFIX}/libreoffice/share/registry/math.xcd ] -#then -# cp -a postprocess/unxl*.pro/misc/math.xcd $PKG/usr/lib${LIBDIRSUFFIX}/libreoffice/share/registry/ -#fi - -## Move the SDK files to sane locations: -#mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/sdk -#mv $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/sdk/{docs,examples,index.html} \ -# $PKG/usr/doc/$PRGNAM-$VERSION/sdk/ -#ln -sf /usr/doc/$PRGNAM-$VERSION/sdk/docs \ -# $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/sdk/ -#ln -sf /usr/doc/$PRGNAM-$VERSION/sdk/index.html \ -# $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/sdk/ -#ln -sf /usr/doc/$PRGNAM-$VERSION/sdk/examples \ -# $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/sdk/ - if [ ! -L $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/sdk/classes ]; then mkdir -p $PKG/usr/share/${PRGNAM}/sdk mv $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/sdk/classes \ @@ -1273,6 +1239,7 @@ find $PKG/usr/doc -type f -exec chmod 644 {} \; # Fix permissions of license files: chmod 0644 $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/*.odt +chmod 0644 $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/{LICENSE,NOTICE} # Fix weird permissions: find ${PKG} -perm 444 -exec chmod 644 {} \; diff --git a/libreoffice/build/libreoffice43.SlackBuild b/libreoffice/build/libreoffice43.SlackBuild index ce8359e1..aad6d73c 100755 --- a/libreoffice/build/libreoffice43.SlackBuild +++ b/libreoffice/build/libreoffice43.SlackBuild @@ -135,8 +135,8 @@ # * New release, still built for Slackware 13.37. # 3.6.4-1: 06/dec/2012 by Eric Hameleers <alien@slackware.com> # * New release. Refreshed the swedish dictionary. -# 4.0.0-1: 28/jan/2013 by Eric Hameleers <alien@slackware.com> -# * Preview of the new 4.0.0 release. +# 4.0.0-1: 29/jan/2013 by Eric Hameleers <alien@slackware.com> +# * New 4.0.0 release built for Slackware 14. # # Run 'sh libreoffice.SlackBuild' to build a Slackware package. # The package (.txz) and .txt file as well as build logs are created in /tmp . @@ -726,24 +726,8 @@ cd $BUILDDIR echo Building ... -# Apply our own (borrowed) patches. -touch $OUTPUT/patch-$PRGNAM.log - -## Fix compilation of hsqldb using java 1.7: -#cat $SRCDIR/hsqldb.jdk7.patch | patch -p1 --verbose \ -# 2>&1 | tee -a $OUTPUT/patch-$PRGNAM.log -## Fix building on armv7hl: -#cat $SRCDIR/libreoffice.gcc3_linux_arm.patch | patch -p1 --verbose \ -# 2>&1 | tee -a $OUTPUT/patch-$PRGNAM.log -## Fix general input/output error on save/open password-protected file: -#cat $SRCDIR/libreoffice.nss_init.patch | patch -p1 --verbose \ -# 2>&1 | tee -a $OUTPUT/patch-$PRGNAM.log -#cat $SRCDIR/libreoffice.mozprofile.patch | patch -p1 --verbose \ -# 2>&1 | tee -a $OUTPUT/patch-$PRGNAM.log -## LO would not start on secondary monitor (hopefully fixed in LO 3.5.4), -## see also https://bugs.freedesktop.org/show_bug.cgi?id=49365 : -#cat $SRCDIR/libreoffice.multimonitor.patch | patch -p1 --verbose \ -# 2>&1 | tee -a $OUTPUT/patch-$PRGNAM.log +## Apply our own (borrowed) patches. +#touch $OUTPUT/patch-$PRGNAM.log if [ -z "$SRCURL[0]" ]; then # Git build; find out what this version of LibreOffice calls itself: @@ -927,24 +911,6 @@ make DESTDIR=$PKG distro-pack-install \ # Remove cruft: rm -f $PKG/gid_Module* -## Copy the omitted math file into the package (seems that my packages never -## shipped with a functional math module???) -#if [ ! -f $PKG/usr/lib${LIBDIRSUFFIX}/libreoffice/share/registry/math.xcd ] -#then -# cp -a postprocess/unxl*.pro/misc/math.xcd $PKG/usr/lib${LIBDIRSUFFIX}/libreoffice/share/registry/ -#fi - -## Move the SDK files to sane locations: -#mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/sdk -#mv $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/sdk/{docs,examples,index.html} \ -# $PKG/usr/doc/$PRGNAM-$VERSION/sdk/ -#ln -sf /usr/doc/$PRGNAM-$VERSION/sdk/docs \ -# $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/sdk/ -#ln -sf /usr/doc/$PRGNAM-$VERSION/sdk/index.html \ -# $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/sdk/ -#ln -sf /usr/doc/$PRGNAM-$VERSION/sdk/examples \ -# $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/sdk/ - if [ ! -L $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/sdk/classes ]; then mkdir -p $PKG/usr/share/${PRGNAM}/sdk mv $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/sdk/classes \ @@ -1273,6 +1239,7 @@ find $PKG/usr/doc -type f -exec chmod 644 {} \; # Fix permissions of license files: chmod 0644 $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/*.odt +chmod 0644 $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/{LICENSE,NOTICE} # Fix weird permissions: find ${PKG} -perm 444 -exec chmod 644 {} \; |