aniani/elinks
1
0
Fork 0
mirror of https://github.com/rkd77/elinks.git synced 2025-05-18 00:48:57 -04:00
Code

[meson] Fixed bittorrent build

Browse Source
This commit is contained in:
Witold Filipczyk 2020-09-13 16:12:57 +02:00
parent deefa7eb8a
commit 5dc8c56b2d
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meson.build
View File

@ -24,7 +24,7 @@ conf_data.set('CONFIG_GLOBHIST', get_option('globhist'))
conf_data.set('CONFIG_MAILCAP', get_option('mailcap')) conf_data.set('CONFIG_MAILCAP', get_option('mailcap'))
conf_data.set('CONFIG_MIMETYPES', get_option('mimetypes')) conf_data.set('CONFIG_MIMETYPES', get_option('mimetypes'))
conf_data.set('CONFIG_IPV6', get_option('ipv6')) conf_data.set('CONFIG_IPV6', get_option('ipv6'))
conf_data.set10('CONFIG_BITTORRENT', get_option('bittorrent')) conf_data.set('CONFIG_BITTORRENT', get_option('bittorrent'))
conf_data.set('CONFIG_DATA', get_option('data')) conf_data.set('CONFIG_DATA', get_option('data'))
conf_data.set('CONFIG_URI_REWRITE', get_option('uri-rewrite')) conf_data.set('CONFIG_URI_REWRITE', get_option('uri-rewrite'))

16
src/dialogs/download.c
View File

@ -70,7 +70,7 @@ dlg_set_notify(struct dialog_data *dlg_data, struct widget_data *widget_data)
if (!file_download->external_handler) if (!file_download->external_handler)
file_download->term = dlg_data->win->term; file_download->term = dlg_data->win->term;
#if CONFIG_BITTORRENT #ifdef CONFIG_BITTORRENT
if (file_download->uri->protocol == PROTOCOL_BITTORRENT) if (file_download->uri->protocol == PROTOCOL_BITTORRENT)
set_bittorrent_notify_on_completion(&file_download->download, set_bittorrent_notify_on_completion(&file_download->download,
file_download->term); file_download->term);
@ -95,7 +95,7 @@ push_delete_button(struct dialog_data *dlg_data, struct widget_data *widget_data
struct file_download *file_download = dlg_data->dlg->udata; struct file_download *file_download = dlg_data->dlg->udata;
file_download->delete_ = 1; file_download->delete_ = 1;
#if CONFIG_BITTORRENT #ifdef CONFIG_BITTORRENT
if (file_download->uri->protocol == PROTOCOL_BITTORRENT) if (file_download->uri->protocol == PROTOCOL_BITTORRENT)
set_bittorrent_files_for_deletion(&file_download->download); set_bittorrent_files_for_deletion(&file_download->download);
#endif #endif
@ -139,7 +139,7 @@ download_dialog_layouter(struct dialog_data *dlg_data)
unsigned char *msg = get_download_msg(download, term, 1, 1, "\n"); unsigned char *msg = get_download_msg(download, term, 1, 1, "\n");
int show_meter = (download_is_progressing(download) int show_meter = (download_is_progressing(download)
&& download->progress->size >= 0); && download->progress->size >= 0);
#if CONFIG_BITTORRENT #ifdef CONFIG_BITTORRENT
int bittorrent = (file_download->uri->protocol == PROTOCOL_BITTORRENT int bittorrent = (file_download->uri->protocol == PROTOCOL_BITTORRENT
&& (show_meter || is_in_state(download->state, S_RESUME))); && (show_meter || is_in_state(download->state, S_RESUME)));
#endif #endif
@ -172,7 +172,7 @@ download_dialog_layouter(struct dialog_data *dlg_data)
y++; y++;
if (show_meter) y += 2; if (show_meter) y += 2;
#if CONFIG_BITTORRENT #ifdef CONFIG_BITTORRENT
if (bittorrent) y += 2; if (bittorrent) y += 2;
#endif #endif
dlg_format_text_do(dlg_data, msg, 0, &y, w, &rw, dlg_format_text_do(dlg_data, msg, 0, &y, w, &rw,
@ -208,7 +208,7 @@ download_dialog_layouter(struct dialog_data *dlg_data)
y++; y++;
} }
#if CONFIG_BITTORRENT #ifdef CONFIG_BITTORRENT
if (bittorrent) { if (bittorrent) {
y++; y++;
draw_bittorrent_piece_progress(download, term, x, y, w, NULL, NULL); draw_bittorrent_piece_progress(download, term, x, y, w, NULL, NULL);
@ -238,7 +238,7 @@ display_download(struct terminal *term, struct file_download *file_download,
if (!is_in_downloads_list(file_download)) if (!is_in_downloads_list(file_download))
return; return;
#if CONFIG_BITTORRENT #ifdef CONFIG_BITTORRENT
#define DOWNLOAD_WIDGETS_COUNT 5 #define DOWNLOAD_WIDGETS_COUNT 5
#else #else
#define DOWNLOAD_WIDGETS_COUNT 4 #define DOWNLOAD_WIDGETS_COUNT 4
@ -259,7 +259,7 @@ display_download(struct terminal *term, struct file_download *file_download,
add_dlg_button(dlg, _("~Background", term), B_ENTER | B_ESC, dlg_undisplay_download, NULL); add_dlg_button(dlg, _("~Background", term), B_ENTER | B_ESC, dlg_undisplay_download, NULL);
add_dlg_button(dlg, _("Background with ~notify", term), B_ENTER | B_ESC, dlg_set_notify, NULL); add_dlg_button(dlg, _("Background with ~notify", term), B_ENTER | B_ESC, dlg_set_notify, NULL);
#if CONFIG_BITTORRENT #ifdef CONFIG_BITTORRENT
if (file_download->uri->protocol == PROTOCOL_BITTORRENT) if (file_download->uri->protocol == PROTOCOL_BITTORRENT)
add_dlg_button(dlg, _("~Info", term), B_ENTER | B_ESC, dlg_show_bittorrent_info, NULL); add_dlg_button(dlg, _("~Info", term), B_ENTER | B_ESC, dlg_show_bittorrent_info, NULL);
#endif #endif
@ -272,7 +272,7 @@ display_download(struct terminal *term, struct file_download *file_download,
add_dlg_button(dlg, _("Abort and ~delete file", term), 0, push_delete_button, NULL); add_dlg_button(dlg, _("Abort and ~delete file", term), 0, push_delete_button, NULL);
} }
#if CONFIG_BITTORRENT #ifdef CONFIG_BITTORRENT
add_dlg_end(dlg, DOWNLOAD_WIDGETS_COUNT - !!file_download->external_handler add_dlg_end(dlg, DOWNLOAD_WIDGETS_COUNT - !!file_download->external_handler
- (file_download->uri->protocol != PROTOCOL_BITTORRENT)); - (file_download->uri->protocol != PROTOCOL_BITTORRENT));
#else #else

2
src/protocol/meson.build
View File

@ -1,4 +1,4 @@
if conf_data.get('CONFIG_BITTORRENT') == 1 if conf_data.get('CONFIG_BITTORRENT')
subdir('bittorrent') subdir('bittorrent')
endif endif
if conf_data.get('CONFIG_FINGER') if conf_data.get('CONFIG_FINGER')

2
src/util/meson.build
View File

@ -15,7 +15,7 @@ endif
if conf_data.get('CONFIG_OWN_LIBC') or (not conf_data.get('CONFIG_GNUTLS_OPENSSL_COMPAT') and not conf_data.get('CONFIG_OPENSSL')) if conf_data.get('CONFIG_OWN_LIBC') or (not conf_data.get('CONFIG_GNUTLS_OPENSSL_COMPAT') and not conf_data.get('CONFIG_OPENSSL'))
srcs += files('md5.c') srcs += files('md5.c')
endif endif
if conf_data.get('CONFIG_BITTORRENT') == 1 if conf_data.get('CONFIG_BITTORRENT')
if conf_data.get('CONFIG_OWN_LIBC') or not conf_data.get('CONFIG_OPENSSL') if conf_data.get('CONFIG_OWN_LIBC') or not conf_data.get('CONFIG_OPENSSL')
srcs += files('sha1.c') srcs += files('sha1.c')
endif endif