Andreas Radke píše v Ne 17. 07. 2011 v 21:26 +0200:
> 1) I have to pass yes to the install process due to some overwritten
> files: yes | make DESTDIR=${srcdir}/fakeinstall distro-pack-install
>
> Installer finished
[...]
> Copying GNOME icons ..
> chmod: cannot operate on dangling symlink
> `/build/src/fakeinstall/usr/bin/libreoffice'
> /build/src/build
> mv: try to overwrite `base.desktop', overriding mode 0444 (r--r--r--)? j
> mv: try to overwrite `calc.desktop', overriding mode 0444 (r--r--r--)? j
> mv: try to overwrite `draw.desktop', overriding mode 0444 (r--r--r--)? j
This should get fixed by the attached
0001-distro-install-desktop-integration-work-with-normal-.patch.
Heh, this problem was not visible when I tested it as root.
> 2) the /usr/share/applications/base.desktop file goes not only into the
> "base" filelist but also into the common
> pkg file list. I had to remove it from the common pkg file list.
Great catch! This gets fixed by the attached
0002-distro-install-desktop-integration-do-not-pack-libre.patch
> 3) I'm running into a build issue when using --with-lang="":
> Error: ../unxlngx6.pro/misc/sysui/dummy/localize.sdf 0 Bytes!
> Error: 1 damaged files encountered
I am unable toi reproduce this but I do not have a clean build tree at
hands. Anyway, --with-lang="" is needed for the en-US build on many
other locations, so it is the right way to go.
> I'm removing the --with-lang or add --with-lang="en-US" now to get
> en-US langpack included. But there's no full langpack/helpfile file list
> created.
> Only the splitted files in orig/gid_Modules_... are there.
It should work better with the attached
0003-distro-install-fix-en-US-only-installation.patch
This probably does not fix the build problem in sysui. Though, it should
generate lang_en_US_list.txt file list even when using --with-lang=""
> Without any langpack installed I get this error that I can solve with
> installing
> any other langpack from the rpms, but there's now en-US langpack:
> [andyrtr@workstation64 trunk]$ libreoffice
> Missing vcl resource. This indicates that files vital to localization are
> missing. You might have a corrupt installation.
> terminate called after throwing an instance of
> 'com::sun::star::uno::RuntimeException'
Yup, it means that you do not have installed any lang pack files.
> Beside this this splitting looks working well, also all desktop integration
> seems to work.
Great to hear this. I expect that more problems might be found over
time. It was added too late, so some patches might be needed on top of
the final libreoffice-3.4.2.x source tarballs. Anyway, it is good to
have a common code base again.
Best Regards,
Petr
>From 64653bcd8c1f1deeb8483e0d3e4ee8768a807b5d Mon Sep 17 00:00:00 2001
From: Petr Mladek <[email protected]>
Date: Mon, 18 Jul 2011 12:32:57 +0200
Subject: [PATCH 1/3] distro-install-desktop-integration: work with normal user
+ alllow to overwrite the readonly desktop files
+ create the compat soffice symlink in DESTDIR
---
bin/distro-install-desktop-integration | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/bin/distro-install-desktop-integration b/bin/distro-install-desktop-integration
index c00c8c6..600c54e 100755
--- a/bin/distro-install-desktop-integration
+++ b/bin/distro-install-desktop-integration
@@ -123,7 +123,7 @@ for file in *.desktop ; do
-e "s/\($INSTALLDIRNAME\)$PRODUCTVERSION/\1/" \
-e "s/\($PRODUCTNAME\) $PRODUCTVERSION/\1/" \
"$file" >"$file.new"
- mv "$file.new" "$file"
+ mv -f "$file.new" "$file"
done
cd -
@@ -160,7 +160,7 @@ add_wrapper unopkg unopkg "" "unopkg" ""
# you cannot include this link directly into the package
# For example, the Novell package mark this symlink as %ghost
# and update it in %post and %postun
-ln -sf $INSTALLDIR/program/soffice $PREFIXDIR/bin/soffice
+ln -sf $INSTALLDIR/program/soffice $DESTDIR$PREFIXDIR/bin/soffice
# create bash completion
mkdir -p $DESTDIR/etc/bash_completion.d
--
1.7.3.4
>From 7b202653f352a6c1bd18066bc71c93b1a5b33c13 Mon Sep 17 00:00:00 2001
From: Petr Mladek <[email protected]>
Date: Mon, 18 Jul 2011 16:48:49 +0200
Subject: [PATCH 2/3] distro-install-desktop-integration: do not pack libreoffice-base.desktop twice
---
bin/distro-install-desktop-integration | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/bin/distro-install-desktop-integration b/bin/distro-install-desktop-integration
index 600c54e..9e3b499 100755
--- a/bin/distro-install-desktop-integration
+++ b/bin/distro-install-desktop-integration
@@ -148,7 +148,7 @@ add_wrapper lomath soffice "--math" "libreoffice" "libreoffice-mat
add_wrapper loimpress soffice "--impress" "libreoffice" "libreoffice-impress.desktop" "gid_Module_Brand_Prg_Impress"
add_wrapper loweb soffice "--web" "libreoffice" "" "gid_Module_Brand_Prg_Wrt"
add_wrapper lowriter soffice "--writer" "libreoffice" "libreoffice-writer.desktop" "gid_Module_Brand_Prg_Wrt"
-add_wrapper lofromtemplate soffice ".uno:NewDoc" "libreoffice" "libreoffice-base.desktop" "gid_Module_Root_Brand"
+add_wrapper lofromtemplate soffice ".uno:NewDoc" "libreoffice" "" "gid_Module_Root_Brand"
add_wrapper libreoffice soffice "" "libreoffice" "libreoffice-startcenter.desktop" "gid_Module_Root_Brand"
add_wrapper loffice soffice "" "libreoffice" "" "gid_Module_Root_Brand"
add_wrapper unopkg unopkg "" "unopkg" "" "gid_Module_Root_Brand"
--
1.7.3.4
>From 72d5c4c3f7d2a5d329eb74fa1d1f69c1fb8c15b9 Mon Sep 17 00:00:00 2001
From: Petr Mladek <[email protected]>
Date: Mon, 18 Jul 2011 16:50:18 +0200
Subject: [PATCH 3/3] distro-install: fix en-US-only installation
generate en-US file list when --with-distro=""
sigh, we should set WITH_LANG=en-US when no language is selected; the empty
string is pretty ugly; unforrunately, many makefile tests check for
this empty variable
---
configure.in | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/configure.in b/configure.in
index 18f93d2..65813cb 100755
--- a/configure.in
+++ b/configure.in
@@ -7906,6 +7906,9 @@ for lang in $WITH_LANG ; do
done
# list with substituted ALL
WITH_LANG_LIST=`echo $WITH_LANG | sed "s/ALL/$ALL_LANGS/"`
+# this variable is used only by bin/distro-install-* helper scripts
+# they need a real list of languages
+test -z "$WITH_LANG_LIST" && WITH_LANG_LIST="en-US"
AC_SUBST(ALL_LANGS)
AC_SUBST(WITH_LANG)
AC_SUBST(WITH_LANG_LIST)
--
1.7.3.4
_______________________________________________
LibreOffice mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/libreoffice
