You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@openoffice.apache.org by Pavel Janík <Pa...@Janik.cz> on 2011/12/14 07:25:22 UTC

Re: svn commit: r1214064 - /incubator/ooo/trunk/ext_sources/7740a8ec23878a2f50120e1faa2730f2-libxml2-2.7.6.tar.gz

On Dec 14, 2011, at 7:15 AM, orcmid@apache.org wrote:

> Modified:
>    incubator/ooo/trunk/ext_sources/7740a8ec23878a2f50120e1faa2730f2-libxml2-2.7.6.tar.gz

We should not patch ext_sources files IMO.
-- 
Pavel Janík




Re: svn commit: r1214064 - /incubator/ooo/trunk/ext_sources/7740a8ec23878a2f50120e1faa2730f2-libxml2-2.7.6.tar.gz

Posted by Jürgen Schmidt <jo...@googlemail.com>.
On 12/14/11 7:52 AM, eric b wrote:
> Hi,
>
> Le 14 déc. 11 à 07:46, Jürgen Schmidt a écrit :
>
>> On 12/14/11 7:25 AM, Pavel Janík wrote:
>>>
>>> On Dec 14, 2011, at 7:15 AM, orcmid@apache.org wrote:
>>>> Modified:
>>>> incubator/ooo/trunk/ext_sources/7740a8ec23878a2f50120e1faa2730f2-libxml2-2.7.6.tar.gz
>>>>
>>>
>>> We should not patch ext_sources files IMO.
>> exactly, changing the tar file (original source) makes the whole patch
>> process obsolete and we don't have control over it. Instead we should
>> 1. extend our patch to fix the problem temporary in our source tree
>>
>
>
> Do you mean
>
> 1. dmake patch
>
> 2. (apply the changes in the .pro)
>
> 3. dmake create_patch

or any other way you prefer to create the patch ;-)

>
> 4. modify the makefile.mk (or the gbuild bazaar) in libxml2 ?

i haven't looked in the makefile in detail, simply change what necessary

Juergen

Re: svn commit: r1214064 - /incubator/ooo/trunk/ext_sources/7740a8ec23878a2f50120e1faa2730f2-libxml2-2.7.6.tar.gz

Posted by eric b <er...@free.fr>.
Hi,

Le 14 déc. 11 à 07:46, Jürgen Schmidt a écrit :

> On 12/14/11 7:25 AM, Pavel Janík wrote:
>>
>> On Dec 14, 2011, at 7:15 AM, orcmid@apache.org wrote:
>>> Modified:
>>>     incubator/ooo/trunk/ext_sources/ 
>>> 7740a8ec23878a2f50120e1faa2730f2-libxml2-2.7.6.tar.gz
>>
>> We should not patch ext_sources files IMO.
> exactly, changing the tar file (original source) makes the whole  
> patch process obsolete and we don't have control over it. Instead  
> we should
> 1. extend our patch to fix the problem temporary in our source tree
>


Do you mean

1. dmake patch

2. (apply the changes in the .pro)

3. dmake create_patch

4. modify the makefile.mk (or the gbuild bazaar)  in libxml2 ?


Regards,

Eric

-- 
qɔᴉɹə
Projet OOo4Kids : http://wiki.ooo4kids.org/index.php/Main_Page
L'association EducOOo : http://www.educoo.org
Blog : http://eric.bachard.org/news






Re: svn commit: r1214064 - /incubator/ooo/trunk/ext_sources/7740a8ec23878a2f50120e1faa2730f2-libxml2-2.7.6.tar.gz

Posted by Andre Fischer <af...@a-w-f.de>.
On 14.12.2011 09:22, Ariel Constenla-Haile wrote:
> On Tue, Dec 13, 2011 at 10:54:57PM -0800, Dennis E. Hamilton wrote:
>> Jürgen,
>>
>> Who are you referring to as "you" here.  Pavel?  Me?
>>
>> I have no idea how to revert the change.  If you would be so kind?
>
> I reverted your changes:
> http://svn.apache.org/viewvc?view=revision&revision=1214090

Thanks.  Now the MD5 checksum is valid again.

>
>
> Regards

Re: svn commit: r1214064 - /incubator/ooo/trunk/ext_sources/7740a8ec23878a2f50120e1faa2730f2-libxml2-2.7.6.tar.gz

Posted by Jürgen Schmidt <jo...@googlemail.com>.
On 12/14/11 9:22 AM, Ariel Constenla-Haile wrote:
> On Tue, Dec 13, 2011 at 10:54:57PM -0800, Dennis E. Hamilton wrote:
>> Jürgen,
>>
>> Who are you referring to as "you" here.  Pavel?  Me?
>>
>> I have no idea how to revert the change.  If you would be so kind?
>
> I reverted your changes:
> http://svn.apache.org/viewvc?view=revision&revision=1214090
>

you beat me ;-)


Thanks

Juergen

Re: svn commit: r1214064 - /incubator/ooo/trunk/ext_sources/7740a8ec23878a2f50120e1faa2730f2-libxml2-2.7.6.tar.gz

Posted by Ariel Constenla-Haile <ar...@apache.org>.
On Tue, Dec 13, 2011 at 10:54:57PM -0800, Dennis E. Hamilton wrote:
> Jürgen,
> 
> Who are you referring to as "you" here.  Pavel?  Me?
> 
> I have no idea how to revert the change.  If you would be so kind?

I reverted your changes:
http://svn.apache.org/viewvc?view=revision&revision=1214090


Regards
-- 
Ariel Constenla-Haile
La Plata, Argentina

RE: svn commit: r1214064 - /incubator/ooo/trunk/ext_sources/7740a8ec23878a2f50120e1faa2730f2-libxml2-2.7.6.tar.gz

Posted by "Dennis E. Hamilton" <de...@acm.org>.
Jürgen,

Who are you referring to as "you" here.  Pavel?  Me?

I have no idea how to revert the change.  If you would be so kind?

With regard to making the patch elsewhere, I am happy for someone else to do that.  I am not qualified to touch the build system properly.

 - Dennis

-----Original Message-----
From: Jürgen Schmidt [mailto:jogischmidt@googlemail.com] 
Sent: Tuesday, December 13, 2011 22:47
To: ooo-dev@incubator.apache.org
Subject: Re: svn commit: r1214064 - /incubator/ooo/trunk/ext_sources/7740a8ec23878a2f50120e1faa2730f2-libxml2-2.7.6.tar.gz

On 12/14/11 7:25 AM, Pavel Janík wrote:
>
> On Dec 14, 2011, at 7:15 AM, orcmid@apache.org wrote:
>
>> Modified:
>>     incubator/ooo/trunk/ext_sources/7740a8ec23878a2f50120e1faa2730f2-libxml2-2.7.6.tar.gz
>
> We should not patch ext_sources files IMO.

exactly, changing the tar file (original source) makes the whole patch 
process obsolete and we don't have control over it. Instead we should

1. extend our patch to fix the problem temporary in our source tree

2. try to upstream the patch to the original project.

Can you please revert this change and can you do it in the correct way 
as we handle external sources here.

Or does anybody else feel responsible for this?

Juergen


Re: svn commit: r1214064 - /incubator/ooo/trunk/ext_sources/7740a8ec23878a2f50120e1faa2730f2-libxml2-2.7.6.tar.gz

Posted by Jürgen Schmidt <jo...@googlemail.com>.
On 12/14/11 7:25 AM, Pavel Janík wrote:
>
> On Dec 14, 2011, at 7:15 AM, orcmid@apache.org wrote:
>
>> Modified:
>>     incubator/ooo/trunk/ext_sources/7740a8ec23878a2f50120e1faa2730f2-libxml2-2.7.6.tar.gz
>
> We should not patch ext_sources files IMO.

exactly, changing the tar file (original source) makes the whole patch 
process obsolete and we don't have control over it. Instead we should

1. extend our patch to fix the problem temporary in our source tree

2. try to upstream the patch to the original project.

Can you please revert this change and can you do it in the correct way 
as we handle external sources here.

Or does anybody else feel responsible for this?

Juergen


Re: svn commit: r1214064 - /incubator/ooo/trunk/ext_sources/7740a8ec23878a2f50120e1faa2730f2-libxml2-2.7.6.tar.gz

Posted by Ariel Constenla-Haile <ar...@apache.org>.
Hi Zhe Liu,

On Wed, Dec 14, 2011 at 02:55:33PM +0800, Zhe Liu wrote:
> Yes. I got workaround.
> 

can you please try the attached patch, with the reverted libxml2 tar?


Regards
-- 
Ariel Constenla-Haile
La Plata, Argentina

Re: svn commit: r1214064 - /incubator/ooo/trunk/ext_sources/7740a8ec23878a2f50120e1faa2730f2-libxml2-2.7.6.tar.gz

Posted by Zhe Liu <al...@gmail.com>.
Yes. I got workaround.

2011/12/14 Dennis E. Hamilton <de...@acm.org>:
> Good point.  I am happy to contribute the patch to the upstream source.  Where might that be?
>
> Or is the patch to be done elsewhere in a build where the external source is actually used?
>
> I trust I've solved Zhe Liu's immediate problem and now it can be cleaned up to follow whatever the protocol is so that the external source builds wherever it is needed by AOO.
>
> Or you can revert the commit, since Zhe Liu now knows what the workaround is, I trust.
>
> I'm easy.
>
>  - Dennis
>
> -----Original Message-----
> From: Pavel Janík [mailto:Pavel@Janik.cz]
> Sent: Tuesday, December 13, 2011 22:25
> To: ooo-dev@incubator.apache.org
> Subject: Re: svn commit: r1214064 - /incubator/ooo/trunk/ext_sources/7740a8ec23878a2f50120e1faa2730f2-libxml2-2.7.6.tar.gz
>
>
> On Dec 14, 2011, at 7:15 AM, orcmid@apache.org wrote:
>
>> Modified:
>>    incubator/ooo/trunk/ext_sources/7740a8ec23878a2f50120e1faa2730f2-libxml2-2.7.6.tar.gz
>
> We should not patch ext_sources files IMO.
> --
> Pavel Janík
>
>
>



-- 
Best Regards
>From aliuzhe@gmail.com

RE: svn commit: r1214064 - /incubator/ooo/trunk/ext_sources/7740a8ec23878a2f50120e1faa2730f2-libxml2-2.7.6.tar.gz

Posted by "Dennis E. Hamilton" <de...@acm.org>.
Good point.  I am happy to contribute the patch to the upstream source.  Where might that be?

Or is the patch to be done elsewhere in a build where the external source is actually used?  

I trust I've solved Zhe Liu's immediate problem and now it can be cleaned up to follow whatever the protocol is so that the external source builds wherever it is needed by AOO.

Or you can revert the commit, since Zhe Liu now knows what the workaround is, I trust.

I'm easy.

 - Dennis

-----Original Message-----
From: Pavel Janík [mailto:Pavel@Janik.cz] 
Sent: Tuesday, December 13, 2011 22:25
To: ooo-dev@incubator.apache.org
Subject: Re: svn commit: r1214064 - /incubator/ooo/trunk/ext_sources/7740a8ec23878a2f50120e1faa2730f2-libxml2-2.7.6.tar.gz


On Dec 14, 2011, at 7:15 AM, orcmid@apache.org wrote:

> Modified:
>    incubator/ooo/trunk/ext_sources/7740a8ec23878a2f50120e1faa2730f2-libxml2-2.7.6.tar.gz

We should not patch ext_sources files IMO.
-- 
Pavel Janík