Re: svn commit: r1214064 - /incubator/ooo/trunk/ext_sources/7740a8ec23878a2f50120e1faa2730f2-libxml2-2.7.6.tar.gz
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, orc...@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
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=revisionrevision=1214090 Regards -- Ariel Constenla-Haile La Plata, Argentina pgp4e1HKE39aL.pgp Description: PGP signature
Re: svn commit: r1214064 - /incubator/ooo/trunk/ext_sources/7740a8ec23878a2f50120e1faa2730f2-libxml2-2.7.6.tar.gz
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
diff --git a/libxml2/libxml2-testapi.patch b/libxml2/libxml2-testapi.patch
new file mode 100644
index 000..cee5c5f
--- /dev/null
+++ b/libxml2/libxml2-testapi.patch
@@ -0,0 +1,12 @@
+diff -uNrp misc/libxml2-2.7.6/testapi.c misc/build/libxml2-2.7.6/testapi.c
+--- misc/libxml2-2.7.6/testapi.c 2009-09-24 12:32:00.0 -0300
misc/build/libxml2-2.7.6/testapi.c 2011-12-14 04:49:53.920180490 -0300
+@@ -291,7 +291,7 @@ static void des_long(int no ATTRIBUTE_UN
+ static xmlChar gen_xmlChar(int no, int nr ATTRIBUTE_UNUSED) {
+ if (no == 0) return('a');
+ if (no == 1) return(' ');
+-if (no == 2) return((xmlChar) '�');
++if (no == 2) return((xmlChar) 0xF8 );
+ return(0);
+ }
+
diff --git a/libxml2/makefile.mk b/libxml2/makefile.mk
index 01f142f..02fcd3c 100755
--- a/libxml2/makefile.mk
+++ b/libxml2/makefile.mk
@@ -53,6 +53,7 @@ PATCH_FILES=libxml2-configure.patch \
libxml2-gnome599717.patch \
libxml2-xpath.patch \
libxml2-global-symbols.patch \
+libxml2-testapi.patch \
.IF $(OS) == WNT
PATCH_FILES+= libxml2-long-path.patch
pgp8d8CIy2huN.pgp
Description: PGP signature
Re: svn commit: r1214064 - /incubator/ooo/trunk/ext_sources/7740a8ec23878a2f50120e1faa2730f2-libxml2-2.7.6.tar.gz
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=revisionrevision=1214090 you beat me ;-) Thanks Juergen
Re: svn commit: r1214064 - /incubator/ooo/trunk/ext_sources/7740a8ec23878a2f50120e1faa2730f2-libxml2-2.7.6.tar.gz
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=revisionrevision=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
On Dec 14, 2011, at 7:15 AM, orc...@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
On 12/14/11 7:25 AM, Pavel Janík wrote: On Dec 14, 2011, at 7:15 AM, orc...@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
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:pa...@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, orc...@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
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, orc...@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
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:jogischm...@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, orc...@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
Yes. I got workaround. 2011/12/14 Dennis E. Hamilton dennis.hamil...@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:pa...@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, orc...@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 aliu...@gmail.com
