diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-10-23 12:02:04 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-23 12:02:04 +0000 |
| commit | 2c2c0379b759c234413de63478847266cdc8ed93 (patch) | |
| tree | 92ebd45d1cd2a17d5fb63ff5c6c006a4d8f25f7e /pkgs/development/libraries/gtk/patches/2.0-clang.patch | |
| parent | 1026189bd67abfd6f7def1c697988217caafbc5c (diff) | |
| parent | a3b463e8874fe9182e758919eeb18bb44070097c (diff) | |
| download | nixlib-2c2c0379b759c234413de63478847266cdc8ed93.tar nixlib-2c2c0379b759c234413de63478847266cdc8ed93.tar.gz nixlib-2c2c0379b759c234413de63478847266cdc8ed93.tar.bz2 nixlib-2c2c0379b759c234413de63478847266cdc8ed93.tar.lz nixlib-2c2c0379b759c234413de63478847266cdc8ed93.tar.xz nixlib-2c2c0379b759c234413de63478847266cdc8ed93.tar.zst nixlib-2c2c0379b759c234413de63478847266cdc8ed93.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/development/libraries/gtk/patches/2.0-clang.patch')
| -rw-r--r-- | pkgs/development/libraries/gtk/patches/2.0-clang.patch | 49 |
1 files changed, 49 insertions, 0 deletions
diff --git a/pkgs/development/libraries/gtk/patches/2.0-clang.patch b/pkgs/development/libraries/gtk/patches/2.0-clang.patch new file mode 100644 index 000000000000..1e2e73b9833d --- /dev/null +++ b/pkgs/development/libraries/gtk/patches/2.0-clang.patch @@ -0,0 +1,49 @@ +diff --git a/gtk/gtkscale.c b/gtk/gtkscale.c +index 4317523fb8..3c09cd3ae8 100644 +--- a/gtk/gtkscale.c ++++ b/gtk/gtkscale.c +@@ -1471,7 +1471,7 @@ gtk_scale_add_mark (GtkScale *scale, + mark->position = position; + + priv->marks = g_slist_insert_sorted_with_data (priv->marks, mark, +- (GCompareFunc) compare_marks, ++ (GCompareDataFunc) compare_marks, + GINT_TO_POINTER ( + gtk_range_get_inverted (GTK_RANGE (scale)) + )); +diff --git a/tests/testmenubars.c b/tests/testmenubars.c +index 416a939861..c65e82be26 100644 +--- a/tests/testmenubars.c ++++ b/tests/testmenubars.c +@@ -21,7 +21,7 @@ + #include <gtk/gtk.h> + + static GtkWidget * +-create_menu (depth) ++create_menu (int depth, gboolean _unused) + { + GtkWidget *menu; + GtkWidget *menuitem; +@@ -35,19 +35,19 @@ create_menu (depth) + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); + gtk_widget_show (menuitem); + gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), +- create_menu (depth - 1)); ++ create_menu (depth - 1, _unused)); + + menuitem = gtk_menu_item_new_with_mnemonic ("Two"); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); + gtk_widget_show (menuitem); + gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), +- create_menu (depth - 1)); ++ create_menu (depth - 1, _unused)); + + menuitem = gtk_menu_item_new_with_mnemonic ("Three"); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); + gtk_widget_show (menuitem); + gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), +- create_menu (depth - 1)); ++ create_menu (depth - 1, _unused)); + + return menu; + } |