diff --git a/0001-Remove-various-unused-variables.patch b/0001-Remove-various-unused-variables.patch new file mode 100644 index 0000000..fdd595f --- /dev/null +++ b/0001-Remove-various-unused-variables.patch @@ -0,0 +1,432 @@ +From aa84d6473b24be82e32289f317334c2fa9e95c1e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= +Date: Thu, 30 Jan 2020 18:31:32 +0100 +Subject: [PATCH 1/5] Remove various unused variables + +--- + src/bar_keywords.c | 1 - + src/color-man.c | 1 - + src/dupe.c | 1 - + src/exif-common.c | 1 - + src/history_list.c | 2 -- + src/image_load_tiff.c | 1 - + src/img-view.c | 1 - + src/layout.c | 4 ---- + src/layout_image.c | 1 - + src/layout_util.c | 6 ------ + src/main.c | 1 - + src/menu.c | 1 - + src/misc.c | 6 +++--- + src/osd.c | 7 ------- + src/preferences.c | 9 +-------- + src/remote.c | 8 -------- + src/search.c | 1 - + src/trash.c | 1 - + src/ui_bookmark.c | 1 - + src/ui_misc.c | 1 - + src/view_file/view_file.c | 4 ---- + 21 files changed, 4 insertions(+), 55 deletions(-) + +diff --git a/src/bar_keywords.c b/src/bar_keywords.c +index f2c36e1378..3c11593de5 100644 +--- a/src/bar_keywords.c ++++ b/src/bar_keywords.c +@@ -1944,7 +1944,6 @@ GList *keyword_list_get() + + void keyword_list_set(GList *keyword_list) + { +- GList *ret = NULL; + GtkTreeIter iter; + + if (!keyword_list) return; +diff --git a/src/color-man.c b/src/color-man.c +index a111e67141..1c8c47a39e 100644 +--- a/src/color-man.c ++++ b/src/color-man.c +@@ -440,7 +440,6 @@ static gchar *color_man_get_profile_name(ColorManProfileType type, cmsHPROFILE p + if (profile) + { + #ifdef HAVE_LCMS2 +- cmsUInt32Number r; + char buffer[20]; + buffer[0] = '\0'; + cmsGetProfileInfoASCII(profile, cmsInfoDescription, "en", "US", buffer, 20); +diff --git a/src/dupe.c b/src/dupe.c +index 532aea2447..74ec06cf59 100644 +--- a/src/dupe.c ++++ b/src/dupe.c +@@ -2348,7 +2348,6 @@ static GtkWidget *dupe_menu_popup_main(DupeWindow *dw, DupeItem *di) + GtkWidget *item; + gint on_row; + GList *editmenu_fd_list; +- GtkWidget *submenu; + + on_row = (di != NULL); + +diff --git a/src/exif-common.c b/src/exif-common.c +index ea561f4eae..3f2df47bd9 100644 +--- a/src/exif-common.c ++++ b/src/exif-common.c +@@ -842,7 +842,6 @@ static gchar *exif_build_formatted_localtime(ExifData *exif) + */ + static gchar *exif_build_formatted_timezone(ExifData *exif) + { +- gchar *time_zone = NULL; + gchar *exif_date_time = NULL; + gchar *timezone = NULL; + gchar *countryname = NULL; +diff --git a/src/history_list.c b/src/history_list.c +index ecf73cfd5a..4131626293 100644 +--- a/src/history_list.c ++++ b/src/history_list.c +@@ -151,8 +151,6 @@ void image_chain_append_end(const gchar *path) + else + { + work = g_list_last(image_chain); +- gchar *tmp; +- tmp = work->data; + if (g_strcmp0(work->data , path) != 0) + { + image_chain = g_list_append(image_chain, g_strdup(path)); +diff --git a/src/image_load_tiff.c b/src/image_load_tiff.c +index 03315c06c1..afc18220e8 100644 +--- a/src/image_load_tiff.c ++++ b/src/image_load_tiff.c +@@ -383,7 +383,6 @@ static void image_loader_tiff_free(gpointer loader) + + static void image_loader_tiff_set_page_num(gpointer loader, gint page_num) + { +- ImageLoader *il = (ImageLoader *) loader; + ImageLoaderTiff *lt = (ImageLoaderTiff *) loader; + + lt->page_num = page_num; +diff --git a/src/img-view.c b/src/img-view.c +index f57ef39c73..fdd7017946 100644 +--- a/src/img-view.c ++++ b/src/img-view.c +@@ -1317,7 +1317,6 @@ static void image_pop_menu_collections_cb(GtkWidget *widget, gpointer data) + static GtkWidget *view_popup_menu(ViewWindow *vw) + { + GtkWidget *menu; +- GtkWidget *submenu; + GtkWidget *item; + GList *editmenu_fd_list; + +diff --git a/src/layout.c b/src/layout.c +index 8f6c51a504..40a56b8739 100644 +--- a/src/layout.c ++++ b/src/layout.c +@@ -293,7 +293,6 @@ static void layout_path_entry_tab_append_cb(const gchar *path, gpointer data, gi + + static gboolean path_entry_tooltip_cb(GtkWidget *widget, gpointer data) + { +- LayoutWindow *lw = data; + GList *box_child_list; + GtkComboBox *path_entry; + gchar *current_path; +@@ -579,7 +578,6 @@ static GtkWidget *layout_zoom_button(LayoutWindow *lw, GtkWidget *box, gint size + + void layout_status_update_progress(LayoutWindow *lw, gdouble val, const gchar *text) + { +- static gdouble thumb = 0; + static gdouble meta = 0; + + if (!layout_valid(&lw)) return; +@@ -589,7 +587,6 @@ void layout_status_update_progress(LayoutWindow *lw, gdouble val, const gchar *t + */ + if(!g_strcmp0(text, "Loading thumbs...")) + { +- thumb = val; + if (meta) + { + return; +@@ -1825,7 +1822,6 @@ static void layout_grid_setup(LayoutWindow *lw) + void layout_style_set(LayoutWindow *lw, gint style, const gchar *order) + { + FileData *dir_fd; +- gint i; + + if (!layout_valid(&lw)) return; + +diff --git a/src/layout_image.c b/src/layout_image.c +index aaf79567a2..c0af5105ba 100644 +--- a/src/layout_image.c ++++ b/src/layout_image.c +@@ -1804,7 +1804,6 @@ static void layout_image_button_cb(ImageWindow *imd, GdkEventButton *event, gpoi + { + LayoutWindow *lw = data; + GtkWidget *menu; +- FileData *dir_fd; + + switch (event->button) + { +diff --git a/src/layout_util.c b/src/layout_util.c +index 6075c78e28..4ad5f814ce 100644 +--- a/src/layout_util.c ++++ b/src/layout_util.c +@@ -542,8 +542,6 @@ static void layout_menu_exif_rotate_cb(GtkToggleAction *action, gpointer data) + + static void layout_menu_select_rectangle_cb(GtkToggleAction *action, gpointer data) + { +- LayoutWindow *lw = data; +- + options->draw_rectangle = gtk_toggle_action_get_active(action); + } + +@@ -980,7 +978,6 @@ static void layout_menu_guidelines_cb(GtkToggleAction *action, gpointer data) + + if (gtk_toggle_action_get_active(action)) + { +- OsdShowFlags flags = image_osd_get(lw->image); + image_osd_set(lw->image, OSD_SHOW_INFO | OSD_SHOW_STATUS | OSD_SHOW_GUIDELINES); + layout_util_sync_views(lw); + } +@@ -1599,7 +1596,6 @@ static void layout_menu_page_previous_cb(GtkAction *action, gpointer data) + static void layout_menu_image_forward_cb(GtkAction *action, gpointer data) + { + LayoutWindow *lw = data; +- FileData *dir_fd; + + /* Obtain next image */ + layout_set_path(lw, image_chain_forward()); +@@ -1608,7 +1604,6 @@ static void layout_menu_image_forward_cb(GtkAction *action, gpointer data) + static void layout_menu_image_back_cb(GtkAction *action, gpointer data) + { + LayoutWindow *lw = data; +- FileData *dir_fd; + + /* Obtain previous image */ + layout_set_path(lw, image_chain_back()); +@@ -2696,7 +2691,6 @@ void layout_actions_setup(LayoutWindow *lw) + { + GError *error; + gint i; +- GtkAction *action; + + DEBUG_1("%s layout_actions_setup: start", get_exec_time()); + if (lw->ui_manager) return; +diff --git a/src/main.c b/src/main.c +index c414bc896c..b578bc11d4 100644 +--- a/src/main.c ++++ b/src/main.c +@@ -829,7 +829,6 @@ gint main(gint argc, gchar *argv[]) + CollectionData *first_collection = NULL; + gchar *buf; + CollectionData *cd = NULL; +- gchar *app_lock; + + #ifdef HAVE_GTHREAD + #if !GLIB_CHECK_VERSION(2,32,0) +diff --git a/src/menu.c b/src/menu.c +index 7c2c7cd7f9..0ce7b9b817 100644 +--- a/src/menu.c ++++ b/src/menu.c +@@ -410,7 +410,6 @@ static void add_collection_list(GtkWidget *menu, GCallback func, + { + GList *work; + gint index = 0; /* index to existing collection list menu item selected */ +- GtkWidget *item; + + work = collection_list; + while (work) +diff --git a/src/misc.c b/src/misc.c +index 104d5de451..8245697888 100644 +--- a/src/misc.c ++++ b/src/misc.c +@@ -253,12 +253,12 @@ int runcmd(gchar *cmd) + */ + gint date_get_first_day_of_week() + { +- gchar *dot; +- gchar *current_locale; +- + #ifdef HAVE__NL_TIME_FIRST_WEEKDAY + return nl_langinfo(_NL_TIME_FIRST_WEEKDAY)[0]; + #else ++ gchar *dot; ++ gchar *current_locale; ++ + current_locale = setlocale(LC_ALL, NULL); + dot = strstr(current_locale, "."); + if ((strncmp(dot - 2, "US", 2) == 0) || (strncmp(dot - 2, "MX", 2) == 0) || (strncmp(dot - 2, "CA", 2) == 0)) +diff --git a/src/osd.c b/src/osd.c +index 7e1f6fda73..9e9407272b 100644 +--- a/src/osd.c ++++ b/src/osd.c +@@ -155,19 +155,12 @@ static void set_osd_button(GtkTable *table, const gint rows, const gint cols, co + + GtkWidget *osd_new(gint max_cols, GtkWidget *template_view) + { +- GtkWidget *hbox; + GtkWidget *vbox; +- GtkWidget *vbox_buttons; +- GtkWidget *group; +- GtkWidget *button; + GtkWidget *scrolled; +- GtkTextBuffer *buffer; + GtkWidget *label; +- GtkWidget * subgroup; + gint i = 0; + gint rows = 0; + gint max_rows = 0; +- gint col = 0; + gint cols = 0; + gdouble entries; + GtkWidget *viewport; +diff --git a/src/preferences.c b/src/preferences.c +index c0c38105a6..04ffc0ec99 100644 +--- a/src/preferences.c ++++ b/src/preferences.c +@@ -1179,8 +1179,6 @@ static gboolean filter_add_scroll(gpointer data) + GList *list_cells; + GtkCellRenderer *cell; + GtkTreeViewColumn *column; +- const gchar *title; +- guint i = 0; + gint rows; + + rows = gtk_tree_model_iter_n_children(GTK_TREE_MODEL(filter_store), NULL); +@@ -2261,7 +2259,6 @@ static void config_tab_osd(GtkWidget *notebook) + { + GtkWidget *hbox; + GtkWidget *vbox; +- GtkWidget *vbox_buttons; + GtkWidget *group; + GtkWidget *button; + GtkWidget *image_overlay_template_view; +@@ -2269,10 +2266,7 @@ static void config_tab_osd(GtkWidget *notebook) + GtkWidget *scrolled_pre_formatted; + GtkTextBuffer *buffer; + GtkWidget *label; +- GtkWidget * subgroup; +- gint i = 0; +- gint rows = 0; +- gint cols = 0; ++ GtkWidget *subgroup; + + vbox = scrolled_notebook_page(notebook, _("OSD")); + +@@ -3778,7 +3772,6 @@ static void timezone_progress_cb(goffset current_num_bytes, goffset total_num_by + static void timezone_cancel_button_cb(GenericDialog *gd, gpointer data) + { + TZData *tz = data; +- GError *error = NULL; + + g_cancellable_cancel(tz->cancellable); + } +diff --git a/src/remote.c b/src/remote.c +index b3c51c391c..dc6e690335 100644 +--- a/src/remote.c ++++ b/src/remote.c +@@ -719,7 +719,6 @@ static void gr_pixel_info(const gchar *text, GIOChannel *channel, gpointer data) + gint width, height; + gint r_mouse, g_mouse, b_mouse; + PixbufRenderer *pr; +- LayoutWindow *lw = NULL; + + if (!layout_valid(&lw_id)) return; + +@@ -761,7 +760,6 @@ static void gr_rectangle(const gchar *text, GIOChannel *channel, gpointer data) + { + gchar *rectangle_info; + PixbufRenderer *pr; +- LayoutWindow *lw = NULL; + gint x1, y1, x2, y2; + + if (!options->draw_rectangle) return; +@@ -1162,8 +1160,6 @@ static void gr_list_add(const gchar *text, GIOChannel *channel, gpointer data) + + static void gr_raise(const gchar *text, GIOChannel *channel, gpointer data) + { +- LayoutWindow *lw = NULL; +- + if (layout_valid(&lw_id)) + { + gtk_window_present(GTK_WINDOW(lw_id->window)); +@@ -1172,16 +1168,12 @@ static void gr_raise(const gchar *text, GIOChannel *channel, gpointer data) + + static void gr_pwd(const gchar *text, GIOChannel *channel, gpointer data) + { +- LayoutWindow *lw = NULL; +- + g_free(pwd); + pwd = g_strdup(text); + } + + static void gr_print0(const gchar *text, GIOChannel *channel, gpointer data) + { +- LayoutWindow *lw = NULL; +- + g_io_channel_write_chars(channel, "print0", -1, NULL, NULL); + g_io_channel_write_chars(channel, "", -1, NULL, NULL); + } +diff --git a/src/search.c b/src/search.c +index aa904db9e4..5a22c40015 100644 +--- a/src/search.c ++++ b/src/search.c +@@ -1096,7 +1096,6 @@ static GtkWidget *search_result_menu(SearchData *sd, gboolean on_row, gboolean e + GtkWidget *menu; + GtkWidget *item; + GList *editmenu_fd_list; +- GtkWidget *submenu; + gboolean video; + + menu = popup_menu_short_lived(); +diff --git a/src/trash.c b/src/trash.c +index b53404e2a1..f3c07791e8 100644 +--- a/src/trash.c ++++ b/src/trash.c +@@ -179,7 +179,6 @@ gboolean file_util_safe_unlink(const gchar *path) + + if (result && !gd) + { +- GtkWidget *button; + gchar *buf; + + buf = g_strdup_printf(_("Unable to access or create the trash folder.\n\"%s\""), options->file_ops.safe_delete_path); +diff --git a/src/ui_bookmark.c b/src/ui_bookmark.c +index 65970d58c1..4eb8af2ef7 100644 +--- a/src/ui_bookmark.c ++++ b/src/ui_bookmark.c +@@ -543,7 +543,6 @@ static void bookmark_drag_begin(GtkWidget *button, GdkDragContext *context, gpoi + + static gboolean bookmark_path_tooltip_cb(GtkWidget *button, gpointer data) + { +- BookMarkData *bm = data; + BookButtonData *b; + + b = g_object_get_data(G_OBJECT(button), "bookbuttondata"); +diff --git a/src/ui_misc.c b/src/ui_misc.c +index 1c20037dc2..ab02c4a7c0 100644 +--- a/src/ui_misc.c ++++ b/src/ui_misc.c +@@ -1738,7 +1738,6 @@ gchar *text_widget_text_pull_selected(GtkWidget *text_widget) + { + GtkTextBuffer *buffer; + GtkTextIter start, end; +- GtkTextIter selection_start, selection_end; + + buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(text_widget)); + gtk_text_buffer_get_bounds(buffer, &start, &end); +diff --git a/src/view_file/view_file.c b/src/view_file/view_file.c +index ed5c5f0ec6..93e38d0b1e 100644 +--- a/src/view_file/view_file.c ++++ b/src/view_file/view_file.c +@@ -1583,7 +1583,6 @@ static gboolean vf_read_metadata_in_idle_cb(gpointer data) + { + FileData *fd; + ViewFile *vf = data; +- GList *list_entry; + GList *work; + + vf_thumb_status(vf, vf_read_metadata_in_idle_progress(vf), _("Loading meta...")); +@@ -1630,9 +1629,6 @@ static void vf_read_metadata_in_idle_finished_cb(gpointer data) + + void vf_read_metadata_in_idle(ViewFile *vf) + { +- GList *work; +- FileData *fd; +- + if (!vf) return; + + if (vf->read_metadata_in_idle_id) diff --git a/0002-Fix-format-string.patch b/0002-Fix-format-string.patch new file mode 100644 index 0000000..7963b05 --- /dev/null +++ b/0002-Fix-format-string.patch @@ -0,0 +1,37 @@ +From 3c2f0298b0a9c89c1c02057d1386cf555285ce21 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= +Date: Tue, 4 Feb 2020 10:27:09 +0100 +Subject: [PATCH 2/5] Fix format string + +dupe.c:3921:69: error: format '%ld' expects argument of type 'long int', but argument 2 has type 'gint64' {aka 'long long int'} [-Werror=format=] + 3921 | output_string = g_string_append(output_string, g_strdup_printf("%ld", di->fd->size)); + | ~~^ ~~~~~~~~~~~~ + | | | + | long int gint64 {aka long long int} + | %lld +--- + src/dupe.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/dupe.c b/src/dupe.c +index 74ec06cf59..edca01f72b 100644 +--- a/src/dupe.c ++++ b/src/dupe.c +@@ -19,6 +19,8 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#include ++ + #include "main.h" + #include "dupe.h" + +@@ -3917,7 +3919,7 @@ static void export_duplicates_data_save_cb(FileDialog *fdlg, gpointer data) + output_string = g_string_append(output_string, sep); + g_free(name); + +- output_string = g_string_append(output_string, g_strdup_printf("%ld", di->fd->size)); ++ output_string = g_string_append(output_string, g_strdup_printf("%"PRIu64, di->fd->size)); + output_string = g_string_append(output_string, sep); + output_string = g_string_append(output_string, text_from_time(di->fd->date)); + output_string = g_string_append(output_string, sep); diff --git a/0003-Remove-unused-callback-functions.patch b/0003-Remove-unused-callback-functions.patch new file mode 100644 index 0000000..4e966de --- /dev/null +++ b/0003-Remove-unused-callback-functions.patch @@ -0,0 +1,104 @@ +From 1d3caa5f2f114bbf13210ea766394aa74e7c07f0 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= +Date: Tue, 4 Feb 2020 10:45:03 +0100 +Subject: [PATCH 3/5] Remove unused callback functions + +--- + src/layout_util.c | 10 ---------- + src/search.c | 14 -------------- + src/trash.c | 7 ------- + src/view_file/view_file.c | 17 ----------------- + 4 files changed, 48 deletions(-) + +diff --git a/src/layout_util.c b/src/layout_util.c +index 4ad5f814ce..ee410c8dd9 100644 +--- a/src/layout_util.c ++++ b/src/layout_util.c +@@ -386,16 +386,6 @@ static void layout_menu_move_to_trash_cb(GtkAction *action, gpointer data) + file_util_delete(NULL, layout_selection_list(lw), layout_window(lw)); + } + +-static void layout_menu_delete_key_cb(GtkAction *action, gpointer data) +-{ +- LayoutWindow *lw = data; +- +- if (options->file_ops.enable_delete_key) +- { +- options->file_ops.safe_delete_enable = FALSE; +- file_util_delete(NULL, layout_selection_list(lw), layout_window(lw)); +- } +-} + static void layout_menu_move_to_trash_key_cb(GtkAction *action, gpointer data) + { + LayoutWindow *lw = data; +diff --git a/src/search.c b/src/search.c +index 5a22c40015..c929440ee0 100644 +--- a/src/search.c ++++ b/src/search.c +@@ -1044,20 +1044,6 @@ static void sr_menu_copy_path_unquoted_cb(GtkWidget *widget, gpointer data) + file_util_copy_path_list_to_clipboard(search_result_selection_list(sd), FALSE); + } + +-static void sr_menu_remove_cb(GtkWidget *widget, gpointer data) +-{ +- SearchData *sd = data; +- +- search_result_remove_selection(sd); +-} +- +-static void sr_menu_clear_cb(GtkWidget *widget, gpointer data) +-{ +- SearchData *sd = data; +- +- search_result_clear(sd); +-} +- + static void sr_menu_play_cb(GtkWidget *widget, gpointer data) + { + SearchData *sd = data; +diff --git a/src/trash.c b/src/trash.c +index f3c07791e8..0bd3aea168 100644 +--- a/src/trash.c ++++ b/src/trash.c +@@ -118,13 +118,6 @@ static gchar *file_util_safe_dest(const gchar *path) + return dest; + } + +-static void file_util_safe_del_close_cb(GtkWidget *dialog, gpointer data) +-{ +- GenericDialog **gd = data; +- +- *gd = NULL; +-} +- + gboolean file_util_safe_unlink(const gchar *path) + { + static GenericDialog *gd = NULL; +diff --git a/src/view_file/view_file.c b/src/view_file/view_file.c +index 93e38d0b1e..f44087cf6b 100644 +--- a/src/view_file/view_file.c ++++ b/src/view_file/view_file.c +@@ -485,23 +485,6 @@ static void vf_pop_menu_toggle_view_type_cb(GtkWidget *widget, gpointer data) + layout_views_set(vf->layout, vf->layout->options.dir_view_type, new_type); + } + +-static void vf_pop_menu_toggle_star_rating(ViewFile *vf) +-{ +- GtkAllocation allocation; +- +- options->show_star_rating = !options->show_star_rating; +- +- gtk_widget_get_allocation(vf->listview, &allocation); +- vf_star_rating_set(vf, options->show_star_rating); +-} +- +-static void vf_pop_menu_show_star_rating_cb(GtkWidget *widget, gpointer data) +-{ +- ViewFile *vf = data; +- +- vf_pop_menu_toggle_star_rating(vf); +-} +- + static void vf_pop_menu_refresh_cb(GtkWidget *widget, gpointer data) + { + ViewFile *vf = data; diff --git a/0004-Fix-freeing-of-unitialized-variable.patch b/0004-Fix-freeing-of-unitialized-variable.patch new file mode 100644 index 0000000..ceead7a --- /dev/null +++ b/0004-Fix-freeing-of-unitialized-variable.patch @@ -0,0 +1,29 @@ +From fe82c8f8efbf8334e256656f634a15f9c893849f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= +Date: Tue, 4 Feb 2020 11:05:09 +0100 +Subject: [PATCH 4/5] Fix freeing of unitialized variable + +The parentheses were aligned wrong, and the freeing was done outside +of the block where the variable is initialized. But in fact we don't +need to free it at all, if we use the copy we already had instead of +doing another copy. +--- + src/exif-common.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/src/exif-common.c b/src/exif-common.c +index 3f2df47bd9..833a86cfad 100644 +--- a/src/exif-common.c ++++ b/src/exif-common.c +@@ -815,10 +815,9 @@ static gchar *exif_build_formatted_localtime(ExifData *exif) + else + { + g_free(exif_date_time); +- exif_date_time = g_strdup(tmp); ++ exif_date_time = tmp; + } + } +- g_free(tmp); + } + putenv(time_zone_org); + diff --git a/0005-Remove-creation-of-unused-label-object.patch b/0005-Remove-creation-of-unused-label-object.patch new file mode 100644 index 0000000..833bfd4 --- /dev/null +++ b/0005-Remove-creation-of-unused-label-object.patch @@ -0,0 +1,29 @@ +From 859071516f0df3db763d03fa237b88dec7e59eff Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= +Date: Tue, 4 Feb 2020 11:06:29 +0100 +Subject: [PATCH 5/5] Remove creation of unused label object + +--- + src/osd.c | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/src/osd.c b/src/osd.c +index 9e9407272b..bcc38d72e1 100644 +--- a/src/osd.c ++++ b/src/osd.c +@@ -157,7 +157,6 @@ GtkWidget *osd_new(gint max_cols, GtkWidget *template_view) + { + GtkWidget *vbox; + GtkWidget *scrolled; +- GtkWidget *label; + gint i = 0; + gint rows = 0; + gint max_rows = 0; +@@ -174,7 +173,6 @@ GtkWidget *osd_new(gint max_cols, GtkWidget *template_view) + gtk_container_set_border_width(GTK_CONTAINER(scrolled), PREF_PAD_BORDER); + gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled), + GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); +- label = gtk_label_new("title"); + gtk_widget_show(scrolled); + gtk_widget_set_size_request(scrolled, -1, 140); + diff --git a/geeqie.spec b/geeqie.spec index 908c97a..4cb10d6 100644 --- a/geeqie.spec +++ b/geeqie.spec @@ -14,6 +14,12 @@ Source0: http://geeqie.org/cgi-bin/gitweb.cgi?p=geeqie.git;a=snapshot;h=%{gitcom Source0: http://geeqie.org/geeqie-%{version}.tar.xz %endif +Patch0: 0001-Remove-various-unused-variables.patch +Patch1: 0002-Fix-format-string.patch +Patch2: 0003-Remove-unused-callback-functions.patch +Patch3: 0004-Fix-freeing-of-unitialized-variable.patch +Patch4: 0005-Remove-creation-of-unused-label-object.patch + BuildRequires: gcc-c++ BuildRequires: autoconf BuildRequires: automake @@ -65,7 +71,7 @@ and zoom. %prep -%setup -q %{?gitcommit:-n %{name}-%{gitcommitshort}} +%autosetup -p1 %{?gitcommit:-n %{name}-%{gitcommitshort}} # fix autoconf problem with missing version sed -r -i 's/m4_esyscmd_s\(git rev-parse --quiet --verify --short HEAD\)/[%{version}]/' configure.ac