diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-12-14 13:26:14 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-12-14 13:26:14 +0000 |
commit | 6abbf81ef2f298e3221ff5e67a1f3c5f23958212 (patch) | |
tree | 25413d1cb3a0cbfe36029db32398c0f333609215 /sci-electronics/xoscope/files | |
parent | 9c417bacd51da6d8b57fa9f37425161d30d4b95b (diff) |
gentoo resync : 14.12.2020
Diffstat (limited to 'sci-electronics/xoscope/files')
-rw-r--r-- | sci-electronics/xoscope/files/xoscope-2.2-fno-common.patch | 16 | ||||
-rw-r--r-- | sci-electronics/xoscope/files/xoscope-2.2-man_no_-Tutf8.patch | 11 |
2 files changed, 27 insertions, 0 deletions
diff --git a/sci-electronics/xoscope/files/xoscope-2.2-fno-common.patch b/sci-electronics/xoscope/files/xoscope-2.2-fno-common.patch new file mode 100644 index 000000000000..124a8fdd767c --- /dev/null +++ b/sci-electronics/xoscope/files/xoscope-2.2-fno-common.patch @@ -0,0 +1,16 @@ +Description: Fix FTBFS with GCC 10 +Bug-Debian: https://bugs.debian.org/957990 +Forwarded: https://sourceforge.net/p/xoscope/discussion/23485/thread/d6fba12f59/ +Author: Raymundo Cassani <raymundo.cassani@gmail.com> +Last-Update: 2020-05-20 + +--- a/display.c ++++ b/display.c +@@ -35,7 +35,6 @@ + #define DEBUG 0 + + int triggered = 0; /* whether we've triggered or not */ +-void *font; + int math_warning = 0; /* TRUE if math has a problem */ + + struct signal_stats stats; diff --git a/sci-electronics/xoscope/files/xoscope-2.2-man_no_-Tutf8.patch b/sci-electronics/xoscope/files/xoscope-2.2-man_no_-Tutf8.patch new file mode 100644 index 000000000000..a0f54eb26e37 --- /dev/null +++ b/sci-electronics/xoscope/files/xoscope-2.2-man_no_-Tutf8.patch @@ -0,0 +1,11 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -132,7 +132,7 @@ AC_DEFINE(CHANNELS, 8, [max number of channels]) + + AC_DEFINE(MSECREFRESH, 30, [minimum number of milliseconds between refresh on libsx version]) + +-AC_DEFINE(HELPCOMMAND, "man -Tutf8 xoscope 2>&1", [shell command for X11 help]) ++AC_DEFINE(HELPCOMMAND, "man xoscope 2>&1", [shell command for X11 help]) + + AC_DEFINE(FILENAME, "oscope.dat", [default file name]) + |