Chakra_Linux/desktop
1
0
Fork 0
mirror of https://gitdl.cn/https://github.com/chakralinux/desktop.git synced 2025-02-03 06:37:16 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

LO: update to 4.2.4

Browse Source
This commit is contained in:
Bruce Liu 2014-05-30 06:32:09 +00:00
commit 08512c7efe
6 changed files with 5218 additions and 1666 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
amarok/PKGBUILD
View File

@ -3,34 +3,41 @@
pkgname=amarok
replaces=('amarok-base' 'amarok-engine-xine' 'amarok-base-mysqlfree')
pkgver=2.8.0
pkgrel=2
pkgrel=3
pkgdesc="A media player for KDE"
arch=('x86_64')
url="http://amarok.kde.org"
screenshot="http://amarok.kde.org/files/Amarok-2.6-InDulciJubilo-screenie4.png"
license=('GPL2' 'LGPL2' 'FDL')
license=('GPL2' 'LGPL2.1' 'FDL')
depends=('kde-runtime' 'mariadb' 'qtscriptgenerator' 'taglib-extras' 'liblastfm' 'ffmpeg' 'libofa'
'qjson' 'mesa' 'loudmouth')
makedepends=('pkgconfig' 'automoc4' 'cmake' 'libgpod' 'libmtp' 'docbook-xsl' 'libmygpo-qt' 'clamz')
'qjson' 'libbluray')
makedepends=('pkgconfig' 'automoc4' 'cmake' 'libgpod' 'libmtp' 'docbook-xsl' 'libmygpo-qt' 'mesa' 'clamz' 'loudmouth')
optdepends=("libgpod: support Apple iPod audio devices"
"libmtp: support for portable media devices"
"libmygpo-qt: support for gpodder.net"
"ifuse: support for Apple iPod Touch and iPhone"
"clamz: allow to download songs from Amazon.com")
"ifuse: support for Apple iPod Touch and iPhone"
"clamz: allow to download songs from Amazon.com"
"loudmouth: backend needed by mp3tunes for syncing")
categories=('multimedia')
install="${pkgname}.install"
source=("http://mirrors.mit.edu/kde/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
md5sums=('53cfcb4819668b10e13b061478c7b32a')
prepare(){
cd "${srcdir}/${pkgname}-${pkgver}"
if [[ -e build ]]; then rm -rf build; fi
mkdir build
}
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
mkdir build
cd build
cmake .. \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr \
-DKDE4_BUILD_TESTS=OFF
-DKDE4_BUILD_TESTS=OFF \
-DWITH_NepomukCore=OFF \
-DWITH_Soprano=OFF
make
}

34
kcm-pacman-repoeditor/PKGBUILD Normal file
View File

@ -0,0 +1,34 @@
#
# Apps Packages for Chakra, part of chakraos.org
#
# maintainer almack@chakraos.org
pkgname=kcm-pacman-repoeditor
pkgver=0.1.1
pkgdesc="A KDE control module for pacman's repositories management."
pkgrel=1
arch=('x86_64')
url="https://github.com/gcala/kcmpacmanrepoeditor"
license=('GPL3')
makedepends=('cmake' 'automoc4')
depends=('kdelibs')
categories=('system')
source=("$pkgname-$pkgver.tar.gz"::"https://github.com/gcala/$pkgname/archive/v$pkgver.tar.gz")
md5sums=('0798977441e7833e08d4ae3ab6e97d2b')
build(){
cd "${srcdir}/${pkgname}-${pkgver}"
mkdir -p build
cd build
cmake .. \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr
make
}
package(){
cd "${srcdir}/${pkgname}-${pkgver}/build"
make DESTDIR="${pkgdir}" install
}

1905
libreoffice-i18n/PKGBUILD
View File

File diff suppressed because it is too large Load Diff

160
libreoffice/PKGBUILD
View File

@ -15,11 +15,10 @@ pkgname=('libreoffice-common'
'libreoffice-writer'
'libreoffice-en-US'
'libreoffice-postgresql-connector'
'libreoffice-extension-presentation-minimizer'
'libreoffice-extension-wiki-publisher'
'libreoffice-extension-nlpsolver')
_LOver=4.1.6.2
pkgver=4.1.6
_LOver=4.2.4.2
pkgver=4.2.4
pkgrel=1
arch=('x86_64')
license=('LGPL3')
@ -34,17 +33,18 @@ makedepends=( # makedepends
"curl>=7.20.0" "hunspell>=1.2.8" 'python3' 'libwpd>=0.9.2' 'libwps' 'libxaw' "neon>=0.28.6"
'pango' 'nss' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' "icu>=4.6" 'libxslt'
'redland' 'graphite' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'libtextcat' 'librsvg' 'lcms2'
'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'translate-toolkit' 'xdg-utils' 'ttf-dejavu' 'libcups' 'libodfgen' 'libetonyek')
'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'translate-toolkit' 'xdg-utils' 'ttf-dejavu' 'libcups' 'libodfgen' 'libmwaw' 'libvisio'
'libetonyek' 'ttf-liberation')
_mirror="http://download.documentfoundation.org/libreoffice/src/${pkgver}"
#_mirror="http://dev-builds.libreoffice.org/pre-releases/src"
_additional_source_url="http://dev-www.libreoffice.org/src"
_additional_source_url2="http://dev-www.libreoffice.org/extern"
source=(${_mirror}/${pkgbase}{,-help,-translations}-${_LOver}.tar.xz
${_additional_source_url}/15cb8c0803064faef0c4ddf5bc5ca279-boost_1_54_0.tar.bz2
${_additional_source_url}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
${_additional_source_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
${_additional_source_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
${_additional_source_url}/2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz
${_additional_source_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
${_additional_source_url}/3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz
${_additional_source_url}/625ff5f2f968dd908bca43c9469d6e6b-commons-lang-2.4-src.tar.gz
@ -61,29 +61,33 @@ source=(${_mirror}/${pkgbase}{,-help,-translations}-${_LOver}.tar.xz
${_additional_source_url}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
${_additional_source_url}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
${_additional_source_url}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
${_additional_source_url}/08c85a6d6d793daee14e10e22eefdc4b-mdds_0.8.1.tar.bz2
${_additional_source_url}/dc3d21a3921931096d6e80f6701f6763-libexttextcat-3.4.0.tar.bz2
${_additional_source_url}/b2371dc7cf4811c9d32146eec913d296-libcmis-0.3.0.tar.gz
${_additional_source_url}/47203e7cade74e5c385aa812f21e7932-mdds_0.10.2.tar.bz2
${_additional_source_url}/ae330b9493bd4503ac390106ff6060d7-libexttextcat-3.4.3.tar.bz2
${_additional_source_url}/22f8a85daf4a012180322e1f52a7563b-libcmis-0.4.1.tar.gz
${_additional_source_url}/ea2acaf140ae40a87a952caa75184f4d-liborcus-0.5.1.tar.bz2
${_additional_source_url}/36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.1.tar.bz2
${_additional_source_url}/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
${_additional_source_url}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll
${_additional_source_url}/libcdr-0.0.14.tar.bz2
${_additional_source_url}/libcdr-0.0.15.tar.bz2
${_additional_source_url}/libmspub-0.0.6.tar.bz2
${_additional_source_url}/libmwaw-0.1.11.tar.bz2
${_additional_source_url}/libvisio-0.0.31.tar.bz2
${_additional_source_url}/libmwaw-0.2.0.tar.bz2
${_additional_source_url}/libfreehand-0.0.0.tar.bz2
${_additional_source_url}/Firebird-2.5.2.26540-0.tar.bz2
${_additional_source_url}/libatomic_ops-7_2d.zip
${_additional_source_url}/libe-book-0.0.3.tar.bz2
${_additional_source_url}/libabw-0.0.2.tar.bz2
${_additional_source_url}/language-subtag-registry-2014-03-27.tar.bz2
make-pyuno-work-with-system-wide-module-install.diff
kde4_cell_freeze.patch
dragndrop_Freeze.patch)
prevent_KDE_Qt_from_interfering_with_the_session_manager.diff)
md5sums=('899137bd1ae0ff5e79d769fb326c24f0'
'2d02d0e86edf64579e5f2d44912fd3be'
'152866fe2b875746112ea264125979ad'
md5sums=('698a482f0cacd8b5eba9865fdd8a5403'
'a0ed88ac1758d2f87687fcf4bb7c9432'
'3db05930dc7c694d2cf58875b3245c2e'
'15cb8c0803064faef0c4ddf5bc5ca279'
'1f24ab1d39f4a51faf22244c94a6203f'
'35c94d2df8893241173de1d16b6034c0'
'798b2ffdc8bcfe7bca2cf92b62caf685'
'2a177023f9ea8ec8bd00837605c5df1b'
'a7983f859eafb2677d7ff386a023bc40'
'3c219630e4302863a9a83d0efde889db'
'625ff5f2f968dd908bca43c9469d6e6b'
@ -100,27 +104,35 @@ md5sums=('899137bd1ae0ff5e79d769fb326c24f0'
'ace6ab49184e329db254e454a010f56d'
'db60e4fde8dd6d6807523deb71ee34dc'
'ba2930200c9f019c2d93a8c88c651a0f'
'08c85a6d6d793daee14e10e22eefdc4b'
'dc3d21a3921931096d6e80f6701f6763'
'b2371dc7cf4811c9d32146eec913d296'
'47203e7cade74e5c385aa812f21e7932'
'ae330b9493bd4503ac390106ff6060d7'
'22f8a85daf4a012180322e1f52a7563b'
'ea2acaf140ae40a87a952caa75184f4d'
'36271d3fa0d9dec1632029b6d7aac925'
'0168229624cfac409e766913506961a8'
'17410483b5b5f267aa18b7e00b65e6e0'
'185d60944ea767075d27247c3162b3bc'
'd88f9b94df880d2c05be943b000ca112'
'fbcd8619fc6646f41d527c1329102998'
'1120705cd0f0d9bd5506360bf57b6c2e'
'828dd03510791fbe037081a2b4a1a8ff'
'82628333418f101a20cd21f980cf9f40'
'd794625f156a9fb1c53b3f8a8aa13b5e'
'496dd00028afcc19f896b01394769043'
'21154d2004e025c8a3666625b0357bb5'
'c0b86562d5aa40761a87134f83e6adcf'
'2f1ceaf2ac8752ed278e175447d9b978'
'40fa48e03b1e28ae0325cc34b35bc46d'
'504af523f5d1a5590bbeb6a4b55e8a97'
'07d2bf5ad839a394cca008b3ec6e7bb1'
'0242690873685e91769bc770fa2c8aa5'
'815f2e2265bd35803d48d25ee1deb531')
'fa2109339289663cb8ea7cf27cc22f4e')
noextract=(
1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
15cb8c0803064faef0c4ddf5bc5ca279-boost_1_54_0.tar.bz2
185d60944ea767075d27247c3162b3bc-unowinreg.dll
47203e7cade74e5c385aa812f21e7932-mdds_0.10.2.tar.bz2
798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz
1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
ae330b9493bd4503ac390106ff6060d7-libexttextcat-3.4.3.tar.bz2
22f8a85daf4a012180322e1f52a7563b-libcmis-0.4.1.tar.gz
35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz
625ff5f2f968dd908bca43c9469d6e6b-commons-lang-2.4-src.tar.gz
@ -137,18 +149,19 @@ noextract=(
ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
08c85a6d6d793daee14e10e22eefdc4b-mdds_0.8.1.tar.bz2
dc3d21a3921931096d6e80f6701f6763-libexttextcat-3.4.0.tar.bz2
b2371dc7cf4811c9d32146eec913d296-libcmis-0.3.0.tar.gz
ea2acaf140ae40a87a952caa75184f4d-liborcus-0.5.1.tar.bz2
36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.1.tar.bz2
0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
185d60944ea767075d27247c3162b3bc-unowinreg.dll
libcdr-0.0.14.tar.bz2
libcdr-0.0.15.tar.bz2
libmspub-0.0.6.tar.bz2
libmwaw-0.1.11.tar.bz2
libvisio-0.0.31.tar.bz2)
libmwaw-0.2.0.tar.bz2
libfreehand-0.0.0.tar.bz2
Firebird-2.5.2.26540-0.tar.bz2
libatomic_ops-7_2d.zip
libe-book-0.0.3.tar.bz2
libabw-0.0.2.tar.bz2
language-subtag-registry-2014-03-27.tar.bz2)
prepare() {
@ -159,20 +172,23 @@ prepare() {
unset CPPFLAGS
# move external sources into place
mkdir ${srcdir}/ext_sources && pushd ${srcdir}/ext_sources
mkdir -p ${srcdir}/ext_sources && pushd ${srcdir}/ext_sources
for source in "${noextract[@]}"; do
ln -s ${srcdir}/$source .
ln -sf ${srcdir}/$source .
done
popd
# unowinreg.dll must be a file not a symlink or the result will become a broken symlink
# /usr/share/libreoffice/sdk/classes/win/unowinreg.dll -> /build/libreoffice/src/185d60944ea767075d27247c3162b3bc-unowinreg.dll
rm ${srcdir}/ext_sources/185d60944ea767075d27247c3162b3bc-unowinreg.dll
cp -f ${srcdir}/185d60944ea767075d27247c3162b3bc-unowinreg.dll ${srcdir}/ext_sources
# fix not upstreamable pyuno paths - patch taken from Debian
patch -Np1 -i ${srcdir}/make-pyuno-work-with-system-wide-module-install.diff
# first try to fix Libreoffice calc hangs when drag&dropping cell(s) in KDE4 (https://bugs.freedesktop.org/show_bug.cgi?id=67011)
# remove with libreoffice version 4.2.x
patch -Np1 -i ${srcdir}/kde4_cell_freeze.patch
patch -Np1 -i ${srcdir}/dragndrop_Freeze.patch
# fix some startup issues with kde4 integration
# https://bugs.archlinux.org/task/39819 - https://bugs.freedesktop.org/show_bug.cgi?id=77128
patch -Np1 -i ${srcdir}/prevent_KDE_Qt_from_interfering_with_the_session_manager.diff
#use the CFLAGS but remove the LibO overridden ones
for i in $CFLAGS; do
@ -195,12 +211,14 @@ build() {
--with-parallelism=${MAKEFLAGS/-j/} \
--with-external-tar="${srcdir}/ext_sources" \
--disable-fetch-external \
--disable-verbose \
--enable-release-build \
--prefix=/usr --exec-prefix=/usr --sysconfdir=/etc \
--libdir=/usr/lib --mandir=/usr/share/man \
--with-lang="" \
--disable-verbose \
--enable-cairo-canvas \
--enable-crashdump \
--enable-avahi \
--enable-dbus \
--disable-evolution2 \
--enable-graphite\
@ -213,7 +231,9 @@ build() {
--enable-gstreamer \
--enable-lockdown\
--enable-mergelibs \
--enable-opencl \
--enable-opengl \
--enable-openssl \
--enable-odk \
--enable-python=system \
--enable-scripting-beanshell \
@ -227,7 +247,6 @@ build() {
--without-system-libcdr \
--without-system-jfreereport \
--without-system-apache-commons \
--without-system-libmwaw \
--without-system-mdds \
--without-myspell-dicts \
--with-system-libvisio \
@ -237,6 +256,12 @@ build() {
--without-system-orcus \
--without-system-liblangtag \
--without-system-npapi-headers \
--with-system-libetonyek \
--without-system-libfreehand \
--without-system-firebird \
--without-system-libatomic-ops \
--without-system-libebook \
--without-system-libabw \
--with-system-dicts \
--with-external-dict-dir=/usr/share/hunspell \
--with-external-hyph-dir=/usr/share/hyphen \
@ -246,6 +271,7 @@ build() {
--with-system-graphite \
--with-system-libwpg \
--with-system-libwps \
--with-system-libodfgen \
--with-system-redland \
--with-ant-home="/usr/share/java/apache-ant"\
--with-system-boost \
@ -255,8 +281,7 @@ build() {
--with-system-headers \
--without-system-hsqldb \
--with-alloc=system\
--with-system-clucene\
--without-system-servlet-api
--with-system-clucene
touch src.downloaded
#./download
@ -272,7 +297,8 @@ package_libreoffice-common() {
install=${pkgbase}.install
depends=('libreoffice-langpack' "hunspell" "python3" "neon"
'nspr' "icu" 'libsm' 'redland' 'hyphen' 'graphite' 'lcms2' 'poppler'
'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'xdg-utils' 'clucene' 'libodfgen' 'lpsolve' 'libmythes' )
'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'xdg-utils' 'clucene' 'libodfgen' 'libmwaw'
'lpsolve' 'libmythes')
#'saxon'
optdepends=('libreoffice-langpack: additional language support'
'java-runtime: adds java support'
@ -307,13 +333,15 @@ replaces=('libreoffice'
'libreoffice-extension-pdfimport'
'libreoffice-extension-presenter-screen'
'libreoffice-extensions-report-builder'
'libreoffice-extension-presentation-minimizer'
)
provides=('libreoffice-extension-pdfimport'
'libreoffice-extension-presenter-screen'
'libreoffice-scripting-beanshell'
'libreoffice-scripting-javascript'
'libreoffice-extensions-report-builder'
'libreoffice-extension-scripting-python')
'libreoffice-extension-scripting-python'
'libreoffice-extension-presentation-minimizer')
# create directories from *list.txt file
for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/common_list.txt`; do
@ -351,9 +379,19 @@ provides=('libreoffice-extension-pdfimport'
# workaround all packages now depend on that file
cp ${srcdir}/fakeinstall/usr/lib/libreoffice/share/registry/writer.xcd ${pkgdir}/usr/lib/libreoffice/share/registry/writer.xcd
# move dicts to en-US langpack to avoid file conflicts with en-GBen-ZA packages
mv ${pkgdir}/usr/lib/libreoffice/share/wordbook/en-GB.dic ${srcdir}/
mv ${pkgdir}/usr/lib/libreoffice/share/wordbook/en-US.dic ${srcdir}/
# add missing files from Beanshell provider
# create directories from *list.txt file
for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/orig/gid_Module_Optional_Extensions_Script_Provider_For_BS`; do
install -dm755 ${pkgdir}/${directory/\%dir/}
done
# install files into the pkg from fakeinstall dir
for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/orig/gid_Module_Optional_Extensions_Script_Provider_For_BS`; do
dirname=`dirname $file`
# check if directory has been already been created - some are missing like manpages
[ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
# mv file from fakeinstall to pkgdir
mv ${srcdir}/fakeinstall${file} ${pkgdir}$file || /bin/true # some double file entries make it fail
done
}
package_libreoffice-base() {
@ -449,7 +487,7 @@ package_libreoffice-draw() {
package_libreoffice-impress() {
pkgdesc="Presentation Application for LibreOffice."
depends=('libreoffice-common' 'libreoffice-kde4' 'libetonyek')
depends=('libreoffice-common' 'libreoffice-kde4')
optdepends=('mesa: for the OGLTrans extension')
backup=()
groups=('libreoffice')
@ -578,8 +616,8 @@ package_libreoffice-writer() {
mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
done
# workaround all packages now depend on that file
rm ${pkgdir}/usr/lib/libreoffice/share/registry/writer.xcd
# workaround this file belongs now to common
rm -vf ${pkgdir}/usr/lib/libreoffice/share/registry/writer.xcd
}
package_libreoffice-en-US() {
@ -601,16 +639,6 @@ package_libreoffice-en-US() {
done
}
package_libreoffice-extension-presentation-minimizer() {
pkgdesc="This extension reduce the file size of the current presentation"
depends=('libreoffice-common' 'libreoffice-kde4' 'gcc-libs')
groups=('libreoffice-extensions')
install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
unzip -q ${srcdir}/libreoffice-$_LOver/solver/unxlng*/bin/presentation-minimizer.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/presentation-minimizer
}
package_libreoffice-extension-wiki-publisher() {
pkgdesc="This extension enables you to create Wiki articles on MediaWiki servers without having to know the syntax of the MediaWiki markup language"
@ -619,7 +647,7 @@ package_libreoffice-extension-wiki-publisher() {
groups=('libreoffice-extensions')
install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
unzip -q ${srcdir}/libreoffice-$_LOver/solver/unxlng*/bin/wiki-publisher.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/wiki-publisher
unzip -q ${srcdir}/libreoffice-$_LOver/workdir/Extension/wiki-publisher.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/wiki-publisher
}
package_libreoffice-extension-nlpsolver() {
@ -630,5 +658,5 @@ package_libreoffice-extension-nlpsolver() {
groups=('libreoffice-extensions')
install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
unzip -q ${srcdir}/libreoffice-$_LOver/solver/unxlng*/bin/nlpsolver.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/nlpsolver
unzip -q ${srcdir}/libreoffice-$_LOver/workdir/Extension/nlpsolver.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/nlpsolver
}

4690
libreoffice/log.txt Normal file
View File

File diff suppressed because one or more lines are too long

72
libreoffice/prevent_KDE_Qt_from_interfering_with_the_session_manager.diff Normal file
View File

@ -0,0 +1,72 @@
From 01d128557726134b5da9e9b951e60286eac311a8 Mon Sep 17 00:00:00 2001
From: Luboš Luňák <l.lunak@collabora.com>
Date: Tue, 25 Mar 2014 12:20:16 +0100
Subject: [PATCH] prevent KDE/Qt from interfering with the session manager
I occassionally get lockups in IceProcessMessages() called from QtCore,
I'm actually not exactly sure why, as theoretically two connections
from one app shouldn't be a problem, but since LO does its own
session handling, there's no need to the KDE/Qt code to be involved,
so prevent it from connecting to the session manager altogether.
Change-Id: Iebe20d4cb5403e5fea8bd5d8c1f69b62d1c2907b
(cherry picked from commit 71f2aff7a56cef4e133abad3c2e447c76c5ee1fe)
---
diff --git a/vcl/unx/kde4/KDEXLib.cxx b/vcl/unx/kde4/KDEXLib.cxx
index 820d39a..e4900a7 100644
--- a/vcl/unx/kde4/KDEXLib.cxx
+++ b/vcl/unx/kde4/KDEXLib.cxx
@@ -166,8 +166,23 @@
KCmdLineArgs::init( m_nFakeCmdLineArgs, m_pAppCmdLineArgs, kAboutData );
+ // LO does its own session management, so prevent KDE/Qt from interfering
+ // (QApplication::disableSessionManagement(false) wouldn't quite do,
+ // since that still actually connects to the session manager, it just
+ // won't save the application data on session shutdown).
+ char* session_manager = NULL;
+ if( getenv( "SESSION_MANAGER" ) != NULL )
+ {
+ session_manager = strdup( getenv( "SESSION_MANAGER" ));
+ unsetenv( "SESSION_MANAGER" );
+ }
m_pApplication = new VCLKDEApplication();
- kapp->disableSessionManagement();
+ if( session_manager != NULL )
+ {
+ setenv( "SESSION_MANAGER", session_manager, 1 );
+ free( session_manager );
+ }
+
KApplication::setQuitOnLastWindowClosed(false);
#if KDE_HAVE_GLIB
diff --git a/vcl/unx/kde4/VCLKDEApplication.hxx b/vcl/unx/kde4/VCLKDEApplication.hxx
index 412ee34..4ce0b2c 100644
--- a/vcl/unx/kde4/VCLKDEApplication.hxx
+++ b/vcl/unx/kde4/VCLKDEApplication.hxx
@@ -21,22 +21,14 @@
#define Region QtXRegion
-#include <QSessionManager>
-
#include <kapplication.h>
#undef Region
-/* #i59042# override KApplications method for session management
- * since it will interfere badly with our own.
- */
class VCLKDEApplication : public KApplication
{
public:
VCLKDEApplication();
-
- virtual void commitData(QSessionManager&) {};
-
virtual bool x11EventFilter(XEvent* event);
};