Dear RMs, on 2007-02-22 I got LyX 1.4.3-3 uploaded to unstable with a fix for #411043 which is in some cases a bigger problem then I thought when this bug appeared first. Well back in February I thought that it would be possible for the Debian buildd network to get the package build on all release architectures within a week. As of today I'd say that this thought was too naive and the builds for alpha, ppc, mips and mipsel are still missing. Counting in the falling number of RC bugs and we're nearing the release I'm now asking for two things: a) Please take a look at the diff between LyX 1.4.3-2 and 1.4.3-3 and decide if the changes are suitable for the Debian/etch release. I've attached the interdiff for your convenience. b) If you think a) is ok maybe you can pull a trigger to get it build on the missing architectures and let it propagate to testing. Thanks for considering, Sven -- If you won't forgive me the rest of my life Let me apologize while I'm still alive I know it's time to face all of my past mistakes [Less than Jake - Rest Of My Life]
diff -u lyx-1.4.3/debian/patches/series lyx-1.4.3/debian/patches/series
--- lyx-1.4.3/debian/patches/series
+++ lyx-1.4.3/debian/patches/series
@@ -2,0 +3 @@
+06.insetassertions
diff -u lyx-1.4.3/debian/changelog lyx-1.4.3/debian/changelog
--- lyx-1.4.3/debian/changelog
+++ lyx-1.4.3/debian/changelog
@@ -1,3 +1,11 @@
+lyx (1.4.3-3) unstable; urgency=low
+
+ * Adding patch 06.insetassertions (r16831 from upstream svn)
+ This is a fix for assertions reported by several people.
+ Closes: #411043
+
+ -- Sven Hoexter <sven@timegate.de> Thu, 22 Feb 2007 16:09:16 +0100
+
lyx (1.4.3-2) unstable; urgency=low
[ Sven Hoexter ]
only in patch2:
unchanged:
--- lyx-1.4.3.orig/debian/patches/06.insetassertions
+++ lyx-1.4.3/debian/patches/06.insetassertions
@@ -0,0 +1,35 @@
+Index: BRANCH_1_4_X/src/cursor.C
+===================================================================
+--- BRANCH_1_4_X/src/cursor.C (revision 16431)
++++ BRANCH_1_4_X/src/cursor.C (revision 16831)
+@@ -99,5 +99,18 @@
+ int yo;
+ InsetBase const * inset = &it.inset();
+- Point o = theCoords.getInsets().xy(inset);
++ std::map<InsetBase const *, Point> const & data =
++ theCoords.getInsets().getData();
++ std::map<InsetBase const *, Point>::const_iterator I = data.find(inset);
++
++ // FIXME: in the case where the inset is not in the cache, this
++ // means that no part of it is visible on screen. In this case
++ // we don't do elaborate search and we just return the forwarded
++ // DocIterator at its beginning.
++ if (I == data.end()) {
++ it.top().pos() = 0;
++ return it;
++ }
++
++ Point o = I->second;
+ inset->cursorPos(it.top(), c.boundary(), xo, yo);
+ // Convert to absolute
+Index: BRANCH_1_4_X/src/coordcache.h
+===================================================================
+--- BRANCH_1_4_X/src/coordcache.h (revision 10321)
++++ BRANCH_1_4_X/src/coordcache.h (revision 16831)
+@@ -95,4 +95,6 @@
+ typedef std::map<T const *, Point> cache_type;
+ cache_type data_;
++public:
++ cache_type const & getData() const { return data_; }
+ };
+
Attachment:
signature.asc
Description: Digital signature