From c1e48d5c70c4cc6957df82a4a79fce9e4cb2d0ff Mon Sep 17 00:00:00 2001 From: robxnano <89391914+robxnano@users.noreply.github.com> Date: Fri, 10 Mar 2023 23:51:04 +0000 Subject: [PATCH] LinGUI: Remove update checker The update checker didn't work and could not be built on any recent Linux distribution. Linux updates are handled by Flatpak or the distribution. configure.py will error out if the --disable-gtk-update-checks flag is used. This is to avoid the flag being passed to make and giving an error anyway. --- .github/workflows/linux.yml | 2 +- gtk/configure.ac | 17 -- gtk/module.defs | 4 - gtk/src/Makefile.am | 2 - gtk/src/appcast.c | 283 ------------------------ gtk/src/appcast.h | 29 --- gtk/src/callbacks.c | 236 -------------------- gtk/src/callbacks.h | 2 - gtk/src/ghb3.ui | 192 ---------------- gtk/src/hb-backend.c | 19 -- gtk/src/internal_defaults.json.template | 3 - gtk/src/main.c | 5 - gtk/src/settings.h | 2 - libhb/handbrake/project.h.m4 | 1 - make/configure.py | 7 +- pkg/linux/flatpak/fr.handbrake.ghb.json | 1 - 16 files changed, 5 insertions(+), 800 deletions(-) delete mode 100644 gtk/src/appcast.c delete mode 100644 gtk/src/appcast.h diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 8f9cefa7ca52..a4f47114ed30 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -55,4 +55,4 @@ jobs: run: | PWD=$(pwd) export PATH=$PWD/cmake-3.16.3-Linux-x86_64/bin:$PATH - ./configure --disable-gtk-update-checks --enable-qsv --enable-vce --enable-nvenc --enable-nvdec --launch-jobs=0 --launch + ./configure --enable-qsv --enable-vce --enable-nvenc --enable-nvdec --launch-jobs=0 --launch diff --git a/gtk/configure.ac b/gtk/configure.ac index 6d6936c535f3..483b5ecdd455 100644 --- a/gtk/configure.ac +++ b/gtk/configure.ac @@ -101,10 +101,6 @@ AC_ARG_ENABLE(gst, AS_HELP_STRING([--disable-gst], [disable gstreamer (live preview)]), gst_disable=yes, gst_disable=no) -AC_ARG_ENABLE(update-checks, - AS_HELP_STRING([--disable-update-checks], [disable update checks]), - update_checks=no, update_checks=yes) - AC_ARG_ENABLE(gtk4, AS_HELP_STRING([--enable-gtk4], [enable building with gtk4]), use_gtk4=yes, use_gtk4=no) @@ -195,19 +191,6 @@ if test "x$gst_disable" = "xno" ; then CFLAGS="$CFLAGS -D_ENABLE_GST" fi -if test "x$update_checks" = "xyes" ; then - PKG_CHECK_MODULES([webkitgtk], webkitgtk-3.0, use_webkitgtk=yes, use_webkitgtk=no) - if test "x$use_webkitgtk" = "xyes" ; then - HB_LIBS="$HB_LIBS $webkitgtk_LIBS" - HB_CPPFLAGS="$HB_CPPFLAGS $webkitgtk_CFLAGS" - else - update_checks="no" - CFLAGS="$CFLAGS -D_NO_UPDATE_CHECK" - fi -else - CFLAGS="$CFLAGS -D_NO_UPDATE_CHECK" -fi - AM_CONDITIONAL([GHB_GTK_4_4], [test "$HAVE_GTK_4_4" -eq 1]) AM_CONDITIONAL([GHB_GTK_3_22], [test "$HAVE_GTK_3_22" -eq 1]) diff --git a/gtk/module.defs b/gtk/module.defs index cba8ee6fa879..589b82d79b33 100644 --- a/gtk/module.defs +++ b/gtk/module.defs @@ -28,10 +28,6 @@ ifeq ($(HAS.pthread),1) endif endif -ifeq (0,$(FEATURE.gtk.update.checks)) - GTK.CONFIGURE.extra += --disable-update-checks -endif - ifeq (0,$(FEATURE.gst)) GTK.CONFIGURE.extra += --disable-gst endif diff --git a/gtk/src/Makefile.am b/gtk/src/Makefile.am index b2c2c9ceba80..8eb280186fc0 100644 --- a/gtk/src/Makefile.am +++ b/gtk/src/Makefile.am @@ -105,8 +105,6 @@ ghb_SOURCES = \ icons.h \ values.c \ values.h \ - appcast.c \ - appcast.h \ plist.c \ plist.h \ hb-backend.c \ diff --git a/gtk/src/appcast.c b/gtk/src/appcast.c deleted file mode 100644 index af1706bbdb64..000000000000 --- a/gtk/src/appcast.c +++ /dev/null @@ -1,283 +0,0 @@ -/* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 4; tab-width: 4 -*- */ -/* - * appcast.c - * Copyright (C) John Stebbins 2008-2022 - * - * appcast.c is free software. - * - * You may redistribute it and/or modify it under the terms of the - * GNU General Public License version 2, as published by the Free Software - * Foundation. - * - * appcast.c is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with main.c. If not, write to: - * The Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor - * Boston, MA 02110-1301, USA. - */ - -#include "ghbcompat.h" - -#include -#include -#include -#include -#include "plist.h" -#include "values.h" -#include "appcast.h" - -enum -{ - A_NONE = 0, - A_DESCRIPTION, - A_ENCLOSURE, - A_ITEM, -}; - -typedef struct -{ - gchar *tag; - gint id; -} tag_map_t; - -static tag_map_t tag_map[] = -{ - {"sparkle:releaseNotesLink", A_DESCRIPTION}, - {"enclosure", A_ENCLOSURE}, - {"item", A_ITEM}, -}; -#define TAG_MAP_SZ (sizeof(tag_map)/sizeof(tag_map_t)) - -typedef struct -{ - gchar *key; - gchar *value; - GQueue *stack; - GQueue *tag_stack; - GString *description; - gchar *build; - gchar *version; - gboolean item; -} parse_data_t; - -static const gchar* -lookup_attr_value( - const gchar *name, - const gchar **attr_names, - const gchar **attr_values) -{ - gint ii; - - if (attr_names == NULL) return NULL; - for (ii = 0; attr_names[ii] != NULL; ii++) - { - if (strcmp(name, attr_names[ii]) == 0) - return attr_values[ii]; - } - return NULL; -} - -static void -start_element( - GMarkupParseContext *ctx, - const gchar *tag, - const gchar **attr_names, - const gchar **attr_values, - gpointer ud, - GError **error) -{ - parse_data_t *pd = (parse_data_t*)ud; - union - { - gint id; - gpointer pid; - } id; - gint ii; - - for (ii = 0; ii < TAG_MAP_SZ; ii++) - { - if (strcmp(tag, tag_map[ii].tag) == 0) - { - id.id = tag_map[ii].id; - break; - } - } - if (ii == TAG_MAP_SZ) - { - g_debug("Unrecognized start tag (%s)", tag); - id.id = A_NONE; - } - g_queue_push_head(pd->tag_stack, id.pid); - switch (id.id) - { - case A_ITEM: - { - pd->item = TRUE; - } break; - case A_ENCLOSURE: - { - const gchar *build, *version; - build = lookup_attr_value( - "sparkle:version", attr_names, attr_values); - version = lookup_attr_value( - "sparkle:shortVersionString", attr_names, attr_values); - if (build) - pd->build = g_strdup(build); - if (version) - pd->version = g_strdup(version); - } break; - } -} - -static void -end_element( - GMarkupParseContext *ctx, - const gchar *tag, - gpointer ud, - GError **error) -{ - parse_data_t *pd = (parse_data_t*)ud; - gint id; - union - { - gint id; - gpointer pid; - } start_id; - gint ii; - - for (ii = 0; ii < TAG_MAP_SZ; ii++) - { - if (strcmp(tag, tag_map[ii].tag) == 0) - { - id = tag_map[ii].id; - break; - } - } - if (ii == TAG_MAP_SZ) - { - g_debug("Unrecognized end tag (%s)", tag); - id = A_NONE; - } - start_id.pid = g_queue_pop_head(pd->tag_stack); - if (start_id.id != id) - g_warning("start tag != end tag: (%s %d) %d", tag, start_id.id, id); - switch (id) - { - case A_ITEM: - { - pd->item = FALSE; - } break; - default: - { - } break; - } - -} - -static void -text_data( - GMarkupParseContext *ctx, - const gchar *text, - gsize len, - gpointer ud, - GError **error) -{ - parse_data_t *pd = (parse_data_t*)ud; - union - { - gint id; - gpointer pid; - } start_id; - - start_id.pid = g_queue_peek_head(pd->tag_stack); - switch (start_id.id) - { - case A_DESCRIPTION: - { - if (pd->item) - { - g_string_append(pd->description, text); - } - } break; - default: - { - if (pd->value) g_free(pd->value); - pd->value = g_strdup(text); - } break; - } -} - -static void -passthrough( - GMarkupParseContext *ctx, - const gchar *text, - gsize len, - gpointer ud, - GError **error) -{ - //parse_data_t *pd = (parse_data_t*)ud; - - //g_debug("passthrough %s", text); -} - -static void -parse_error(GMarkupParseContext *ctx, GError *error, gpointer ud) -{ - g_warning("Resource parse error: %s", error->message); -} - -// This is required or the parser crashes -static void -destroy_notify(gpointer data) -{ // Do nothing - //g_debug("destroy parser"); -} - -void -ghb_appcast_parse(gchar *buf, gchar **desc, gchar **build, gchar **version) -{ - GMarkupParseContext *ctx; - GMarkupParser parser; - parse_data_t pd; - GError *err = NULL; - gint len; - gchar *start; - //gchar tmp[4096] - - // Skip junk at beginning of buffer - start = strstr(buf, ""); - if (glitch) - *glitch = 0; - *build = pd.build; - *version = pd.version; -} diff --git a/gtk/src/appcast.h b/gtk/src/appcast.h deleted file mode 100644 index 3434094a8133..000000000000 --- a/gtk/src/appcast.h +++ /dev/null @@ -1,29 +0,0 @@ -/* - * appcast.h - * Copyright (C) John Stebbins 2008-2022 - * - * appcast.h is free software. - * - * You may redistribute it and/or modify it under the terms of the - * GNU General Public License version 2, as published by the Free Software - * Foundation. - * - * appcast.h is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with main.c. If not, write to: - * The Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor - * Boston, MA 02110-1301, USA. - */ - -#if !defined(_GHB_APPCAST_H_) -#define _GHB_APPCAST_H_ - -void ghb_appcast_parse( - gchar *buf, gchar **desc, gchar **build, gchar **version); - -#endif // _GHB_APPCAST_H_ diff --git a/gtk/src/callbacks.c b/gtk/src/callbacks.c index 3cb7af72aea3..a76f4d33cb39 100644 --- a/gtk/src/callbacks.c +++ b/gtk/src/callbacks.c @@ -50,14 +50,6 @@ #include #include -#if !defined(_NO_UPDATE_CHECK) -#if defined(_OLD_WEBKIT) -#include -#else -#include -#endif -#endif - #ifndef NOTIFY_CHECK_VERSION #define NOTIFY_CHECK_VERSION(x,y,z) 0 #endif @@ -83,7 +75,6 @@ #include "preview.h" #include "values.h" #include "plist.h" -#include "appcast.h" #include "hb-backend.h" #include "ghb-dvd.h" #include "libavutil/parseutils.h" @@ -96,7 +87,6 @@ static GList* dvd_device_list(void); static void prune_logs(signal_user_data_t *ud); static gboolean can_suspend_logind(void); static void suspend_logind(void); -static gboolean appcast_busy = FALSE; static gboolean has_drive = FALSE; #if !defined(_WIN32) @@ -4538,37 +4528,6 @@ ghb_timer_cb(gpointer data) ghb_set_preview_image(ud); update_preview = FALSE; } - -#if !defined(_NO_UPDATE_CHECK) - if (!appcast_busy) - { - const gchar *updates; - updates = ghb_dict_get_string(ud->prefs, "check_updates"); - gint64 duration = 0; - if (strcmp(updates, "daily") == 0) - duration = 60 * 60 * 24; - else if (strcmp(updates, "weekly") == 0) - duration = 60 * 60 * 24 * 7; - else if (strcmp(updates, "monthly") == 0) - duration = 60 * 60 * 24 * 7; - - if (duration != 0) - { - gint64 last; - time_t tt; - - last = ghb_dict_get_int(ud->prefs, "last_update_check"); - time(&tt); - if (last + duration < tt) - { - ghb_dict_set_int(ud->prefs, - "last_update_check", tt); - ghb_pref_save(ud->prefs, "last_update_check"); - GHB_THREAD_NEW("Update Check", G_THREAD_FUNC(ghb_check_update), ud); - } - } - } -#endif return TRUE; } @@ -5388,201 +5347,6 @@ format_deblock_cb(GtkScale *scale, gdouble val, signal_user_data_t *ud) } } -static void -process_appcast(signal_user_data_t *ud) -{ - gchar *description = NULL, *build = NULL, *version = NULL, *msg; -#if !defined(_WIN32) && !defined(_NO_UPDATE_CHECK) - GtkWidget *window; - static GtkWidget *html = NULL; -#endif - GtkWidget *dialog, *label; - gint response, ibuild = 0, skip; - - if (ud->appcast == NULL || ud->appcast_len < 15 || - strncmp(&(ud->appcast[9]), "200 OK", 6)) - { - goto done; - } - ghb_appcast_parse(ud->appcast, &description, &build, &version); - if (build) - ibuild = g_strtod(build, NULL); - skip = ghb_dict_get_int(ud->prefs, "update_skip_version"); - if (description == NULL || build == NULL || version == NULL - || ibuild <= hb_get_build(NULL) || skip == ibuild) - { - goto done; - } - msg = g_strdup_printf(_("HandBrake %s/%s is now available (you have %s/%d)."), - version, build, hb_get_version(NULL), hb_get_build(NULL)); - label = GHB_WIDGET(ud->builder, "update_message"); - gtk_label_set_text(GTK_LABEL(label), msg); - -#if !defined(_WIN32) && !defined(_NO_UPDATE_CHECK) - if (html == NULL) - { - html = webkit_web_view_new(); - window = GHB_WIDGET(ud->builder, "update_scroll"); - gtk_container_add(GTK_CONTAINER(window), html); - // Show it - gtk_widget_set_size_request(html, 420, 240); - gtk_widget_show(html); - } - webkit_web_view_open(WEBKIT_WEB_VIEW(html), description); -#endif - dialog = GHB_WIDGET(ud->builder, "update_dialog"); - response = gtk_dialog_run(GTK_DIALOG(dialog)); - gtk_widget_hide(dialog); - if (response == GTK_RESPONSE_OK) - { - // Skip - ghb_dict_set_int(ud->prefs, "update_skip_version", ibuild); - ghb_pref_save(ud->prefs, "update_skip_version"); - } - g_free(msg); - -done: - if (description) g_free(description); - if (build) g_free(build); - if (version) g_free(version); - g_free(ud->appcast); - ud->appcast_len = 0; - ud->appcast = NULL; - appcast_busy = FALSE; -} - -static void -net_close (GIOChannel *ioc) -{ - gint fd; - - ghb_log_func(); - if (ioc == NULL) return; - fd = g_io_channel_unix_get_fd(ioc); - close(fd); - g_io_channel_unref(ioc); -} - -G_MODULE_EXPORT gboolean -ghb_net_recv_cb(GIOChannel *ioc, GIOCondition cond, gpointer data) -{ - gchar buf[2048]; - gsize len; - GError *gerror = NULL; - GIOStatus status; - - ghb_log_func(); - signal_user_data_t *ud = (signal_user_data_t*)data; - - status = g_io_channel_read_chars (ioc, buf, 2048, &len, &gerror); - if ((status == G_IO_STATUS_NORMAL || status == G_IO_STATUS_EOF) && - len > 0) - { - gint new_len = ud->appcast_len + len; - ud->appcast = g_realloc(ud->appcast, new_len + 1); - memcpy(&(ud->appcast[ud->appcast_len]), buf, len); - ud->appcast_len = new_len; - } - if (status == G_IO_STATUS_EOF) - { - if ( ud->appcast != NULL ) - { - ud->appcast[ud->appcast_len] = 0; - } - net_close(ioc); - process_appcast(ud); - return FALSE; - } - return TRUE; -} - -static GIOChannel* -net_open(signal_user_data_t *ud, gchar *address, gint port) -{ - GIOChannel *ioc; - gint fd; - - struct sockaddr_in sock; - struct hostent * host; - - ghb_log_func(); - if( !( host = gethostbyname( address ) ) ) - { - g_warning( "gethostbyname failed (%s)", address ); - appcast_busy = FALSE; - return NULL; - } - - memset( &sock, 0, sizeof( struct sockaddr_in ) ); - sock.sin_family = host->h_addrtype; - sock.sin_port = htons( port ); - memcpy( &sock.sin_addr, host->h_addr, host->h_length ); - - fd = socket(host->h_addrtype, SOCK_STREAM, 0); - if( fd < 0 ) - { - g_debug( "socket failed" ); - appcast_busy = FALSE; - return NULL; - } - - if(connect(fd, (struct sockaddr*)&sock, sizeof(struct sockaddr_in )) < 0 ) - { - g_debug( "connect failed" ); - appcast_busy = FALSE; - return NULL; - } - ioc = g_io_channel_unix_new(fd); - g_io_channel_set_encoding (ioc, NULL, NULL); - g_io_channel_set_flags(ioc, G_IO_FLAG_NONBLOCK, NULL); - g_io_add_watch (ioc, G_IO_IN, ghb_net_recv_cb, (gpointer)ud ); - - return ioc; -} - -gpointer ghb_check_update (signal_user_data_t *ud) -{ - gchar *query; - gsize len; - GIOChannel *ioc; - GError *gerror = NULL; - GRegex *regex; - GMatchInfo *mi; - gchar *host, *appcast; - - ghb_log_func(); - appcast_busy = TRUE; - regex = g_regex_new("^http://(.+)/(.+)$", 0, 0, NULL); - if (!g_regex_match(regex, HB_PROJECT_URL_APPCAST, 0, &mi)) - { - return NULL; - } - - host = g_match_info_fetch(mi, 1); - appcast = g_match_info_fetch(mi, 2); - - if (host == NULL || appcast == NULL) - return NULL; - - query = g_strdup_printf("GET /%s HTTP/1.0\r\nHost: %s\r\n\r\n", - appcast, host); - - ioc = net_open(ud, host, 80); - if (ioc == NULL) - goto free_resources; - - g_io_channel_write_chars(ioc, query, strlen(query), &len, &gerror); - g_io_channel_flush(ioc, &gerror); - -free_resources: - g_free(query); - g_free(host); - g_free(appcast); - g_match_info_free(mi); - g_regex_unref(regex); - return NULL; -} - void ghb_notify_done(signal_user_data_t *ud) { diff --git a/gtk/src/callbacks.h b/gtk/src/callbacks.h index 0b1b81c3466f..7f0a83cb7f6d 100644 --- a/gtk/src/callbacks.h +++ b/gtk/src/callbacks.h @@ -67,7 +67,6 @@ void ghb_check_dependency( void ghb_do_scan( signal_user_data_t *ud, const gchar *filename, gint titlenum, gboolean force); void ghb_log(gchar *log, ...); -gpointer ghb_check_update(signal_user_data_t *ud); #if defined(_WIN32) void wm_drive_changed(MSG *msg, signal_user_data_t *ud); #endif @@ -97,7 +96,6 @@ void ghb_break_duration(gint64 duration, gint *hh, gint *mm, gint *ss); GtkFileFilter *ghb_add_file_filter(GtkFileChooser *chooser, signal_user_data_t *ud, const char *name, const char *id); -gpointer ghb_check_update(signal_user_data_t *ud); void ghb_notify_done(signal_user_data_t *ud); #endif // _CALLBACKS_H_ diff --git a/gtk/src/ghb3.ui b/gtk/src/ghb3.ui index 9b7e47c36d3f..488878497517 100644 --- a/gtk/src/ghb3.ui +++ b/gtk/src/ghb3.ui @@ -7774,42 +7774,6 @@ Only one subtitle track can be burned! Since conflicts can occur, the first chos vertical True False - - - horizontal - True - False - 4 - 6 - 6 - 12 - - - GTK_ALIGN_CENTER - True - False - - - - 0 - - - - - True - False - Automatically check for updates - True - - - 1 - - - - - 0 - - horizontal @@ -10198,162 +10162,6 @@ DRC allows you to 'compress' the range by making loud sounds softer and soft sou - - HandBrake Updater - hb_window - False - True - center-on-parent - dialog - True - True - False - 1 - - - Skip This Version - True - True - True - - - - - Remind Me Later - True - True - True - - - - update_skip - update_remind - - - - True - False - 2 - - - horizontal - True - False - True - - - vertical - True - False - - - False - True - False - GDK_BUTTON_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_STRUCTURE_MASK - - - True - False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 64 - hb-icon - - - - - 0 - - - - - - - - 0 - - - - - vertical - True - False - True - - - True - False - start - 10 - 10 - 5 - 5 - <b>A new version of HandBrake is available!</b> - True - - - 0 - - - - - True - False - start - 10 - 10 - 5 - 5 - HandBrake xxx is now available (you have yyy). - - - 1 - - - - - True - False - 0 - etched-out - True - - - 12 - start - True - False - - - - - - - - True - False - <b>Release Notes</b> - True - - - - - 2 - - - - - 1 - - - - - 1 - - - - - 1 1 diff --git a/gtk/src/hb-backend.c b/gtk/src/hb-backend.c index 60fc9cfa0b3e..7ba22bf1d9b5 100644 --- a/gtk/src/hb-backend.c +++ b/gtk/src/hb-backend.c @@ -169,19 +169,6 @@ combo_opts_t log_longevity_opts = d_log_longevity_opts }; -static options_map_t d_appcast_update_opts[] = -{ - {N_("Never"), "never", 0}, - {N_("Daily"), "daily", 1}, - {N_("Weekly"), "weekly", 2}, - {N_("Monthly"), "monthly", 3}, -}; -combo_opts_t appcast_update_opts = -{ - sizeof(d_appcast_update_opts)/sizeof(options_map_t), - d_appcast_update_opts -}; - static options_map_t d_vqual_granularity_opts[] = { {"0.2", "0.2", 0.2 }, @@ -643,12 +630,6 @@ combo_name_map_t combo_name_map[] = small_opts_set, generic_opt_get }, - { - "check_updates", - &appcast_update_opts, - small_opts_set, - generic_opt_get - }, { "VideoQualityGranularity", &vqual_granularity_opts, diff --git a/gtk/src/internal_defaults.json.template b/gtk/src/internal_defaults.json.template index 735401d389bb..836801c41c57 100644 --- a/gtk/src/internal_defaults.json.template +++ b/gtk/src/internal_defaults.json.template @@ -86,8 +86,6 @@ "PauseEncodingOnLowBattery": false, "LowBatteryLevel": 15, "allow_tweaks": false, - "last_update_check": 0, - "check_updates": "weekly", "default_source": "/dev/dvd", "ExportDirectory": "", "destination_dir": "", @@ -106,7 +104,6 @@ "UseM4v": false, "auto_name": true, "auto_name_template": "{source}", - "update_skip_version": 0, "VideoQualityGranularity": "1", "version": "0.1", "PreferredLanguage": "und", diff --git a/gtk/src/main.c b/gtk/src/main.c index 256a2aa82805..8ab7a4eadf33 100644 --- a/gtk/src/main.c +++ b/gtk/src/main.c @@ -1099,11 +1099,6 @@ ghb_activate_cb(GApplication * app, signal_user_data_t * ud) GtkWidget *widget; -#if defined(_NO_UPDATE_CHECK) - widget = GHB_WIDGET(ud->builder, "check_updates_box"); - gtk_widget_hide(widget); -#endif - // Get GtkTextBuffers for activity logs widget = GHB_WIDGET(ud->builder, "activity_view"); ud->activity_buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(widget)); diff --git a/gtk/src/settings.h b/gtk/src/settings.h index 8b9d2ba2ab61..4f24867956e1 100644 --- a/gtk/src/settings.h +++ b/gtk/src/settings.h @@ -76,8 +76,6 @@ typedef struct char * extra_activity_path; gboolean append_queue_activity; preview_t * preview; - gchar * appcast; - gint appcast_len; int stderr_src_id; GtkApplication * app; GtkFileChooserNative* source_dialog; diff --git a/libhb/handbrake/project.h.m4 b/libhb/handbrake/project.h.m4 index a447f9bbf3e0..dc117bdf00c5 100644 --- a/libhb/handbrake/project.h.m4 +++ b/libhb/handbrake/project.h.m4 @@ -45,7 +45,6 @@ dnl <<#>>define HB_PROJECT_FEATURE_FLATPAK __FEATURE_flatpak <<#>>define HB_PROJECT_FEATURE_GTK __FEATURE_gtk <<#>>define HB_PROJECT_FEATURE_GTK_MINGW __FEATURE_gtk_mingw -<<#>>define HB_PROJECT_FEATURE_GTK_UPDATE_CHECKS __FEATURE_gtk_update_checks <<#>>define HB_PROJECT_FEATURE_GST __FEATURE_gst <<#>>define HB_PROJECT_FEATURE_MF __FEATURE_mf <<#>>define HB_PROJECT_FEATURE_NVENC __FEATURE_nvenc diff --git a/make/configure.py b/make/configure.py index 1e12aad37894..80aeac80f3ae 100644 --- a/make/configure.py +++ b/make/configure.py @@ -1412,8 +1412,7 @@ def createCLI( cross = None ): h = IfHost( 'disable GTK GUI', '*-*-linux*', '*-*-freebsd*', '*-*-netbsd*', '*-*-openbsd*', none=argparse.SUPPRESS ).value grp.add_argument( '--disable-gtk', default=False, action='store_true', help=h ) - h = IfHost( 'disable GTK GUI update checks', '*-*-linux*', '*-*-freebsd*', '*-*-netbsd*', '*-*-openbsd*', none=argparse.SUPPRESS ).value - grp.add_argument( '--disable-gtk-update-checks', default=False, action='store_true', help=h ) + grp.add_argument( '--disable-gtk-update-checks', default=False, action='store_true', help=argparse.SUPPRESS ) h = 'enable GTK GUI for Windows' if (cross is not None and 'mingw' in cross) else argparse.SUPPRESS grp.add_argument( '--enable-gtk-mingw', default=False, action='store_true', help=h ) @@ -1721,6 +1720,9 @@ class Tools: cli = createCLI( cross ) options, args = cli.parse_known_args() + if options.disable_gtk_update_checks: + raise AbortError('The --disable-gtk-update-checks flag is no longer required or supported') + ## update cfg with cli directory locations cfg.update_cli( options ) @@ -2068,7 +2070,6 @@ class Tools: doc.add( 'FEATURE.gtk4', int( options.enable_gtk4 )) doc.add( 'FEATURE.gtk', int( not options.disable_gtk )) doc.add( 'FEATURE.gtk.mingw', int( options.enable_gtk_mingw )) - doc.add( 'FEATURE.gtk.update.checks', int( not options.disable_gtk_update_checks )) doc.add( 'FEATURE.gst', int( not options.disable_gst )) doc.add( 'FEATURE.mf', int( options.enable_mf )) doc.add( 'FEATURE.nvenc', int( options.enable_nvenc )) diff --git a/pkg/linux/flatpak/fr.handbrake.ghb.json b/pkg/linux/flatpak/fr.handbrake.ghb.json index a06287142f2c..8df9bb8dbe6f 100644 --- a/pkg/linux/flatpak/fr.handbrake.ghb.json +++ b/pkg/linux/flatpak/fr.handbrake.ghb.json @@ -54,7 +54,6 @@ "no-autogen": true, "config-opts": [ "--flatpak", - "--disable-gtk-update-checks" ], "builddir": true, "post-install": ["install -d /app/extensions"],