Date: Saturday, April 18, 2015 @ 13:37:26
Author: andyrtr
Revision: 237401
use system coin-or-mp; FS#44078
Modified:
libreoffice-fresh/trunk/PKGBUILD
----------+
PKGBUILD | 20 ++++----------------
1 file changed, 4 insertions(+), 16 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2015-04-18 11:33:40 UTC (rev 237400)
+++ PKGBUILD 2015-04-18 11:37:26 UTC (rev 237401)
@@ -20,8 +20,8 @@
'gperf' 'kdelibs' 'gtk3' 'cppunit' 'beanshell2' 'vigra' 'clucene'
'junit' 'libmythes' 'libwpg' 'mesa' 'java-environment'
'postgresql-libs'
'bluez-libs' 'harfbuzz-icu' 'gdb' 'doxygen' 'libatomic_ops' 'mdds'
'glew'
- 'apr' 'serf' 'chrpath' 'ttf-liberation' 'glm' 'libxinerama'
'libpagemaker'
- 'libabw' 'libmwaw' 'libe-book')
+ 'apr' 'serf' 'ttf-liberation' 'glm' 'libxinerama' 'libpagemaker'
+ 'libabw' 'libmwaw' 'libe-book' 'coin-or-mp')
_mirror="http://download.documentfoundation.org/libreoffice/src/${pkgver}";
#_mirror="http://dev-builds.libreoffice.org/pre-releases/src";
@@ -50,7 +50,6 @@
${_additional_source_url}/7681383be6ce489d84c1c74f4e7f9643-liborcus-0.7.0.tar.bz2
${_additional_source_url}/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
${_additional_source_url}/language-subtag-registry-2014-12-03.tar.bz2
- ${_additional_source_url}/CoinMP-1.7.6.tgz
${_additional_source_url}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2
${_additional_source_url}/OpenCOLLADA-master-6509aa13af.tar.bz2
${_additional_source_url}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
@@ -86,7 +85,6 @@
7681383be6ce489d84c1c74f4e7f9643-liborcus-0.7.0.tar.bz2
0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
language-subtag-registry-2014-12-03.tar.bz2
- CoinMP-1.7.6.tgz
4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2
OpenCOLLADA-master-6509aa13af.tar.bz2
17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
@@ -126,7 +124,6 @@
'7681383be6ce489d84c1c74f4e7f9643'
'0168229624cfac409e766913506961a8'
'0f2677ec23bb43ddc7355d1b4cc8ed45'
- '1cce53bf4b40ae29790d2c5c9f8b1129'
'4b87018f7fff1d054939d19920b751a0'
'4ca8a6ef0afeefc864e9ef21b9f14bd6'
'17410483b5b5f267aa18b7e00b65e6e0'
@@ -238,7 +235,7 @@
--with-system-libatomic-ops \
--with-system-libebook \
--with-system-libabw \
- --without-system-coinmp \
+ --with-system-coinmp \
--without-system-libgltf \
--with-system-dicts \
--with-external-dict-dir=/usr/share/hunspell \
@@ -314,7 +311,7 @@
'lcms2' 'poppler>=0.24.0' 'libvisio' 'libetonyek' 'libodfgen'
'libcdr'
'libmspub' 'harfbuzz-icu' 'glew' 'nss' 'clucene'
'hicolor-icon-theme'
'desktop-file-utils' 'shared-mime-info' 'xdg-utils' 'glu'
'libpagemaker'
- 'gst-plugins-base-libs' 'libxinerama' 'libabw' 'libmwaw'
'libe-book')
+ 'gst-plugins-base-libs' 'libxinerama' 'libabw' 'libmwaw'
'libe-book' 'coin-or-mp')
optdepends=('java-runtime: adds java support'
'java-environment: required by extension-wiki-publisher and
extension-nlpsolver'
'pstoedit: translates PostScript and PDF graphics into
other vector formats'
@@ -378,13 +375,4 @@
# add application descriptions
install -v -m644
${srcdir}/libreoffice-$_LOver/sysui/desktop/appstream-appdata/*.xml \
${pkgdir}/usr/share/appdata
-
- # fix insecure rpath
- chrpath -d ${pkgdir}/usr/lib/libreoffice/program/libCbc.so.3
- chrpath -d ${pkgdir}/usr/lib/libreoffice/program/libOsi.so.1
- chrpath -d ${pkgdir}/usr/lib/libreoffice/program/libCoinMP.so.1
- chrpath -d ${pkgdir}/usr/lib/libreoffice/program/libCbcSolver.so.3
- chrpath -d ${pkgdir}/usr/lib/libreoffice/program/libOsiClp.so.1
- chrpath -d ${pkgdir}/usr/lib/libreoffice/program/libCgl.so.1
- chrpath -d ${pkgdir}/usr/lib/libreoffice/program/libClp.so.1
}
