Date: Tuesday, May 3, 2011 @ 13:56:13
Author: andyrtr
Revision: 122279
prepare 3.4 branch builds; make install is fixed now; remove no more included
extensions
Added:
libreoffice/trunk/fix_destdir.diff
Modified:
libreoffice/trunk/PKGBUILD
Deleted:
libreoffice/trunk/old-install-behaviour.diff
----------------------------+
PKGBUILD | 268 ++++++++++++++-----------------------------
fix_destdir.diff | 15 ++
old-install-behaviour.diff | 125 --------------------
3 files changed, 104 insertions(+), 304 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2011-05-03 17:48:14 UTC (rev 122278)
+++ PKGBUILD 2011-05-03 17:56:13 UTC (rev 122279)
@@ -3,10 +3,9 @@
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')
-_LOver=3.3.99.2
-pkgver=3.3.4beta2
+ 'libreoffice-extension-report-builder'
'libreoffice-extension-wiki-publisher' 'libreoffice-extension-ct2n')
+_LOver=3.3.99.3
+pkgver=3.4beta3
pkgrel=1
arch=('i686' 'x86_64')
#_LO_tree="3.4"
@@ -33,7 +32,7 @@
#_mirror="ftp://ftp.uni-muenster.de/pub/software/tdf/libreoffice/src";
#_mirror="ftp://ftp.astral.ro/mirrors/tdf/libreoffice/src";
_additional_source_url="http://hg.services.openoffice.org/binaries";
-source=(${_mirror}/${pkgbase}-{artwork,base,bootstrap,calc,components,extensions,extras,filters,help,impress,libs-core,libs-extern,libs-extern-sys,libs-gui,postprocess,sdk,testing,translations,ure,writer}-${_LOver}.tar.bz2
+source=(${_mirror}/${pkgbase}-{artwork,base,bootstrap,calc,components,extensions,extras,filters,help,impress,libs-core,libs-extern,libs-extern-sys,libs-gui,postprocess,sdk,testing,ure,writer}-${_LOver}.tar.bz2
#,translations
${_additional_source_url}/128cfc86ed5953e57fe0f5ae98b62c2e-libtextcat-2.2.tar.gz
${_additional_source_url}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
${_additional_source_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
@@ -58,7 +57,6 @@
${_additional_source_url}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
${_additional_source_url}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
${_additional_source_url}/18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
-
${_additional_source_url}/7376930b0d3f3d77a685d94c4a3acda8-STLport-4.5-0119.tar.gz
http://download.go-oo.org/src/7a0dcb3fe1e8c7229ab4fb868b7325e6-mdds_0.5.2.tar.bz2
http://download.go-oo.org/src/9e436bff44c60dc8b97cba0c7fc11a5c-libwps-0.2.0.tar.bz2
http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll
@@ -69,7 +67,7 @@
buildfix_i116795.diff
buildfix_boost.diff
buildfix_ct2n.diff
- old-install-behaviour.diff)
+ fix_destdir.diff)
noextract=(185d60944ea767075d27247c3162b3bc-unowinreg.dll
b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2
7a0dcb3fe1e8c7229ab4fb868b7325e6-mdds_0.5.2.tar.bz2
@@ -98,30 +96,28 @@
db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
- 7376930b0d3f3d77a685d94c4a3acda8-STLport-4.5-0119.tar.gz
451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt
90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2
f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2)
-md5sums=('3b162daf1f68d8448fe2da774464b154'
- 'c6d5c8d049b71aedfa06e58ebfd1f66b'
- '5273abb776b01c8f6ab643d19cbd0b45'
- '34904d2ea9fef2b7ad40177d4e11efea'
- '9af3a41591863d4adb2c9929920e1e44'
- '1280d013a5601401469ed0893b09a584'
- '0fffe1d088045fc185a946822b356adf'
- '95e8ec284d76aaf395422a8da578f002'
- 'bb66885d1ef0ff89f06fc0a23204b8b6'
- 'b35b3bf57bb93f8f2d52745205144d6a'
- '4b0cf024a31ba9ae8263ba211df8822b'
- '399fa85e82572d2e9773cf8e2539a404'
- '1226361d6ae74ea6dddd14da0a2363ed'
- '98c144c809b0693464ef54a10ab6a488'
- 'ce3ac78cd95d267754d5a374f3881453'
- 'a9d215bdacc52a72d359324290f91d56'
- 'cc1ab6a4432c42187793b5f21794a63f'
- '8d4f2f72ca5f3729b60df78ad1b08aee'
- '53a30144ae578e5778c78f57ea03a30c'
- '621da516b0130067ebcc61ba571db062'
+md5sums=('343577500a1fa355f4367679df8cbd1d'
+ 'a3d00244ae8549758f8f8d0d1fb9faea'
+ '4ed19fb5ca6b503d690e62ccc1d5ea7b'
+ '2bf458a89f41be685875e0776f82f182'
+ '7a078433b26250f8a26a6cb8fab0bf9f'
+ 'af031fcaaa52856e30d483608ba24bc9'
+ '1ff2ff5c67be9c4e5ff95a7662580bf5'
+ '8a4fcc9d2a9302ba4f79a3884b8d6389'
+ '1c2e43d081db6e622d543af250da1b5a'
+ 'f5888a9164a5628f0dd592b3057c113b'
+ 'aaa796d0eb2315012c9407e5b1be12e7'
+ '76896f949450e66d836f0e0e1cd0a135'
+ 'c1ae39c2867e5c9bff275c0ad5c6ea7c'
+ '74e81f2022eec529fae0e060dce60ad8'
+ '8122d248f68c588840118c74601413b6'
+ '2d3eab755f18fe86dd8fb090a60c3dd2'
+ '7a42d03447301d607458e25b997c2e5a'
+ 'edc472d752d30678f3f9f7cb034a0af1'
+ 'b1f378d5d13e37638a65371b646df140'
'128cfc86ed5953e57fe0f5ae98b62c2e'
'1f24ab1d39f4a51faf22244c94a6203f'
'35c94d2df8893241173de1d16b6034c0'
@@ -146,7 +142,6 @@
'db60e4fde8dd6d6807523deb71ee34dc'
'ba2930200c9f019c2d93a8c88c651a0f'
'18f577b374d60b3c760a3a3350407632'
- '7376930b0d3f3d77a685d94c4a3acda8'
'7a0dcb3fe1e8c7229ab4fb868b7325e6'
'9e436bff44c60dc8b97cba0c7fc11a5c'
'185d60944ea767075d27247c3162b3bc'
@@ -157,7 +152,7 @@
'0520d63c946e272ed3bdfc863fbdc42e'
'bc228237108cab7745897a9f466b6d39'
'eee273f501ff45dc5f1365e78c6d57c0'
- '4bd1a068a3065c5c59b01985247a875e')
+ 'b99dd668b290c4d7269a7cd57544d2b1')
build() {
@@ -168,7 +163,7 @@
# move all LibO sources into one build directory
mkdir ${srcdir}/build && cd ${srcdir}/build
- for i in
libreoffice-{artwork,base,bootstrap,calc,components,extensions,extras,filters,help,impress,libs-core,libs-extern,libs-extern-sys,libs-gui,postprocess,sdk,testing,translations,ure,writer}-${_LOver};
do
+ for i in
libreoffice-{artwork,base,bootstrap,calc,components,extensions,extras,filters,help,impress,libs-core,libs-extern,libs-extern-sys,libs-gui,postprocess,sdk,testing,ure,writer}-${_LOver};
do #,translations
mv ${srcdir}/$i/* .
done
@@ -184,7 +179,7 @@
patch -Np1 -i ${srcdir}/buildfix_i116795.diff
patch -Np1 -i ${srcdir}/buildfix_boost.diff
patch -Np1 -i ${srcdir}/buildfix_ct2n.diff
- patch -Np1 -i ${srcdir}/old-install-behaviour.diff
+ patch -Np1 -i ${srcdir}/fix_destdir.diff
# unset C(XX)FLAGS
# http://www.openoffice.org/issues/show_bug.cgi?id=103205
@@ -207,9 +202,10 @@
# # # avoid problems with ixion for now
# sed -i '/fields-table-formula.diff/d' patches/dev300/apply ||
return 1
# fi
+# --with-package-format="native" archive installed tardist" \
- autoconf -v -f
- ./configure --with-build-version="${_LOver} ArchLinux build-${pkgrel}" \
+# autoconf -v -f
+ ./configure --with-build-version="${_LOver} ArchLinux build-${pkgrel}"
--with-vendor="ArchLinux" \
--with-unix-wrapper="libreoffice" \
--with-max-jobs=${MAKEFLAGS/-j/} \
--with-external-tar="${srcdir}/ext_sources" \
@@ -217,10 +213,11 @@
--with-install-dirname="${pkgbase}" --libdir=/usr/lib
--mandir=/usr/share/man \
--with-lang="" \
--enable-cairo\
- --enable-crashdump\
+ --enable-crashdump \
+ --enable-dbus \
--enable-evolution2\
--disable-graphite\
- --disable-gio\
+ --enable-gio\
--disable-gnome-vfs\
--disable-kde\
--enable-kde4\
@@ -274,58 +271,11 @@
#--enable-ext-mysql-connector
#--with-system-graphite --enable-graohite ?
-#--enable-dbus
-#--enable-gio ?
#--with-servlet-api-jar=JARFILE
-#checking whether to build extension for support of scripts in BeanShell... no
-#checking whether to build extension for support of scripts in JavaScript... no
-#checking whether to build extension for support of scripts in Python... no
-#checking whether to enable KDE address book support... no
-#checking whether to include MathMLDTD... yes
-#checking which themes to include... default crystal hicontrast oxygen tango
-#checking for helppack integration... integration
-#checking for extensions integration... no integration
-#checking for Lightproof extensions integration (only supported languages
displayed)... no integration
-#checking for Watch Window extension integration... yes
-#checking for Diagram extension integration... yes
-#checking for Validator extension integration... no
-#checking for Barcode extension integration... no
-#checking for ConvertTextToNumber extension integration... yes
-#checking for Numbertext extension integration... yes
-#checking for Hungarian Cross-reference Toolbar extension integration... yes
-#checking for Typography Toolbar extension integration... yes
-#checking for Google Docs extension integration... no
-#checking for NLPSolver extension integration... yes
-#checking for LanguageTool extension integration... no
-#checking for oooblogger extension integration... yes
-#checking for Sun Professional Template Pack integration (only supported
languages displayed)... no integration
-#checking whether to include third-party fonts... no
-#checking whether to include Agfa Monotype fonts... no
-#checking whether to include PPDs... no
-#checking whether to include AFMs... no
-#checking whether to include extra galleries... no
-#checking whether to include extra templates... no
-#checking whether to include extra samples... no
-#checking whether to include extra fonts... no
-#checking whether and how to use Xinerama... yes, with dynamic linking
-#checking for vendor... not set
-#checking for UNIX wrapper name... not set
-#checking whether to statically link to Gtk... no
-#checking whether to use layout dialogs... no
-#checking build verbosity... not set
-
# see http://qa.openoffice.org/issues/show_bug.cgi?id=110136
# --with-system-saxon\
# --with-saxon-jar=/usr/share/java/saxon/saxon9he.jar\
-
-# --enable-report-builder \
-# --with-additional-sections="OOXMLExport"
-# --with-languagetool \
-# --with-lightproof \
-# --with-validator \
-# --with-barcode \
-
touch src.downloaded
#./download
unset MAKEFLAGS
@@ -375,16 +325,34 @@
replaces=('go-openoffice' 'openoffice-base' )
cd ${srcdir}/build
- #bin/ooinstall <path-to-install>
- #make OODESTDIR=${pkgdir} install
make DESTDIR=${pkgdir} install
-
+
+ # workaround broken make $DESTDIR install :(
+# install -dm755 ${pkgdir}/usr/lib/libreoffice
+ install -dm755 ${pkgdir}/usr/share/applications
+# mv
instsetoo_native/unxlngx6.pro/LibreOffice/native/install/LibO_3.4.0beta3_Linux_x86-64_install_en-US/linux-2.6-x86_64/buildroot/opt/libreoffice/*
${pkgdir}/usr/lib/libreoffice
+# chmod -R +w ${pkgdir}/usr/lib/libreoffice
+
+ # fix missing desktop integration
+ install -dm755 ${pkgdir}/usr/bin
+ cd ${pkgdir}/usr/bin
+ ln -vsf /usr/lib/libreoffice/program/soffice ./libreoffice
+ ln -vsf /usr/lib/libreoffice/program/soffice ./soffice
+ ln -vsf /usr/lib/libreoffice/program/sbase ./lobase
+ ln -vsf /usr/lib/libreoffice/program/scalc ./localc
+ ln -vsf /usr/lib/libreoffice/program/sdraw ./lodraw
+ ln -vsf /usr/lib/libreoffice/program/simpress ./loimpress
+ ln -vsf /usr/lib/libreoffice/program/smath ./lomath
+ ln -vsf /usr/lib/libreoffice/program/swriter ./lowriter
+ ln -vsf /usr/lib/libreoffice/program/unopkg ./unopkg
+
# move sysui desktop files into place we want to use - javafilter and
qstarter, but not unneeded printeradmin
- cp ${pkgdir}/usr/lib/libreoffice/share/xdg/javafilter.desktop
${pkgdir}/usr/share/applications/
- sed -i -e "s/Exec=oo/Exec=so/g"
${pkgdir}/usr/share/applications/javafilter.desktop #
https://bugs.archlinux.org/task/23361
- cp ${pkgdir}/usr/lib/libreoffice/share/xdg/qstart.desktop
${pkgdir}/usr/share/applications/
+# cp ${pkgdir}/usr/lib/libreoffice/share/xdg/javafilter.desktop
${pkgdir}/usr/share/applications/
+ cp ${pkgdir}/usr/lib/libreoffice/share/xdg/*.desktop
${pkgdir}/usr/share/applications/
+# sed -i -e "s/Exec=oo/Exec=so/g"
${pkgdir}/usr/share/applications/javafilter.desktop #
https://bugs.archlinux.org/task/23361
+# cp ${pkgdir}/usr/lib/libreoffice/share/xdg/qstart.desktop
${pkgdir}/usr/share/applications/
# remove version in menu entry and make it visible
- sed -i -e "s/3.3 Quickstarter/Quickstarter/g"
${pkgdir}/usr/share/applications/qstart.desktop
+ sed -i -e "s/3.4 Quickstarter/Quickstarter/g"
${pkgdir}/usr/share/applications/qstart.desktop
sed -i -e "/NoDisplay=true/d"
${pkgdir}/usr/share/applications/qstart.desktop
# remove unneeded .desktop files from vanilla sysui
rm -rf ${pkgdir}/usr/lib/libreoffice/share/xdg
@@ -392,11 +360,11 @@
# put configuration files into place
install -dm755 ${pkgdir}/etc/libreoffice
install -m644
${pkgdir}/usr/lib/libreoffice/program/{bootstraprc,sofficerc}
${pkgdir}/etc/libreoffice/
- install -m644
${pkgdir}/usr/lib/libreoffice/basis3.3/share/psprint/psprint.conf
${pkgdir}/etc/libreoffice/
+ install -m644
${pkgdir}/usr/lib/libreoffice/basis3.4/share/psprint/psprint.conf
${pkgdir}/etc/libreoffice/
# install dummy links to make them found by LibO
cd ${pkgdir}/usr/lib/libreoffice/program/
ln -vsf /etc/libreoffice/{bootstraprc,sofficerc} .
- cd ${pkgdir}/usr/lib/libreoffice/basis3.3/share/psprint/
+ cd ${pkgdir}/usr/lib/libreoffice/basis3.4/share/psprint/
ln -vsf /etc/libreoffice/psprint.conf .
#fix http://bugs.archlinux.org/task/17656
@@ -411,20 +379,23 @@
install -m644 ${srcdir}/extensions-install/package.txt
${pkgdir}/usr/lib/libreoffice/share/extensions/
# move SDK to separated package
- mkdir -p ${srcdir}/sdk-install/usr/lib/libreoffice/basis3.3/sdk
- mv ${pkgdir}/usr/lib/libreoffice/basis3.3/sdk
${srcdir}/sdk-install/usr/lib/libreoffice/basis3.3/
+ mkdir -p ${srcdir}/sdk-install/usr/lib/libreoffice/basis3.4/sdk
+ mv ${pkgdir}/usr/lib/libreoffice/basis3.4/sdk
${srcdir}/sdk-install/usr/lib/libreoffice/basis3.4/
- mkdir -p ${srcdir}/sdk-install/usr/share/doc/packages/libreoffice/sdk
- mv ${pkgdir}/usr/share/doc/packages/libreoffice/sdk
${srcdir}/sdk-install/usr/share/doc/packages/libreoffice/
+# mkdir -p ${srcdir}/sdk-install/usr/share/doc/packages/libreoffice/sdk
+# mv ${pkgdir}/usr/share/doc/packages/libreoffice/sdk
${srcdir}/sdk-install/usr/share/doc/packages/libreoffice/
+# mkdir -p ${srcdir}/sdk-install/usr/share/libreoffice/sdk
+# mv ${pkgdir}/usr/share/libreoffice/sdk
${srcdir}/sdk-install/usr/share/libreoffice/
- mkdir -p ${srcdir}/sdk-install/usr/share/libreoffice/sdk
- mv ${pkgdir}/usr/share/libreoffice/sdk
${srcdir}/sdk-install/usr/share/libreoffice/
+# mkdir -p ${srcdir}/sdk-install/usr/share/idl/libreoffice
+# mv ${pkgdir}/usr/share/idl/libreoffice
${srcdir}/sdk-install/usr/share/idl/
- mkdir -p ${srcdir}/sdk-install/usr/share/idl/libreoffice
- mv ${pkgdir}/usr/share/idl/libreoffice
${srcdir}/sdk-install/usr/share/idl/
+# mkdir -p ${srcdir}/sdk-install/usr/include/libreoffice
+# mv ${pkgdir}/usr/include/libreoffice ${srcdir}/sdk-install/usr/include/
- mkdir -p ${srcdir}/sdk-install/usr/include/libreoffice
- mv ${pkgdir}/usr/include/libreoffice ${srcdir}/sdk-install/usr/include/
+ # cleanup gid_Module files
+ mkdir ${srcdir}/splitlist
+ mv -f ${pkgdir}/gid_Module* ${srcdir}/splitlist/
}
package_libreoffice-sdk() {
@@ -435,10 +406,15 @@
cd ${srcdir}/sdk-install
cp -r * ${pkgdir}
- cd ${pkgdir}/usr/lib/libreoffice/basis3.3/sdk
- for file in setsdkenv_unix.csh setsdkenv_unix.sh ; do
- chmod 755 $file
- done
+# cd ${srcdir}/build
+# install -dm755 ${pkgdir}/usr/lib/libreoffice
+# mv
instsetoo_native/unxlngx6.pro/LibreOffice_SDK/native/install/LibO-SDK_3.4beta3_Linux_x86-64_install_en-US/linux-2.6-x86_64/buildroot/opt/libreoffice/*
${pkgdir}/usr/lib/libreoffice
+
+ cd ${pkgdir}/usr/lib/libreoffice/basis3.4/sdk
+# for file in setsdkenv_unix.csh setsdkenv_unix.sh ; do
+# chmod 755 $file
+# done
+ mv setsdkenv_unix setsdkenv_unix.sh && chmod 755 setsdkenv_unix.sh
#fix permissions
find examples -type f -exec chmod -x {} \;
}
@@ -451,7 +427,7 @@
groups=('libreoffice-extensions')
install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
- unzip ${srcdir}/solver/${_OFFICEUPD}/unxlng*/bin/NLPSolver.oxt -d
${pkgdir}/usr/lib/libreoffice/share/extensions/nlpsolver
+ unzip ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/NLPSolver.oxt -d
${pkgdir}/usr/lib/libreoffice/share/extensions/nlpsolver
}
package_libreoffice-extension-pdfimport() {
@@ -461,7 +437,7 @@
groups=('libreoffice-extensions')
install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
- unzip
${srcdir}/solver/${_OFFICEUPD}/unxlng*/bin/pdfimport/pdfimport.oxt -d
${pkgdir}/usr/lib/libreoffice/share/extensions/pdfimport
+ unzip
${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/pdfimport/pdfimport.oxt -d
${pkgdir}/usr/lib/libreoffice/share/extensions/pdfimport
}
package_libreoffice-extension-presentation-minimizer() {
@@ -471,7 +447,7 @@
groups=('libreoffice-extensions')
install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
- unzip
${srcdir}/solver/${_OFFICEUPD}/unxlng*/bin/presentation-minimizer.oxt -d
${pkgdir}/usr/lib/libreoffice/share/extensions/presentation-minimizer
+ unzip
${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/presentation-minimizer.oxt -d
${pkgdir}/usr/lib/libreoffice/share/extensions/presentation-minimizer
}
package_libreoffice-extension-presenter-screen() {
@@ -481,7 +457,7 @@
groups=('libreoffice-extensions')
install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
- unzip
${srcdir}/solver/${_OFFICEUPD}/unxlng*/bin/presenter/presenter-screen.oxt -d
${pkgdir}/usr/lib/libreoffice/share/extensions/presenter-screen
+ unzip
${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/presenter/presenter-screen.oxt
-d ${pkgdir}/usr/lib/libreoffice/share/extensions/presenter-screen
}
package_libreoffice-extension-report-builder() {
@@ -492,7 +468,7 @@
groups=('libreoffice-extensions')
install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
- unzip ${srcdir}/solver/${_OFFICEUPD}/unxlng*/bin/report-builder.oxt -d
${pkgdir}/usr/lib/libreoffice/share/extensions/report-builder
+ unzip
${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/report-builder.oxt -d
${pkgdir}/usr/lib/libreoffice/share/extensions/report-builder
}
package_libreoffice-extension-wiki-publisher() {
@@ -503,7 +479,7 @@
groups=('libreoffice-extensions')
install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
- unzip ${srcdir}/solver/${_OFFICEUPD}/unxlng*/bin/wiki-publisher.oxt -d
${pkgdir}/usr/lib/libreoffice/share/extensions/wiki-publisher
+ unzip
${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/wiki-publisher.oxt -d
${pkgdir}/usr/lib/libreoffice/share/extensions/wiki-publisher
}
package_libreoffice-extension-ct2n() {
@@ -514,71 +490,5 @@
groups=('libreoffice-extensions')
install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
- unzip
${srcdir}/solver/${_OFFICEUPD}/unxlng*/bin/ConvertTextToNumber.oxt -d
${pkgdir}/usr/lib/libreoffice/share/extensions/ct2n
+ unzip
${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/ConvertTextToNumber.oxt -d
${pkgdir}/usr/lib/libreoffice/share/extensions/ct2n
}
-
-package_libreoffice-extension-hunart() {
-
- pkgdesc="Hungarian cross-reference toolbar extension"
- #arch=('any')
- depends=('libreoffice')
- groups=('libreoffice-extensions')
-
- install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
- unzip ${srcdir}/solver/${_OFFICEUPD}/unxlng*/bin/hunart.oxt -d
${pkgdir}/usr/lib/libreoffice/share/extensions/hunart
-}
-
-package_libreoffice-extension-numbertext() {
-
- pkgdesc="NUMBERTEXT/MONEYTEXT extensions"
- #arch=('any')
- depends=('libreoffice')
- groups=('libreoffice-extensions')
-
- install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
- unzip ${srcdir}/solver/${_OFFICEUPD}/unxlng*/bin/numbertext.oxt -d
${pkgdir}/usr/lib/libreoffice/share/extensions/numbertext
-}
-
-package_libreoffice-extension-oooblogger() {
-
- pkgdesc="An extensions for blogging"
- #arch=('any')
- depends=('libreoffice')
- groups=('libreoffice-extensions')
-
- install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
- unzip ${srcdir}/solver/${_OFFICEUPD}/unxlng*/bin/oooblogger.oxt -d
${pkgdir}/usr/lib/libreoffice/share/extensions/oooblogger
-}
-
-package_libreoffice-extension-typo() {
-
- pkgdesc="Typography toolbar extension"
- #arch=('any')
- depends=('libreoffice')
- groups=('libreoffice-extensions')
-
- install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
- unzip ${srcdir}/solver/${_OFFICEUPD}/unxlng*/bin/typo.oxt -d
${pkgdir}/usr/lib/libreoffice/share/extensions/typo
-}
-
-package_libreoffice-extension-watch-window() {
-
- pkgdesc="A OOo Calc extension to add a Watch Window, which keeps the value of
the monitored cell on the screen."
- #arch=('any')
- depends=('libreoffice')
- groups=('libreoffice-extensions')
-
- install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
- unzip ${srcdir}/solver/${_OFFICEUPD}/unxlng*/bin/WatchWindow.oxt -d
${pkgdir}/usr/lib/libreoffice/share/extensions/watch-window
-}
-
-package_libreoffice-extension-diagram() {
-
- pkgdesc="An OOo Draw and Impress extension that creates your favorite
diagrams with a few clicks"
- #arch=('any')
- depends=('libreoffice')
- groups=('libreoffice-extensions')
-
- install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
- unzip ${srcdir}/solver/${_OFFICEUPD}/unxlng*/bin/Diagram.oxt -d
${pkgdir}/usr/lib/libreoffice/share/extensions/diagram
-}
Added: fix_destdir.diff
===================================================================
--- fix_destdir.diff (rev 0)
+++ fix_destdir.diff 2011-05-03 17:56:13 UTC (rev 122279)
@@ -0,0 +1,15 @@
+--- build/solenv/bin/ooinstall 2011-04-21 21:06:44.000000000 +0200
++++ build/solenv/bin/ooinstall 2011-05-03 16:59:30.501750167 +0200
+@@ -29,8 +29,10 @@
+ $help = 1;
+ } else {
+ # Cwd::realpath does not work if the path does not exist
+- mkpath($arg) unless -d $arg;
+- $path = Cwd::realpath( $arg );
++ mkpath($ENV{DESTDIR} . $arg) unless -d $ENV{DESTDIR} . $arg;
++ $path = Cwd::realpath( $ENV{DESTDIR} . $arg );
++ my $destdir = Cwd::realpath( $ENV{DESTDIR} );
++ $path =~ s|$destdir||;
+ }
+ }
+
Deleted: old-install-behaviour.diff
===================================================================
--- old-install-behaviour.diff 2011-05-03 17:48:14 UTC (rev 122278)
+++ old-install-behaviour.diff 2011-05-03 17:56:13 UTC (rev 122279)
@@ -1,125 +0,0 @@
-From c612724331a3d66d2ee488d91161a54f4d3576bd Mon Sep 17 00:00:00 2001
-From: Hanno Meyer-Thurow <[email protected]>
-Date: Wed, 20 Apr 2011 13:30:08 +0000
-Subject: make the installation dir better configurable
-
-install to %libdir% intead of %prefix% as it is usual for other projects;
-use the usual DESTDIR instead of OODESTDIR
-
-Note that the default installation path is /usr/local/lib/libreoffice;
-it can be redefined by --prefix, --libdir, --with-install-dirname
-configure options
-
-Some of these changes contributed by Petr Mladek <[email protected]>
----
-diff --git a/Makefile.in b/Makefile.in
-index 54e93cf..37c1389 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -8,6 +8,10 @@ else
- GBUILD_OPT:=--gmake
- endif
-
-+prefix = @prefix@
-+exec_prefix = @exec_prefix@
-+libdir = @libdir@
-+
- all: Makefile dmake/dmake@EXEEXT@ src.downloaded
-
- @. ./*[Ee]nv.[Ss]et.sh && \
-@@ -16,11 +20,11 @@ all: Makefile dmake/dmake@EXEEXT@ src.downloaded
-
- install:
- @. ./*[Ee]nv.[Ss]et.sh && \
-- echo "Installing in $${prefix:-@prefix@}..." && \
-- ooinstall "$${prefix:-@prefix@}" && \
-+ echo "Installing in $${libdir:-@libdir@}/@INSTALL_DIRNAME@..." && \
-+ ooinstall "$${libdir:-@libdir@}/@INSTALL_DIRNAME@" && \
- echo "" && \
- echo "Installation finished, you can now execute:" && \
-- echo "$${prefix:-@prefix@}/program/soffice"
-+ echo "$${libdir:-@libdir@}/@INSTALL_DIRNAME@/program/soffice"
-
- dev-install:
- @. ./*[Ee]nv.[Ss]et.sh && \
-diff --git a/configure.in b/configure.in
-index 18de3ff..8cbcd74 100755
---- a/configure.in
-+++ b/configure.in
-@@ -1207,6 +1207,20 @@ AC_ARG_WITH(vendor,
- ],
- ,)
-
-+AC_ARG_WITH(install-dirname,
-+ AS_HELP_STRING([--with-install-dirname],
-+ [Specify the directory name of the core LibO install dir. The final
-+ installation path is defined by <libdir>/<install-dirname>.
-+ The default value is "libreoffice" and the default installation
-+ patch is /usr/lib/libreoffice.
-+
-+ FIXME: It affects only the installation by "make install" and not the
-+ generated installation sets.])
-+ [
-+ Usage: --with-install-dirname=lo-3.4.2
-+ ],
-+,)
-+
- AC_ARG_WITH(unix-wrapper,
- AS_HELP_STRING([--with-unix-wrapper],
- [Redefines the name of the UNIX wrapper that will be used in the
desktop
-@@ -7817,6 +7831,14 @@ else
- fi
- AC_SUBST(UNIXWRAPPERNAME)
-
-+INSTALL_DIRNAME=libreoffice
-+AC_MSG_CHECKING([for install dirname])
-+if test -n "$with_install_dirname" -a "$with_install_dirname" != "no" -a
"$with_install_dirname" != "yes" ; then
-+ INSTALL_DIRNAME="$with_install_dirname"
-+fi
-+AC_MSG_RESULT([$INSTALL_DIRNAME])
-+AC_SUBST(INSTALL_DIRNAME)
-+
- AC_MSG_CHECKING([whether to statically link to Gtk])
- if test -n "$enable_static_gtk" && test "$enable_static_gtk" != "no"; then
- ENABLE_STATIC_GTK="TRUE"
-diff --git a/solenv/bin/ooinstall b/solenv/bin/ooinstall
-index 2a2d2ad..83717fa 100755
---- a/solenv/bin/ooinstall
-+++ b/solenv/bin/ooinstall
-@@ -67,9 +67,9 @@ my @larr = grep { $_ ne '' } split(/ /, $langs);
- $langs = join (",", @larr);
-
- $destdir='';
--if ( defined $ENV{OODESTDIR} &&
-- $ENV{OODESTDIR} ne "" ) {
-- $destdir = "-destdir \"$ENV{OODESTDIR}\"";
-+if ( defined $ENV{DESTDIR} &&
-+ $ENV{DESTDIR} ne "" ) {
-+ $destdir = "-destdir \"$ENV{DESTDIR}\"";
- }
-
- $strip='';
---
-cgit v0.8.3-6-g21f6
-From 6326baaba7534667c95c6cc8aac6287bb140580e Mon Sep 17 00:00:00 2001
-From: Petr Mladek <[email protected]>
-Date: Wed, 20 Apr 2011 14:42:09 +0000
-Subject: set default install dirname from AC_PACKAGE_NAME
-
-idea by Hanno Meyer-Thurow <[email protected]>
----
-diff --git a/configure.in b/configure.in
-index 8cbcd74..64f88ec 100755
---- a/configure.in
-+++ b/configure.in
-@@ -7831,7 +7831,7 @@ else
- fi
- AC_SUBST(UNIXWRAPPERNAME)
-
--INSTALL_DIRNAME=libreoffice
-+INSTALL_DIRNAME=`echo AC_PACKAGE_NAME | tr [[:upper:]] [[:lower:]]`
- AC_MSG_CHECKING([for install dirname])
- if test -n "$with_install_dirname" -a "$with_install_dirname" != "no" -a
"$with_install_dirname" != "yes" ; then
- INSTALL_DIRNAME="$with_install_dirname"
---
-cgit v0.8.3-6-g21f6
