Document Foundation Mail Archive › LibreOffice › Dev

[Patch] Fix for installer::languages::shorten_language_string()

Classic

List

Threaded

5 messages Options

Sean McMurray-2

[Patch] Fix for installer::languages::shorten_language_string()

This patch is public domain.

_______________________________________________
LibreOffice mailing list
[hidden email]
http://lists.freedesktop.org/mailman/listinfo/libreoffice

0001-Bug-fix-for-installer-languages-shorten_language_s.patch (2K) Download Attachment

Tor Lillqvist

Re: [Patch] Fix for installer::languages::shorten_language_string()

Please note that your earlier MD5::Digest patch was reverted, though, because it was causing problems, so this follow-up patch which presumably depends on that earlier one can not be applied. I didn't notice the problems myself as I hadn't got that far in the build before the patch was applied and then reverted... but those who experienced the problems hopefully can describe in more detail.

Cheers,
--tml

_______________________________________________
LibreOffice mailing list
[hidden email]
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Michael Meeks

Re: [Patch] Fix for installer::languages::shorten_language_string()

Hi Sean,

On Wed, 2010-10-27 at 02:24 -0600, Tor Lillqvist wrote:
> Please note that your earlier MD5::Digest patch was reverted, though,
> because it was causing problems

Right - it was breaking existing includes of Digest::MD5 at least on my
system. Quite possibly this is because I first committed the digest
code, and then the changes to adapt to it (if so my fault) :-)

Any chance of a complete git diff origin/master..master ?

Thanks,

Michael.

--
[hidden email] <><, Pseudo Engineer, itinerant idiot

_______________________________________________
LibreOffice mailing list
[hidden email]
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Sean McMurray-2

Re: [Patch] Fix for installer::languages::shorten_language_string()

Attached are the three commits that make up the whole patch.
I hope this helps.

On 10/27/2010 01:44 AM, Michael Meeks wrote:

> Hi Sean,
>
> On Wed, 2010-10-27 at 02:24 -0600, Tor Lillqvist wrote:
>
>> Please note that your earlier MD5::Digest patch was reverted, though,
>> because it was causing problems
>>
> Right - it was breaking existing includes of Digest::MD5 at least on my
> system. Quite possibly this is because I first committed the digest
> code, and then the changes to adapt to it (if so my fault) :-)
>
> Any chance of a complete git diff origin/master..master ?
>
> Thanks,
>
> Michael.
>

_______________________________________________
LibreOffice mailing list
[hidden email]
http://lists.freedesktop.org/mailman/listinfo/libreoffice

0001-Added-perl-module-required-for-commit-f8114ef6051e0f.patch (30K) Download Attachment

0001-Bug-fix-for-installer-languages-shorten_language_s.patch (2K) Download Attachment

0001-Created-installer-languages-shorten_language_strin.patch (7K) Download Attachment

Michael Meeks

Re: [Patch] Fix for installer::languages::shorten_language_string()

Hi Sean,

On Wed, 2010-10-27 at 07:23 -0700, Sean McMurray wrote:
> Attached are the three commits that make up the whole patch.
> I hope this helps.

Hokay - so I applied, tested and got the same problem as before:

$ bin/ooinstall /opt/TTInstall
Reading setup from bin/setup
Running OOo installer
Digest::MD5 object version 2.39 does not match bootstrap parameter 2.51 at /usr/lib/perl5/5.12.1/i586-linux-thread-multi/DynaLoader.pm line 223.
Compilation failed in require at /data/opt/OpenOffice/HEAD/build/libreoffice-3.2.99.2/solenv/bin/modules/installer/languages.pm line 30.
BEGIN failed--compilation aborted at /data/opt/OpenOffice/HEAD/build/libreoffice-3.2.99.2/solenv/bin/modules/installer/languages.pm line 30.
Compilation failed in require at /data/opt/OpenOffice/HEAD/build/libreoffice-3.2.99.2/solenv/bin/modules/installer/systemactions.pm line 35.
BEGIN failed--compilation aborted at /data/opt/OpenOffice/HEAD/build/libreoffice-3.2.99.2/solenv/bin/modules/installer/systemactions.pm line 35.
Compilation failed in require at /data/opt/OpenOffice/HEAD/build/libreoffice-3.2.99.2/solenv/bin/modules/installer/exiter.pm line 33.
BEGIN failed--compilation aborted at /data/opt/OpenOffice/HEAD/build/libreoffice-3.2.99.2/solenv/bin/modules/installer/exiter.pm line 33.
Compilation failed in require at /data/opt/OpenOffice/HEAD/build/libreoffice-3.2.99.2/solenv/bin/modules/installer/archivefiles.pm line 33.
BEGIN failed--compilation aborted at /data/opt/OpenOffice/HEAD/build/libreoffice-3.2.99.2/solenv/bin/modules/installer/archivefiles.pm line 33.
Compilation failed in require at /data/opt/OpenOffice/HEAD/build/libreoffice-3.2.99.2/solenv/bin/make_installer.pl line 36.
BEGIN failed--compilation aborted at /data/opt/OpenOffice/HEAD/build/libreoffice-3.2.99.2/solenv/bin/make_installer.pl line 36.
Failed to install: at solenv/bin/ooinstall line 96.
Failed to ooinstall at bin/ooinstall line 72.

I suspect this is just a version mismatch between the Digest::MD5
base-class and the sub-class that we include. Perhaps including both
would fix this.

Anyhow - I pushed it all to a branch: feature/fastinstall :-) best to
make patches / test new things out there.

Thanks,

Michael.

--
[hidden email] <><, Pseudo Engineer, itinerant idiot

_______________________________________________
LibreOffice mailing list
[hidden email]
http://lists.freedesktop.org/mailman/listinfo/libreoffice