Package: aplus-fsf
Version: 4.22.1-10.1
Followup-For: Bug #983970
User: [email protected]
Usertags: origin-ubuntu impish ubuntu-patch
X-Debbugs-Cc: [email protected]
Control: tags -1 patch
Dear Maintainer,
aplus-fsf FTBFS with GCC-11 because it is using ordered pointer comparison with
integer, that are not supported anymore:
https://gcc.gnu.org/gcc-11/porting_to.html
In Ubuntu, the attached patch was applied to achieve the following:
* Fix FTBFS on GCC-11, avoiding ordered pointer comparisons with integer.
Thanks for considering the patch.
-- System Information:
Debian Release: 11.0
APT prefers impish
APT policy: (500, 'impish')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 5.13.0-16-generic (SMP w/4 CPU threads)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_WARN, TAINT_OOT_MODULE
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8),
LANGUAGE=de_DE:en_GB:en
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
only in patch2:
unchanged:
--- aplus-fsf-4.22.1.orig/src/MSGUI/MSGraphUI.C
+++ aplus-fsf-4.22.1/src/MSGUI/MSGraphUI.C
@@ -1493,7 +1493,7 @@
{
xs=trace->xAxis();
ys=trace->yAxis();
- if(trace->style()!=MSG::Text&&trace->dataCount()>1&&trace->legend()>0)
+ if(trace->style()!=MSG::Text&&trace->dataCount()>1&&trace->legend()!=0)
{
if (setX==MSFalse)
{
only in patch2:
unchanged:
--- aplus-fsf-4.22.1.orig/src/MSTypes/MSBinaryMatrix.C
+++ aplus-fsf-4.22.1/src/MSTypes/MSBinaryMatrix.C
@@ -832,7 +832,7 @@
unsigned char *dp=d->elements();
unsigned char *mp=aBinaryMatrix_.data();
unsigned char *row=aBinaryMatrix_.data()+aBinaryMatrix_.columns();
- if (mp>0)
+ if (mp!=0)
{
do
{
@@ -842,7 +842,7 @@
}
mp=bBinaryMatrix_.data();
row=bBinaryMatrix_.data()+bBinaryMatrix_.columns();
- if (mp>0)
+ if (mp!=0)
{
do
{
@@ -869,7 +869,7 @@
unsigned char *dp=d->elements();
unsigned char *mp=data();
unsigned char *row=data()+columns();
- if (mp>0)
+ if (mp!=0)
{
do
{
@@ -879,7 +879,7 @@
}
mp=aBinaryMatrix_.data();
row=aBinaryMatrix_.data()+aBinaryMatrix_.columns();
- if (mp>0)
+ if (mp!=0)
{
do
{
@@ -917,7 +917,7 @@
unsigned char *dp=d->elements();
unsigned char *mp=aBinaryMatrix_.data();
unsigned char *row=aBinaryMatrix_.data()+aBinaryMatrix_.columns();
- if (mp>0)
+ if (mp!=0)
{
do
{
@@ -929,7 +929,7 @@
dp=d->elements()+aBinaryMatrix_.columns();
mp=bBinaryMatrix_.data();
row=bBinaryMatrix_.data()+bBinaryMatrix_.columns();
- if (mp>0)
+ if (mp!=0)
{
do
{
@@ -957,7 +957,7 @@
unsigned char *dp=d->elements();
unsigned char *mp=data();
unsigned char *row=data()+columns();
- if (mp>0)
+ if (mp!=0)
{
do
{
@@ -969,7 +969,7 @@
dp=d->elements()+columns();
mp=aBinaryMatrix_.data();
row=aBinaryMatrix_.data()+aBinaryMatrix_.columns();
- if (mp>0)
+ if (mp!=0)
{
do
{
