[Libreoffice] [PATCH] universal LibO URE packaging breaks in instsetoo_native (was: Debian packaging in universal LibO seems broken)
Hi all, this is a resubmitting, because I think the other patch (lurking here: http://lists.freedesktop.org/archives/libreoffice/2010-October/001329.html, please ignore it) went unnoticed 'cause I forgot to tag it as a [PATCH] and 'cause from the dev I cc'ed there I got an autoanswer stating that he will be unavailable till Nov, 1st. Without this patch the current universal LibO build seems broken to me in instsetoo_native. The attached patch seems to solve the problem. Please verify. Patch released according to LGPLv3+. In any case there seem to be still some problem during Debian package installation because the application icons seems missing on the Debian menu package. I'll investigate into the matter. beppec56. -- Kind Regards, Giuseppe Castagno Acca Esse http://www.acca-esse.eu giuseppe.castagno at acca-esse.eu beppec56 at openoffice.org >From ad5e717629d46d589c5ecc92d1f26982ab2e1037 Mon Sep 17 00:00:00 2001 From: Giuseppe Castagno Date: Fri, 22 Oct 2010 14:36:00 +0200 Subject: [PATCH] Add BRANDPACKAGEVERSION to URE. --- instsetoo_native/util/openoffice.lst |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst index ce1ac92..8daf376 100644 --- a/instsetoo_native/util/openoffice.lst +++ b/instsetoo_native/util/openoffice.lst @@ -261,6 +261,7 @@ URE PACKAGEVERSION 1.7 PACKAGEREVISION 1 PRODUCTEXTENSION +BRANDPACKAGEVERSION 3 LONG_PRODUCTEXTENSION SHORT_PRODUCTEXTENSION LICENSENAME LGPL -- 1.6.3.3 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] How can I speed up a build?
On Fri, Oct 22, 2010 at 9:15 PM, Mattias Johnsson wrote: > Hello all, > > Two (probably idiotic) questions. First, when I refresh my master branch with > > ~/loroot $ ga pull -r > > and then make via > > ~/loroot/rawbuild $ ./autogen.sh --with-num-cpus=5 --without-junit > --disable-kde > ~/loroot/rawbuild $ make > > it seems that everything is rebuilt which takes hours, even if only a > few files have changed. Is there a way to ensure that only changed and > new files are compiled and linked, so the build process is a lot > quicker? It may seems that way, but it you just did make (and not make clean before) then only thing that the make thought needed rebuilding got rebuilt It is possible that the git pull pulled a change to a header that is used in a lot of place, which would trigger a quasi full rebuild... > > Second, although I'm using autogen.sh with the --with-num-cpus=5 > option, it appears that only one cpu is being utilized. Or possibly > two at most - when I look at the output of "top" during the build, at > most I only ever see one "cc1plus" process and one "dmake" process, > and dmake is never using more that 1% of a cpu. Any thoughts? > Try to used --with-max-jobs=4. I found that parralelising the jobs is more effective that parralelising the number of compile per job. I run with 6 and 6 on a 8 core system... Another thing that may help is ccache. That won't help the first time, but it does help a lot on later rebuild... especially if you have to do a make clean && make, which is needed sometimes, unfortunatly. Norbert > Cheers, > Mattias > ___ > LibreOffice mailing list > LibreOffice@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/libreoffice > ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] vos removal: looking for windows and MacOS build-tester
On Fri, Oct 22, 2010 at 10:09 PM, Santiago Bosio wrote: > El 21/10/10 21:11, Norbert Thiebaud escribió: >> >> ... > >> git checkout -b vos origin/feature/vos-removal&& ./bin/g checkout -b >> vos origin/feature/vos-removal >> > > I'm trying to build on Fedora 13 (32bit). Thanks.. > It's still going on, but I just > want to comment that this last command fails on git repo 'l10n'. I have it > enabled as I build with the switch "--with-lang=es". I had to enter on each > other git repo and execute "git checkout -b vos origin/feature/vos-removal" > there. > > Perhaps that feature branch isn't created on the "l10n" repo. It is very possible indeed. when thing like that happend, you can use ./bin/g -f checkout the -f tell bin/g to not stop if one repo has a problem and to keep applying the command to other repos. (this would have avoided the need to do the command manually on each other repos) Norbert > > Best regards, > > Santiago > ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] How can I speed up a build?
Hello all, Two (probably idiotic) questions. First, when I refresh my master branch with ~/loroot $ ga pull -r and then make via ~/loroot/rawbuild $ ./autogen.sh --with-num-cpus=5 --without-junit --disable-kde ~/loroot/rawbuild $ make it seems that everything is rebuilt which takes hours, even if only a few files have changed. Is there a way to ensure that only changed and new files are compiled and linked, so the build process is a lot quicker? Second, although I'm using autogen.sh with the --with-num-cpus=5 option, it appears that only one cpu is being utilized. Or possibly two at most - when I look at the output of "top" during the build, at most I only ever see one "cc1plus" process and one "dmake" process, and dmake is never using more that 1% of a cpu. Any thoughts? Cheers, Mattias ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] vos removal: looking for windows and MacOS build-tester
I guess you did emerge rpm I had a problem with rpm, where the current 'stable' rpm (4.4.6-r7) in portage would segfault... I unmask th ~amd64 and got the 4.8.1 ebuild... that would pass the point where rpm segfault.. but then failed later on yet unknown reasons. I removed /var/lib/rpm, emerged -C rpm, and re-emerged the 'stable' rpm... and that seems to have 'solved' it. Norbert On Fri, Oct 22, 2010 at 7:07 PM, Wols Lists wrote: > On 23/10/10 00:55, Norbert Thiebaud wrote: >> On Fri, Oct 22, 2010 at 5:41 PM, Wols Lists wrote: >>> On 22/10/10 01:11, Norbert Thiebaud wrote: Hi, I've pushed an updated version of the feature/vos-removal branch At this point vos is no more, and I build and 'smoketest' successfully in rawbuild on Linux x86_64 I'm looking for volonteer to build it and to basic test on it on other platforms. (note Linux welcome too, it won't hurt to have another flavor of Linux tested ) Howto: in your root git: git pull -r && ./bin/g pull -r git checkout -b vos origin/feature/vos-removal && ./bin/g checkout -b vos origin/feature/vos-removal cd rawbuild ./autogen.sh . (applicable parameter for your platform.. the usual stuff) make if you have a build failure, the usual source .Env.sh; cd ; build 2>&1 | tee problematic_module.log and post the problematic_module.log if the make is successful, try cd test build deliver -link cd ../smoketestoo_install build if everything goes right you should see near the end 'OK(1)' Bonus Point: I had to do a lot of rewriting in the adabas driver to kick vos out, if someone has the ability to muscle up that driver that would be great Cleanup: When you are done. to get rid of the vos branch do, from the root repo git checkout master && ./bin/g checkout master git branch -D vos && ./bin/g branch -D vos Thanks. >>> On my system (gentoo) the autogen crashes with "rpm not found" >>> >>> checking for javac... /usr/bin/javac >>> checking for javadoc... /usr/bin/javadoc >>> configure: WARNING: JAVA_HOME was not explicitly informed with >>> --with-jdk-home. the configure script >>> configure: WARNING: attempted to find JAVA_HOME automatically, but >>> apparently it failed >>> configure: WARNING: in case JAVA_HOME is incorrectly set, some projects >>> with not be built correctly >>> checking for jawt lib name... -ljawt >>> checking whether to enable gcj aot compilation... no >>> checking for dmake... no >>> dmake will be built on ./bootstrap >>> checking whether to enable EPM for packing... yes >>> checking for epm... no >>> EPM will be built. >>> checking which package format to use... rpm >>> checking for rpm... configure: error: not found >>> >>> at which point it bombs back to the command line. >> >> I have a gentoo too, and I somehow have to specify the jdk-home on the >> autogen in rawbuild: >> >> ./autogen.sh --with-num-cpus=6 --with-max-jobs=6 --without-junit >> --disable-kde --with-jdk-home=/opt/sun-jdk-1.6.0.20 > I'm guessing that, in my case, that's icedtea. But no change, same bomb. > > Cheers, > Wol > ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] vos removal: looking for windows and MacOS build-tester
On 23/10/10 00:55, Norbert Thiebaud wrote: > On Fri, Oct 22, 2010 at 5:41 PM, Wols Lists wrote: >> On 22/10/10 01:11, Norbert Thiebaud wrote: >>> Hi, >>> >>> I've pushed an updated version of the feature/vos-removal branch >>> >>> At this point vos is no more, and I build and 'smoketest' successfully >>> in rawbuild on Linux x86_64 >>> >>> I'm looking for volonteer to build it and to basic test on it on other >>> platforms. (note Linux welcome too, it won't hurt to have another >>> flavor of Linux tested ) >>> >>> Howto: >>> >>> in your root git: >>> >>> git pull -r && ./bin/g pull -r >>> >>> git checkout -b vos origin/feature/vos-removal && ./bin/g checkout -b >>> vos origin/feature/vos-removal >>> >>> cd rawbuild >>> >>> ./autogen.sh . (applicable parameter for your platform.. the usual >>> stuff) >>> >>> make >>> >>> if you have a build failure, the usual source .Env.sh; cd >>> ; build 2>&1 | tee problematic_module.log >>> and post the problematic_module.log >>> >>> if the make is successful, try >>> >>> cd test >>> build >>> deliver -link >>> cd ../smoketestoo_install >>> build >>> >>> if everything goes right you should see near the end 'OK(1)' >>> >>> Bonus Point: >>> I had to do a lot of rewriting in the adabas driver to kick vos out, >>> if someone has the ability to muscle up that driver that would be >>> great >>> >>> >>> Cleanup: >>> When you are done. to get rid of the vos branch do, from the root repo >>> >>> git checkout master && ./bin/g checkout master >>> git branch -D vos && ./bin/g branch -D vos >>> >>> Thanks. >>> >>> >>> >> On my system (gentoo) the autogen crashes with "rpm not found" >> >> checking for javac... /usr/bin/javac >> checking for javadoc... /usr/bin/javadoc >> configure: WARNING: JAVA_HOME was not explicitly informed with >> --with-jdk-home. the configure script >> configure: WARNING: attempted to find JAVA_HOME automatically, but >> apparently it failed >> configure: WARNING: in case JAVA_HOME is incorrectly set, some projects >> with not be built correctly >> checking for jawt lib name... -ljawt >> checking whether to enable gcj aot compilation... no >> checking for dmake... no >> dmake will be built on ./bootstrap >> checking whether to enable EPM for packing... yes >> checking for epm... no >> EPM will be built. >> checking which package format to use... rpm >> checking for rpm... configure: error: not found >> >> at which point it bombs back to the command line. > > I have a gentoo too, and I somehow have to specify the jdk-home on the > autogen in rawbuild: > > ./autogen.sh --with-num-cpus=6 --with-max-jobs=6 --without-junit > --disable-kde --with-jdk-home=/opt/sun-jdk-1.6.0.20 I'm guessing that, in my case, that's icedtea. But no change, same bomb. Cheers, Wol ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] vos removal: looking for windows and MacOS build-tester
On Fri, Oct 22, 2010 at 5:41 PM, Wols Lists wrote: > On 22/10/10 01:11, Norbert Thiebaud wrote: >> Hi, >> >> I've pushed an updated version of the feature/vos-removal branch >> >> At this point vos is no more, and I build and 'smoketest' successfully >> in rawbuild on Linux x86_64 >> >> I'm looking for volonteer to build it and to basic test on it on other >> platforms. (note Linux welcome too, it won't hurt to have another >> flavor of Linux tested ) >> >> Howto: >> >> in your root git: >> >> git pull -r && ./bin/g pull -r >> >> git checkout -b vos origin/feature/vos-removal && ./bin/g checkout -b >> vos origin/feature/vos-removal >> >> cd rawbuild >> >> ./autogen.sh . (applicable parameter for your platform.. the usual >> stuff) >> >> make >> >> if you have a build failure, the usual source .Env.sh; cd >> ; build 2>&1 | tee problematic_module.log >> and post the problematic_module.log >> >> if the make is successful, try >> >> cd test >> build >> deliver -link >> cd ../smoketestoo_install >> build >> >> if everything goes right you should see near the end 'OK(1)' >> >> Bonus Point: >> I had to do a lot of rewriting in the adabas driver to kick vos out, >> if someone has the ability to muscle up that driver that would be >> great >> >> >> Cleanup: >> When you are done. to get rid of the vos branch do, from the root repo >> >> git checkout master && ./bin/g checkout master >> git branch -D vos && ./bin/g branch -D vos >> >> Thanks. >> >> >> > On my system (gentoo) the autogen crashes with "rpm not found" > > checking for javac... /usr/bin/javac > checking for javadoc... /usr/bin/javadoc > configure: WARNING: JAVA_HOME was not explicitly informed with > --with-jdk-home. the configure script > configure: WARNING: attempted to find JAVA_HOME automatically, but > apparently it failed > configure: WARNING: in case JAVA_HOME is incorrectly set, some projects > with not be built correctly > checking for jawt lib name... -ljawt > checking whether to enable gcj aot compilation... no > checking for dmake... no > dmake will be built on ./bootstrap > checking whether to enable EPM for packing... yes > checking for epm... no > EPM will be built. > checking which package format to use... rpm > checking for rpm... configure: error: not found > > at which point it bombs back to the command line. I have a gentoo too, and I somehow have to specify the jdk-home on the autogen in rawbuild: ./autogen.sh --with-num-cpus=6 --with-max-jobs=6 --without-junit --disable-kde --with-jdk-home=/opt/sun-jdk-1.6.0.20 > ___ > LibreOffice mailing list > LibreOffice@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/libreoffice > ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] vos removal: looking for windows and MacOS build-tester
On 22/10/10 01:11, Norbert Thiebaud wrote: > Hi, > > I've pushed an updated version of the feature/vos-removal branch > > At this point vos is no more, and I build and 'smoketest' successfully > in rawbuild on Linux x86_64 > > I'm looking for volonteer to build it and to basic test on it on other > platforms. (note Linux welcome too, it won't hurt to have another > flavor of Linux tested ) > > Howto: > > in your root git: > > git pull -r && ./bin/g pull -r > > git checkout -b vos origin/feature/vos-removal && ./bin/g checkout -b > vos origin/feature/vos-removal > > cd rawbuild > > ./autogen.sh . (applicable parameter for your platform.. the usual stuff) > > make > > if you have a build failure, the usual source .Env.sh; cd > ; build 2>&1 | tee problematic_module.log > and post the problematic_module.log > > if the make is successful, try > > cd test > build > deliver -link > cd ../smoketestoo_install > build > > if everything goes right you should see near the end 'OK(1)' > > Bonus Point: > I had to do a lot of rewriting in the adabas driver to kick vos out, > if someone has the ability to muscle up that driver that would be > great > > > Cleanup: > When you are done. to get rid of the vos branch do, from the root repo > > git checkout master && ./bin/g checkout master > git branch -D vos && ./bin/g branch -D vos > > Thanks. > > > On my system (gentoo) the autogen crashes with "rpm not found" checking for javac... /usr/bin/javac checking for javadoc... /usr/bin/javadoc configure: WARNING: JAVA_HOME was not explicitly informed with --with-jdk-home. the configure script configure: WARNING: attempted to find JAVA_HOME automatically, but apparently it failed configure: WARNING: in case JAVA_HOME is incorrectly set, some projects with not be built correctly checking for jawt lib name... -ljawt checking whether to enable gcj aot compilation... no checking for dmake... no dmake will be built on ./bootstrap checking whether to enable EPM for packing... yes checking for epm... no EPM will be built. checking which package format to use... rpm checking for rpm... configure: error: not found at which point it bombs back to the command line. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] PATCH - change default KDE from 3 to 4
With thanks to Rene Kjellerup ... your pointer was spot on. This patch (in the top level build dir) makes the development system compile with KDE4 switched on and KDE3 switched off. How do I update the develop page on the web? There's a bunch of useful stuff I'd like to document to make life easier for the next person who wants to fix a "won't build" problem (whether a global default or a personal setup). Cheers, Wol diff --git a/distro-configs/LibreOfficeLinuxDevel.conf.in b/distro-configs/LibreOfficeLinuxDevel.conf.in index a8df1e0..58b9e8d 100644 --- a/distro-configs/LibreOfficeLinuxDevel.conf.in +++ b/distro-configs/LibreOfficeLinuxDevel.conf.in @@ -1,6 +1,6 @@ --with-vendor=\"The Document Foundation\" --disable-dbus ---disable-kde4 +--enable-kde4 --enable-cairo --without-system-cairo --enable-gstreamer @@ -13,7 +13,7 @@ --with-java-target-version=1.5 --with-jdk-home=$JAVA_HOME --without-myspell-dicts ---enable-kde +--disable-kde --without-system-mozilla --without-system-jpeg --without-system-libxml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Windows dependancies
License terms regarding MSVS redistributable components are specified somewhere in the Visual Studio installation directory. IIRC, you can freely redistribute any of them with your application as long as you don't modify them in any way. I'll be able to say more precisely and/or quote the related text when I'm at desktop. On Friday 22 October 2010 12:36:44 Tor Lillqvist wrote: > > is there some redistribution licensing foo going on here? > > As far as I know the intent is that they are redistributed with an > application that needs them (i.e. one built with Microsoft's toolchain), and > it might well be that you are not allowed to redistribute them by themselves. > Have your legal expert read and interpret the license;) > > --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Windows dependancies
> is there some redistribution licensing foo going on here? As far as I know the intent is that they are redistributed with an application that needs them (i.e. one built with Microsoft's toolchain), and it might well be that you are not allowed to redistribute them by themselves. Have your legal expert read and interpret the license;) --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH] remove pam in writer sw
On Thu, 2010-10-21 at 06:42 +0200, Nadav Vinik wrote: > remove pam in writer sw Thorsten applied this one I see, always good to remove includes of headers which aren't necessary to compile. Though just in case there's any confusion, pam.hxx in writer is the header for the "Point and Mark" class, effectively the cursor implementation. i.e. (http://wiki.services.openoffice.org/wiki/Writer/Core_And_Layout) Not anything to do with the Pluggable Authentication Modules API available under Linux to authenticate a user and is currently a dependency of sal/vos in LibreOffice, but on first glance seems ununused and possibly worth removing/stripping down http://wiki.documentfoundation.org/Easy_Hacks#remove_PAM_dependency C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] vos removal: looking for windows and MacOS build-tester
Ubuntu 10.10 here. Entering /media/libreoffice/rawbuild/comphelper/util Making:libcomphelp4gcc3.so ../unxlngx6.pro/slo/regpathhelper.o: In function `comphelper::getPathToSystemRegistry()': regpathhelper.cxx:(.text+0x82): undefined reference to `vos::OStartupInfo::OStartupInfo()' regpathhelper.cxx:(.text+0x8d): undefined reference to `vos::OStartupInfo::getExecutableFile(rtl::OUString&) const' regpathhelper.cxx:(.text+0x14c): undefined reference to `vos::OStartupInfo::~OStartupInfo()' regpathhelper.cxx:(.text+0x382): undefined reference to `vos::OStartupInfo::~OStartupInfo()' ../unxlngx6.pro/slo/regpathhelper.o: In function `comphelper::getPathToUserRegistry()': regpathhelper.cxx:(.text+0x4f3): undefined reference to `vos::OStartupInfo::OStartupInfo()' regpathhelper.cxx:(.text+0x4fb): undefined reference to `vos::OStartupInfo::getCommandArgCount()' regpathhelper.cxx:(.text+0x544): undefined reference to `vos::OStartupInfo::getCommandArg(unsigned int, rtl::OUString&)' regpathhelper.cxx:(.text+0x620): undefined reference to `vos::OStartupInfo::~OStartupInfo()' regpathhelper.cxx:(.text+0xb4e): undefined reference to `vos::OStartupInfo::~OStartupInfo()' collect2: ld returned 1 exit status dmake: Error code 1, while making '../unxlngx6.pro/lib/libcomphelp4gcc3.so' pgpT0q1CkKxP6.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH] sfx2: Simplify "About" dialog
On Fri, 2010-10-22 at 11:22 +0200, Sebastian Spaeth wrote: > Removed lots of code that was supposed to do scrolling in the about dialog. But the scolling in the about dialog is one of those cunning neato sort of easter egg things. Go to the about box and hold CTRL and type sdt. I'd be sad to loose that :-( Definitely be nice to tidy up the about dialog, but can we rework that to retain the about scrolling. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] build failure loading pythonloader.uno.so
On Fri, 2010-10-22 at 15:03 +0200, Thomas Klausner wrote: > error (CannotRegisterImplementationException): loading component library > failed: ./pythonloader.uno.so > dmake: Error code 1, while making '../../unxbsdx3.pro/lib/pyuno_services.rdb' > > I don't know what it's doing here or why it fails -- verbose=1 doesn't > tell me more. Here's where porting gets hard unfortunately. This is just a generic error, and from an exception. What might help you out there is find exactly where the exceptions is being thrown and see what the exact error is at the throw point. Which might be rather painful with exceptions being caught, and something else thrown instead. e.g. adding the attached patch and export GDBREGCOMPTRACE=1 you get the picture, even if I've typos etc in this. The other (horror possibility) is that your uno bridge isn't working at all. Running the basic part of the uno bridge test might be already possible for you if you try... cd testtools/source/bridgetest dmake C. --- solenv/inc/settings.mk.orig 2010-10-22 14:39:32.0 +0100 +++ solenv/inc/settings.mk 2010-10-22 14:41:16.0 +0100 @@ -1048,19 +1048,24 @@ # allow seperate handling EXTMAXPROCESS*=$(MAXPROCESS) + +GDBTRACE=gdb --command=$(SOLARENV)/bin/gdbtrycatchtrace --args +.IF "$(DEBUGCPPUNIT)" != "" +GDBCPPUNITTRACE=$(GDBTRACE) +.ENDIF +.IF "$(GDBREGCOMPTRACE)" != "" +GDBCPPUNITTRACE=$(GDBTRACE) +.ENDIF + IDLC*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/idlc REGMERGE*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/regmerge REGCOMPARE*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/regcompare -REGCOMP*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/regcomp +REGCOMP*=$(AUGMENT_LIBRARY_PATH) $(GDBREGCOMPTRACE) $(SOLARBINDIR)/regcomp CPPUMAKER*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/cppumaker JAVAMAKER*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/javamaker RDBMAKER*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/rdbmaker CLIMAKER*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/climaker -.IF "$(DEBUGCPPUNIT)" != "" -GDBCPPUNITTRACE=gdb --command=$(SOLARENV)/bin/gdbtrycatchtrace --args -.ENDIF - CPPUNITTESTER=$(AUGMENT_LIBRARY_PATH_LOCAL) $(GDBCPPUNITTRACE) $(SOLARBINDIR)/cppunittester HELPEX=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/helpex LNGCONVEX=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/lngconvex ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] ucb/source/ucb compilation error
At 8:08am -0400 Fri, 22 Oct 2010, Thomas Klausner wrote: On Thu, Oct 21, 2010 at 05:16:32PM +0200, Thomas Klausner wrote: I'll switch diagnose.h (locally) to give " " for OSL_THIS_FUNC, as it currently seems to do for everyone else. To close this thread: I've pushed this change. Have you enumerated everywhere this is used (in the code base). At the moment, I'm having a difficult time seeing the use (both logically and usefully) of a macro that defines a single space. At the point you're basically castrating that macro, why not just remove it entirely? As they say, "code removed is code debugged," and we've already experienced some confusion over the handling of the use-related __PRETTY_FUNCTION__ non-macro. Cheers, Kevin ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Debian packaging in universal LibO seems broken.
Comments follow Giuseppe Castagno wrote: Hi all, it seems that the Debian packaging in the universal is somehow broken in instsetoo_native. The URE package name seems wrong. The log is as follow: ... Calculating Installed-Size... Building Debian binary distribution... Packaging failed! Try 2 : Could not execute "LD_PRELOAD=/home/beppe/LibO-b/LibO_master-head-wrk2/wrk2.d/build/libreoffice-3.2.99.2/solver/330/unxlngx6.pro/bin/getuid.so /home/beppe/LibO-b/LibO_master-head-wrk2/wrk2.d/build/libreoffice-3.2.99.2/solver/330/unxlngx6.pro/bin/epm -f deb libreoffice%brandpackageversion-ure /home/beppe/LibO-b/LibO_master-head-wrk2/wrk2.d/build/libreoffice-3.2.99.2/instsetoo_native/unxlngx6.pro/URE/deb/listfile/en-US/epm_gid_Module_Root_Ure_Hidden.lst --output-dir DEBS -v 2>&1 |"! Systemcall (Try 3): LD_PRELOAD=/home/beppe/LibO-b/LibO_master-head-wrk2/wrk2.d/build/libreoffice-3.2.99.2/solver/330/unxlngx6.pro/bin/getuid.so /home/beppe/LibO-b/LibO_master-head-wrk2/wrk2.d/build/libreoffice-3.2.99.2/solver/330/unxlngx6.pro/bin/epm -f deb libreoffice%brandpackageversion-ure /home/beppe/LibO-b/LibO_master-head-wrk2/wrk2.d/build/libreoffice-3.2.99.2/instsetoo_native/unxlngx6.pro/URE/deb/listfile/en-US/epm_gid_Module_Root_Ure_Hidden.lst --output-dir DEBS -v 2>&1 | dpkg-deb: parse error, in file 'libreoffice%brandpackageversion-ure_1.7.0-1_amd64/DEBIAN/control' near line 1: invalid package name (character `%' not allowed (only letters, digits and characters `-+._')) ESP Package Manager v3.7.0 Copyright 1999-2003 by Easy Software Products. Patched for OpenOffice.org ... Seems related to the new naming scheme and %brandpackageversion not initialized, but unfortunately ATM I have no idea how to fix it. the attached patch seems to solve to problem. Please verify. Patch released according to LGPLv3+. In any case there seem to be still some problem during Debian package installation because there is something missing on the distro menu package. I'll investigate later on this matter if no one else does. CCed to Petr 'cause according the git logs it's the last one working on this. beppec56. -- Kind Regards, Giuseppe Castagno Acca Esse http://www.acca-esse.eu giuseppe.castagno at acca-esse.eu beppec56 at openoffice.org >From ad5e717629d46d589c5ecc92d1f26982ab2e1037 Mon Sep 17 00:00:00 2001 From: Giuseppe Castagno Date: Fri, 22 Oct 2010 14:36:00 +0200 Subject: [PATCH] Add BRANDPACKAGEVERSION to URE. --- instsetoo_native/util/openoffice.lst |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst index ce1ac92..8daf376 100644 --- a/instsetoo_native/util/openoffice.lst +++ b/instsetoo_native/util/openoffice.lst @@ -261,6 +261,7 @@ URE PACKAGEVERSION 1.7 PACKAGEREVISION 1 PRODUCTEXTENSION +BRANDPACKAGEVERSION 3 LONG_PRODUCTEXTENSION SHORT_PRODUCTEXTENSION LICENSENAME LGPL -- 1.6.3.3 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] build failure loading pythonloader.uno.so
Hi! My latest build failure is: Entering /disk/2/archive/libreoffice/build/libreoffice-3.2.99.2/pyuno/source/loader Making:all_pythonloader.uno.dpslo Compiling: pyuno/unxbsdx3.pro/misc/pythonloader.uno_version.c Compiling: pyuno/source/loader/pyuno_loader.cxx Making:pythonloader.uno.lib Making:pythonloader.uno.so cp pythonloader.py ../../unxbsdx3.pro/lib/pythonloader.py rm -f ../../unxbsdx3.pro/lib/pyuno_services.rdb ../../unxbsdx3.pro/lib/pyuno_services.tmp ../../unxbsdx3.pro/lib/pyuno_services.rdb cd ../../unxbsdx3.pro/lib && : && LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}/disk/2/archive/libreoffice/build/libreoffice-3.2.99.2/solver/330/unxbsdx3.pro/lib /disk/2/archive/libreoffice/build/libreoffice-3.2.99.2/solver/330/unxbsdx3.pro/bin/regcomp -register -r pyuno_services.tmp -wop -c stocservices.uno -c invocation.uno -c introspection.uno -c invocadapt.uno -c proxyfac.uno -c reflection.uno -c ./pythonloader.uno stocservices.uno invocation.uno introspection.uno invocadapt.uno proxyfac.uno reflection.uno ./pythonloader.uno register component 'stocservices.uno' in registry 'pyuno_services.tmp' successful! register component 'invocation.uno' in registry 'pyuno_services.tmp' successful! register component 'introspection.uno' in registry 'pyuno_services.tmp' successful! register component 'invocadapt.uno' in registry 'pyuno_services.tmp' successful! register component 'proxyfac.uno' in registry 'pyuno_services.tmp' successful! register component 'reflection.uno' in registry 'pyuno_services.tmp' successful! register component './pythonloader.uno' in registry 'pyuno_services.tmp' failed! error (CannotRegisterImplementationException): loading component library failed: ./pythonloader.uno.so dmake: Error code 1, while making '../../unxbsdx3.pro/lib/pyuno_services.rdb' I don't know what it's doing here or why it fails -- verbose=1 doesn't tell me more. Thomas ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] ucb/source/ucb compilation error
On Thu, Oct 21, 2010 at 05:16:32PM +0200, Thomas Klausner wrote: > I'll switch diagnose.h (locally) to give " " for OSL_THIS_FUNC, as it > currently seems to do for everyone else. To close this thread: I've pushed this change. Thomas ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] BOOL redefinition problem
On Fri, Oct 22, 2010 at 01:36:19AM -0500, Norbert Thiebaud wrote: > Completely untested but: > > in BDriver.cxx, move > #include "odbc/OFunction.hh" and odbc/OTools.hxx to the end of the > include list, and just before them add #undef BOOL. see if that help > (the more permanent solution is to convert BOOL to sal_Bool and remove > the definition into solar.h.. that is in the 'easy hack' todo list... > but it is quite a big 'easy' task I tried the attached bool.diff, but it didn't work. I then tried bool.2.diff instead, which didn't work either. I've switched to external iodbc for now. Thanks for the suggestion though, Thomas diff --git a/connectivity/source/drivers/adabas/BDriver.cxx b/connectivity/source/drivers/adabas/BDriver.cxx index 705df3d..58526ed 100644 --- a/connectivity/source/drivers/adabas/BDriver.cxx +++ b/connectivity/source/drivers/adabas/BDriver.cxx @@ -32,9 +32,7 @@ #include #include "adabas/BDriver.hxx" #include "adabas/BConnection.hxx" -#include "odbc/OFunctions.hxx" #include -#include "odbc/OTools.hxx" #include "connectivity/dbexception.hxx" #include "TConnection.hxx" #include "diagnose_ex.h" @@ -45,6 +43,10 @@ #include #include "resource/adabas_res.hrc" #include "resource/sharedresources.hxx" +/* newer iodbc headers define BOOL as well, avoid conflict with sal_Bool */ +#undef BOOL +#include "odbc/OFunctions.hxx" +#include "odbc/OTools.hxx" #include diff --git a/tools/inc/tools/solar.h b/tools/inc/tools/solar.h index f6a0bcb..47b5718 100644 --- a/tools/inc/tools/solar.h +++ b/tools/inc/tools/solar.h @@ -54,7 +54,9 @@ /* Previous typedefs from before sal convergence are in comments */ /* to the right of the new types.*/ +#if !defined(BOOL) typedef sal_Bool BOOL; /* typedef unsigned char BOOL; */ +#endif typedef sal_uInt8 BYTE; /* typedef unsigned char BYTE; */ typedef sal_uInt16 USHORT; /* typedef unsigned short USHORT; */ typedef sal_uIntPtrULONG; /* typedef unsigned long ULONG; */ ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] Debian packaging in universal LibO seems broken.
Hi all, it seems that the Debian packaging in the universal is somehow broken in instsetoo_native. The URE package name seems wrong. The log is as follow: ... Calculating Installed-Size... Building Debian binary distribution... Packaging failed! Try 2 : Could not execute "LD_PRELOAD=/home/beppe/LibO-b/LibO_master-head-wrk2/wrk2.d/build/libreoffice-3.2.99.2/solver/330/unxlngx6.pro/bin/getuid.so /home/beppe/LibO-b/LibO_master-head-wrk2/wrk2.d/build/libreoffice-3.2.99.2/solver/330/unxlngx6.pro/bin/epm -f deb libreoffice%brandpackageversion-ure /home/beppe/LibO-b/LibO_master-head-wrk2/wrk2.d/build/libreoffice-3.2.99.2/instsetoo_native/unxlngx6.pro/URE/deb/listfile/en-US/epm_gid_Module_Root_Ure_Hidden.lst --output-dir DEBS -v 2>&1 |"! Systemcall (Try 3): LD_PRELOAD=/home/beppe/LibO-b/LibO_master-head-wrk2/wrk2.d/build/libreoffice-3.2.99.2/solver/330/unxlngx6.pro/bin/getuid.so /home/beppe/LibO-b/LibO_master-head-wrk2/wrk2.d/build/libreoffice-3.2.99.2/solver/330/unxlngx6.pro/bin/epm -f deb libreoffice%brandpackageversion-ure /home/beppe/LibO-b/LibO_master-head-wrk2/wrk2.d/build/libreoffice-3.2.99.2/instsetoo_native/unxlngx6.pro/URE/deb/listfile/en-US/epm_gid_Module_Root_Ure_Hidden.lst --output-dir DEBS -v 2>&1 | dpkg-deb: parse error, in file 'libreoffice%brandpackageversion-ure_1.7.0-1_amd64/DEBIAN/control' near line 1: invalid package name (character `%' not allowed (only letters, digits and characters `-+._')) ESP Package Manager v3.7.0 Copyright 1999-2003 by Easy Software Products. Patched for OpenOffice.org ... Seems related to the new naming scheme and %brandpackageversion not initialized, but unfortunately ATM I have no idea how to fix it. beppec56. -- Kind Regards, Giuseppe Castagno Acca Esse http://www.acca-esse.eu giuseppe.castagno at acca-esse.eu beppec56 at openoffice.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Image Compression Patch
Hi Kendy I've finished the process of lossless optimization for the default_images pack.The archive is available here:http://people.bath.ac.uk/ea2aced/OOo/default_images.zip I also raised a corresponding issue over at OOo to give them a chance to get this upstream if they wish...http://qa.openoffice.org/issues/show_bug.cgi?id=115195 I'd be most grateful if you could get this checked in to the repository. Cheers.I haven't yet compress the new 'brand' image folder- but I know these are a work in progress any way. Many thanks,Andrew > Subject: Re: [Libreoffice] Image Compression Patch > From: ke...@suse.cz > To: p...@pathawks.com; ace_d...@hotmail.com > CC: libreoffice@lists.freedesktop.org > Date: Tue, 12 Oct 2010 14:30:38 +0200 > > Hi Pat, > > On 2010-10-11 at 10:20 -0500, Pat Hawks wrote: > > > I've applied some lossless compression to the PNGs in the package to > > reduce the size of the files a bit, some by as much as 50% > > > > In the grand scheme of things I know it's not life or death, but every > > little bit helps, right? > > > > This is contributed under the LGPLv3+ > > When you send your script you used for the better compression of the > icons, please CC: Andrew too - he has previously done lots of good work > on recompressing the images, and has just recently got in touch with us > again. Would be great if you both can share experience :-) > > Thank you a lot, > Kendy > > ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [PATCH] sfx2: Simplify "About" dialog
Removed lots of code that was supposed to do scrolling in the about dialog. And removed unused includes and variables too. Also don't squeeze the Copyright text in a too small multiline edit. Compiled and run: looks a bit nicer than before and less code too. There are still a few commented out lines where we need to remove Resource strings, that's beyond my head though. Included TODOs for that. Signed-off-by: Sebastian Spaeth --- All in all this is a net win (170 LOC less and some more comments), and easier too understand too IMHO. Not sure sfx2/inc/about.hxx | 25 +--- sfx2/source/dialog/about.cxx | 351 -- 2 files changed, 101 insertions(+), 275 deletions(-) diff --git a/sfx2/inc/about.hxx b/sfx2/inc/about.hxx index 901807e..51de28a 100644 --- a/sfx2/inc/about.hxx +++ b/sfx2/inc/about.hxx @@ -31,57 +31,34 @@ #include #include -#include #include -#include -#include #include "svtools/fixedhyper.hxx" #include// SfxModalDialog -DECLARE_LIST( AccelList, Accelerator* ) - // class AboutDialog - class AboutDialog : public SfxModalDialog { private: OKButton aOKButton; -Image aAppLogo; +Image aAppLogo; MultiLineEdit aVersionText; MultiLineEdit aCopyrightText; svt::FixedHyperlink aInfoLink; -ResStringArray aDeveloperAry; -String aDevVersionStr; -String aAccelStr; -String aVersionData; String aVersionTextStr; String aCopyrightTextStr; String aLinkStr; -AccelList aAccelList; - -AutoTimer aTimer; -longnOff; -longm_nDeltaWidth; -intm_nPendingScrolls; - -BOOLbNormal; - protected: virtual BOOL Close(); virtual void Paint( const Rectangle& ); public: AboutDialog( Window* pParent, const ResId& rId, const String& rVerStr ); -~AboutDialog(); -DECL_LINK( TimerHdl, Timer * ); -DECL_LINK( AccelSelectHdl, Accelerator * ); DECL_LINK( HandleHyperlink, svt::FixedHyperlink * ); }; #endif // #ifndef _ABOUT_HXX - - diff --git a/sfx2/source/dialog/about.cxx b/sfx2/source/dialog/about.cxx index a6360e1..289b995 100644 --- a/sfx2/source/dialog/about.cxx +++ b/sfx2/source/dialog/about.cxx @@ -31,46 +31,44 @@ // include --- -#include +//#include #include -#include -#include -#include -#include -#include +//#include +//#include +//#include +//#include #include #include -#include -#include -#include - +//#include +//#include +//#include +// #include "com/sun/star/system/SystemShellExecuteFlags.hpp" #include "com/sun/star/system/XSystemShellExecute.hpp" #include #include "comphelper/anytostring.hxx" #include "cppuhelper/exc_hlp.hxx" -#include "cppuhelper/bootstrap.hxx" - -#include +//#include "cppuhelper/bootstrap.hxx" +// +//#include +//TODO:Clean up about.hxx too #include "about.hxx" -#include "sfxresid.hxx" -#include +//#include "sfxresid.hxx" +//#include #include - #include "dialog.hrc" using namespace ::com::sun::star; -// defines --- - -#define SCROLL_OFFSET 1 -#define SPACE_OFFSET 5 -#define SCROLL_TIMER 30 - -#define WELCOME_URL DEFINE_CONST_UNICODE( "http://www.openoffice.org/welcome/credits.html"; ) +#define SPACE_OFFSET 10 +#define WELCOME_URL DEFINE_CONST_UNICODE( "http://www.openoffice.org/welcome/credits.html"; ) -/** loads the application logo as used in the about dialog and impress slideshow pause screen */ +/** + * loads the application logo as used in the about dialog + * and impress slideshow pause screen + * @return Image() with the Application logo +*/ Image SfxApplication::GetApplicationLogo() { BitmapEx aBitmap; @@ -78,38 +76,42 @@ Image SfxApplication::GetApplicationLogo() return Image( aBitmap ); } +/** + * Class containing the Help menu about dialog +*/ AboutDialog::AboutDialog( Window* pParent, const ResId& rId, const String& rVerStr ) : SfxModalDialog ( pParent, rId ), - aOKButton ( this, ResId( ABOUT_BTN_OK, *rId.GetResMgr() ) ), aVersionText ( this, ResId( ABOUT_FTXT_VERSION, *rId.GetResMgr() ) ), aCopyrightText ( this, ResId( ABOUT_FTXT_COPYRIGHT, *rId.GetResMgr() ) ), aInfoLink ( this, ResId( ABOUT_FTXT_LINK, *rId.GetResMgr() ) ), -aDeveloperAry ( ResId( ABOUT_STR_DEVELOPER_ARY, *rId.GetResMgr() ) ), -aDevVersionStr ( rVerStr ), -aAccelStr ( ResId( ABOUT_STR_ACCEL, *rId.GetResMgr() ) ), +//TODO, remove from resources +//aDeveloperAr
Re: [Libreoffice] Minor translation, commented code removal
On Tue, 2010-10-19 at 01:55 -0400, Kevin Hunter wrote: > Here are 3 minor patches against calc/sc/source/core/data/attarray.cxx. With a bit of massaging I got these to apply. I removed the bits that remove the vim modelines at the end of the document. Those are new and part of the attempt to make it easier to adhere to the new whitespace checkin rules. Otherwise pushed and committed, thanks. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] User-experience <---> C++ classes
On Thu, Oct 21, 2010 at 09:02:45PM -0300, Júlio Hoffimann wrote: > There is a place where i can make a connection between my user-experience > and LibreOffice's C++ classes? > > I know this link generated by Doxygen, http://docs.go-oo.org/, but would be > helpful an user point of view to get familiar with the project. I want to > contribute more than cleanup comments and warnings. Cedric had a great blog post regarding this area: http://cedric.bosdonnat.free.fr/wordpress/?p=657 HTH pgpmDv2Iq5yGG.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice