Re: [Libreoffice] [PATCH] Gentoo patches from old build repository for master
On Tue, 2011-03-08 at 22:41 +0100, Hanno Meyer-Thurow wrote: > I guess/hope that is a nobrainer now. Sure, looks harmless. C. ___ 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
Hi Hanno, On Mon, 7 Mar 2011 19:03:32 +0100 Hanno Meyer-Thurow wrote: > next week I will merge the following Gentoo patches from the old > build repository into master as long as there are no objections. just a short note: you might want to use the scriptify-all script as described here: http://nabble.documentfoundation.org/Migration-of-build-repository-patches-td2646493.html Best Regards, Bjoern -- https://launchpad.net/~bjoern-michaelsen signature.asc Description: PGP signature ___ 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 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
Re: [Libreoffice] [PATCH] Gentoo patches from old build repository for master
On Tue, 2011-03-08 at 19:48 +0100, Hanno Meyer-Thurow wrote: > > > 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. *ah*, now I see, I was talking above a completely different patch of course, sorry about that. IIRC, that COMMON_OUTDIR used to be a dir side-by-side with e.g. wntmsci.pro unxlngx6.pro of something like "common.pro" in each module output's where non-arch specific output would go. Doesn't seem to exist anymore anywhere. C. ___ 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/.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, 8 Mar 2011 18:45:49 +0100 Hanno Meyer-Thurow wrote: > On Tue, 08 Mar 2011 10:55:43 + > Caolán McNamara 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
On Tue, 08 Mar 2011 10:55:43 + Caolán McNamara 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 Mon, 2011-03-07 at 22:54 +0100, Hanno Meyer-Thurow wrote: > On Mon, 07 Mar 2011 20:44:04 + > Caolán McNamara 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). ... > 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. > > > 3. Fix sandbox violation in officecfg module: rm /bin/.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? I was thinking more that osl_getHomeDir/getConfigDir should return osl_getTempDirURL as a fallback if they can't get any other result ? C. ___ 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 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/.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] [PATCH] Gentoo patches from old build repository for master
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 > > 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 ? > 3. Fix sandbox violation in officecfg module: rm /bin/.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. C. ___ 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/.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