[pkg-fgfs-crew] simgear/flightgear and openscenegraph fix
Markus Wanner
markus at bluegap.ch
Fri Nov 7 15:42:51 UTC 2014
On 11/06/2014 11:42 AM, Rebecca N. Palmer wrote:
> Also, I wouldn't tighten the build-dep as that needlessly forbids
> backports: only openscenegraph 3.2.1 has the bug, not earlier versions
> (which is why we only saw it recently).
Given the simgear binNMU really fixes the issue, I agree with that and
reverted that change in git.
Attached are the debdiff outputs for the flightgear and flightgear-data
unblock requests. The corresponding git repos should be up to date.
Please have a quick look. Am I missing something?
Regards
Markus
-------------- next part --------------
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.000000000 +0200
+++ flightgear-3.0.0/debian/changelog 2014-11-06 20:05:15.000000000 +0100
@@ -1,3 +1,9 @@
+flightgear (3.0.0-4) unstable; urgency=medium
+
+ * Add patch 750939.patch. Closes: #750939.
+
+ -- Markus Wanner <markus at bluegap.ch> Mon, 27 Oct 2014 11:32:03 +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.patch 1970-01-01 01:00:00.000000000 +0100
+++ flightgear-3.0.0/debian/patches/750939.patch 2014-10-27 11:33:20.000000000 +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.000000000 +0200
+++ flightgear-3.0.0/debian/patches/series 2014-10-27 11:33:44.000000000 +0100
@@ -1,3 +1,4 @@
systemLibraries.patch
nasal-fix.patch
fix-mobile-tacan.patch
+750939.patch
-------------- next part --------------
diff -Nru flightgear-data-3.0.0/debian/changelog flightgear-data-3.0.0/debian/changelog
--- flightgear-data-3.0.0/debian/changelog 2014-02-18 21:42:38.000000000 +0100
+++ flightgear-data-3.0.0/debian/changelog 2014-11-06 20:26:41.000000000 +0100
@@ -1,3 +1,13 @@
+flightgear-data (3.0.0-2) unstable; urgency=medium
+
+ [ Rebecca N. Palmer ]
+ * Fix type mismatch crash. Closes: #766251.
+
+ [ Markus Wanner ]
+ * Add patch translation-update-pt.diff.
+
+ -- Markus Wanner <markus at bluegap.ch> Mon, 27 Oct 2014 10:37:02 +0100
+
flightgear-data (3.0.0-1) unstable; urgency=low
[ Markus Wanner ]
diff -Nru flightgear-data-3.0.0/debian/patches/766251.patch flightgear-data-3.0.0/debian/patches/766251.patch
--- flightgear-data-3.0.0/debian/patches/766251.patch 1970-01-01 01:00:00.000000000 +0100
+++ flightgear-data-3.0.0/debian/patches/766251.patch 2014-10-27 11:44:43.000000000 +0100
@@ -0,0 +1,15 @@
+Description: Fix type mismatch crash in SGExpression
+Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
+Forwarded: not-needed
+Bug-Debian: https://bugs.debian.org/766251
+--- a/Effects/model-combined-transparent.eff
++++ b/Effects/model-combined-transparent.eff
+@@ -12,7 +12,7 @@
+ <and>
+ <equal>
+ <property>/sim/rendering/shaders/model</property>
+- <value type="int">0</value>
++ <value type="float">0</value>
+ </equal>
+ <or>
+ <less-equal>
diff -Nru flightgear-data-3.0.0/debian/patches/series flightgear-data-3.0.0/debian/patches/series
--- flightgear-data-3.0.0/debian/patches/series 1970-01-01 01:00:00.000000000 +0100
+++ flightgear-data-3.0.0/debian/patches/series 2014-11-06 20:12:35.000000000 +0100
@@ -0,0 +1,2 @@
+766251.patch
+translation-update-pt.diff
diff -Nru flightgear-data-3.0.0/debian/patches/translation-update-pt.diff flightgear-data-3.0.0/debian/patches/translation-update-pt.diff
--- flightgear-data-3.0.0/debian/patches/translation-update-pt.diff 1970-01-01 01:00:00.000000000 +0100
+++ flightgear-data-3.0.0/debian/patches/translation-update-pt.diff 2014-11-06 20:16:34.000000000 +0100
@@ -0,0 +1,26 @@
+Description: Update portuguese translation
+Origin: https://gitorious.org/fg/fgdata/commit/1da6f87557f655047391161d529faea4930eacde
+Forwarded: not-needed
+--- a/Translations/pt/sys.xml
++++ b/Translations/pt/sys.xml
+@@ -25,15 +25,15 @@
+ <init>inicializando</init> <!-- English: "initializing" -->
+ <loading-aircraft-list>carregando lista de aeronaves</loading-aircraft-list> <!-- English: "loading aircraft list" -->
+ <loading-aircraft>carregando aeronaves</loading-aircraft> <!-- English: "loading aircraft" -->
+- <loading-nav-dat>carregando dados de navagação</loading-nav-dat> <!-- English: "loading navigation data" -->
+- <init-scenery>inicializando cenários</init-scenery> <!-- English: "initializing scenery" -->
++ <loading-nav-dat>carregando dados de navagacao</loading-nav-dat> <!-- English: "loading navigation data" -->
++ <init-scenery>inicializando cenarios</init-scenery> <!-- English: "initializing scenery" -->
+ <creating-subsystems>criando subsistemas</creating-subsystems> <!-- English: "creating subsystems" -->
+ <init-subsystems>inicializando subsistemas</init-subsystems> <!-- English: "initializing subsystems" -->
+ <binding-subsystems>ligando subsistemas</binding-subsystems> <!-- English: "binding subsystems" -->
+ <finishing-subsystems>finalizando subsistemas</finishing-subsystems> <!-- English: "finalizing subsystems" -->
+- <init-graphics>inicializando o motor gráfico</init-graphics> <!-- English: "initializing graphics engine" -->
+- <loading-scenery>carregando cenários</loading-scenery> <!-- English: "loading scenery" -->
+- <finalize-position>finalizando posição</finalize-position> <!-- English: "finalizing position" -->
++ <init-graphics>inicializando o motor grafico</init-graphics> <!-- English: "initializing graphics engine" -->
++ <loading-scenery>carregando cenarios</loading-scenery> <!-- English: "loading scenery" -->
++ <finalize-position>finalizando posicao</finalize-position> <!-- English: "finalizing position" -->
+ </splash>
+
+ </PropertyList>
More information about the pkg-fgfs-crew
mailing list