diff --git a/flake.lock b/flake.lock index 6fe33b9ea..ed5c3046f 100644 --- a/flake.lock +++ b/flake.lock @@ -10,11 +10,11 @@ ] }, "locked": { - "lastModified": 1740040182, - "narHash": "sha256-OUVFwJiHbzETINMpVy/++o1J3w8e33zVfWgt5QtGsJM=", + "lastModified": 1740726745, + "narHash": "sha256-ROi3SP749WpMFqRCvt+ULEC3fgB12jvWuZoOYMOO8kw=", "owner": "tiiuae", "repo": "ci-test-automation", - "rev": "65b84ecf78db3b14cc8e223a135f4d250eb971a5", + "rev": "29d61af8770f8f5c67fa83693a20b7264de57842", "type": "github" }, "original": { @@ -108,11 +108,11 @@ ] }, "locked": { - "lastModified": 1739841949, - "narHash": "sha256-lSOXdgW/1zi/SSu7xp71v+55D5Egz8ACv0STkj7fhbs=", + "lastModified": 1740485968, + "narHash": "sha256-WK+PZHbfDjLyveXAxpnrfagiFgZWaTJglewBWniTn2Y=", "owner": "nix-community", "repo": "disko", - "rev": "15dbf8cebd8e2655a883b74547108e089f051bf0", + "rev": "19c1140419c4f1cdf88ad4c1cfb6605597628940", "type": "github" }, "original": { @@ -144,11 +144,11 @@ ] }, "locked": { - "lastModified": 1738453229, - "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=", + "lastModified": 1740872218, + "narHash": "sha256-ZaMw0pdoUKigLpv9HiNDH2Pjnosg7NBYMJlHTIsHEUo=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd", + "rev": "3876f6b87db82f33775b1ef5ea343986105db764", "type": "github" }, "original": { @@ -258,11 +258,11 @@ ] }, "locked": { - "lastModified": 1737465171, - "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=", + "lastModified": 1740915799, + "narHash": "sha256-JvQvtaphZNmeeV+IpHgNdiNePsIpHD5U/7QN5AeY44A=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17", + "rev": "42b1ba089d2034d910566bf6b40830af6b8ec732", "type": "github" }, "original": { @@ -445,11 +445,11 @@ ] }, "locked": { - "lastModified": 1737057290, - "narHash": "sha256-3Pe0yKlCc7EOeq1X/aJVDH0CtNL+tIBm49vpepwL1MQ=", + "lastModified": 1740947705, + "narHash": "sha256-Co2kAD2SZalOm+5zoxmzEVZNvZ17TyafuFsD46BwSdY=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "d002ce9b6e7eb467cd1c6bb9aef9c35d191b5453", + "rev": "507911df8c35939050ae324caccc7cf4ffb76565", "type": "github" }, "original": { @@ -460,11 +460,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1740089251, - "narHash": "sha256-Y78mDBWoO8CLLTjQfPfII+KXFb6lAmF9GrLbyVBsIMM=", + "lastModified": 1740646007, + "narHash": "sha256-dMReDQobS3kqoiUCQIYI9c0imPXRZnBubX20yX/G5LE=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "18e9f9753e9ae261bcc7d3abe15745686991fd30", + "rev": "009b764ac98a3602d41fc68072eeec5d24fc0e49", "type": "github" }, "original": { @@ -475,11 +475,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1739866667, - "narHash": "sha256-EO1ygNKZlsAC9avfcwHkKGMsmipUk1Uc0TbrEZpkn64=", + "lastModified": 1740828860, + "narHash": "sha256-cjbHI+zUzK5CPsQZqMhE3npTyYFt9tJ3+ohcfaOF/WM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "73cf49b8ad837ade2de76f87eb53fc85ed5d4680", + "rev": "303bd8071377433a2d8f76e684ec773d70c5b642", "type": "github" }, "original": { diff --git a/overlays/README.md b/overlays/README.md index 2e46e4488..5b5e13a32 100644 --- a/overlays/README.md +++ b/overlays/README.md @@ -39,4 +39,6 @@ The status of the integration in nixpkgs can be tracked using the [Pull Request [gtklock: Multiple errors on wrong password](https://github.com/jovanlanik/gtklock/pull/119) +[libqmi: Failure to cross compile](https://github.com/NixOS/nixpkgs/issues/384946) + ## carried in tiiuae/nixpkgs/... diff --git a/overlays/cross-compilation/default.nix b/overlays/cross-compilation/default.nix index d22e75137..619964eee 100644 --- a/overlays/cross-compilation/default.nix +++ b/overlays/cross-compilation/default.nix @@ -3,4 +3,7 @@ # # This overlay is for specific fixes needed only to enable cross-compilation. # -(_final: prev: { papirus-icon-theme = import ./papirus-icon-theme { inherit prev; }; }) +(final: prev: { + papirus-icon-theme = import ./papirus-icon-theme { inherit prev; }; + libqmi = import ./libqmi { inherit final prev; }; +}) diff --git a/overlays/cross-compilation/libqmi/default.nix b/overlays/cross-compilation/libqmi/default.nix new file mode 100644 index 000000000..de407ebae --- /dev/null +++ b/overlays/cross-compilation/libqmi/default.nix @@ -0,0 +1,18 @@ +# Copyright 2022-2024 TII (SSRC) and the Ghaf contributors +# SPDX-License-Identifier: Apache-2.0 +# +# papirus-icon-theme cross-compilation fixes (removing qt dependency) +# +# TODO: check if we should be using the qt6 version of the theme +# kdePackages.breeze-icons and not the deprecated qt5 version +{ final, prev }: +prev.libqmi.override { + meson = prev.buildPackages.meson.overrideAttrs { + src = final.fetchFromGitHub { + owner = "mesonbuild"; + repo = "meson"; + tag = "1.6.1"; + hash = "sha256-t0JItqEbf2YqZnu5mVsCO9YGzB7WlCfsIwi76nHJ/WI="; + }; + }; +} diff --git a/overlays/cross-compilation/papirus-icon-theme/default.nix b/overlays/cross-compilation/papirus-icon-theme/default.nix index a749efb0d..4c5503dcd 100644 --- a/overlays/cross-compilation/papirus-icon-theme/default.nix +++ b/overlays/cross-compilation/papirus-icon-theme/default.nix @@ -3,7 +3,9 @@ # # papirus-icon-theme cross-compilation fixes (removing qt dependency) # +# TODO: check if we should be using the qt6 version of the theme +# kdePackages.breeze-icons and not the deprecated qt5 version { prev }: prev.papirus-icon-theme.overrideAttrs (old: { - propagatedBuildInputs = prev.lib.lists.remove prev.breeze-icons old.propagatedBuildInputs; + propagatedBuildInputs = prev.lib.lists.remove prev.libsForQt5.breeze-icons old.propagatedBuildInputs; }) diff --git a/overlays/custom-packages/labwc/labwc-colored-borders.patch b/overlays/custom-packages/labwc/labwc-colored-borders.patch index 98bba7342..73efd45df 100644 --- a/overlays/custom-packages/labwc/labwc-colored-borders.patch +++ b/overlays/custom-packages/labwc/labwc-colored-borders.patch @@ -1,4 +1,4 @@ -From c4614e2dbaacb8cdbfaf2b28933622fb78669540 Mon Sep 17 00:00:00 2001 +From 446730eb2c0d63ad6e948e7657193ea34e1c2427 Mon Sep 17 00:00:00 2001 From: Humaid Alqasimi Date: Sat, 9 Nov 2024 15:23:20 +0400 Subject: [PATCH] Add colored borders @@ -26,10 +26,10 @@ Signed-off-by: Humaid Alqasimi 8 files changed, 139 insertions(+), 9 deletions(-) diff --git a/include/theme.h b/include/theme.h -index a297e05e..ca8f9cd0 100644 +index c2c7e8be..334a91d2 100644 --- a/include/theme.h +++ b/include/theme.h -@@ -172,4 +172,14 @@ void theme_init(struct theme *theme, struct server *server, const char *theme_na +@@ -176,4 +176,14 @@ void theme_init(struct theme *theme, struct server *server, const char *theme_na */ void theme_finish(struct theme *theme); @@ -45,7 +45,7 @@ index a297e05e..ca8f9cd0 100644 + #endif /* LABWC_THEME_H */ diff --git a/include/window-rules.h b/include/window-rules.h -index 30abfddb..9c566f6d 100644 +index b93bc367..066cc7f0 100644 --- a/include/window-rules.h +++ b/include/window-rules.h @@ -21,6 +21,7 @@ enum property { @@ -56,8 +56,8 @@ index 30abfddb..9c566f6d 100644 struct window_rule { char *identifier; char *title; -@@ -41,11 +42,27 @@ struct window_rule { - enum property want_absorbed_modifier_release_events; +@@ -40,11 +41,27 @@ struct window_rule { + enum property fixed_position; struct wl_list link; /* struct rcxml.window_rules */ + @@ -85,10 +85,10 @@ index 30abfddb..9c566f6d 100644 + #endif /* LABWC_WINDOW_RULES_H */ diff --git a/src/config/rcxml.c b/src/config/rcxml.c -index bdd84291..7ae29f54 100644 +index a3b3ee3a..26f2e603 100644 --- a/src/config/rcxml.c +++ b/src/config/rcxml.c -@@ -36,6 +36,7 @@ +@@ -37,6 +37,7 @@ #include "view.h" #include "window-rules.h" #include "workspaces.h" @@ -96,38 +96,38 @@ index bdd84291..7ae29f54 100644 #define LAB_WLR_VERSION_OLDER_THAN(major, minor, micro) \ (WLR_VERSION_NUM < (((major) << 16) | ((minor) << 8) | (micro))) -@@ -310,6 +311,7 @@ fill_window_rule(char *nodename, char *content) +@@ -277,6 +278,7 @@ fill_window_rule(char *nodename, char *content, struct parser_state *state) if (!strcasecmp(nodename, "windowRule.windowRules")) { - current_window_rule = znew(*current_window_rule); - current_window_rule->window_type = -1; // Window types are >= 0 -+ init_window_rule(current_window_rule); - wl_list_append(&rc.window_rules, ¤t_window_rule->link); - wl_list_init(¤t_window_rule->actions); + state->current_window_rule = znew(*state->current_window_rule); + state->current_window_rule->window_type = -1; // Window types are >= 0 ++ init_window_rule(state->current_window_rule); + wl_list_append(&rc.window_rules, &state->current_window_rule->link); + wl_list_init(&state->current_window_rule->actions); return; -@@ -324,6 +326,8 @@ fill_window_rule(char *nodename, char *content) +@@ -291,6 +293,8 @@ fill_window_rule(char *nodename, char *content, struct parser_state *state) /* Criteria */ } else if (!strcmp(nodename, "identifier")) { - xstrdup_replace(current_window_rule->identifier, content); + xstrdup_replace(state->current_window_rule->identifier, content); + wlr_log(WLR_INFO, "Identifier found: %s=\"%s\"", + nodename, content); } else if (!strcmp(nodename, "title")) { - xstrdup_replace(current_window_rule->title, content); + xstrdup_replace(state->current_window_rule->title, content); } else if (!strcmp(nodename, "type")) { -@@ -361,6 +365,14 @@ fill_window_rule(char *nodename, char *content) - } else if (!strcasecmp(nodename, "wantAbsorbedModifierReleaseEvents")) { - set_property(content, ¤t_window_rule->want_absorbed_modifier_release_events); +@@ -326,6 +330,14 @@ fill_window_rule(char *nodename, char *content, struct parser_state *state) + } else if (!strcasecmp(nodename, "fixedPosition")) { + set_property(content, &state->current_window_rule->fixed_position); + /* Custom border properties: color */ + } else if (!strcasecmp(nodename, "borderColor")) { -+ parse_hexstr(content, current_window_rule->custom_border_color); -+ current_window_rule->has_custom_border = true; ++ parse_hexstr(content, state->current_window_rule->custom_border_color); ++ state->current_window_rule->has_custom_border = true; + wlr_log(WLR_DEBUG, "Custom borderColor was found in config: %s, parsed into: %f, %f, %f, %f\n", -+ content, current_window_rule->custom_border_color[0], current_window_rule->custom_border_color[1], -+ current_window_rule->custom_border_color[2], current_window_rule->custom_border_color[3]); ++ content, state->current_window_rule->custom_border_color[0], state->current_window_rule->custom_border_color[1], ++ state->current_window_rule->custom_border_color[2], state->current_window_rule->custom_border_color[3]); + /* Actions */ } else if (!strcmp(nodename, "name.action")) { - current_window_rule_action = action_create(content); + state->current_window_rule_action = action_create(content); diff --git a/src/ssd/ssd-border.c b/src/ssd/ssd-border.c index 435119e2..f986b6bf 100644 --- a/src/ssd/ssd-border.c @@ -164,10 +164,10 @@ index 435119e2..f986b6bf 100644 wl_list_init(&subtree->parts); add_scene_rect(&subtree->parts, LAB_SSD_PART_LEFT, parent, diff --git a/src/ssd/ssd-titlebar.c b/src/ssd/ssd-titlebar.c -index 47ab4ef1..a094a0a2 100644 +index 2879b203..05e91804 100644 --- a/src/ssd/ssd-titlebar.c +++ b/src/ssd/ssd-titlebar.c -@@ -17,6 +17,7 @@ +@@ -18,6 +18,7 @@ #include "ssd-internal.h" #include "theme.h" #include "view.h" @@ -175,7 +175,7 @@ index 47ab4ef1..a094a0a2 100644 #define FOR_EACH_STATE(ssd, tmp) FOR_EACH(tmp, \ &(ssd)->titlebar.active, \ -@@ -31,6 +32,16 @@ ssd_titlebar_create(struct ssd *ssd) +@@ -32,6 +33,16 @@ ssd_titlebar_create(struct ssd *ssd) { struct view *view = ssd->view; struct theme *theme = view->server->theme; @@ -192,7 +192,7 @@ index 47ab4ef1..a094a0a2 100644 int width = view->current.width; int corner_width = ssd_get_corner_width(); -@@ -455,6 +466,18 @@ ssd_update_title(struct ssd *ssd) +@@ -458,6 +469,18 @@ ssd_update_title(struct ssd *ssd) } struct theme *theme = view->server->theme; @@ -212,7 +212,7 @@ index 47ab4ef1..a094a0a2 100644 bool title_unchanged = state->text && !strcmp(title, state->text); diff --git a/src/ssd/ssd.c b/src/ssd/ssd.c -index 49f088b7..a4cd9283 100644 +index 65416ca3..41142899 100644 --- a/src/ssd/ssd.c +++ b/src/ssd/ssd.c @@ -14,6 +14,7 @@ @@ -223,7 +223,7 @@ index 49f088b7..a4cd9283 100644 struct border ssd_thickness(struct view *view) -@@ -402,9 +403,12 @@ ssd_enable_keybind_inhibit_indicator(struct ssd *ssd, bool enable) +@@ -463,9 +464,12 @@ ssd_enable_keybind_inhibit_indicator(struct ssd *ssd, bool enable) return; } @@ -240,10 +240,10 @@ index 49f088b7..a4cd9283 100644 struct ssd_part *part = ssd_get_part(&ssd->border.active.parts, LAB_SSD_PART_TOP); struct wlr_scene_rect *rect = wlr_scene_rect_from_node(part->node); diff --git a/src/theme.c b/src/theme.c -index 2a7111b2..ba7874c5 100644 +index 51468e02..153b6d01 100644 --- a/src/theme.c +++ b/src/theme.c -@@ -497,7 +497,7 @@ hex_to_dec(char c) +@@ -410,7 +410,7 @@ hex_to_dec(char c) * @hex: hex string to be parsed * @rgba: pointer to float[4] for return value */ @@ -252,7 +252,7 @@ index 2a7111b2..ba7874c5 100644 parse_hexstr(const char *hex, float *rgba) { if (!hex || hex[0] != '#' || strlen(hex) < 7) { -@@ -566,7 +566,7 @@ parse_justification(const char *str) +@@ -479,7 +479,7 @@ parse_justification(const char *str) static void theme_builtin(struct theme *theme, struct server *server) { @@ -261,7 +261,7 @@ index 2a7111b2..ba7874c5 100644 theme->window_titlebar_padding_height = 0; theme->window_titlebar_padding_width = 0; -@@ -1610,3 +1610,33 @@ theme_finish(struct theme *theme) +@@ -1540,3 +1540,33 @@ theme_finish(struct theme *theme) zdrop(&theme->window[active].shadow_edge); } } @@ -296,7 +296,7 @@ index 2a7111b2..ba7874c5 100644 + load_buttons(theme); +} diff --git a/src/window-rules.c b/src/window-rules.c -index 7c88865f..b4b24561 100644 +index 0f4f1952..f7324c66 100644 --- a/src/window-rules.c +++ b/src/window-rules.c @@ -46,6 +46,14 @@ view_matches_criteria(struct window_rule *rule, struct view *view) @@ -314,7 +314,7 @@ index 7c88865f..b4b24561 100644 void window_rules_apply(struct view *view, enum window_rule_event event) { -@@ -117,3 +125,20 @@ window_rules_get_property(struct view *view, const char *property) +@@ -112,3 +120,20 @@ window_rules_get_property(struct view *view, const char *property) } return LAB_PROP_UNSPECIFIED; } @@ -336,5 +336,5 @@ index 7c88865f..b4b24561 100644 + return false; +} -- -2.47.0 +2.47.2