diff options
| author | Randy Eckenrode <randy@largeandhighquality.com> | 2023-10-22 18:59:58 -0400 |
|---|---|---|
| committer | Randy Eckenrode <randy@largeandhighquality.com> | 2023-10-22 19:00:50 -0400 |
| commit | ca9b6ed32d93edece15db525f006941096e6e50b (patch) | |
| tree | 58d698669340349b24e0f41ed1c70e75286a7b0e | |
| parent | b9e9e443a9e65726388ea4d6e74e1535cdfd8e8e (diff) | |
| download | nixpkgs-ca9b6ed32d93edece15db525f006941096e6e50b.tar nixpkgs-ca9b6ed32d93edece15db525f006941096e6e50b.tar.gz nixpkgs-ca9b6ed32d93edece15db525f006941096e6e50b.tar.bz2 nixpkgs-ca9b6ed32d93edece15db525f006941096e6e50b.tar.lz nixpkgs-ca9b6ed32d93edece15db525f006941096e6e50b.tar.xz nixpkgs-ca9b6ed32d93edece15db525f006941096e6e50b.tar.zst nixpkgs-ca9b6ed32d93edece15db525f006941096e6e50b.zip | |
gtk2: fix build with clang 16
* Resolve incompatible function pointer conversion error; and * Fix signature of `create_menu` in `tests/testmenubars.c`.
| -rw-r--r-- | pkgs/development/libraries/gtk/2.x.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/gtk/patches/2.0-clang.patch | 49 |
2 files changed, 51 insertions, 0 deletions
diff --git a/pkgs/development/libraries/gtk/2.x.nix b/pkgs/development/libraries/gtk/2.x.nix index 539cfc37051..b2afb21b621 100644 --- a/pkgs/development/libraries/gtk/2.x.nix +++ b/pkgs/development/libraries/gtk/2.x.nix @@ -66,6 +66,8 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals stdenv.isDarwin [ ./patches/2.0-gnome_bugzilla_557780_306776_freeciv_darwin.patch ./patches/2.0-darwin-x11.patch + # Fixes an incompatible function pointer conversion and implicit int errors with clang 16. + ./patches/2.0-clang.patch ]; propagatedBuildInputs = [ 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 00000000000..1e2e73b9833 --- /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; + } |