Re: [Libreoffice] Doxygen for C/C++ URE Documentation
On Wed, 04 Jan 2012 15:30:03 +0100 Stephan Bergmann sberg...@redhat.com wrote: Hi all, Hi Stephan, http://cgit.freedesktop.org/libreoffice/core/commit/?id=8907d159378b518a769e9f8c4f67290ec588a77d Temporary hack to work around autodoc bug made it even more evident that our home-brewed autodoc is not up to its task and should be replaced. So, I tried to switch to doxygen when generating the C/C++ header documentation in odk/pack/gendocu. (There are apparently various alternatives to doxygen out there; I did not bother to look at any of them, given that doxygen is something of an industry standard. Speak up if you know of a superior alternative.) The build then has an additional dependency on the doxygen executable as a prerequisite. This can be controlled via --with-doxygen, where an explicit --without-doxygen disables generation of the C/C++ documentation in odk (and --disable-odk skips the doxygen check completely in configure). Tinderboxes that have no doxygen installed would need an explicit --without-doxygen to avoid configure failures. (Reportedly, doxygen works well on Mac OS X and Windows, but I did not check that.) I would not like to see a new configure flag for doxygen, the odk flag suffices; generate the documentation anyway. Otherwise it is always good to use standards. If the generation has to be configurable, chain it to --with-help or --with-helppack-integration or so?! Regards, Hanno ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Doxygen for C/C++ URE Documentation
On Wed, 04 Jan 2012 15:57:58 +0100 Stephan Bergmann sberg...@redhat.com wrote: On 01/04/2012 03:58 PM, Hanno Meyer-Thurow wrote: I would not like to see a new configure flag for doxygen, the odk flag suffices; generate the documentation anyway. Otherwise it is always good to use standards. Do you mean, those who do not have doxygen and don't want to or can't install it should use --disable-odk (i.e., do not build SDK at all) instead of --without-doxygen (i.e., build SDK but without C++ documentation)? Doxygen won't be shipped with LO source like all the other 3rd parties?! Interesting ... And what do you mean with generate the documentation anyway? If doxygen is there, you can use it anyway. If the generation has to be configurable, chain it to --with-help or --with-helppack-integration or so?! I'd say these are rather unrelated, so would prefer not to combine them. One kind of help for a developer is what doxygen generates I would say. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Doxygen for C/C++ URE Documentation
On Wed, 04 Jan 2012 17:01:32 +0100 Stephan Bergmann sberg...@redhat.com wrote: On 01/04/2012 04:35 PM, Hanno Meyer-Thurow wrote: On Wed, 04 Jan 2012 15:57:58 +0100 Stephan Bergmannsberg...@redhat.com wrote: On 01/04/2012 03:58 PM, Hanno Meyer-Thurow wrote: [...] Doxygen won't be shipped with LO source like all the other 3rd parties?! Interesting ... God no! Hmm, quite strange to me but o well ... And what do you mean with generate the documentation anyway? If doxygen is there, you can use it anyway. Which happens with the implicit --with-doxygen=yes (i.e., pick doxygen from path) option. Hmm, that kind of evil automagic I do not like ... If the generation has to be configurable, chain it to --with-help or --with-helppack-integration or so?! I'd say these are rather unrelated, so would prefer not to combine them. One kind of help for a developer is what doxygen generates I would say. But it would be odd if generation of HTML docu for SDK C++ stuff were controlled by --with-help while generation of HTML docu for SDK Java stuff were not. And an SDK w/o docu makes little sense, so generally controlling generation of HTML docu for any SDK stuff via --with-help does not look right, either. ... and ending in this mess. That should be fixed in one or another unified way. ... an SDK w/o docu makes little sense ... Sure, like I said in the beginning, enforce the tool(s) for docu generation; always(case: odk enabled) and for any SDK (C++, Java, Python, etc ...). In the sense of keeping it simple. ... controlling generation of HTML docu for any SDK stuff via --with-help does not look right ... Mind the ... or so?! part of mine. Feel free to use '--with-developer-help' or something like that. I just did not like the flag named after one tool that is subject to change in future and surely for other SDKs. I still do not like the extra flag. Well, it is just me ... ;) Or leave it to pure automagic with configuration notice. Or add that doxygen flag, just another funny flag. Should the configure flags not be reduced and/or simplified? I thought there was something like that on the list before ... Hanno ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Building libgsf on Mac absolutely necessary ?
On Sun, 05 Jun 2011 10:22:13 +0200 Alexander Thurgood alex.thurg...@gmail.com wrote: Hi all, Hi Alexander, My understanding is that libgsf is a Gnome i/o abstraction library used for reading/writing structured file formats, and it has several extensions, one of which is the thumbnailer which produces thumbnails in Nautilus with the Gnome FS, so why is it necessary on Mac ? Is it because it is dependent on librsvg (which is also an external lib that gets pulled in) for the build of LibO ? Old versions of librsvg required libgsf for svgz files. Newer versions default to Glib/GIO for zipped svg files. Glib and librsvg are new enough in the LO repository. So, it is quite strange to depend on libgsf at all but if GIO fails to build on some architectures. Luckily we can build against system librsvg without libgsf. :-) Regards, Hanno ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Building libgsf on Mac absolutely necessary ?
On Sun, 05 Jun 2011 12:08:42 +0200 Alexander Thurgood alex.thurg...@gmail.com wrote: I don't have librsvg natively on MacOSX, and I already have gio, so I don't understand why it isn't being recognised instead of requiring libgsf, unless it is a compiler linking problem ?? So, if there is GIO for linux, windows, mac, etc. from internal Glib one may patch libgsf out of libreoffice since it is simply not needed. That is where I am aiming at. And your error disappears for good. I could install librsvg via MacPorts (not a problem as such). However, that does tend to negate Christian's motto of keeping ports installation involvement out of, or to a minimum, for MacOS LibO development. Sure, see above. You could try to remove 'libgsf' from http://cgit.freedesktop.org/libreoffice/libs-extern-sys/tree/librsvg/prj/build.lst and see if you can load svgz files. May be in other prj/build.lst as well. Hanno ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] 8 combinations of Python support: do we really need that?
On Mon, 30 May 2011 14:08:41 -0600 Tor Lillqvist tlillqv...@novell.com wrote: Browsing configure.in, I see three different binary options for various aspects of Pyhon support: --disable-python. Disable build of Python 2.x UNO API --enable-ext-scripting-python. Enables support for scripts in Python --with-system-python. Use Python already on system I added '--disable-python' because not everyone needs python uno api. Since python-2 is necessary for build tools, there is '--with-system-python'. There is just no need to build it internally each time. I have no idea about '--enable-ext-scripting-python'. :-) Well, just my view as a linux packager. Regards, Hanno ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] 8 combinations of Python support: do we really need that?
On Mon, 30 May 2011 22:54:54 +0200 Christian Lohmaier lohmaier+libreoff...@googlemail.com wrote: Hi Hanno, *, Hi Christian, What build tools need python? The build system is perl, not python. Translate-Toolkit is python. http://translate.sourceforge.net/wiki/toolkit/index Regards, Hanno ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Two services.rdb files in postprocess/packcomponents/makefile.mk ?!
I made the attached patches to get rid of the 'ooo-services.rdb' file
and fix the disabled-python build. Though, now I get a general
configuration error. stderr shows following message:
Error: File
/mnt/data/tmp/portage/app-office/libreoffice-3.3.99.1/work/libreoffice-bootstrap-3.3.99.1/desktop/source/app/langselect.cxx,
Line 401:
unsatisfied query for interface of type
com.sun.star.lang.XMultiServiceFactory!
Well, this is still beta1. Let's see if beta2 or beta3 behave.
But already better than crashing for non-existant file.
Any thoughts or ideas?
Regards,
Hanno--- postprocess/packcomponents/makefile.mk.orig 2011-04-21 14:38:24.538714491 +0200
+++ postprocess/packcomponents/makefile.mk 2011-04-21 14:41:07.030714284 +0200
@@ -124,6 +124,7 @@
localebe1 \
log \
lwpfilter \
+mailmerge \
mcnttype \
migrationoo2 \
msfilter \
@@ -363,11 +364,9 @@
my_components += avmedia.jar
.END
-my_ooo_components = mailmerge
-
.INCLUDE: target.mk
-ALLTAR : $(MISC)/services.rdb $(MISC)/ooo-services.rdb
+ALLTAR : $(MISC)/services.rdb
$(MISC)/services.rdb .ERRREMOVE : $(SOLARENV)/bin/packcomponents.xslt \
$(MISC)/services.input $(my_components:^$(SOLARXMLDIR)/:+.component)
@@ -378,14 +377,3 @@
echo \
'list$(my_components:^filename:+.component/filename)/list' \
$@
-
-$(MISC)/ooo-services.rdb .ERRREMOVE : $(SOLARENV)/bin/packcomponents.xslt \
-$(MISC)/ooo-services.input \
-$(my_ooo_components:^$(SOLARXMLDIR)/:+.component)
-$(XSLTPROC) --nonet --stringparam prefix $(SOLARXMLDIR)/ -o $@ \
-$(SOLARENV)/bin/packcomponents.xslt $(MISC)/ooo-services.input
-
-$(MISC)/ooo-services.input : makefile.mk
-echo 'list' \
-'$(my_ooo_components:^filename:+.component/filename)' \
-'/list' $@
--- postprocess/prj/d.lst.orig 2011-04-21 14:45:21.062714209 +0200
+++ postprocess/prj/d.lst 2011-04-21 14:45:32.558714722 +0200
@@ -2,6 +2,5 @@
..\%__SRC%\bin\uiconfig.zip %_DEST%\bin%_EXT%\uiconfig.zip
..\%__SRC%\misc\*.xcd %_DEST%\xml%_EXT%\
..\%__SRC%\misc\lang\*.xcd %_DEST%\xml%_EXT%\
-..\%__SRC%\misc\ooo-services.rdb %_DEST%\xml%_EXT%\ooo\services.rdb
..\%__SRC%\misc\services.input %_DEST%\xml%_EXT%\services.input
..\%__SRC%\misc\services.rdb %_DEST%\xml%_EXT%\services.rdb
--- scp2/source/ooo/ooo_brand.scp.orig 2011-04-21 14:44:08.490714213 +0200
+++ scp2/source/ooo/ooo_brand.scp 2011-04-21 14:44:23.562715664 +0200
@@ -39,13 +39,6 @@
End
#endif
-File gid_Brand_File_ServicesRdb
-TXT_FILE_BODY;
-Dir = gid_Brand_Dir_Program;
-Name = /ooo/services.rdb;
-Styles = (PACKED);
-End
-
ProfileItem gid_Brand_Profileitem_Bootstrap_Errorreport_Server
ProfileID = gid_Brand_Profile_Bootstrap_Ini;
ModuleID = gid_Module_Root_Brand;
--- scp2/source/ooo/common_brand.scp.orig 2011-04-21 14:46:41.198714790 +0200
+++ scp2/source/ooo/common_brand.scp 2011-04-21 14:51:20.534714520 +0200
@@ -86,7 +86,6 @@
gid_Brand_File_Msvcm80crt_Manifest,
gid_Brand_File_Lib_Npsoplugin,
gid_Brand_File_Lib_Subscrib_C05,
- gid_Brand_File_ServicesRdb,
gid_Brand_File_Share_Registry_Brand_Xcd,
gid_Brand_File_Share_Registry_O5oo_Xcd,
gid_Brand_File_Script_Unopkg,
@@ -1317,14 +1316,6 @@
Value = ${${OOO_BASE_DIR}/program/ PROFILENAME(fundamentalbasis) :URE_MORE_TYPES};
End
-ProfileItem gid_Brand_Profileitem_Fundamental_Ure_More_Services
-ModuleID = gid_Module_Root_Brand;
-ProfileID = gid_Brand_Profile_Fundamental_Ini;
-Section = Bootstrap;
-Key = URE_MORE_SERVICES;
-Value = ${${OOO_BASE_DIR}/program/ PROFILENAME(fundamentalbasis) :URE_MORE_SERVICES} $ORIGIN/services.rdb;
-End
-
ProfileItem gid_Brand_Profileitem_Fundamental_Ure_More_Java_Types
ModuleID = gid_Module_Root_Brand;
ProfileID = gid_Brand_Profile_Fundamental_Ini;
--- postprocess/packcomponents/makefile.mk.orig 2011-04-22 12:02:00.278680458 +0200
+++ postprocess/packcomponents/makefile.mk 2011-04-22 12:05:06.086680205 +0200
@@ -124,7 +124,6 @@
localebe1 \
log \
lwpfilter \
-mailmerge \
mcnttype \
migrationoo2 \
msfilter \
@@ -141,7 +140,6 @@
placeware \
preload \
protocolhandler \
-pythonloader \
res \
rpt \
rptui \
@@ -194,6 +192,12 @@
xsltfilter \
xstor
+.IF $(DISABLE_PYTHON) != TRUE
+my_components += \
+pythonloader \
+mailmerge
+.ENDIF
+
.IF $(OS) != WNT $(OS) != MACOSX
my_components += splash
.ENDIF
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] PyUno is Python 3 compatible
On Wed, 20 Apr 2011 17:53:20 +0200
Andreas Becker atayoo...@googlemail.com wrote:
First of all, it has nothing to do with that patch.
You should perhaps update automake (my version is 1.11).
You are so right. automake 1.11 does just fine.
Now then, I got this error:
=
Building module translate_toolkit
=
Entering
/tmp/portage/app-office/libreoffice-3.3.99.1/work/libreoffice-bootstrap-3.3.99.1/translate_toolkit
mkdir: kann Verzeichnis „./unxlngx6.pro/misc/build/translate-toolkit-1.8.1/“
nicht anlegen: Die Datei existiert bereits
File setup.py, line 29
[join('translate',filename) for filename in 'ChangeLog', 'COPYING',
'LICENSE', 'README'])]
^
SyntaxError: invalid syntax
dmake: Error code 1, while making './unxlngx6.pro/misc/build/so_built_trt'
___
Would you mind to fix the rest of the build for Python3?
Regards,
Hanno
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] no libreoffice-build-3.3.99.1 ?
On Thu, 21 Apr 2011 10:58:29 +0200 Andreas Radke a.ra...@arcor.de wrote: One of the arguments seems to point outside my chroot or wherever to a bad path. How can I check the args? First of all, just to verify, your PKGBUILD looks just fine. So, how to check the args, see http://cgit.freedesktop.org/libreoffice/bootstrap/tree/solenv/bin/ooinstall?h=libreoffice-3-4#n81 There you may add a print with whatever args you want to be shown. Regards, Hanno ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] PyUno is Python 3 compatible
Hi Andreas, got around my problem by disabling translations. Finally, I got it installed. Though, scp2 needs patching and Python modules have even on Mac OS X .so endings stated here: scp2/source/python/file_python.scp:303:// pyuno.so even on Mac OS X, because it is a python module Is that still valid? Otherwise ignore my update patch for your patchset. So, a patch for scp2 and an update patch for your patchset is attached. I could not test the mailmerge extension since LO failed starting because javaldx is not there for a java disabled build and unopkg could not initialize UCB. O, well, another day. I am too tired ... :-) Regards, Hanno--- scp2/source/python/file_python.scp.orig 2011-04-21 23:27:12.454700359 +0200 +++ scp2/source/python/file_python.scp 2011-04-21 23:27:21.018700303 +0200 @@ -32,7 +32,7 @@ File gid_File_Lib_Pyuno TXT_FILE_BODY; #ifdef UNX -Name = STRING(CONCAT2(libpyuno,UNXSUFFIX)); +Name = STRING(CONCAT2(pyuno,UNXSUFFIX)); #else Name = pyuno.pyd; #endif --- pyuno-python3.diff.orig 2011-04-21 23:37:38.766700113 +0200 +++ pyuno-python3.diff 2011-04-21 23:38:45.798700273 +0200 @@ -638,17 +638,15 @@ index 1dd212e..81e79cf 100644 --- a/pyuno/prj/d.lst +++ b/pyuno/prj/d.lst -@@ -1,9 +1,8 @@ +@@ -1,8 +1,6 @@ mkdir: %_DEST%\bin%_EXT%\pyuno mkdir: %_DEST%\lib%_EXT%\pyuno -..\%__SRC%\lib\libpyuno.so %_DEST%\lib%_EXT%\libpyuno.so -..\%__SRC%\lib\libpyuno.dylib %_DEST%\lib%_EXT%\libpyuno.dylib ..\%__SRC%\lib\pyuno.so %_DEST%\lib%_EXT%\pyuno.so -+..\%__SRC%\lib\pyuno.dylib %_DEST%\lib%_EXT%\pyuno.dylib ..\%__SRC%\lib\pythonloader.uno.so %_DEST%\lib%_EXT%\pythonloader.uno.so ..\%__SRC%\lib\pythonloader.uno.dylib %_DEST%\lib%_EXT%\pythonloader.uno.dylib - ..\%__SRC%\lib\unohelper.py %_DEST%\lib%_EXT%\pyuno\unohelper.py diff --git a/pyuno/source/loader/makefile.mk b/pyuno/source/loader/makefile.mk index 65ec811..76c3dc2 100644 --- a/pyuno/source/loader/makefile.mk ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] no libreoffice-build-3.3.99.1 ?
On Wed, 20 Apr 2011 09:42:31 +0200
Andreas Radke a.ra...@arcor.de wrote:
... (make DESTDIR=... install is broken for me).
Hi all,
I would recommend my patch attached. For that one would need
to pass '--libdir=/usr/LIBDIR' to configure to behave. Otherwise it
installs to /LIBDIR. Improvements to the patch are welcomed!
Though, this way I came close to the old behaviour.
@Petr
Would you mind to commit if it is ok, please?
Regards,
Hanno--- Makefile.in.orig 2011-02-25 23:01:35.128013555 +0100
+++ Makefile.in 2011-02-25 23:04:53.404013587 +0100
@@ -16,11 +16,11 @@
install:
@. ./*[Ee]nv.[Ss]et.sh \
- echo Installing in $${prefix:-@prefix@}... \
- ooinstall $${prefix:-@prefix@} \
+ echo Installing in $${libdir:-@libdir@}/libreoffice... \
+ ooinstall $${libdir:-@libdir@}/libreoffice \
echo \
echo Installation finished, you can now execute: \
- echo $${prefix:-@prefix@}/program/soffice
+ echo $${libdir:-@libdir@}/libreoffice/program/soffice
dev-install:
@. ./*[Ee]nv.[Ss]et.sh \
--- solenv/bin/ooinstall.orig 2011-02-25 23:09:13.484013610 +0100
+++ solenv/bin/ooinstall 2011-02-25 23:09:43.856013608 +0100
@@ -67,9 +67,9 @@
$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='';
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] no libreoffice-build-3.3.99.1 ?
On Wed, 20 Apr 2011 15:43:07 +0200 Petr Mladek pmla...@suse.cz wrote: I did some changes. I made the libreoffice dirname configurable by --with-install-dirname option. Also I defined prefix, exec_prefix, libdir values in Makefile.in. The result is that the installation path is /usr/local/lib/libreoffice instead of /libreoffice I hope that my changes are fine for you. They are perfectly fine for me. I just found a micro-optimization. Instead of hard-wiring 'INSTALL_DIRNAME=libreoffice' I would prefer it to be 'INSTALL_DIRNAME=$AC_PACKAGE_NAME', which is generated by AC_INIT at the top of configure.in. Though, $AC_PACKAGE_NAME would have uppercase letters. Is there any posix function to lower-case that macro? Quite busy with other stuff, too, right now ... Regards, Hanno ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] no libreoffice-build-3.3.99.1 ?
On Wed, 20 Apr 2011 17:35:47 +0200 Andreas Radke a.ra...@arcor.de wrote: This has not happened when using plain beta1 source and using make OODESTDIR=foo install. The only thing changed there was OODESTDIR to DESTDIR. So it should stay in the sandbox. Would you mind to pastebin the log of the installer and maybe some logs of your package tool, please? Regards, Hanno ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] PyUno is Python 3 compatible
Hi Andreas, your patchset applies fine to 3.3.99.1. Though, configure fails with: checking which python to use... external checking for a Python interpreter with version = 2.2... none configure: error: no suitable Python interpreter found I test with python3.1 as only version installed. # python --version Python 3.1.3 I also added PYTHON_CFLAGS=-I/usr/include/python3.1 PYTHON_LIBS=/usr/lib/libpython3.1.so -lpthread -ldl -lutil. Please have a look at that, thanks! Regards, Hanno ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] Two services.rdb files in postprocess/packcomponents/makefile.mk ?!
Hi all, would anyone of you know why there are two services.rdb created in that makefile? And in the second one is mailmerge the only component. Could we not simply merge mailmerge into the other one? Why I ask? The way it is now does a bit of a headache for a Python/PyUno disabled build; skipping the so-called 'ooo-services.rdb' of that makefile results in a segfault at startup of LO. It simply tries to read the non-existant file without error checks. :-) Regards, Hanno ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH] Gentoo patches from old build repository for master
On Tue, 08 Mar 2011 10:55:43 + Caolán McNamara caol...@redhat.com wrote: Well, that '/usr/lib' path is hard-coded in configure right now. But currently only if pkg-config --variable=libdir x11 fails. I wonder if just removing the surrounding 'if test $x_libraries... ' would be sufficient for your problem. A well, nowadays x11 libraries and includes are installed in compiler default paths, on Gentoo at least. So, if you add the `pkg-config --variable=libdir x11` library path to the gcc command line you are at the beginning of the problem again. Same for include. O well, let's check what the gcc commandline is nowadays without the patch. ;) That is not used anymore as far as we could see. So just some cruft left. At least for officecfg. Is there more to it? I was thinking more that osl_getHomeDir/getConfigDir should return osl_getTempDirURL as a fallback if they can't get any other result ? I quite do not get where you want to go here. That sandbox violation is caused by an silly 'rm /bin/bla.zip' shell call from makefile.mk script for no good reason. officecfg does not even create that file where the sandbox would have screamed already. And the environment sets COMMON_OUTDIR= which is funny. (See my last post for a link.) Regards, Hanno ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH] Gentoo patches from old build repository for master
On Tue, 8 Mar 2011 18:45:49 +0100 Hanno Meyer-Thurow h@web.de wrote: On Tue, 08 Mar 2011 10:55:43 + Caolán McNamara caol...@redhat.com wrote: Well, that '/usr/lib' path is hard-coded in configure right now. But currently only if pkg-config --variable=libdir x11 fails. I wonder if just removing the surrounding 'if test $x_libraries... ' would be sufficient for your problem. A well, nowadays x11 libraries and includes are installed in compiler default paths, on Gentoo at least. So, if you add the `pkg-config --variable=libdir x11` library path to the gcc command line you are at the beginning of the problem again. Same for include. O well, let's check what the gcc commandline is nowadays without the patch. ;) A ha, there is some check in set_soenv.in for XLIB. So I will just add a check for XINC != /usr/nclude and no need to hack on that funny configure check for X libraries. I was thinking more that osl_getHomeDir/getConfigDir should return osl_getTempDirURL as a fallback if they can't get any other result ? Just for clarification, I do not want to add the sal-sandbox.dff hack but rather a silly sandbox violation caused by officecfg makefile.mk. I am going to resend my patches with proper links. Somehow I messed up before. Regards, Hanno ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH] Gentoo patches from old build repository for master
Well, this is just a resend of the first message, though, with proper links to the patches. 1. Do not add compiler default include and library path: potentially build against different version of system library than requested by the user (i.e., /usr/local/lib vs /usr/lib). Report: http://qa.openoffice.org/issues/show_bug.cgi?id=65976 Fix: http://code.google.com/p/gekis-playground/source/browse/trunk/app-office/libreoffice/files/pre/config_office-XINC-XLIB-defaults.diff 2. Add a configure option to disable Python2 (PyUNO) bindings. Python3 is available for more than two years. Noone cares, therefore rest in peace. Python2 is going to be ditched at some point. Simply do not fail then. Windows builds need to be updated for BUILD_TYPE: PYUNO. Or how is it handled nowadays? Report: none Fix: http://code.google.com/p/gekis-playground/source/browse/trunk/app-office/libreoffice/files/pre/disable-python.diff 3. Fix sandbox violation in officecfg module: rm /bin/language.zip Report: https://bugs.gentoo.org/show_bug.cgi?id=251932 Fix: http://code.google.com/p/gekis-playground/source/browse/trunk/app-office/libreoffice/files/pre/gentoo-sandbox.diff 4. Add a configure option to search only in one place for JVMs, which is quite interesting for Linux Distributions. Enforce the user to place JVMs in one base directory. Report: none Fix: http://code.google.com/p/gekis-playground/source/browse/trunk/app-office/libreoffice/files/pre/jvm-search-path.diff 5. Fix build for libxml-2.7.8 with ICU support. Report: https://bugs.gentoo.org/show_bug.cgi?id=355185 Fix: http://code.google.com/p/gekis-playground/source/browse/trunk/app-office/libreoffice/files/pre/libxmlsec_fix_extern_c.diff Well, that is it. The patches may be applied cleanly in the above order. You may find the up-to-date versions of hacks and patches I apply here: http://code.google.com/p/gekis-playground/source/browse/#svn/trunk/app-office/libreoffice/files/pre Regards, Hanno ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH] Gentoo patches from old build repository for master
On Tue, 08 Mar 2011 21:31:05 + Caolán McNamara caol...@redhat.com wrote: Just for clarification, I do not want to add the sal-sandbox.dff hack but rather a silly sandbox violation caused by officecfg makefile.mk. *ah*, now I see, I was talking above a completely different patch of course, sorry about that. No problem! For that sal sandbox violation I hope to set HOME properly within the sandbox environment somehow. Anyway out of the scope of libreoffice sources. And you may have a look at the simplified configure fix for x11 library/include paths here: http://code.google.com/p/gekis-playground/source/browse/trunk/app-office/libreoffice/files/pre/config_office-XINC-XLIB-defaults.diff I guess/hope that is a nobrainer now. Regards, Hanno ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [PATCH] Gentoo patches from old build repository for master
Hi all, next week I will merge the following Gentoo patches from the old build repository into master as long as there are no objections. 1. Do not add compiler default include and library path: potentially build against different version of system library than requested by the user (i.e., /usr/local/lib vs /usr/lib). Report: http://qa.openoffice.org/issues/show_bug.cgi?id=65976 Fix: http://code.google.com/p/gekis-playground/source/browse/#svn/trunk/app-office/libreoffice/files/pre/config_office-XINC-XLIB-defaults.diff 2. Add a configure option to disable Python2 (PyUNO) bindings. Python3 is available for more than two years. Noone cares, therefore rest in peace. Python2 is going to be ditched at some point. Simply do not fail then. Windows builds need to be updated for BUILD_TYPE: PYUNO. Or how is it handled nowadays? Report: none Fix: http://code.google.com/p/gekis-playground/source/browse/#svn/trunk/app-office/libreoffice/files/pre/disable-python.diff 3. Fix sandbox violation in officecfg module: rm /bin/language.zip Report: https://bugs.gentoo.org/show_bug.cgi?id=251932 Fix: http://code.google.com/p/gekis-playground/source/browse/#svn/trunk/app-office/libreoffice/files/pre/gentoo-sandbox.diff 4. Add a configure option to search only in one place for JVMs, which is quite interesting for Linux Distributions. Enforce the user to place JVMs in one base directory. Report: none Fix: http://code.google.com/p/gekis-playground/source/browse/#svn/trunk/app-office/libreoffice/files/pre/jvm-search-path.diff 5. Fix build for libxml-2.7.8 with ICU support. Report: https://bugs.gentoo.org/show_bug.cgi?id=355185 Fix: http://code.google.com/p/gekis-playground/source/browse/trunk/app-office/libreoffice/files/pre/libxmlsec_fix_extern_c.diff Well, that is it. The patches may be applied cleanly in the above order. You may find the up-to-date versions of hacks and patches I apply here: http://code.google.com/p/gekis-playground/source/browse/#svn/trunk/app-office/libreoffice/files/pre Regards, Hanno ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH] Gentoo patches from old build repository for master
On Mon, 07 Mar 2011 20:44:04 +
Caolán McNamara caol...@redhat.com wrote:
On Mon, 2011-03-07 at 19:03 +0100, Hanno Meyer-Thurow wrote:
1. Do not add compiler default include and library path: potentially build
against different version of system library than requested by the user
(i.e., /usr/local/lib vs /usr/lib).
Report: http://qa.openoffice.org/issues/show_bug.cgi?id=65976
Fix:
http://code.google.com/p/gekis-playground/source/browse/#svn/trunk/app-office/libreoffice/files/pre/config_office-XINC-XLIB-defaults.diff
Remove XLIB=`$PKG_CONFIG --variable=libdir x11` and hardcoding
XLIB=/usr/lib will break the 64bit multilib archs, e.g. Fedora x86_64
which place 64bit libs into /usr/lib64 not /usr/lib
Well, that '/usr/lib' path is hard-coded in configure right now. So I may
replace
it for the xinerama check, which should be properly rewritten anyway, with
`$PKG_CONFIG --variable=libdir x11`.
2. Add a configure option to disable Python2 (PyUNO) bindings. Python3 is
available for more than two years.
This just allows disabling it right ?, not actually provides a Python3
port ?
Yes and no port. That requires an advanced Python/C hackers ability for
some non-portable code - needs rewrite/redesign from scratch AFAICT
for Python3, at least one part.
3. Fix sandbox violation in officecfg module: rm /bin/language.zip
Report: https://bugs.gentoo.org/show_bug.cgi?id=251932
Fix:
http://code.google.com/p/gekis-playground/source/browse/#svn/trunk/app-office/libreoffice/files/pre/gentoo-sandbox.diff
Personally would prefer that code falls back to some allowed location,
e.g. getTempDir or something, rather than hacking it out.
That is not used anymore as far as we could see. So just some cruft left.
At least for officecfg. Is there more to it?
http://svn.services.openoffice.org/opengrok/xref/Current%20%28trunk%29/set_soenv.in#186
This is not good. Either the modules should set it or a proper default to
${TEMP} or such should be.
Thanks for the review, Caolan!
Hanno
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Branch libreoffice-3-3-1 created
On Mon, 21 Feb 2011 15:45:22 +0100 Jan Holesovsky ke...@suse.cz wrote: Hi Hanno, Hi Jan, hi Andreas, Sorry for being unclear in the announcement mail. Indeed, the 'build' repo is an exception, and the distro maintainers are free to commit whatever they need for their own distros, you only need to make sure you are not breaking the distros of others. ah, okay, so I will commit my patch to branch libreoffice-3-3. @Andreas You may merge it to the subbranches (3-3-1, ...) if you want. And I want to squeeze out the remaining patches, so that all the Gentoo related patches will be gone or merged into master. Sounds great :-) There are four left that may need to be discussed, or not. I will send them to mailing-list and wait a week for answers before committing. Regards, Kendy Regards, Hanno ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [PATCH] GentooOnly cleanup and 64bit jdk server path (sun/oracle jdk)
Hi all, attached is one patch to libreoffice/build tree branch libreoffice-3-3 that just cleans up the Gentoo patchset. You may merge it to the libreoffice-3-3-1 branch as well, please. The second patch, to accept the 64bit jdk server path of sun/oracle jdk to libjvm.so, may be valid to any branch of libreoffice/ure http://cgit.freedesktop.org/libreoffice/build/tree/patches/64bit/64bit-jdk-server-paths.diff That would be great to be merged. Regards, HannoFrom cc3cff24234ca1f853f6d1e9149e30a12552dd90 Mon Sep 17 00:00:00 2001 From: Hanno Meyer-Thurow h@web.de Date: Fri, 11 Feb 2011 13:09:06 +0100 Subject: [PATCH] (GentooOnly) Clean up patchset. Long overdue removal of old patches. * patches/dev300/apply: clean up * patches/dev300/gentoo-pax-fix.diff: bin * patches/dev300/ibm-j9vm.diff: bin * patches/dev300/system-db-check.diff: bin delete mode 100644 patches/dev300/gentoo-pax-fix.diff delete mode 100644 patches/dev300/ibm-j9vm.diff delete mode 100644 patches/dev300/system-db-check.diff diff --git a/patches/dev300/apply b/patches/dev300/apply index c47179f..f7552f7 100755 --- a/patches/dev300/apply +++ b/patches/dev300/apply @@ -876,16 +876,8 @@ win32-gw-send-mail.diff, i#34264, n#418407, tml [ GentooOnly ] SectionOwner = aprosky -# Allow build to proceed with PaX enabled -gentoo-pax-fix.diff, aprosky # support server-only versions of 64bit JDKs 64bit-jdk-server-paths.diff, i#65974, hmth -# use IBM j9vm over IBM classic JVM -ibm-j9vm.diff, hmth -# system db check -system-db-check.diff, i#65979, hmth -# User ~/.ooo3 as user dir -scp2-user-config-ooo3.diff, pmladek # default inc/lib config_office-XINC-XLIB-defaults.diff, i#65976 # Sandbox problem with wrong path diff --git a/patches/dev300/gentoo-pax-fix.diff b/patches/dev300/gentoo-pax-fix.diff deleted file mode 100644 index e0b4700..000 --- a/patches/dev300/gentoo-pax-fix.diff +++ /dev/null @@ -1,26 +0,0 @@ solenv/inc/unxlngi4.mk.orig 2005-10-29 17:09:48.0 +0200 -+++ solenv/inc/unxlngi4.mk 2005-10-29 17:18:46.0 +0200 -@@ -138,8 +138,8 @@ - LINKFLAGS=-z combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH) - - # linker flags for linking applications --LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec --LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec -+LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec -Wl,-z,execheap -+LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec -Wl,-z,execheap - - # linker flags for linking shared libraries - LINKFLAGSSHLGUI= -shared solenv/inc/unxlngi6.mk.orig 2005-10-29 17:16:27.0 +0200 -+++ solenv/inc/unxlngi6.mk 2005-10-29 17:19:08.0 +0200 -@@ -147,8 +147,8 @@ - LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH) - - # linker flags for linking applications --LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec --LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec -+LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec -Wl,-z,execheap -+LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec -Wl,-z,execheap - - # linker flags for linking shared libraries - LINKFLAGSSHLGUI= -shared diff --git a/patches/dev300/ibm-j9vm.diff b/patches/dev300/ibm-j9vm.diff deleted file mode 100644 index 1e865fd..000 --- a/patches/dev300/ibm-j9vm.diff +++ /dev/null @@ -1,20 +0,0 @@ jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx.orig 2006-08-16 12:13:05.0 +0200 -+++ jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx 2006-08-16 12:14:30.0 +0200 -@@ -76,6 +76,8 @@ - #ifdef MACOSX - /../../../JavaVM - #else -+/bin/j9vm/libjvm.so, // for IBM Java -+/jre/bin/j9vm/libjvm.so, // for IBM Java - /lib/ JFW_PLUGIN_ARCH /client/libjvm.so, // for Blackdown PPC - /lib/ JFW_PLUGIN_ARCH /server/libjvm.so, // for Blackdown AMD64 - /lib/ JFW_PLUGIN_ARCH /classic/libjvm.so, // for Blackdown PPC -@@ -101,6 +103,8 @@ - #else - /bin, - /jre/bin, -+/bin/j9vm, -+/jre/bin/j9vm, - /bin/classic, - /jre/bin/classic, - /lib/ JFW_PLUGIN_ARCH /client, diff --git a/patches/dev300/system-db-check.diff b/patches/dev300/system-db-check.diff deleted file mode 100644 index 4ab65e8..000 --- a/patches/dev300/system-db-check.diff +++ /dev/null @@ -1,69 +0,0 @@ configure.in.orig 2007-07-15 16:45:32.0 +0200 -+++ configure.in 2007-07-15 16:48:19.0 +0200 -@@ -3277,14 +3277,12 @@ - test $with_system_db != no; then - SYSTEM_DB=YES - AC_MSG_RESULT([external]) --AC_CHECK_HEADER(db.h, [ DB_INCLUDES=/usr/include ], --[ -- CFLAGS=-I/usr/include/db4 -- AC_CHECK_HEADER(db4/db.h, -- [ DB_INCLUDES=/usr/include/db4 ], -- [ AC_MSG_ERROR(no. install the db4 libraries) ], []+ ) --], [] --) -+for dbver in -5.1 5.1 -5.0 5.0 -5 5 -4.8 4.8 -4.7 4.7 -4 4 ''; do -+ AC_CHECK_HEADER(db$dbver/db.h, [ DB_INCLUDES=/usr/include/db$dbver
Re: [Libreoffice] [PATCH] Fix configure check for BerkleyDB where db_create is macro
Hi, I just checked for my db version. I, too, use [IP-] [ ] sys-libs/db-4.8.30:4.8 which works just fine. So I wonder what differs. Regards, Hanno ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH] solenv/bin/ooinstall and undefined setup_vars array
On Wed, 10 Nov 2010 05:11:48 +0100 Jan Holesovsky ke...@suse.cz wrote: Hi Hanno, Hi Kendy, I have pushed that to master, and when cherry-picking to libreoffice-3-3, I found out that Rene already partially updated it, so I incorporated your changes there too - namely use WITH_LANG, and use DISABLE_STRIP. yes, sorry about that. I was mislead by the Gentoo script to manage packages from git repositories. It says it has the branch but actually checks out master. Thank you for pushing! Regards, Hanno ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
