[arch-commits] Commit in libreoffice/trunk (4 files)
Date: Saturday, April 6, 2013 @ 20:06:25
Author: andyrtr
Revision: 182083
upgpkg: libreoffice 4.0.2-2
make pyuno finally work; fixes FS#27257
Modified:
libreoffice/trunk/PKGBUILD
libreoffice/trunk/libreoffice-common.csh
libreoffice/trunk/libreoffice-common.sh
libreoffice/trunk/make-pyuno-work-with-system-wide-module-install.diff
--+
PKGBUILD | 19 ++---
libreoffice-common.csh |2 -
libreoffice-common.sh|2 -
make-pyuno-work-with-system-wide-module-install.diff |8 +++
4 files changed, 16 insertions(+), 15 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-04-06 16:03:11 UTC (rev 182082)
+++ PKGBUILD2013-04-06 18:06:25 UTC (rev 182083)
@@ -21,7 +21,7 @@
'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with
all extensions built)
_LOver=4.0.2.2
pkgver=4.0.2
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
license=('LGPL3')
url=http://www.libreoffice.org/;
@@ -152,9 +152,9 @@
'107a3d18f637b342684b3c21eb0fcd7d'
'881c4628ec5f54d47f35d5d19e335662'
'92bde158f249b9b27f76f48cc65a0242'
- '97bf43dda273d79ff90c848ab53b0e3c'
- 'abcb1b0a7deaffe13ab3d7ca70becb49'
- '72790a4103da259a55cadd66db931d00'
+ '07d2bf5ad839a394cca008b3ec6e7bb1'
+ '4195735a80876ae812fca5736b50192a'
+ 'e7e4b3e70e99e5cba8f8dfcacf3b0d87'
'941aab11a42c8052cc1999434ae82bcd'
'caf426e9eefb99108adba6cf231de348'
'c367454b402720eea064280d0dfb291b'
@@ -190,7 +190,7 @@
popd
# fix not upstreamable pyuno paths - patch taken from Debian
-#patch -Np1 -i
${srcdir}/make-pyuno-work-with-system-wide-module-install.diff
+patch -Np1 -i
${srcdir}/make-pyuno-work-with-system-wide-module-install.diff
#use the CFLAGS but remove the LibO overridden ones
for i in $CFLAGS; do
@@ -300,7 +300,7 @@
install=libreoffice-common.install
depends=('libreoffice-langpack' hunspell=1.2.8 python=3.3
neon=0.28.6 'dbus-glib'
'nss' 'libsm' 'redland' 'hyphen' 'graphite' icu=51.1 'clucene'
'lcms2' poppler=0.22.2
- 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info'
'xdg-utils') # 'orbit2')
+ 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info'
'xdg-utils')
optdepends=('libreoffice-langpack: additional language support'
'java-runtime: adds java support'
'libcups: adds printing support'
@@ -347,7 +347,7 @@
cd ${pkgdir}/usr/lib/libreoffice/share/psprint/
ln -vsf /etc/libreoffice/psprint.conf .
- # set VLC and if needed python-uno PYTHON path
+ # allow to preset desired VLC
install -dm755 ${pkgdir}/etc/profile.d
install -m755 ${srcdir}/libreoffice-common.{sh,csh} ${pkgdir}/etc/profile.d/
@@ -361,6 +361,11 @@
rm -f ${pkgdir}/usr/lib/libreoffice/program/classes/js.jar
rm -f
${pkgdir}/usr/lib/libreoffice/program/services/scriptproviderforjavascript.rdb
+ # make pyuno find its modules
+ install -dm755 ${pkgdir}/usr/lib/python3.3/site-packages
+ ln -svf /usr/lib/libreoffice/program/uno.py
${pkgdir}/usr/lib/python3.3/site-packages/uno.py
+ ln -svf /usr/lib/libreoffice/program/unohelper.py
${pkgdir}/usr/lib/python3.3/site-packages/unohelper.py
+
# 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
}
Modified: libreoffice-common.csh
===
--- libreoffice-common.csh 2013-04-06 16:03:11 UTC (rev 182082)
+++ libreoffice-common.csh 2013-04-06 18:06:25 UTC (rev 182083)
@@ -1,5 +1,3 @@
-#setenv PYTHONPATH ${PYTHONPATH}:/usr/lib/libreoffice/program
-
# to force a certain look'n feel
#setenv SAL_USE_VCLPLUGIN gen
Modified: libreoffice-common.sh
===
--- libreoffice-common.sh 2013-04-06 16:03:11 UTC (rev 182082)
+++ libreoffice-common.sh 2013-04-06 18:06:25 UTC (rev 182083)
@@ -1,5 +1,3 @@
-#export PYTHONPATH=$PYTHONPATH:/usr/lib/libreoffice/program
-
# to force a certain look'n feel
#export SAL_USE_VCLPLUGIN=gen
Modified: make-pyuno-work-with-system-wide-module-install.diff
===
--- make-pyuno-work-with-system-wide-module-install.diff2013-04-06
16:03:11 UTC (rev 182082)
+++ make-pyuno-work-with-system-wide-module-install.diff2013-04-06
18:06:25 UTC (rev 182083)
@@ -17,9 +17,9 @@
--- a/pyuno/source/module/uno.py
+++ b/pyuno/source/module/uno.py
@@ -26,8 +26,12 @@
- # for a copy of the LGPLv3 License.
+ # except in compliance with the License. You may obtain a copy of
+ #
[arch-commits] Commit in libreoffice/trunk (4 files)
Date: Tuesday, September 11, 2012 @ 13:49:28 Author: andyrtr Revision: 166565 prepare next release Modified: libreoffice/trunk/PKGBUILD Deleted: libreoffice/trunk/buildfix_icu49.diff libreoffice/trunk/fix_broken_hebrew_wordwrapping.diff libreoffice/trunk/git_fixes.diff -+ PKGBUILD| 23 - buildfix_icu49.diff | 42 - fix_broken_hebrew_wordwrapping.diff | 360 git_fixes.diff | 743 -- 4 files changed, 10 insertions(+), 1158 deletions(-) The diff is longer than the limit of 200KB. Use svn diff -r 166564:166565 to see the changes.
[arch-commits] Commit in libreoffice/trunk (4 files)
Date: Monday, September 3, 2012 @ 16:31:11
Author: andyrtr
Revision: 165917
upgpkg: libreoffice 3.6.1-4
add some post release upstream git commits to solve starting issues when no
extensions are installed and langpacks are used - FS#31360; add some vcl
presettings to the profile files
Added:
libreoffice/trunk/git_fixes.diff
Modified:
libreoffice/trunk/PKGBUILD
libreoffice/trunk/libreoffice-common.csh
libreoffice/trunk/libreoffice-common.sh
+
PKGBUILD | 15
git_fixes.diff | 743 +++
libreoffice-common.csh |7
libreoffice-common.sh |7
4 files changed, 766 insertions(+), 6 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-09-03 20:30:41 UTC (rev 165916)
+++ PKGBUILD2012-09-03 20:31:11 UTC (rev 165917)
@@ -26,7 +26,7 @@
'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with
all extensions built
_LOver=3.6.1.2
pkgver=3.6.1
-pkgrel=3
+pkgrel=4
arch=('i686' 'x86_64')
license=('LGPL3')
url=http://www.libreoffice.org/;
@@ -82,6 +82,7 @@
${_additional_source_url}/ce5a1def34578b75959ac31210f031f6-libcdr-0.0.8.tar.bz2
${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll
buildfix.diff
+ git_fixes.diff
libreoffice-common.sh libreoffice-common.csh)
noextract=(94e7f271e38c976462558b4278590178-libvisio-0.0.19.tar.bz2
18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
@@ -147,8 +148,9 @@
'ce5a1def34578b75959ac31210f031f6'
'185d60944ea767075d27247c3162b3bc'
'234e91ac65945ce1ab1e3839780e90f7'
- 'f0e72d0e1bc93a50a3aa9d31350b156c'
- '867c682b45f477f916786e00c45d7ab7')
+ '2445aca137bdbf0cf7526e91f768a1d0'
+ 'abcb1b0a7deaffe13ab3d7ca70becb49'
+ '72790a4103da259a55cadd66db931d00')
build() {
@@ -170,6 +172,7 @@
# buildfixes bugfixes
patch -Np1 -i ${srcdir}/buildfix.diff
+patch -Np1 -i ${srcdir}/git_fixes.diff
#use the CFLAGS but remove the LibO overridden ones
for i in $CFLAGS; do
@@ -383,12 +386,12 @@
# for directory in `grep ^%dir
${srcdir}/libreoffice-core-$_LOver/file-lists/postgresql_list.txt`; do
# install -dm755 ${pkgdir}/${directory/\%dir/}
# done
-# # install files into the pkg from fakeinstall dir
+ # install files into the pkg from fakeinstall dir
# for file in `grep -v ^%dir
$srcdir/libreoffice-core-$_LOver/file-lists/postgresql_list.txt`; do
# dirname=`dirname $file`
-# # check if directory has been already been created - some are missing like
manpages
+ # 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 file from fakeinstall to pkgdir
# mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
# done
}
Added: git_fixes.diff
===
--- git_fixes.diff (rev 0)
+++ git_fixes.diff 2012-09-03 20:31:11 UTC (rev 165917)
@@ -0,0 +1,743 @@
+From 427529801dee122250e44d2311b34651db92bbdb Mon Sep 17 00:00:00 2001
+From: Stephan Bergmann sberg...@redhat.com
+Date: Tue, 21 Aug 2012 16:55:11 +
+Subject: Typo
+
+Change-Id: I41fd1463b6432818ee36e7f90e920a5fd98c7106
+(cherry picked from commit 1316cfe8a72f7c7bc2f5ad7644a2d4c54b77fc8b)
+
+Signed-off-by: Eike Rathke er...@redhat.com
+---
+diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
+index d929787..55ebaca 100644
+--- a/desktop/source/app/app.cxx
b/desktop/source/app/app.cxx
+@@ -194,7 +194,7 @@ void removeTree(OUString const url) {
+ osl::FileBase::RC rc = osl::Directory::remove(url);
+ SAL_WARN_IF(
+ rc != osl::FileBase::E_None, desktop,
+-cannot remove directory url : +rc);
++cannot remove directory url : +rc);
+ // at least on Windows XP removing some existing directories fails
with
+ // osl::FileBase::E_ACCESS because they are read-only; but keeping
those
+ // directories around should be harmless once they are empty
+--
+cgit v0.9.0.2-2-gbebe
+From b4f8acb41165a28b2db47acd3c6b624a4c507c54 Mon Sep 17 00:00:00 2001
+From: Stephan Bergmann sberg...@redhat.com
+Date: Fri, 24 Aug 2012 14:06:15 +
+Subject: Fix removeRdbFiles (caused extension update to fail)
+
+removeRdbFiles suffered from a confusion that ImplementationInfo.uri denotes
the
+corresponding component (.so, .jar, etc.), but not the .rdb file. So removing
+an .rdb file silently failed to remove the corresponding implementations, so
re-
+installing a similar enough .rdb (as typically happens during extension update)
+would fail due to duplicate implementation names.
+
+Change-Id: I25d4ff72656c99a3af509eef09e89c18cfd0aabe
+Reviewed-on:
[arch-commits] Commit in libreoffice/trunk (4 files)
Date: Friday, April 22, 2011 @ 08:06:05
Author: andyrtr
Revision: 120345
prepare 3.4 branch builds, add boost fix for gcc 4.6; switch to internal boost;
install still broken
Added:
libreoffice/trunk/buildfix_boost.diff
Modified:
libreoffice/trunk/PKGBUILD
Deleted:
libreoffice/trunk/buildfix_kde4.diff
libreoffice/trunk/buildfix_kde4_2.diff
--+
PKGBUILD | 18 +-
buildfix_boost.diff | 40
buildfix_kde4.diff | 30 --
buildfix_kde4_2.diff | 34 --
4 files changed, 49 insertions(+), 73 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-04-22 11:25:38 UTC (rev 120344)
+++ PKGBUILD2011-04-22 12:06:05 UTC (rev 120345)
@@ -63,9 +63,9 @@
http://download.go-oo.org/extern/b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2
http://download.go-oo.org/src/451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt
http://download.go-oo.org/src/90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2
+
http://download.go-oo.org/src/f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
buildfix_i116795.diff
- buildfix_kde4.diff
- buildfix_kde4_2.diff
+ buildfix_boost.diff
buildfix_ct2n.diff
old-install-behaviour.diff)
noextract=(185d60944ea767075d27247c3162b3bc-unowinreg.dll
@@ -96,7 +96,8 @@
db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt
- 90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2)
+ 90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2
+ f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2)
md5sums=('3b162daf1f68d8448fe2da774464b154'
'c6d5c8d049b71aedfa06e58ebfd1f66b'
'5273abb776b01c8f6ab643d19cbd0b45'
@@ -146,9 +147,9 @@
'b4cae0700aa1c2aef7eb7f345365e6f1'
'451ccf439a36a568653b024534669971'
'90401bca927835b6fbae4a707ed187c8'
+ 'f02578f5218f217a9f20e9c30e119c6a'
'0520d63c946e272ed3bdfc863fbdc42e'
- '765cdd3c64b332e5c279b8ecd9663936'
- '6eb230c49f747c0b9e74d0cfb0c8ef38'
+ 'bc228237108cab7745897a9f466b6d39'
'eee273f501ff45dc5f1365e78c6d57c0'
'4bd1a068a3065c5c59b01985247a875e')
@@ -175,8 +176,7 @@
# buildfixes bugfixes
patch -Np1 -i ${srcdir}/buildfix_i116795.diff
- patch -Np1 -i ${srcdir}/buildfix_kde4.diff
- patch -Np1 -i ${srcdir}/buildfix_kde4_2.diff
+ patch -Np1 -i ${srcdir}/buildfix_boost.diff
patch -Np1 -i ${srcdir}/buildfix_ct2n.diff
patch -Np1 -i ${srcdir}/old-install-behaviour.diff
@@ -202,7 +202,7 @@
#sed -i '/fields-table-formula.diff/d' patches/dev300/apply ||
return 1
fi
- autoconf -v
+ autoconf -v -f
./configure --with-build-version=${_LOver} ArchLinux build-${pkgrel} \
--with-unix-wrapper=libreoffice \
--with-max-jobs=${MAKEFLAGS/-j/} \
@@ -253,7 +253,7 @@
--without-system-libtextcat\
--with-openldap\
--with-ant-home=/usr/share/java/apache-ant\
- --with-system-boost\
+ --without-system-boost\
--with-system-cairo\
--with-system-libs\
--with-system-mozilla\
Added: buildfix_boost.diff
===
--- buildfix_boost.diff (rev 0)
+++ buildfix_boost.diff 2011-04-22 12:06:05 UTC (rev 120345)
@@ -0,0 +1,40 @@
+From bae4fdbd105142cd3f317445eddc826da529a732 Mon Sep 17 00:00:00 2001
+From: Caolán McNamara caol...@redhat.com
+Date: Tue, 05 Apr 2011 14:07:02 +
+Subject: silence some more of that annoying gcc#47679
+
+---
+diff --git a/boost/boost.gcc47679.patch b/boost/boost.gcc47679.patch
+index 1c804aa..9b33a5f 100644
+--- a/boost/boost.gcc47679.patch
b/boost/boost.gcc47679.patch
+@@ -36,3 +36,26 @@
+ template int MaxDigits
+ inline bool allow_more_digits(std::size_t i)
+ {
++--- misc/boost_1_44_0/boost/optional/optional.hpp 2011-04-05
13:19:01.223587256 +0100
+ misc/build/boost_1_44_0/boost/optional/optional.hpp 2011-04-05
13:19:01.223587256 +0100
++@@ -31,6 +31,8 @@
++
++ #include boost/optional/optional_fwd.hpp
++
+++#include string.h
+++
++ #if BOOST_WORKAROUND(BOOST_MSVC, == 1200)
++ // VC6.0 has the following bug:
++ // When a templated assignment operator exist, an implicit conversion
++@@ -114,6 +116,11 @@
++
++ public:
++
+++aligned_storage()
+++{
+++ memset(dummy_, 0, sizeof(dummy_));
+++}
+++
++ void const* address() const { return dummy_.data[0]; }
++ void
