Refresh of 1.01 Debian package in experimental - please help testing.

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
10 messages Options
Reply | Threaded
Open this post in threaded view
|

Refresh of 1.01 Debian package in experimental - please help testing.

Erich Schubert
Hello all,
I've uploaded a new version of the 1.01 enigma package to Debian
experimental. I've also started preparing a package for the 1.10
pre-release.
The reason I uploaded to experimental is that I did one "bigger"
change, so I need some people to test enigma.
The "risky" (to break enigma, not to trash your system) is that I
switched Enigma from Xerces 2.x to Xerces 3.x, since the 2.x branch is
considered obsolete.
I also solved a (previously discussed here) crasher for amd64 (the va_list bug).

I'd ask the Debian users here on the list to test the enigma package,
so I can upload it to unstable soon. It should then also find it's way
into Ubuntu semi-automatically.
I will then upload a 1.10 pre-release package to experimental afterwards.

Thank you.

best regards,
Erich Schubert

P.S. you don't have to switch to experimental; it should be possible
to just download the single packages from
http://packages.debian.org/source/experimental/enigma
and the corresponding data package
http://packages.debian.org/source/experimental/enigma-data
and install them manually using "dpkg -i enigma*.deb".
You _might_ then be missing the xerces3 library, which you can add
using "apt-get -f install".


_______________________________________________
Enigma-devel mailing list
[hidden email]
http://lists.nongnu.org/mailman/listinfo/enigma-devel
Reply | Threaded
Open this post in threaded view
|

Re: Refresh of 1.01 Debian package in experimental - please help testing.

Ronald Lamprecht
Hi,

Erich Schubert schrieb:

> Hello all,
> I've uploaded a new version of the 1.01 enigma package to Debian
> experimental. I've also started preparing a package for the 1.10
> pre-release.
> The reason I uploaded to experimental is that I did one "bigger"
> change, so I need some people to test enigma.
> The "risky" (to break enigma, not to trash your system) is that I
> switched Enigma from Xerces 2.x to Xerces 3.x, since the 2.x branch is
> considered obsolete.
> I also solved a (previously discussed here) crasher for amd64 (the va_list bug).

In case your 1.01 package is based upon our 1.01 branch r1745, and your
1.10 pre-release is based on our trunk top revision then I guarantee
that absolutely no problems will arise :-) In fact I used all time since
  the Enigma 1.00 development the Xerces 3.x trunk version and added
Xerces 2.x support just for backward compatibility. All Windows versions
of Enigma have always been based and distributed on Xerces 3.x versions!
Thus it is very, very well tested.

BTW please check that the 1.10 prerelease package depends on "xdg-open".
Please report X-desktop versions that do not properly open the homepage,
documentation or folders of the auto levelpack or enigma.score.

> I'd ask the Debian users here on the list to test the enigma package,
> so I can upload it to unstable soon. It should then also find it's way
> into Ubuntu semi-automatically.
> I will then upload a 1.10 pre-release package to experimental afterwards.
>
> Thank you.
>
> best regards,
> Erich Schubert
>
> P.S. you don't have to switch to experimental; it should be possible
> to just download the single packages from
> http://packages.debian.org/source/experimental/enigma
> and the corresponding data package
> http://packages.debian.org/source/experimental/enigma-data
> and install them manually using "dpkg -i enigma*.deb".
> You _might_ then be missing the xerces3 library, which you can add
> using "apt-get -f install".

Greets,

Ronald


_______________________________________________
Enigma-devel mailing list
[hidden email]
http://lists.nongnu.org/mailman/listinfo/enigma-devel
Reply | Threaded
Open this post in threaded view
|

Re: Refresh of 1.01 Debian package in experimental - please help testing.

Erich Schubert
Hello Ronald,
> In case your 1.01 package is based upon our 1.01 branch r1745, and your 1.10
> pre-release is based on our trunk top revision then I guarantee that

I used the 1.01 release, I'll have a look at the branch diff.
I had to patch some things myself (IIRC just a return type I changed
from short to some named enum and configure), so I guess I could have
taken these changes from that branch. I"ll have a look at merging
them, then I can safely upload into unstable when it's that well
tested already.

best regards,
Erich Schubert


_______________________________________________
Enigma-devel mailing list
[hidden email]
http://lists.nongnu.org/mailman/listinfo/enigma-devel
Reply | Threaded
Open this post in threaded view
|

Re: Refresh of 1.01 Debian package in experimental - please help testing.

Ronald Lamprecht
Hi,

Erich Schubert wrote:
>> In case your 1.01 package is based upon our 1.01 branch r1745, and your 1.10
>> pre-release is based on our trunk top revision then I guarantee that
>
> I used the 1.01 release, I'll have a look at the branch diff.
> I had to patch some things myself (IIRC just a return type I changed
> from short to some named enum and configure), so I guess I could have
> taken these changes from that branch. I"ll have a look at merging
> them, then I can safely upload into unstable when it's that well
> tested already.

Enigma 1.01 has been released more than a year before Xerces 3.0. But I
ensured by proper bug reports and fixes that all required features had
been stable in Xercers trunk development version at the point of the
1.01 release. Just two minor syntax changes have been introduced in
Xerces 3.0 up to the final release.

Please check our branch 1.01 diff and commit logs
(http://svn.berlios.de/wsvn/enigma-game/branches/1.01/?op=log&rev=0&sc=0&isdir=1)
and report any additional fixes that you have to apply for Debian/Ubuntu.

Thanks,

Ronald



_______________________________________________
Enigma-devel mailing list
[hidden email]
http://lists.nongnu.org/mailman/listinfo/enigma-devel
Reply | Threaded
Open this post in threaded view
|

Re: Refresh of 1.01 Debian package in experimental - please help testing.

Alexandros Tasos
Hi,

So, how do I test in Ubuntu Jaunty? Do I have to upgrade to Ubuntu Karmic Alpha 2 in order to do so?

Greets,
Alexandros

2009/7/10 Ronald Lamprecht <[hidden email]>
Hi,


Erich Schubert wrote:
In case your 1.01 package is based upon our 1.01 branch r1745, and your 1.10
pre-release is based on our trunk top revision then I guarantee that

I used the 1.01 release, I'll have a look at the branch diff.
I had to patch some things myself (IIRC just a return type I changed
from short to some named enum and configure), so I guess I could have
taken these changes from that branch. I"ll have a look at merging
them, then I can safely upload into unstable when it's that well
tested already.

Enigma 1.01 has been released more than a year before Xerces 3.0. But I ensured by proper bug reports and fixes that all required features had been stable in Xercers trunk development version at the point of the 1.01 release. Just two minor syntax changes have been introduced in Xerces 3.0 up to the final release.

Please check our branch 1.01 diff and commit logs (http://svn.berlios.de/wsvn/enigma-game/branches/1.01/?op=log&rev=0&sc=0&isdir=1) and report any additional fixes that you have to apply for Debian/Ubuntu.

Thanks,

Ronald




_______________________________________________
Enigma-devel mailing list
[hidden email]
http://lists.nongnu.org/mailman/listinfo/enigma-devel


_______________________________________________
Enigma-devel mailing list
[hidden email]
http://lists.nongnu.org/mailman/listinfo/enigma-devel
Reply | Threaded
Open this post in threaded view
|

Re: Refresh of 1.01 Debian package in experimental - please help testing.

Erich Schubert
In reply to this post by Ronald Lamprecht
Hello Ronald,
I had done basically the same changes to adopt to Xerces 3.0 release
that you had in the 1.01 branch.
I've pulled a couple more changes from the 1.01 branch.

> and report any additional fixes that you have to apply for Debian/Ubuntu.

My other changes (you merged the gcc 4.3 and 4.4 compability stuff
IIRC) are mostly related to the location of documentation and to not
using zipios included with Enigma but the Debian packaged one.

However I just received a new bug report with respect to Xerces 3 and AMD64.
See attached patch which hopefully should resolve the issue. As I read
from the bug report at
http://bugs.debian.org/536682
it seems that it comes from assuming XMLSize_t == int which is true on
i386 but not on amd64.

It should also affect the 1.10 branch; the patch will likely apply
with some fuzz.

@Alexandros: for testing on Ubuntu, you probably can just wait for the
Ubuntu enigma package to be synched with Debian. Usually takes just a
couple of days for them to automatically pick up the changes and build
their own package (which then should appear in Karmic). It should be
possible to cross-install the Debian package on Ubuntu, but I do not
want to advocate mixing package sources.

best regards,
Erich Schubert

_______________________________________________
Enigma-devel mailing list
[hidden email]
http://lists.nongnu.org/mailman/listinfo/enigma-devel

utf8toxml-xerces3-amd64.patch (1K) Download Attachment
Reply | Threaded
Open this post in threaded view
|

Re: Refresh of 1.01 Debian package in experimental - please help testing.

Ronald Lamprecht
Hi,

Erich Schubert wrote:
> However I just received a new bug report with respect to Xerces 3 and AMD64.
> See attached patch which hopefully should resolve the issue. As I read
> from the bug report at
> http://bugs.debian.org/536682
> it seems that it comes from assuming XMLSize_t == int which is true on
> i386 but not on amd64.
>
> It should also affect the 1.10 branch; the patch will likely apply
> with some fuzz.

The syntax incompatibility has been introduced by Xerces revision 553923
on July 7th 2007. That has been unfortunatly the week in which my old PC
  mainboard broke and I had to set up a new one. So I obviously missed
the notification and it did not cause compiler warnings on my system ...

Unfortunatly your fix is incomplete and breaks the backward
compatibility for Xerces 2.x. Please use the attached patch that has
been commited in r1755 to the trunk and r1756 to the 1.01 branch.

Greets,

Ronald

Index: src/Utf8ToXML.cc
===================================================================
--- src/Utf8ToXML.cc (revision 1754)
+++ src/Utf8ToXML.cc (working copy)
@@ -40,11 +40,19 @@
     }
 
     void Utf8ToXML::init(const char * const toTranscode) {
+#if _XERCES_VERSION >= 30000
+        XMLSize_t srcLength = std::strlen(toTranscode) + 1;
+        // make safe assumptions on utf-16 size
+        XMLSize_t maxDestLength = srcLength;
+        XMLSize_t charsEaten;
+        XMLSize_t destLength;
+#else
         unsigned int srcLength = std::strlen(toTranscode) + 1;
         // make safe assumptions on utf-16 size
         unsigned int maxDestLength = srcLength;
         unsigned int charsEaten;
         unsigned int destLength;
+#endif
         unsigned char *charSizes = new unsigned char[maxDestLength]; // just junk
         // make a buffer - size does not matter - the object is temporary
         xmlString = new XMLCh[maxDestLength];
Index: src/XMLtoUtf8.cc
===================================================================
--- src/XMLtoUtf8.cc (revision 1754)
+++ src/XMLtoUtf8.cc (working copy)
@@ -27,11 +27,19 @@
 namespace enigma
 {
     XMLtoUtf8::XMLtoUtf8(const XMLCh* const toTranscode) {
+#if _XERCES_VERSION >= 30000
+        XMLSize_t srcLength = XMLString::stringLen(toTranscode) + 1;
+        // make safe assumptions on utf-8 size
+        XMLSize_t maxDestLength = 3 * srcLength;
+        XMLSize_t charsEaten;
+        XMLSize_t destLength;
+#else
         unsigned int srcLength = XMLString::stringLen(toTranscode) + 1;
         // make safe assumptions on utf-8 size
         unsigned int maxDestLength = 3 * srcLength;
         unsigned int charsEaten;
         unsigned int destLength;
+#endif
         // make a buffer - size does not matter - the object is temporary
         utf8String = new char[maxDestLength];
         // transcode to utf-8 -- there are no unrepresentable chars

_______________________________________________
Enigma-devel mailing list
[hidden email]
http://lists.nongnu.org/mailman/listinfo/enigma-devel
Reply | Threaded
Open this post in threaded view
|

Re: Refresh of 1.01 Debian package in experimental - please help testing.

Alexandros Tasos
Hi,

@Ronald: Sorry, I probably clicked BCC instead of CC.

@Erich: OK, I'll wait until Ubuntu syncs the Enigma package, then upgrade to karmic and test.
BTW, I found the request for syncing (it's actually a bug report):
https://bugs.launchpad.net/ubuntu/+source/enigma/+bug/398442

Greets,
Alexandros

2009/7/12 Ronald Lamprecht <[hidden email]>
Hi,


Erich Schubert wrote:
However I just received a new bug report with respect to Xerces 3 and AMD64.
See attached patch which hopefully should resolve the issue. As I read
from the bug report at
http://bugs.debian.org/536682
it seems that it comes from assuming XMLSize_t == int which is true on
i386 but not on amd64.

It should also affect the 1.10 branch; the patch will likely apply
with some fuzz.

The syntax incompatibility has been introduced by Xerces revision 553923 on July 7th 2007. That has been unfortunatly the week in which my old PC  mainboard broke and I had to set up a new one. So I obviously missed the notification and it did not cause compiler warnings on my system ...

Unfortunatly your fix is incomplete and breaks the backward compatibility for Xerces 2.x. Please use the attached patch that has been commited in r1755 to the trunk and r1756 to the 1.01 branch.

Greets,

Ronald

Index: src/Utf8ToXML.cc
===================================================================
--- src/Utf8ToXML.cc    (revision 1754)
+++ src/Utf8ToXML.cc    (working copy)
@@ -40,11 +40,19 @@
    }

    void Utf8ToXML::init(const char * const toTranscode) {
+#if _XERCES_VERSION >= 30000
+        XMLSize_t srcLength = std::strlen(toTranscode) + 1;
+        // make safe assumptions on utf-16 size
+        XMLSize_t maxDestLength = srcLength;
+        XMLSize_t charsEaten;
+        XMLSize_t destLength;
+#else
        unsigned int srcLength = std::strlen(toTranscode) + 1;
        // make safe assumptions on utf-16 size
        unsigned int maxDestLength = srcLength;
        unsigned int charsEaten;
        unsigned int destLength;
+#endif
        unsigned char *charSizes = new unsigned char[maxDestLength]; // just junk
        // make a buffer - size does not matter - the object is temporary
        xmlString = new XMLCh[maxDestLength];
Index: src/XMLtoUtf8.cc
===================================================================
--- src/XMLtoUtf8.cc    (revision 1754)
+++ src/XMLtoUtf8.cc    (working copy)
@@ -27,11 +27,19 @@
 namespace enigma
 {
    XMLtoUtf8::XMLtoUtf8(const XMLCh* const toTranscode) {
+#if _XERCES_VERSION >= 30000
+        XMLSize_t srcLength = XMLString::stringLen(toTranscode) + 1;
+        // make safe assumptions on utf-8 size
+        XMLSize_t maxDestLength = 3 * srcLength;
+        XMLSize_t charsEaten;
+        XMLSize_t destLength;
+#else
        unsigned int srcLength = XMLString::stringLen(toTranscode) + 1;
        // make safe assumptions on utf-8 size
        unsigned int maxDestLength = 3 * srcLength;
        unsigned int charsEaten;
        unsigned int destLength;
+#endif
        // make a buffer - size does not matter - the object is temporary
        utf8String = new char[maxDestLength];
        // transcode to utf-8 -- there are no unrepresentable chars

_______________________________________________
Enigma-devel mailing list
[hidden email]
http://lists.nongnu.org/mailman/listinfo/enigma-devel



_______________________________________________
Enigma-devel mailing list
[hidden email]
http://lists.nongnu.org/mailman/listinfo/enigma-devel
Reply | Threaded
Open this post in threaded view
|

Re: Refresh of 1.01 Debian package in experimental - please help testing.

Erich Schubert
In reply to this post by Ronald Lamprecht
reopen 536682
thanks

Hello Roland,
> Unfortunatly your fix is incomplete and breaks the backward compatibility
> for Xerces 2.x. Please use the attached patch that has been commited in
> r1755 to the trunk and r1756 to the 1.01 branch.

Thank you. Yeah, I missed the reverse direction, it didn't show up in my grep.
If I have some time on tuesday, I'll try to resync all my patches to
bring the Debian package into a "direct" r1756+patches shape. Right
now it's the released 1.01 version plus some debian patches plus
patches up to 1755 minus a lot of overlap manually removed from one or
the other patch.

Thank you for your work on Enigma - it's an excellent software, and
you are the perfect upstream any "maintainer" dreams of.

best regards,
Erich Schubert


_______________________________________________
Enigma-devel mailing list
[hidden email]
http://lists.nongnu.org/mailman/listinfo/enigma-devel
Reply | Threaded
Open this post in threaded view
|

Re: Refresh of 1.01 Debian package in experimental - please help testing.

Erich Schubert
In reply to this post by Alexandros Tasos
Hi all,
Ubuntu now also has the 1.01-7 package including the patches for
xerces3 and the amd64 varargs bug.

In Karmic only (the others will stick with the previous stable
package), which is the current development branch to be released as
9.10 I guess.

> @Erich: OK, I'll wait until Ubuntu syncs the Enigma package, then upgrade to
> karmic and test.
> BTW, I found the request for syncing (it's actually a bug report):
> https://bugs.launchpad.net/ubuntu/+source/enigma/+bug/398442

In particular, they apparently can now use my package without
modifications on Ubuntu, so it seems to be automatically sync'd now.

best regards,
Erich Schubert


_______________________________________________
Enigma-devel mailing list
[hidden email]
http://lists.nongnu.org/mailman/listinfo/enigma-devel