jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

libreoffice: fix removing ${DESTDIR}/all

Browse source 
Removing the intermediate directory in post_install() was
too early. Do it after the last subpackage libreoffice-writer
was installed.

FIXME: There are obviously some files which are not in any
package, namely the fonts. Identify the files and perhaps
create additional subpackages which don't rely on libreoffice's
file-list/*_list.txt files.

Signed-off-by: Jürgen Buchmüller <pullmoll@t-online.de>
This commit is contained in:
Jürgen Buchmüller 2018-05-15 16:48:53 +02:00
parent 6777b314c1
commit 45a428c95a
No known key found for this signature in database
GPG key ID: 6764EC32352D0647
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
srcpkgs/libreoffice/template
View file

@ -544,8 +544,6 @@ post_install() {
sed -i "s/libreoffice5.4/libreoffice/" ${DESTDIR}/usr/lib/libreoffice/share/xdg/*.desktop sed -i "s/libreoffice5.4/libreoffice/" ${DESTDIR}/usr/lib/libreoffice/share/xdg/*.desktop
;; ;;
esac esac
# Remove any remains from not packaged files
rm -rf ${DESTDIR}/all
} }
libreoffice-common_package() { libreoffice-common_package() {
@ -601,6 +599,14 @@ libreoffice-impress_package() {
} }
} }
libreoffice-kit_package() {
short_desc+=" - development files"
pkg_install() {
vmkdir usr/include
vcopy ${wrksrc}/include/LibreOfficeKit usr/include
}
}
libreoffice-math_package() { libreoffice-math_package() {
short_desc+=" - Equation editor" short_desc+=" - Equation editor"
depends="libreoffice-common>=${version}_${revision}" depends="libreoffice-common>=${version}_${revision}"
@ -625,13 +631,7 @@ libreoffice-writer_package() {
noverifyrdeps=yes noverifyrdeps=yes
pkg_install() { pkg_install() {
_split writer _split writer
} # Remove any remains from not packaged files
} rm -rf ${DESTDIR}/all
libreoffice-kit_package() {
short_desc+=" - development files"
pkg_install() {
vmkdir usr/include
vcopy ${wrksrc}/include/LibreOfficeKit usr/include
} }
} }