Bug#782381: pre-approval: unblock: motif/2.3.4-8
control: tag 781995 pending
On Sat, Apr 11, 2015 at 7:41 AM, Graham Inggs wrote:
> Hi release team
>
> In order to fix RC bug #781995, I would like to upload a version of
> Motif with upstream's fix for their bug #1565 reverted. I plan to
> replace debian/patches/18-updated-fix1565.patch with the following:
>
> --- a/lib/Xm/XmI.h
> +++ b/lib/Xm/XmI.h
> @@ -297,7 +297,6 @@
> #define FIX_1501
> #define FIX_1521
> #define FIX_1505
> -#define FIX_1565
>
> #endif /* _XmI_h */
> /* DON'T ADD ANYTHING AFTER THIS #endif */
>
> Not defining FIX_1565 causes popup menus and keyboard navigation in
> menus to revert to their behaviour in Motif 2.3.3. This fixes #781995
> and #730026 remains fixed.
I just caught this message after preparing an nmu today. I applied
your suggested changes (in a more minimal way than you suggest),
tested the problem was fixed, and uploaded the nmu to delayed/5.
If you would prefer it to be a sponsored upload, or if you want me to
delay/alter the nmu please let me know.
Best wishes,
Mike
diff -Nru motif-2.3.4/debian/changelog motif-2.3.4/debian/changelog
--- motif-2.3.4/debian/changelog 2014-10-13 07:27:43.000000000 +0000
+++ motif-2.3.4/debian/changelog 2015-04-12 19:34:03.000000000 +0000
@@ -1,3 +1,10 @@
+motif (2.3.4-6.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Disable buggy fix for upstream bug #1565 (closes: #781995).
+
+ -- Michael Gilbert <mgilbert@debian.org> Sun, 12 Apr 2015 19:25:51 +0000
+
motif (2.3.4-6) unstable; urgency=medium
* Bump standards-version to 3.9.6 (no changes).
diff -Nru motif-2.3.4/debian/patches/22-disable-1565.patch motif-2.3.4/debian/patches/22-disable-1565.patch
--- motif-2.3.4/debian/patches/22-disable-1565.patch 1970-01-01 00:00:00.000000000 +0000
+++ motif-2.3.4/debian/patches/22-disable-1565.patch 2015-04-12 19:31:45.000000000 +0000
@@ -0,0 +1,14 @@
+Description: Fix for upstream 1565 causes segfaults in motif applications, so disable it
+Author: Graham Inggs <graham@nerve.org.za>
+Bug-Debian: https://bugs.debian.org/781995
+
+--- 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 07:27:43.000000000 +0000
+++ motif-2.3.4/debian/patches/series 2015-04-12 19:29:28.000000000 +0000
@@ -19,3 +19,4 @@
19-fix-type-inconsistencies.patch
20-fix-1612.patch
21-fix-1636.patch
+22-disable-1565.patch
Reply to: