[hamradio-commits] [dump1090-mutability] 169/172: debian/patches/: patchset reworked against v1.14
Matteo F. Vescovi
mfv at moszumanska.debian.org
Sun Jan 28 13:45:56 UTC 2018
This is an automated email from the git hooks/post-receive script.
mfv pushed a commit to branch master
in repository dump1090-mutability.
commit 087e06b3d35cbf321f0254da2381db5209c8bd17
Author: Matteo F. Vescovi <mfv at debian.org>
Date: Sat Jan 27 23:02:07 2018 +0100
debian/patches/: patchset reworked against v1.14
---
debian/patches/0001-jquery.patch | 26 ++++++++++++++++++++++++++
debian/patches/0002-excanvas.patch | 22 ++++++++++++++++++++++
debian/patches/0003-gcc7.patch | 31 +++++++++++++++++++++++++++++++
debian/patches/01-jquery.patch | 19 -------------------
debian/patches/02-excanvas.patch | 16 ----------------
debian/patches/03-gcc7.patch | 26 --------------------------
debian/patches/series | 6 +++---
7 files changed, 82 insertions(+), 64 deletions(-)
diff --git a/debian/patches/0001-jquery.patch b/debian/patches/0001-jquery.patch
new file mode 100644
index 0000000..e00a689
--- /dev/null
+++ b/debian/patches/0001-jquery.patch
@@ -0,0 +1,26 @@
+From: Matthew John Ernisse <mernisse at ub3rgeek.net>
+Date: Sat, 27 Jan 2018 22:57:54 +0100
+Subject: jquery
+
+Locally serve jQuery and jQuery-UI files.
+---
+ public_html/gmap.html | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/public_html/gmap.html b/public_html/gmap.html
+index a2f0ff2..b086afd 100644
+--- a/public_html/gmap.html
++++ b/public_html/gmap.html
+@@ -2,9 +2,9 @@
+ <head>
+ <meta charset="utf-8"/>
+ <link rel="stylesheet" type="text/css" href="style.css" />
+- <link rel="stylesheet" href="http://code.jquery.com/ui/1.10.3/themes/smoothness/jquery-ui.css" />
+- <script src="//ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
+- <script src="//ajax.googleapis.com/ajax/libs/jqueryui/1.10.3/jquery-ui.min.js"></script>
++ <link rel="stylesheet" href="jquery-ui.min.css" />
++ <script src="jquery.min.js"></script>
++ <script src="jquery-ui.min.js"></script>
+ <script type="text/javascript" src="https://maps.googleapis.com/maps/api/js?sensor=false&libraries=geometry"></script>
+ <script type="text/javascript" src="config.js"></script>
+ <script type="text/javascript" src="planeObject.js"></script>
diff --git a/debian/patches/0002-excanvas.patch b/debian/patches/0002-excanvas.patch
new file mode 100644
index 0000000..e6e1148
--- /dev/null
+++ b/debian/patches/0002-excanvas.patch
@@ -0,0 +1,22 @@
+From: Matthew John Ernisse <mernisse at ub3rgeek.net>
+Date: Sat, 27 Jan 2018 23:00:16 +0100
+Subject: excanvas
+
+Replace local version of excanvas.js with libjs-excanvas.
+---
+ public_html/gmap.html | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/public_html/gmap.html b/public_html/gmap.html
+index b086afd..8fcf2d1 100644
+--- a/public_html/gmap.html
++++ b/public_html/gmap.html
+@@ -9,7 +9,7 @@
+ <script type="text/javascript" src="config.js"></script>
+ <script type="text/javascript" src="planeObject.js"></script>
+ <script type="text/javascript" src="script.js"></script>
+- <script type="text/javascript" src="coolclock/excanvas.js"></script>
++ <script type="text/javascript" src="excanvas.min.js"></script>
+ <script type="text/javascript" src="coolclock/coolclock.js"></script>
+ <script type="text/javascript" src="coolclock/moreskins.js"></script>
+ <title>DUMP1090</title>
diff --git a/debian/patches/0003-gcc7.patch b/debian/patches/0003-gcc7.patch
new file mode 100644
index 0000000..1a263d5
--- /dev/null
+++ b/debian/patches/0003-gcc7.patch
@@ -0,0 +1,31 @@
+From: "Matteo F. Vescovi" <mfv at debian.org>
+Date: Sat, 27 Jan 2018 23:01:01 +0100
+Subject: gcc7
+
+Fix FTBFS against gcc7
+---
+ interactive.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/interactive.c b/interactive.c
+index 22221a7..954ebda 100644
+--- a/interactive.c
++++ b/interactive.c
+@@ -103,7 +103,7 @@ void interactiveShowData(void) {
+ ) {
+ int altitude = a->altitude, speed = a->speed;
+ char strSquawk[5] = " ";
+- char strFl[6] = " ";
++ char strFl[12] = " ";
+ char strTt[5] = " ";
+ char strGs[5] = " ";
+
+@@ -128,7 +128,7 @@ void interactiveShowData(void) {
+ if (Modes.interactive_rtl1090) { // RTL1090 display mode
+
+ if (a->bFlags & MODES_ACFLAGS_ALTITUDE_VALID) {
+- snprintf(strFl,6,"F%03d",(altitude/100));
++ snprintf(strFl,11,"F%03d",((a->altitude+50)/100));
+ }
+ printf("%06x %-8s %-4s %-3s %-3s %4s %-6d %-2.0f\n",
+ a->addr, a->flight, strFl, strGs, strTt, strSquawk, msgs, (now - a->seen)/1000.0);
diff --git a/debian/patches/01-jquery.patch b/debian/patches/01-jquery.patch
deleted file mode 100644
index cb0bf6a..0000000
--- a/debian/patches/01-jquery.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Author: Matthew John Ernisse <mernisse at ub3rgeek.net>
-Description: Locally serve jQuery and jQuery-UI files.
-Forwarded: not-needed
-
---- a/public_html/gmap.html
-+++ b/public_html/gmap.html
-@@ -3,9 +3,9 @@
- <head>
- <meta charset="utf-8"/>
- <link rel="stylesheet" type="text/css" href="style.css" />
-- <link rel="stylesheet" href="jquery/jquery-ui-1.11.4-smoothness.css" />
-- <script src="jquery/jquery-3.0.0.min.js"></script>
-- <script src="jquery/jquery-ui-1.11.4.min.js"></script>
-+ <link rel="stylesheet" href="jquery-ui.min.css" />
-+ <script src="jquery.min.js"></script>
-+ <script src="jquery-ui.min.js"></script>
-
- <link rel="stylesheet" href="ol3/ol-3.17.1.css" type="text/css" />
- <script src="ol3/ol-3.17.1.js" type="text/javascript"></script>
diff --git a/debian/patches/02-excanvas.patch b/debian/patches/02-excanvas.patch
deleted file mode 100644
index be69fb9..0000000
--- a/debian/patches/02-excanvas.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Author: Matthew John Ernisse <mernisse at ub3rgeek.net>
-Description: Replace local version of excanvas.js with libjs-excanvas.
-Forwarded: not-needed
-Index: mutability-dump1090/public_html/gmap.html
-===================================================================
---- mutability-dump1090.orig/public_html/gmap.html
-+++ mutability-dump1090/public_html/gmap.html
-@@ -22,7 +22,7 @@
- <script type="text/javascript" src="flags.js"></script>
- <script type="text/javascript" src="layers.js"></script>
- <script type="text/javascript" src="script.js"></script>
-- <script type="text/javascript" src="coolclock/excanvas.js"></script>
-+ <script type="text/javascript" src="excanvas.min.js"></script>
- <script type="text/javascript" src="coolclock/coolclock.js"></script>
- <script type="text/javascript" src="coolclock/moreskins.js"></script>
- <title>DUMP1090</title>
diff --git a/debian/patches/03-gcc7.patch b/debian/patches/03-gcc7.patch
deleted file mode 100644
index bbb5ebe..0000000
--- a/debian/patches/03-gcc7.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Author: Matteo F. Vescovi <mfv at debian.org>
-Description: Fix FTBFS against gcc7
-Forwarded: not-needed
-
-diff --git a/interactive.c b/interactive.c
-index 9137790..f906923 100644
---- a/interactive.c
-+++ b/interactive.c
-@@ -118,7 +118,7 @@ void interactiveShowData(void) {
- || (((flags & (MODEAC_MSG_MODES_HIT | MODEAC_MSG_MODEC_OLD )) == 0 ) && (msgs > 127) )
- ) {
- char strSquawk[5] = " ";
-- char strFl[7] = " ";
-+ char strFl[12] = " ";
- char strTt[5] = " ";
- char strGs[5] = " ";
-
-@@ -140,7 +140,7 @@ void interactiveShowData(void) {
-
- if (Modes.interactive_rtl1090) { // RTL1090 display mode
- if (trackDataValid(&a->altitude_valid)) {
-- snprintf(strFl,6,"F%03d",((a->altitude+50)/100));
-+ snprintf(strFl,11,"F%03d",((a->altitude+50)/100));
- }
- printf("%06x %-8s %-4s %-3s %-3s %4s %-6d %-2.0f\n",
- a->addr, a->callsign, strFl, strGs, strTt, strSquawk, msgs, (now - a->seen)/1000.0);
diff --git a/debian/patches/series b/debian/patches/series
index 2fc95e9..fd6dbb1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
-01-jquery.patch
-02-excanvas.patch
-03-gcc7.patch
+0001-jquery.patch
+0002-excanvas.patch
+0003-gcc7.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/dump1090-mutability.git
More information about the pkg-hamradio-commits
mailing list