[arch-commits] Commit in libreoffice/trunk (PKGBUILD libreoffice.install)
andyrtr at archlinux.org
andyrtr at archlinux.org
Thu Dec 30 15:13:25 UTC 2010
Date: Thursday, December 30, 2010 @ 10:13:25
Author: andyrtr
Revision: 104175
fix extension splitting #22204 - workaround in splitted subpackages for #22174; don't build the dictionaries anymore; point to new {hunspell,hyphen,mythes}-xx packes
Modified:
libreoffice/trunk/PKGBUILD
libreoffice/trunk/libreoffice.install
---------------------+
PKGBUILD | 66 ++++++++++++++++++++++++++++++--------------------
libreoffice.install | 2 -
2 files changed, 41 insertions(+), 27 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2010-12-30 14:58:29 UTC (rev 104174)
+++ PKGBUILD 2010-12-30 15:13:25 UTC (rev 104175)
@@ -4,11 +4,11 @@
pkgbase="libreoffice"
pkgname=('libreoffice' 'libreoffice-sdk' 'libreoffice-extension-nlpsolver' 'libreoffice-extension-pdfimport' 'libreoffice-extension-presentation-minimizer' 'libreoffice-extension-presenter-screen'
'libreoffice-extension-report-builder' 'libreoffice-extension-wiki-publisher' 'libreoffice-extension-ct2n' 'libreoffice-extension-hunart' 'libreoffice-extension-numbertext'
- 'libreoffice-extension-oooblogger' 'libreoffice-extension-typo' 'libreoffice-extension-watch-window' 'libreoffice-extension-diagram'
- 'libreoffice-dictionaries')
+ 'libreoffice-extension-oooblogger' 'libreoffice-extension-typo' 'libreoffice-extension-watch-window' 'libreoffice-extension-diagram')
+ # 'libreoffice-dictionaries')
_LOver=3.3.0.2 # = 3.3-RC2
pkgver=${_LOver}
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
_LO_tree="3.3"
_OFFICEUPD="330"
@@ -292,7 +292,6 @@
--with-docdir=/usr/share/doc/packages/"${pkgbase}" \
--mandir=/usr/share/man \
--with-lang="" \
- --with-dict=ALL\
--with-binsuffix=no \
--enable-cairo\
--enable-crashdump\
@@ -328,6 +327,8 @@
--without-system-agg\
--without-system-libwps\
--without-system-mdds\
+ --without-myspell-dicts \
+ --with-external-dict-dir=/usr/share/hunspell \
--with-system-cppunit\
--with-system-libwpg\
--with-system-redland\
@@ -476,7 +477,8 @@
groups=('libreoffice-extensions')
install -dm755 ${pkgdir}/usr/lib/ooo-3.3/share/extensions
- unzip ${srcdir}/${pkgbase}-build-${_LOver}/build/libreoffice-${pkgver}/solver/${_OFFICEUPD}/unxlng*/bin/NLPSolver.oxt -d ${pkgdir}/usr/lib/ooo-3.3/share/extensions/${pkgname}
+# unzip ${srcdir}/${pkgbase}-build-${_LOver}/build/libreoffice-${pkgver}/solver/${_OFFICEUPD}/unxlng*/bin/NLPSolver.oxt -d ${pkgdir}/usr/lib/ooo-3.3/share/extensions/${pkgname}
+ unzip ${srcdir}/${pkgbase}-build-${_LOver}/build/libreoffice-${pkgver}/solver/${_OFFICEUPD}/unxlng*/bin/NLPSolver.oxt -d ${pkgdir}/usr/lib/ooo-3.3/share/extensions/nlpsolver
}
package_libreoffice-extension-pdfimport() {
@@ -486,7 +488,8 @@
groups=('libreoffice-extensions')
install -dm755 ${pkgdir}/usr/lib/ooo-3.3/share/extensions
- unzip ${srcdir}/${pkgbase}-build-${_LOver}/build/libreoffice-${pkgver}/solver/${_OFFICEUPD}/unxlng*/bin/pdfimport/pdfimport.oxt -d ${pkgdir}/usr/lib/ooo-3.3/share/extensions/${pkgname}
+# unzip ${srcdir}/${pkgbase}-build-${_LOver}/build/libreoffice-${pkgver}/solver/${_OFFICEUPD}/unxlng*/bin/pdfimport/pdfimport.oxt -d ${pkgdir}/usr/lib/ooo-3.3/share/extensions/${pkgname}
+ unzip ${srcdir}/${pkgbase}-build-${_LOver}/build/libreoffice-${pkgver}/solver/${_OFFICEUPD}/unxlng*/bin/pdfimport/pdfimport.oxt -d ${pkgdir}/usr/lib/ooo-3.3/share/extensions/pdfimport
}
package_libreoffice-extension-presentation-minimizer() {
@@ -496,7 +499,8 @@
groups=('libreoffice-extensions')
install -dm755 ${pkgdir}/usr/lib/ooo-3.3/share/extensions
- unzip ${srcdir}/${pkgbase}-build-${_LOver}/build/libreoffice-${pkgver}/solver/${_OFFICEUPD}/unxlng*/bin/presentation-minimizer.oxt -d ${pkgdir}/usr/lib/ooo-3.3/share/extensions/${pkgname}
+# unzip ${srcdir}/${pkgbase}-build-${_LOver}/build/libreoffice-${pkgver}/solver/${_OFFICEUPD}/unxlng*/bin/presentation-minimizer.oxt -d ${pkgdir}/usr/lib/ooo-3.3/share/extensions/${pkgname}
+ unzip ${srcdir}/${pkgbase}-build-${_LOver}/build/libreoffice-${pkgver}/solver/${_OFFICEUPD}/unxlng*/bin/presentation-minimizer.oxt -d ${pkgdir}/usr/lib/ooo-3.3/share/extensions/presentation-minimizer
}
package_libreoffice-extension-presenter-screen() {
@@ -506,7 +510,8 @@
groups=('libreoffice-extensions')
install -dm755 ${pkgdir}/usr/lib/ooo-3.3/share/extensions
- unzip ${srcdir}/${pkgbase}-build-${_LOver}/build/libreoffice-${pkgver}/solver/${_OFFICEUPD}/unxlng*/bin/presenter/presenter-screen.oxt -d ${pkgdir}/usr/lib/ooo-3.3/share/extensions/${pkgname}
+# unzip ${srcdir}/${pkgbase}-build-${_LOver}/build/libreoffice-${pkgver}/solver/${_OFFICEUPD}/unxlng*/bin/presenter/presenter-screen.oxt -d ${pkgdir}/usr/lib/ooo-3.3/share/extensions/${pkgname}
+ unzip ${srcdir}/${pkgbase}-build-${_LOver}/build/libreoffice-${pkgver}/solver/${_OFFICEUPD}/unxlng*/bin/presenter/presenter-screen.oxt -d ${pkgdir}/usr/lib/ooo-3.3/share/extensions/presenter-screen
}
package_libreoffice-extension-report-builder() {
@@ -517,7 +522,8 @@
groups=('libreoffice-extensions')
install -dm755 ${pkgdir}/usr/lib/ooo-3.3/share/extensions
- unzip ${srcdir}/${pkgbase}-build-${_LOver}/build/libreoffice-${pkgver}/solver/${_OFFICEUPD}/unxlng*/bin/report-builder.oxt -d ${pkgdir}/usr/lib/ooo-3.3/share/extensions/${pkgname}
+# unzip ${srcdir}/${pkgbase}-build-${_LOver}/build/libreoffice-${pkgver}/solver/${_OFFICEUPD}/unxlng*/bin/report-builder.oxt -d ${pkgdir}/usr/lib/ooo-3.3/share/extensions/${pkgname}
+ unzip ${srcdir}/${pkgbase}-build-${_LOver}/build/libreoffice-${pkgver}/solver/${_OFFICEUPD}/unxlng*/bin/report-builder.oxt -d ${pkgdir}/usr/lib/ooo-3.3/share/extensions/report-builder
}
package_libreoffice-extension-wiki-publisher() {
@@ -528,7 +534,8 @@
groups=('libreoffice-extensions')
install -dm755 ${pkgdir}/usr/lib/ooo-3.3/share/extensions
- unzip ${srcdir}/${pkgbase}-build-${_LOver}/build/libreoffice-${pkgver}/solver/${_OFFICEUPD}/unxlng*/bin/wiki-publisher.oxt -d ${pkgdir}/usr/lib/ooo-3.3/share/extensions/${pkgname}
+# unzip ${srcdir}/${pkgbase}-build-${_LOver}/build/libreoffice-${pkgver}/solver/${_OFFICEUPD}/unxlng*/bin/wiki-publisher.oxt -d ${pkgdir}/usr/lib/ooo-3.3/share/extensions/${pkgname}
+ unzip ${srcdir}/${pkgbase}-build-${_LOver}/build/libreoffice-${pkgver}/solver/${_OFFICEUPD}/unxlng*/bin/wiki-publisher.oxt -d ${pkgdir}/usr/lib/ooo-3.3/share/extensions/wiki-publisher
}
package_libreoffice-extension-ct2n() {
@@ -539,7 +546,8 @@
groups=('libreoffice-extensions')
install -dm755 ${pkgdir}/usr/lib/ooo-3.3/share/extensions
- unzip ${srcdir}/${pkgbase}-build-${_LOver}/build/libreoffice-${pkgver}/solver/${_OFFICEUPD}/unxlng*/bin/ConvertTextToNumber-1.3.2.oxt -d ${pkgdir}/usr/lib/ooo-3.3/share/extensions/${pkgname}
+# unzip ${srcdir}/${pkgbase}-build-${_LOver}/build/libreoffice-${pkgver}/solver/${_OFFICEUPD}/unxlng*/bin/ConvertTextToNumber-1.3.2.oxt -d ${pkgdir}/usr/lib/ooo-3.3/share/extensions/${pkgname}
+ unzip ${srcdir}/${pkgbase}-build-${_LOver}/build/libreoffice-${pkgver}/solver/${_OFFICEUPD}/unxlng*/bin/ConvertTextToNumber-1.3.2.oxt -d ${pkgdir}/usr/lib/ooo-3.3/share/extensions/ct2n
}
package_libreoffice-extension-hunart() {
@@ -550,7 +558,8 @@
groups=('libreoffice-extensions')
install -dm755 ${pkgdir}/usr/lib/ooo-3.3/share/extensions
- unzip ${srcdir}/${pkgbase}-build-${_LOver}/build/libreoffice-${pkgver}/solver/${_OFFICEUPD}/unxlng*/bin/hunart.oxt -d ${pkgdir}/usr/lib/ooo-3.3/share/extensions/${pkgname}
+# unzip ${srcdir}/${pkgbase}-build-${_LOver}/build/libreoffice-${pkgver}/solver/${_OFFICEUPD}/unxlng*/bin/hunart.oxt -d ${pkgdir}/usr/lib/ooo-3.3/share/extensions/${pkgname}
+ unzip ${srcdir}/${pkgbase}-build-${_LOver}/build/libreoffice-${pkgver}/solver/${_OFFICEUPD}/unxlng*/bin/hunart.oxt -d ${pkgdir}/usr/lib/ooo-3.3/share/extensions/hunart
}
package_libreoffice-extension-numbertext() {
@@ -561,7 +570,8 @@
groups=('libreoffice-extensions')
install -dm755 ${pkgdir}/usr/lib/ooo-3.3/share/extensions
- unzip ${srcdir}/${pkgbase}-build-${_LOver}/build/libreoffice-${pkgver}/solver/${_OFFICEUPD}/unxlng*/bin/numbertext.oxt -d ${pkgdir}/usr/lib/ooo-3.3/share/extensions/${pkgname}
+# unzip ${srcdir}/${pkgbase}-build-${_LOver}/build/libreoffice-${pkgver}/solver/${_OFFICEUPD}/unxlng*/bin/numbertext.oxt -d ${pkgdir}/usr/lib/ooo-3.3/share/extensions/${pkgname}
+ unzip ${srcdir}/${pkgbase}-build-${_LOver}/build/libreoffice-${pkgver}/solver/${_OFFICEUPD}/unxlng*/bin/numbertext.oxt -d ${pkgdir}/usr/lib/ooo-3.3/share/extensions/numbertext
}
package_libreoffice-extension-oooblogger() {
@@ -572,7 +582,8 @@
groups=('libreoffice-extensions')
install -dm755 ${pkgdir}/usr/lib/ooo-3.3/share/extensions
- unzip ${srcdir}/${pkgbase}-build-${_LOver}/build/libreoffice-${pkgver}/solver/${_OFFICEUPD}/unxlng*/bin/oooblogger-0.1.oxt -d ${pkgdir}/usr/lib/ooo-3.3/share/extensions/${pkgname}
+# unzip ${srcdir}/${pkgbase}-build-${_LOver}/build/libreoffice-${pkgver}/solver/${_OFFICEUPD}/unxlng*/bin/oooblogger-0.1.oxt -d ${pkgdir}/usr/lib/ooo-3.3/share/extensions/${pkgname}
+ unzip ${srcdir}/${pkgbase}-build-${_LOver}/build/libreoffice-${pkgver}/solver/${_OFFICEUPD}/unxlng*/bin/oooblogger-0.1.oxt -d ${pkgdir}/usr/lib/ooo-3.3/share/extensions/oooblogger
}
package_libreoffice-extension-typo() {
@@ -583,7 +594,8 @@
groups=('libreoffice-extensions')
install -dm755 ${pkgdir}/usr/lib/ooo-3.3/share/extensions
- unzip ${srcdir}/${pkgbase}-build-${_LOver}/build/libreoffice-${pkgver}/solver/${_OFFICEUPD}/unxlng*/bin/typo.oxt -d ${pkgdir}/usr/lib/ooo-3.3/share/extensions/${pkgname}
+# unzip ${srcdir}/${pkgbase}-build-${_LOver}/build/libreoffice-${pkgver}/solver/${_OFFICEUPD}/unxlng*/bin/typo.oxt -d ${pkgdir}/usr/lib/ooo-3.3/share/extensions/${pkgname}
+ unzip ${srcdir}/${pkgbase}-build-${_LOver}/build/libreoffice-${pkgver}/solver/${_OFFICEUPD}/unxlng*/bin/typo.oxt -d ${pkgdir}/usr/lib/ooo-3.3/share/extensions/typo
}
package_libreoffice-extension-watch-window() {
@@ -594,7 +606,8 @@
groups=('libreoffice-extensions')
install -dm755 ${pkgdir}/usr/lib/ooo-3.3/share/extensions
- unzip ${srcdir}/${pkgbase}-build-${_LOver}/build/libreoffice-${pkgver}/solver/${_OFFICEUPD}/unxlng*/bin/WatchWindow.oxt -d ${pkgdir}/usr/lib/ooo-3.3/share/extensions/${pkgname}
+# unzip ${srcdir}/${pkgbase}-build-${_LOver}/build/libreoffice-${pkgver}/solver/${_OFFICEUPD}/unxlng*/bin/WatchWindow.oxt -d ${pkgdir}/usr/lib/ooo-3.3/share/extensions/${pkgname}
+ unzip ${srcdir}/${pkgbase}-build-${_LOver}/build/libreoffice-${pkgver}/solver/${_OFFICEUPD}/unxlng*/bin/WatchWindow.oxt -d ${pkgdir}/usr/lib/ooo-3.3/share/extensions/watch-window
}
package_libreoffice-extension-diagram() {
@@ -605,16 +618,17 @@
groups=('libreoffice-extensions')
install -dm755 ${pkgdir}/usr/lib/ooo-3.3/share/extensions
- unzip ${srcdir}/${pkgbase}-build-${_LOver}/build/libreoffice-${pkgver}/solver/${_OFFICEUPD}/unxlng*/bin/Diagram.oxt -d ${pkgdir}/usr/lib/ooo-3.3/share/extensions/${pkgname}
+# unzip ${srcdir}/${pkgbase}-build-${_LOver}/build/libreoffice-${pkgver}/solver/${_OFFICEUPD}/unxlng*/bin/Diagram.oxt -d ${pkgdir}/usr/lib/ooo-3.3/share/extensions/${pkgname}
+ unzip ${srcdir}/${pkgbase}-build-${_LOver}/build/libreoffice-${pkgver}/solver/${_OFFICEUPD}/unxlng*/bin/Diagram.oxt -d ${pkgdir}/usr/lib/ooo-3.3/share/extensions/diagram
}
-package_libreoffice-dictionaries() {
- pkgdesc="a collection of dictionaries for spell checking, hyphenation and thesaurus"
- depends=('libreoffice')
+#package_libreoffice-dictionaries() {
+# pkgdesc="a collection of dictionaries for spell checking, hyphenation and thesaurus"
+# depends=('libreoffice')
- install -dm755 ${pkgdir}/usr/lib/ooo-3.3/share/extensions
- for lang in ${srcdir}/${pkgbase}-build-${_LOver}/build/libreoffice-${pkgver}/solver/${_OFFICEUPD}/unxlng*/pck/dict-* ; do
- langdir=$(basename ${lang})
- unzip ${lang} -d ${pkgdir}/usr/lib/ooo-3.3/share/extensions/$(echo ${langdir/.oxt/})
- done
-}
\ No newline at end of file
+# install -dm755 ${pkgdir}/usr/lib/ooo-3.3/share/extensions
+# for lang in ${srcdir}/${pkgbase}-build-${_LOver}/build/libreoffice-${pkgver}/solver/${_OFFICEUPD}/unxlng*/pck/dict-* ; do
+# langdir=$(basename ${lang})
+# unzip ${lang} -d ${pkgdir}/usr/lib/ooo-3.3/share/extensions/$(echo ${langdir/.oxt/})
+# done
+#}
Modified: libreoffice.install
===================================================================
--- libreoffice.install 2010-12-30 14:58:29 UTC (rev 104174)
+++ libreoffice.install 2010-12-30 15:13:25 UTC (rev 104175)
@@ -7,7 +7,7 @@
echo " * see http://wiki.archlinux.org/index.php/Openoffice"
echo " * you may want to pacman -Ss libreoffice-extensions"
echo " to see what extensions are prepared to install"
-echo " * it's recommended to install the libreoffice-dictionaries pkg"
+echo " * it's recommended to install {hunspell,mythes,hyphen}-xx pkg for spell checking"
echo " * make sure you have installed some ttf font (ttf-dejavu recommended)"
}
More information about the arch-commits
mailing list