[med-svn] [Git][med-team/emboss][master] 2 commits: Fix FTBFS with GCC-15 (Closes: #1096578)
Andrius Merkys (@merkys)
gitlab at salsa.debian.org
Fri Sep 5 08:57:14 BST 2025
Andrius Merkys pushed to branch master at Debian Med / emboss
Commits:
2bfa7a58 by Andrius Merkys at 2025-09-05T03:11:08-04:00
Fix FTBFS with GCC-15 (Closes: #1096578)
- - - - -
35070111 by Andrius Merkys at 2025-09-05T03:12:34-04:00
Update changelog for 6.6.0+dfsg-16 release
- - - - -
3 changed files:
- debian/changelog
- + debian/patches/rename-bool-variable.patch
- debian/patches/series
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+emboss (6.6.0+dfsg-16) unstable; urgency=medium
+
+ * Team upload.
+ * Fix FTBFS with GCC-15 (Closes: #1096578)
+
+ -- Andrius Merkys <merkys at debian.org> Fri, 05 Sep 2025 03:12:19 -0400
+
emboss (6.6.0+dfsg-15) unstable; urgency=medium
* Team upload.
=====================================
debian/patches/rename-bool-variable.patch
=====================================
@@ -0,0 +1,434 @@
+--- a/ajax/core/ajsql.c
++++ b/ajax/core/ajsql.c
+@@ -3030,7 +3030,7 @@
+
+ AjBool ajSqlcolumnToBool(AjPSqlrow sqlr, AjBool *Pvalue)
+ {
+- AjBool bool = ajFalse;
++ AjBool bool_value = ajFalse;
+
+ AjPStr str = NULL;
+
+@@ -3045,14 +3045,14 @@
+
+ str = ajStrNew();
+
+- bool = ajSqlcolumnToStr(sqlr, &str);
++ bool_value = ajSqlcolumnToStr(sqlr, &str);
+
+- if(bool)
++ if(bool_value)
+ ajStrToBool(str, Pvalue);
+
+ ajStrDel(&str);
+
+- return bool;
++ return bool_value;
+ }
+
+
+@@ -3074,7 +3074,7 @@
+
+ AjBool ajSqlcolumnToDouble(AjPSqlrow sqlr, double *Pvalue)
+ {
+- AjBool bool = ajFalse;
++ AjBool bool_value = ajFalse;
+
+ AjPStr str = NULL;
+
+@@ -3089,14 +3089,14 @@
+
+ str = ajStrNew();
+
+- bool = ajSqlcolumnToStr(sqlr, &str);
++ bool_value = ajSqlcolumnToStr(sqlr, &str);
+
+- if(bool)
++ if(bool_value)
+ ajStrToDouble(str, Pvalue);
+
+ ajStrDel(&str);
+
+- return bool;
++ return bool_value;
+ }
+
+
+@@ -3118,7 +3118,7 @@
+
+ AjBool ajSqlcolumnToFloat(AjPSqlrow sqlr, float *Pvalue)
+ {
+- AjBool bool = ajFalse;
++ AjBool bool_value = ajFalse;
+
+ AjPStr str = NULL;
+
+@@ -3133,14 +3133,14 @@
+
+ str = ajStrNew();
+
+- bool = ajSqlcolumnToStr(sqlr, &str);
++ bool_value = ajSqlcolumnToStr(sqlr, &str);
+
+- if(bool)
++ if(bool_value)
+ ajStrToFloat(str, Pvalue);
+
+ ajStrDel(&str);
+
+- return bool;
++ return bool_value;
+ }
+
+
+@@ -3162,7 +3162,7 @@
+
+ AjBool ajSqlcolumnToInt(AjPSqlrow sqlr, ajint *Pvalue)
+ {
+- AjBool bool = ajFalse;
++ AjBool bool_value = ajFalse;
+
+ AjPStr str = NULL;
+
+@@ -3177,14 +3177,14 @@
+
+ str = ajStrNew();
+
+- bool = ajSqlcolumnToStr(sqlr, &str);
++ bool_value = ajSqlcolumnToStr(sqlr, &str);
+
+- if(bool)
++ if(bool_value)
+ ajStrToInt(str, Pvalue);
+
+ ajStrDel(&str);
+
+- return bool;
++ return bool_value;
+ }
+
+
+@@ -3206,7 +3206,7 @@
+
+ AjBool ajSqlcolumnToLong(AjPSqlrow sqlr, ajlong *Pvalue)
+ {
+- AjBool bool = ajFalse;
++ AjBool bool_value = ajFalse;
+
+ AjPStr str = NULL;
+
+@@ -3221,14 +3221,14 @@
+
+ str = ajStrNew();
+
+- bool = ajSqlcolumnToStr(sqlr, &str);
++ bool_value = ajSqlcolumnToStr(sqlr, &str);
+
+- if(bool)
++ if(bool_value)
+ ajStrToLong(str, Pvalue);
+
+ ajStrDel(&str);
+
+- return bool;
++ return bool_value;
+ }
+
+
+@@ -3300,7 +3300,7 @@
+
+ AjBool ajSqlcolumnToTime(AjPSqlrow sqlr, AjPTime *Pvalue)
+ {
+- AjBool bool = ajFalse;
++ AjBool bool_value = ajFalse;
+
+ AjPStr str = NULL;
+
+@@ -3318,14 +3318,14 @@
+
+ str = ajStrNew();
+
+- bool = ajSqlcolumnToStr(sqlr, &str);
++ bool_value = ajSqlcolumnToStr(sqlr, &str);
+
+- if(bool)
++ if(bool_value)
+ ajTimeSetS(*Pvalue, str);
+
+ ajStrDel(&str);
+
+- return bool;
++ return bool_value;
+ }
+
+
+@@ -3347,7 +3347,7 @@
+
+ AjBool ajSqlcolumnToUint(AjPSqlrow sqlr, ajuint *Pvalue)
+ {
+- AjBool bool = ajFalse;
++ AjBool bool_value = ajFalse;
+
+ AjPStr str = NULL;
+
+@@ -3362,14 +3362,14 @@
+
+ str = ajStrNew();
+
+- bool = ajSqlcolumnToStr(sqlr, &str);
++ bool_value = ajSqlcolumnToStr(sqlr, &str);
+
+- if(bool)
++ if(bool_value)
+ ajStrToUint(str, Pvalue);
+
+ ajStrDel(&str);
+
+- return bool;
++ return bool_value;
+ }
+
+
+@@ -3391,7 +3391,7 @@
+
+ AjBool ajSqlcolumnToUlong(AjPSqlrow sqlr, ajulong *Pvalue)
+ {
+- AjBool bool = ajFalse;
++ AjBool bool_value = ajFalse;
+
+ AjPStr str = NULL;
+
+@@ -3406,14 +3406,14 @@
+
+ str = ajStrNew();
+
+- bool = ajSqlcolumnToStr(sqlr, &str);
++ bool_value = ajSqlcolumnToStr(sqlr, &str);
+
+- if(bool)
++ if(bool_value)
+ ajStrToUlong(str, Pvalue);
+
+ ajStrDel(&str);
+
+- return bool;
++ return bool_value;
+ }
+
+
+@@ -3546,7 +3546,7 @@
+ AjBool ajSqlcolumnNumberToBool(const AjPSqlrow sqlr, ajuint column,
+ AjBool *Pvalue)
+ {
+- AjBool bool = ajFalse;
++ AjBool bool_value = ajFalse;
+
+ AjPStr str = NULL;
+
+@@ -3561,14 +3561,14 @@
+
+ str = ajStrNew();
+
+- bool = ajSqlcolumnNumberToStr(sqlr, column, &str);
++ bool_value = ajSqlcolumnNumberToStr(sqlr, column, &str);
+
+- if(bool)
++ if(bool_value)
+ ajStrToBool(str, Pvalue);
+
+ ajStrDel(&str);
+
+- return bool;
++ return bool_value;
+ }
+
+
+@@ -3592,7 +3592,7 @@
+ AjBool ajSqlcolumnNumberToDouble(const AjPSqlrow sqlr, ajuint column,
+ double *Pvalue)
+ {
+- AjBool bool = ajFalse;
++ AjBool bool_value = ajFalse;
+
+ AjPStr str = NULL;
+
+@@ -3607,14 +3607,14 @@
+
+ str = ajStrNew();
+
+- bool = ajSqlcolumnNumberToStr(sqlr, column, &str);
++ bool_value = ajSqlcolumnNumberToStr(sqlr, column, &str);
+
+- if(bool)
++ if(bool_value)
+ ajStrToDouble(str, Pvalue);
+
+ ajStrDel(&str);
+
+- return bool;
++ return bool_value;
+ }
+
+
+@@ -3638,7 +3638,7 @@
+ AjBool ajSqlcolumnNumberToFloat(const AjPSqlrow sqlr, ajuint column,
+ float *Pvalue)
+ {
+- AjBool bool = ajFalse;
++ AjBool bool_value = ajFalse;
+
+ AjPStr str = NULL;
+
+@@ -3653,14 +3653,14 @@
+
+ str = ajStrNew();
+
+- bool = ajSqlcolumnNumberToStr(sqlr, column, &str);
++ bool_value = ajSqlcolumnNumberToStr(sqlr, column, &str);
+
+- if(bool)
++ if(bool_value)
+ ajStrToFloat(str, Pvalue);
+
+ ajStrDel(&str);
+
+- return bool;
++ return bool_value;
+ }
+
+
+@@ -3684,7 +3684,7 @@
+ AjBool ajSqlcolumnNumberToInt(const AjPSqlrow sqlr, ajuint column,
+ ajint *Pvalue)
+ {
+- AjBool bool = ajFalse;
++ AjBool bool_value = ajFalse;
+
+ AjPStr str = NULL;
+
+@@ -3699,14 +3699,14 @@
+
+ str = ajStrNew();
+
+- bool = ajSqlcolumnNumberToStr(sqlr, column, &str);
++ bool_value = ajSqlcolumnNumberToStr(sqlr, column, &str);
+
+- if(bool)
++ if(bool_value)
+ ajStrToInt(str, Pvalue);
+
+ ajStrDel(&str);
+
+- return bool;
++ return bool_value;
+ }
+
+
+@@ -3730,7 +3730,7 @@
+ AjBool ajSqlcolumnNumberToLong(const AjPSqlrow sqlr, ajuint column,
+ ajlong *Pvalue)
+ {
+- AjBool bool = ajFalse;
++ AjBool bool_value = ajFalse;
+
+ AjPStr str = NULL;
+
+@@ -3745,14 +3745,14 @@
+
+ str = ajStrNew();
+
+- bool = ajSqlcolumnNumberToStr(sqlr, column, &str);
++ bool_value = ajSqlcolumnNumberToStr(sqlr, column, &str);
+
+- if(bool)
++ if(bool_value)
+ ajStrToLong(str, Pvalue);
+
+ ajStrDel(&str);
+
+- return bool;
++ return bool_value;
+ }
+
+
+@@ -3828,7 +3828,7 @@
+ AjBool ajSqlcolumnNumberToTime(const AjPSqlrow sqlr, ajuint column,
+ AjPTime *Pvalue)
+ {
+- AjBool bool = ajFalse;
++ AjBool bool_value = ajFalse;
+
+ AjPStr str = NULL;
+
+@@ -3846,14 +3846,14 @@
+
+ str = ajStrNew();
+
+- bool = ajSqlcolumnNumberToStr(sqlr, column, &str);
++ bool_value = ajSqlcolumnNumberToStr(sqlr, column, &str);
+
+- if(bool)
++ if(bool_value)
+ ajTimeSetS(*Pvalue, str);
+
+ ajStrDel(&str);
+
+- return bool;
++ return bool_value;
+ }
+
+
+@@ -3877,7 +3877,7 @@
+ AjBool ajSqlcolumnNumberToUint(const AjPSqlrow sqlr, ajuint column,
+ ajuint *Pvalue)
+ {
+- AjBool bool = ajFalse;
++ AjBool bool_value = ajFalse;
+
+ AjPStr str = NULL;
+
+@@ -3892,14 +3892,14 @@
+
+ str = ajStrNew();
+
+- bool = ajSqlcolumnNumberToStr(sqlr, column, &str);
++ bool_value = ajSqlcolumnNumberToStr(sqlr, column, &str);
+
+- if(bool)
++ if(bool_value)
+ ajStrToUint(str, Pvalue);
+
+ ajStrDel(&str);
+
+- return bool;
++ return bool_value;
+ }
+
+
+@@ -3923,7 +3923,7 @@
+ AjBool ajSqlcolumnNumberToUlong(const AjPSqlrow sqlr, ajuint column,
+ ajulong *Pvalue)
+ {
+- AjBool bool = ajFalse;
++ AjBool bool_value = ajFalse;
+
+ AjPStr str = NULL;
+
+@@ -3938,14 +3938,14 @@
+
+ str = ajStrNew();
+
+- bool = ajSqlcolumnNumberToStr(sqlr, column, &str);
++ bool_value = ajSqlcolumnNumberToStr(sqlr, column, &str);
+
+- if(bool)
++ if(bool_value)
+ ajStrToUlong(str, Pvalue);
+
+ ajStrDel(&str);
+
+- return bool;
++ return bool_value;
+ }
+
+
=====================================
debian/patches/series
=====================================
@@ -8,3 +8,4 @@ remove_non-free_doc.patch
path_max.patch
no_makejar.patch
com_sun_net_deprecation.patch
+rename-bool-variable.patch
View it on GitLab: https://salsa.debian.org/med-team/emboss/-/compare/c895e0e959cb59511bd36e302ebdc2508660aedb...35070111cafa4bee22554ac62a586394ccc7c6af
--
View it on GitLab: https://salsa.debian.org/med-team/emboss/-/compare/c895e0e959cb59511bd36e302ebdc2508660aedb...35070111cafa4bee22554ac62a586394ccc7c6af
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20250905/1454acd2/attachment-0001.htm>
More information about the debian-med-commit
mailing list