[SCM] Packaging for LIGGGHTS, an Open Source Discrete Element Method Particle Simulation Software. branch, master, updated. upstream/1.5.1-36-g4f62071

Anton Gladky gladky.anton at gmail.com
Sat Mar 3 06:37:38 UTC 2012


The following commit has been merged in the master branch:
commit 6ed36231c4eebb8202d0ba0d6c87beaf80079183
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Fri Mar 2 23:34:40 2012 +0100

    Fix FTBFS "format not a string literal and no format arg"

diff --git a/debian/patches/fix_format_not_a_string.patch b/debian/patches/fix_format_not_a_string.patch
new file mode 100644
index 0000000..1515017
--- /dev/null
+++ b/debian/patches/fix_format_not_a_string.patch
@@ -0,0 +1,45 @@
+Description: Fix FTBFS "format not a string literal and no format arg"
+Author: Anton Gladky <gladky.anton at gmail.com>
+Last-Update: 2012-03-02
+
+--- a/src/fix_print.cpp
++++ b/src/fix_print.cpp
+@@ -126,10 +126,10 @@
+   modify->addstep_compute(update->ntimestep + nevery);
+ 
+   if (me == 0) {
+-    if (screenflag && screen) fprintf(screen,copy);
+-    if (screenflag && logfile) fprintf(logfile,copy);
++    if (screenflag && screen) fprintf(screen,"%s",copy);
++    if (screenflag && logfile) fprintf(logfile,"%s",copy);
+     if (fp) {
+-      fprintf(fp,copy);
++      fprintf(fp,"%s",copy);
+       fflush(fp);
+     }
+   }
+--- a/src/thermo.cpp
++++ b/src/thermo.cpp
+@@ -255,8 +255,8 @@
+   sprintf(&line[loc],"\n");
+ 
+   if (me == 0) {
+-    if (screen) fprintf(screen,line);
+-    if (logfile) fprintf(logfile,line);
++    if (screen) fprintf(screen,"%s",line);
++    if (logfile) fprintf(logfile,"%s",line);
+   }
+ }
+ 
+@@ -322,9 +322,9 @@
+   // print line to screen and logfile
+ 
+   if (me == 0) {
+-    if (screen) fprintf(screen,line);
++    if (screen) fprintf(screen,"%s",line);
+     if (logfile) {
+-      fprintf(logfile,line);
++      fprintf(logfile,"%s",line);
+       if (flushflag) fflush(logfile);
+     }
+   }
diff --git a/debian/patches/series b/debian/patches/series
index 15b0160..3f2a16c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 add_interpretator_name_to_the_examples.patches
 enable_default_compile_flags.patch
+fix_format_not_a_string.patch

-- 
Packaging for LIGGGHTS, an Open Source Discrete Element Method Particle Simulation Software.



More information about the debian-science-commits mailing list