diff options
| author |   Jakov Smolic <jakov.smolic@sartura.hr> | 2021-01-12 10:36:55 +0100 |
|---|---|---|
| committer |   David Seifert <soap@gentoo.org> | 2021-01-12 10:36:55 +0100 |
| commit | 7ed2a39abb986e3f4264e059559f1865a1519881 (patch) | |
| tree | 7e07f0d901ad127643a5bc10da5892f8884ff766 /net-ftp/pureadmin/files | |
| parent | app-editors/lpe: Port to EAPI 7 (diff) | |
| download | gentoo-7ed2a39abb986e3f4264e059559f1865a1519881.tar.gz gentoo-7ed2a39abb986e3f4264e059559f1865a1519881.tar.bz2 gentoo-7ed2a39abb986e3f4264e059559f1865a1519881.zip | |
net-ftp/pureadmin: Fix build with gcc-10
Closes: https://bugs.gentoo.org/707206
Signed-off-by: Jakov Smolic <jakov.smolic@sartura.hr>
Closes: https://github.com/gentoo/gentoo/pull/18967
Signed-off-by: David Seifert <soap@gentoo.org>
Diffstat (limited to 'net-ftp/pureadmin/files')
| -rw-r--r-- | net-ftp/pureadmin/files/pureadmin-0.4-fno-common.patch | 42 | ||||
| -rw-r--r-- | net-ftp/pureadmin/files/pureadmin-0.4-gold.patch | 8 |
2 files changed, 42 insertions, 8 deletions
diff --git a/net-ftp/pureadmin/files/pureadmin-0.4-fno-common.patch b/net-ftp/pureadmin/files/pureadmin-0.4-fno-common.patch new file mode 100644 index 000000000000..829867e8c0db --- /dev/null +++ b/net-ftp/pureadmin/files/pureadmin-0.4-fno-common.patch @@ -0,0 +1,42 @@ +https://bugs.gentoo.org/707206 +--- a/src/globals.h ++++ b/src/globals.h +@@ -90,7 +90,7 @@ typedef enum { + RUNMODE_INETD /* Running through inetd or similar */ + } ftp_runmode_t; + +-ftp_runmode_t ftp_runmode; ++extern ftp_runmode_t ftp_runmode; + + void exit_program (void); + +--- a/src/gui_helper.c ++++ b/src/gui_helper.c +@@ -39,6 +39,7 @@ + #include "binreloc.h" + #include "system_accounts.h" + ++extern ftp_runmode_t ftp_runmode; + EggStatusIcon *status_icon = NULL; + + static gchar *sec_to_time (gulong sec) +--- a/src/main.c ++++ b/src/main.c +@@ -53,6 +53,7 @@ + gboolean timeout_update_activity (gpointer data); + gboolean timeout_check_for_availability (gpointer data); + ++ftp_runmode_t ftp_runmode; + static ftp_runmode_t get_ftp_runmode (void); + static void activity_show_error_message (const gchar *errmsg); + static void activity_show_welcome_message (void); +--- a/src/mainwin_cb.c ++++ b/src/mainwin_cb.c +@@ -46,6 +46,7 @@ + + popup_src_t popup_source; + ++extern ftp_runmode_t ftp_runmode; + gboolean usermanager_initialized = FALSE; + + static void update_adv_info (void) diff --git a/net-ftp/pureadmin/files/pureadmin-0.4-gold.patch b/net-ftp/pureadmin/files/pureadmin-0.4-gold.patch index 7b19565ac10a..c410da51f507 100644 --- a/net-ftp/pureadmin/files/pureadmin-0.4-gold.patch +++ b/net-ftp/pureadmin/files/pureadmin-0.4-gold.patch @@ -1,9 +1,3 @@ - src/Makefile.am | 2 +- - src/Makefile.in | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/Makefile.am b/src/Makefile.am -index 94f61e0..0ebb561 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -38,5 +38,5 @@ pureadmin_CFLAGS = -std=gnu99 -Wall @@ -13,8 +7,6 @@ index 94f61e0..0ebb561 100644 -pureadmin_LDADD = @GTK_LIBS@ $(INTLLIBS) @BINRELOC_LIBS@ +pureadmin_LDADD = @GTK_LIBS@ $(INTLLIBS) @BINRELOC_LIBS@ -lm -lX11 -diff --git a/src/Makefile.in b/src/Makefile.in -index b2ade45..dd9401c 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -249,7 +249,7 @@ pureadmin_SOURCES = \ |