Properly .gitignore and make clean sc-cpd-overrides.css

Makefile

@@ -218,6 +218,7 @@ clean:
 	rm -rf element-web/dist
 	rm -rf local-pkgbuild
 	rm -f bom.lock
+	rm -f matrix-react-sdk/res/css/sc-cpd-overrides.css
 
 undo_setup:
 	rm -rf element-desktop/node_modules element-web/node_modules matrix-react-sdk/node_modules matrix-js-sdk/node_modules i18n-helper/node_modules element-desktop/.hak

matrix-react-sdk

@@ -1 +1 @@
-Subproject commit 2f6683c60ef03eee12adfc8c44d198f8438d8756
+Subproject commit 586a582d3e5211eafe2e6099d8203ddf07a8e969

patches/matrix-react-sdk/0002-Disable-sticky-rooms.patch

@@ -1,4 +1,4 @@
-From 5330229d442d90df01b78e0a216e92543cec6d0b Mon Sep 17 00:00:00 2001
+From fff7d0f6309d9f265407c73f53ec7bf5b0d79ef7 Mon Sep 17 00:00:00 2001
 From: SpiritCroc <dev@spiritcroc.de>
 Date: Tue, 18 Jan 2022 13:28:22 +0100
 Subject: Disable sticky rooms

patches/matrix-react-sdk/0003-Bring-back-unified-room-list.patch

@@ -1,4 +1,4 @@
-From bdfe28c9c30139e45ea71d7969a9cb11db525413 Mon Sep 17 00:00:00 2001
+From 9418c3b8bea0d998b6c2c7e8c19428d872df52d6 Mon Sep 17 00:00:00 2001
 From: SpiritCroc <dev@spiritcroc.de>
 Date: Sun, 5 May 2024 10:12:17 +0200
 Subject: Bring back unified room list

patches/matrix-react-sdk/0004-Don-t-sort-muted-rooms-to-bottom-I-still-want-to-see.patch

@@ -1,4 +1,4 @@
-From 3978dc98c0bc2272a20a083a767f93da6a98a8b2 Mon Sep 17 00:00:00 2001
+From e7dd307a517f3ec085cfd78a5dc6aae98325b56b Mon Sep 17 00:00:00 2001
 From: SpiritCroc <dev@spiritcroc.de>
 Date: Sun, 17 Dec 2023 11:11:58 +0100
 Subject: Don't sort muted rooms to bottom, I still want to see them.

patches/matrix-react-sdk/0005-Don-t-preview-reactions.patch

@@ -1,4 +1,4 @@
-From f63086180b877d00d60c45e72e932cdfa6560823 Mon Sep 17 00:00:00 2001
+From eff72cf5b51740c4ce99f40e2a363e598a8b7bdf Mon Sep 17 00:00:00 2001
 From: SpiritCroc <dev@spiritcroc.de>
 Date: Thu, 14 Dec 2023 10:32:10 +0100
 Subject: Don't preview reactions

patches/matrix-react-sdk/0006-Hide-the-mute-notification-state-the-same-way-as-the.patch

@@ -1,4 +1,4 @@
-From 86b04ca7ac01e6d45eca5812079cbb95b336fc4d Mon Sep 17 00:00:00 2001
+From 431a783ae440460fa8d2670579b000f10718c644 Mon Sep 17 00:00:00 2001
 From: SpiritCroc <dev@spiritcroc.de>
 Date: Wed, 17 Nov 2021 12:50:25 +0100
 Subject: Hide the "mute" notification state the same way as the other states

patches/matrix-react-sdk/0007-Allow-muted-rooms-to-render-as-unread.patch

@@ -1,4 +1,4 @@
-From 3bd11332c72a9a42c86af65a0a3569ff12a06f38 Mon Sep 17 00:00:00 2001
+From f49fe0ce2eadc1fc7c6331dce0a1974c6e748ee9 Mon Sep 17 00:00:00 2001
 From: SpiritCroc <dev@spiritcroc.de>
 Date: Fri, 10 May 2024 18:58:32 +0200
 Subject: Allow muted rooms to render as unread

patches/matrix-react-sdk/0008-Increase-default-visible-tiles.patch

@@ -1,4 +1,4 @@
-From 1513534630832a3e64ed658436cc0867067f74c5 Mon Sep 17 00:00:00 2001
+From a8cedd5df0c83c54f2d137a4a0c6cf54aebb09e0 Mon Sep 17 00:00:00 2001
 From: SpiritCroc <dev@spiritcroc.de>
 Date: Sun, 30 Aug 2020 15:33:01 +0200
 Subject: Increase default visible tiles

patches/matrix-react-sdk/0009-Bring-back-showSpaceDMBadges-setting-force-enabled-f.patch

@@ -1,4 +1,4 @@
-From fc40f03afa3382f712bf6e826391930838e463bc Mon Sep 17 00:00:00 2001
+From b218bc7f5295a44c6b08f5e24e9ce34d5646f261 Mon Sep 17 00:00:00 2001
 From: su-ex <codeworks@supercable.onl>
 Date: Sun, 26 May 2024 10:43:36 +0200
 Subject: Bring back showSpaceDMBadges setting, force-enabled for now

patches/matrix-react-sdk/0010-Squashed-Freeform-reactions-from-tadzik-freeform-rea.patch

@@ -1,4 +1,4 @@
-From 2c57b9864b2d86dfa4cc89098c4cda965fcb2401 Mon Sep 17 00:00:00 2001
+From ad0993f82d83ea13e87b48f62aafbc030fda30d5 Mon Sep 17 00:00:00 2001
 From: SpiritCroc <dev@spiritcroc.de>
 Date: Wed, 29 May 2024 19:32:42 +0200
 Subject: Squashed: Freeform reactions from tadzik/freeform-reactions-upstream

patches/matrix-react-sdk/0011-Allow-reactions-to-take-more-space.patch

@@ -1,4 +1,4 @@
-From 5c3b02f8c82c6eb581ee771b4de4058dab7220b6 Mon Sep 17 00:00:00 2001
+From c305c30e95602605db06c58390a2a14550a3cb9f Mon Sep 17 00:00:00 2001
 From: su-ex <codeworks@supercable.onl>
 Date: Sat, 22 Apr 2023 12:15:18 +0200
 Subject: Allow reactions to take more space

patches/matrix-react-sdk/0012-On-space-switch-don-t-automatically-show-last-opened.patch

@@ -1,4 +1,4 @@
-From a90c65a2ca9223d4d2a8fbeb657b3f0ec5d6ed51 Mon Sep 17 00:00:00 2001
+From 779404fe780a9b992a26b5d40e6ad558b598dd91 Mon Sep 17 00:00:00 2001
 From: su-ex <codeworks@supercable.onl>
 Date: Thu, 30 May 2024 14:35:16 +0200
 Subject: On space switch don't automatically show last opened room

patches/matrix-react-sdk/0013-Exclude-spaces-from-breadcrumbs.patch

@@ -1,4 +1,4 @@
-From 89defddc48625f66e760b8aaa21b0045c8831f25 Mon Sep 17 00:00:00 2001
+From 0ce27077f06e2e72e51fd38d6bd7262122750c24 Mon Sep 17 00:00:00 2001
 From: SpiritCroc <dev@spiritcroc.de>
 Date: Tue, 9 Aug 2022 09:32:19 +0200
 Subject: Exclude spaces from breadcrumbs

patches/matrix-react-sdk/0014-Stop-the-search-bar-wobble.patch

@@ -1,4 +1,4 @@
-From 1ccc65fc580392537fab12b40f4b007cf0616e1c Mon Sep 17 00:00:00 2001
+From f16b1fe3a1f3b31d958a029fd05e991b2ca7dd9a Mon Sep 17 00:00:00 2001
 From: SpiritCroc <dev@spiritcroc.de>
 Date: Mon, 19 Aug 2024 20:27:33 +0200
 Subject: Stop the search bar wobble

patches/matrix-react-sdk/0015-Import-SC-compound-theme-overrides.patch

@@ -1,23 +1,12 @@
-From e9b0c9d989d6ac8ff0a08020151f73fefa465ffb Mon Sep 17 00:00:00 2001
+From ff1ac255a8ccab814e7ca560b839f725f7648d3b Mon Sep 17 00:00:00 2001
 From: SpiritCroc <dev@spiritcroc.de>
 Date: Sun, 13 Oct 2024 11:23:54 +0200
 Subject: Import SC compound theme overrides
 
 ---
- .gitignore           | 2 ++
  res/css/_common.pcss | 1 +
- 2 files changed, 3 insertions(+)
+ 1 file changed, 1 insertion(+)
 
-diff --git a/.gitignore b/.gitignore
-index 3137cd555b..5345301b97 100644
---- a/.gitignore
-+++ b/.gitignore
-@@ -1,3 +1,5 @@
-+res/css/sc-*.css
-+
- /.npmrc
- /*.log
- package-lock.json
 diff --git a/res/css/_common.pcss b/res/css/_common.pcss
 index 7861af6381..f7a660a339 100644
 --- a/res/css/_common.pcss

patches/matrix-react-sdk/0016-No-damn-avatar-background-in-room-list.patch

@@ -1,4 +1,4 @@
-From a60b2c3988e20d10ec873fc0cfb241220dc02b86 Mon Sep 17 00:00:00 2001
+From 05b4fd5a2d629183a3baa10a5f37fc65472bc811 Mon Sep 17 00:00:00 2001
 From: su-ex <codeworks@supercable.onl>
 Date: Tue, 7 Sep 2021 19:41:52 +0200
 Subject: No damn avatar background in room list

patches/matrix-react-sdk/0017-No-red-messages-in-1-1-chats-Close-SchildiChat-schil.patch

@@ -1,4 +1,4 @@
-From 37649905fb9c57d233f14d4de2dc1d3bc5eecd84 Mon Sep 17 00:00:00 2001
+From 18a0ead19c86cb162134006dd25658dfedba480a Mon Sep 17 00:00:00 2001
 From: su-ex <codeworks@supercable.onl>
 Date: Tue, 22 Dec 2020 19:16:28 +0100
 Subject: No red messages in 1:1 chats Close SchildiChat/schildichat-desktop#13

patches/matrix-react-sdk/0018-Always-apply-corner-radius-to-all-edges-of-the-bubbl.patch

@@ -1,4 +1,4 @@
-From a765c5b0eabd4ba249157a0a3562f76b5d235d82 Mon Sep 17 00:00:00 2001
+From feb6e933d5d61a667ed165628880e9da9e07b69c Mon Sep 17 00:00:00 2001
 From: SpiritCroc <dev@spiritcroc.de>
 Date: Sun, 13 Oct 2024 13:26:16 +0200
 Subject: Always apply corner radius to all edges of the bubble

patches/matrix-react-sdk/0019-Always-show-timestamps-by-default.patch

@@ -1,4 +1,4 @@
-From f8bdf88fd81872e997e8ba61b4997d059ac9747e Mon Sep 17 00:00:00 2001
+From 4973bd12e0db2de060cdb5202d117f9faa8c3a9a Mon Sep 17 00:00:00 2001
 From: SpiritCroc <dev@spiritcroc.de>
 Date: Sun, 13 Oct 2024 13:53:07 +0200
 Subject: Always show timestamps by default

patches/matrix-react-sdk/0020-Enable-custom-emote-rendering-by-default.patch

@@ -1,4 +1,4 @@
-From 91513e88358321b3e3a742969aaf9ff44c7356f1 Mon Sep 17 00:00:00 2001
+From 354e87734f7660968abd1c023d02a261e3849140 Mon Sep 17 00:00:00 2001
 From: SpiritCroc <dev@spiritcroc.de>
 Date: Thu, 17 Oct 2024 19:40:51 +0200
 Subject: Enable custom emote rendering by default

setup.sh

@@ -45,3 +45,13 @@ popd
 
 # CSS overrides
 cp res/css/* matrix-react-sdk/res/css/
+
+# Ensure appropriate .gitignore to avoid unnecessary dirty repos
+# when re-running setup. merge_upstream.sh will include this into the
+# "Automatic setup commit".
+if grep -q res/css/sc- matrix-react-sdk/.gitignore; then
+    echo "Skip updating .gitignore, already looks ok"
+else
+    echo "Updating .gitignore"
+    echo -e "\nres/css/sc-*.css" >> matrix-react-sdk/.gitignore
+fi