Package: release.debian.org
User: release.debian@packages.debian.org
Usertags: unblock
Severity: normal
X-Debbugs-CC: pkg-fgfs-c...@lists.alioth.debian.org
Please unblock package flightgear
The recent upload to unstable fixes bug #750939 (severity: important -
Occasional deadlock when processing key input).
flightgear (3.0.0-4) unstable; urgency=medium
* Add patch 750939.patch. Closes: #750939.
-- Markus Wanner mar...@bluegap.ch Fri, 07 Nov 2014 17:27:44 +0100
unblock flightgear/3.0.0-4
Thanks
Markus Wanner
diff -Nru flightgear-3.0.0/debian/changelog flightgear-3.0.0/debian/changelog
--- flightgear-3.0.0/debian/changelog 2014-10-08 10:56:43.0 +0200
+++ flightgear-3.0.0/debian/changelog 2014-11-07 17:27:50.0 +0100
@@ -1,3 +1,9 @@
+flightgear (3.0.0-4) unstable; urgency=medium
+
+ * Add patch 750939.patch. Closes: #750939.
+
+ -- Markus Wanner mar...@bluegap.ch Fri, 07 Nov 2014 17:27:44 +0100
+
flightgear (3.0.0-3) unstable; urgency=medium
* Change B-D to libjpeg-dev to finish the transition to
diff -Nru flightgear-3.0.0/debian/patches/750939.patch
flightgear-3.0.0/debian/patches/750939.patch
--- flightgear-3.0.0/debian/patches/750939.patch1970-01-01
01:00:00.0 +0100
+++ flightgear-3.0.0/debian/patches/750939.patch2014-10-27
11:33:20.0 +0100
@@ -0,0 +1,28 @@
+Description: Fix hang in nested Nasal calls
+
+naCall() increments Nasal's active threads count; as Nasal's garbage
+collector first asks all other threads to stop and waits for them to
+say they have, this can cause a hang when used in a function that was
+itself called from Nasal (inner function's GC waiting for outer function
+to say it has stopped, outer function waiting for inner function to return).
+
+naCallMethodCtx() doesn't, to avoid exactly this problem.
+(simgear simgear/nasal/nasal.h:108)
+
+(Deliberately not changing NasalXMLVisitor: that already uses naSubContext,
+another mechanism to do the same thing.)
+
+Author: Rebecca Palmer
+Bug-Debian: https://bugs.debian.org/750939
+
+--- flightgear-3.0.0.orig/src/Scripting/NasalSys.cxx
flightgear-3.0.0/src/Scripting/NasalSys.cxx
+@@ -872,7 +872,7 @@ naRef FGNasalSys::wrappedPropsNode(SGPro
+ naRef args[1];
+ args[0] = propNodeGhost(aProps);
+ naContext ctx = naNewContext();
+-naRef wrapped = naCall(ctx, _wrappedNodeFunc, 1, args, naNil(), naNil());
++naRef wrapped = naCallMethodCtx(ctx, _wrappedNodeFunc, naNil(), 1, args,
naNil());
+ naFreeContext(ctx);
+ return wrapped;
+ }
diff -Nru flightgear-3.0.0/debian/patches/series
flightgear-3.0.0/debian/patches/series
--- flightgear-3.0.0/debian/patches/series 2014-10-07 11:36:09.0
+0200
+++ flightgear-3.0.0/debian/patches/series 2014-10-27 11:33:44.0
+0100
@@ -1,3 +1,4 @@
systemLibraries.patch
nasal-fix.patch
fix-mobile-tacan.patch
+750939.patch
signature.asc
Description: OpenPGP digital signature
