Hi Julien
On 19/06/2015 07:08, Julien Cristau wrote:
This description of that change is terrible. The symbol is actually
removed by 22-disable-1565.patch, this is removing it from the debian
packaging metadata, not the library...
Also, the way this is handled makes it pretty hard from the diff to
figure out what undefining FIX_1565 actually does.
Please see revised debdiff attached.
Regards
Graham
diff -Nru motif-2.3.4/debian/changelog motif-2.3.4/debian/changelog
--- motif-2.3.4/debian/changelog 2014-10-13 09:27:43.000000000 +0200
+++ motif-2.3.4/debian/changelog 2015-06-19 11:17:06.000000000 +0200
@@ -1,3 +1,13 @@
+motif (2.3.4-6+deb8u1) jessie-proposed-updates; urgency=medium
+
+ * Disable fix for upstream bug #1565 which caused segfaults in
+ ddd and xpdf (Closes: #781995).
+ * Remove XmForceGrabKeyboard@Base from d/libxm4.symbols
+ which was introduced by upstream's updated fix applied in
+ motif 2.3.4-5 (Closes: #782678).
+
+ -- Graham Inggs <gra...@nerve.org.za> Fri, 19 Jun 2015 10:55:55 +0200
+
motif (2.3.4-6) unstable; urgency=medium
* Bump standards-version to 3.9.6 (no changes).
diff -Nru motif-2.3.4/debian/libxm4.symbols motif-2.3.4/debian/libxm4.symbols
--- motif-2.3.4/debian/libxm4.symbols 2014-10-07 15:57:54.000000000 +0200
+++ motif-2.3.4/debian/libxm4.symbols 2015-06-19 10:55:45.000000000 +0200
@@ -257,7 +257,6 @@
XmFontListInitFontContext@Base 2.3.4
XmFontListNextEntry@Base 2.3.4
XmFontListRemoveEntry@Base 2.3.4
- XmForceGrabKeyboard@Base 2.3.4-5~
XmGetAtomName@Base 2.3.4
XmGetColorCalculation@Base 2.3.4
XmGetColors@Base 2.3.4
diff -Nru motif-2.3.4/debian/patches/22-disable-fix-1565.patch
motif-2.3.4/debian/patches/22-disable-fix-1565.patch
--- motif-2.3.4/debian/patches/22-disable-fix-1565.patch 1970-01-01
02:00:00.000000000 +0200
+++ motif-2.3.4/debian/patches/22-disable-fix-1565.patch 2015-06-19
11:10:05.000000000 +0200
@@ -0,0 +1,22 @@
+Description: Disable fix for upstream bug #1565
+ This patch reverts the changes introduced by upstream's fix for
+ upstream bug #1565 and causes pop menus and keyboard navigation in
+ menus to revert to their Motif 2.3.3 behaviour.
+ .
+ Upstream's original fix broke keyboard navigation in menus (#730026)
+ and upstream's updated fix (applied in motif 2.3.4-5) caused segfaults
+ in ddd and xpdf (#781995).
+Author: Graham Inggs <gra...@nerve.org.za>
+Bug: http://bugs.motifzone.net/show_bug.cgi?id=1565
+Bug-Debian: https://bugs.debian.org/781995
+Last-Update: 2015-06-19
+--- a/lib/Xm/XmI.h
++++ b/lib/Xm/XmI.h
+@@ -299,7 +299,6 @@ extern Pixel _XmAssignInsensitiveColor(W
+ #define FIX_1501
+ #define FIX_1521
+ #define FIX_1505
+-#define FIX_1565
+
+ #endif /* _XmI_h */
+ /* DON'T ADD ANYTHING AFTER THIS #endif */
diff -Nru motif-2.3.4/debian/patches/series motif-2.3.4/debian/patches/series
--- motif-2.3.4/debian/patches/series 2014-10-13 09:27:43.000000000 +0200
+++ motif-2.3.4/debian/patches/series 2015-06-19 10:58:12.000000000 +0200
@@ -19,3 +19,4 @@
19-fix-type-inconsistencies.patch
20-fix-1612.patch
21-fix-1636.patch
+22-disable-fix-1565.patch
