Control: tags -1 patch
Hi,
In Ubuntu, the attached patch was applied to achieve the following:
* d/p/1005_gcc_10.patch: Fix FTBFS with GCC 10 by unconditionally marking
variable as extern in header files.
Thanks for considering the patch.
Logan
diff -Nru kannel-sqlbox-0.7.2/debian/patches/1005_gcc_10.patch
kannel-sqlbox-0.7.2/debian/patches/1005_gcc_10.patch
--- kannel-sqlbox-0.7.2/debian/patches/1005_gcc_10.patch 1969-12-31
19:00:00.000000000 -0500
+++ kannel-sqlbox-0.7.2/debian/patches/1005_gcc_10.patch 2021-04-02
13:43:20.000000000 -0400
@@ -0,0 +1,72 @@
+--- a/gw/sqlbox_mssql.h
++++ b/gw/sqlbox_mssql.h
+@@ -47,8 +47,5 @@
+ Msg *mssql_fetch_msg();
+ void sql_shutdown();
+ struct server_type *sqlbox_init_mssql(Cfg *cfg);
+-#ifndef sqlbox_mssql_c
+-extern
+-#endif
+-Octstr *sqlbox_id;
++extern Octstr *sqlbox_id;
+ #endif
+--- a/gw/sqlbox_mysql.h
++++ b/gw/sqlbox_mysql.h
+@@ -49,8 +49,5 @@
+ Msg *mysql_fetch_msg();
+ void sql_shutdown();
+ struct server_type *sqlbox_init_mysql(Cfg *cfg);
+-#ifndef sqlbox_mysql_c
+-extern
+-#endif
+-Octstr *sqlbox_id;
++extern Octstr *sqlbox_id;
+ #endif
+--- a/gw/sqlbox_pgsql.h
++++ b/gw/sqlbox_pgsql.h
+@@ -46,8 +46,5 @@
+ void sql_shutdown();
+ struct server_type *sqlbox_init_pgsql(Cfg *cfg);
+ void sqlbox_configure_pgsql(Cfg* cfg);
+-#ifndef sqlbox_pgsql_c
+-extern
+-#endif
+-Octstr *sqlbox_id;
++extern Octstr *sqlbox_id;
+ #endif
+--- a/gw/sqlbox_sdb.h
++++ b/gw/sqlbox_sdb.h
+@@ -22,8 +22,5 @@
+ Msg *sdb_fetch_msg();
+ void sql_shutdown();
+ struct server_type *sqlbox_init_sdb(Cfg *cfg);
+-#ifndef sqlbox_sdb_c
+-extern
+-#endif
+-Octstr *sqlbox_id;
++extern Octstr *sqlbox_id;
+ #endif
+--- a/gw/sqlbox_sqlite.h
++++ b/gw/sqlbox_sqlite.h
+@@ -42,8 +42,5 @@
+ Msg *sqlite_fetch_msg();
+ void sql_shutdown();
+ struct server_type *sqlbox_init_sqlite(Cfg *cfg);
+-#ifndef sqlbox_sqlite_c
+-extern
+-#endif
+-Octstr *sqlbox_id;
++extern Octstr *sqlbox_id;
+ #endif
+--- a/gw/sqlbox_sqlite3.h
++++ b/gw/sqlbox_sqlite3.h
+@@ -42,8 +42,5 @@
+ Msg *sqlite3_fetch_msg();
+ void sql_shutdown();
+ struct server_type *sqlbox_init_sqlite3(Cfg *cfg);
+-#ifndef sqlbox_sqlite3_c
+-extern
+-#endif
+-Octstr *sqlbox_id;
++extern Octstr *sqlbox_id;
+ #endif
diff -Nru kannel-sqlbox-0.7.2/debian/patches/series
kannel-sqlbox-0.7.2/debian/patches/series
--- kannel-sqlbox-0.7.2/debian/patches/series 2018-10-07 18:37:08.000000000
-0400
+++ kannel-sqlbox-0.7.2/debian/patches/series 2021-04-02 13:39:55.000000000
-0400
@@ -2,3 +2,4 @@
1002_gwlib_autoonf.patch
1003_clang_FTBFS_Wreturn-type.patch
1004_allow_changing_db_type.patch
+1005_gcc_10.patch
