Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 16 additions & 3 deletions pkgbuilds/omarchy-config/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,13 @@ pkgver=${_ver#v}
# rewrites the shell to `Commons.Color`, the same rewrite upstream made
# after this pin; prepare() runs it after the patches and asserts nothing
# bare is left.
pkgrel=7
# 8: first-background.patch. On a first boot the shell has nothing on screen
# when omarchy-theme-set hands it a snapshot of the wallpaper, and it showed
# the snapshot, which theme-set deletes three seconds later. A phone that
# had not decoded the 5120x2880 image by then booted to a blank desktop,
# and re-reading the background link did nothing, because the shell took
# the real file as already shown.
pkgrel=8
pkgdesc="Omarchy's configuration and theme layer, with moarchy's plugins hosted"
arch=('any')
url="$_url"
Expand All @@ -127,13 +133,15 @@ makedepends=('python')
source=("omarchy-$_ref.tar.gz::$_url/archive/$_ref.tar.gz"
'port-4x.patch'
'notification-popups-bar-opt-out.patch'
'first-background.patch'
'qualify-color.py')
sha256sums=('8cc6b1d9d903c606600395e3b3d80ad9f15bd3ab78f0f19b0f49041b1df82013'
'3b562e93dbe65fd5aff211285891df51149eaca967136a7a06d5aac997b112e6'
'e2e3425600b71ae016a8d63439a60dbbb2b42eb51f95516089ebd7d9610d67c5'
'f7229e1d8f627fcec51e7bcf7e4163bd4bee86ec1657bd6acefd34f526e06afb'
'ccf5c77201815742c094c853dddaffb371175641e4593dd67c2c9fa49348861c')

# Two patches, and they are different kinds of thing.
# Three patches, and they are different kinds of thing.
#
# port-4x.patch is the Sway port: it exists because this hardware cannot run
# Hyprland, it will never go upstream, and it is the reason this package is not
Expand All @@ -147,7 +155,11 @@ sha256sums=('8cc6b1d9d903c606600395e3b3d80ad9f15bd3ab78f0f19b0f49041b1df82013'
# copy the sibling project carries, which is what keeps one patch rather than
# two drifting ones.
#
# Both must apply with no fuzz and no offset, and the two guards after them are
# first-background.patch is a fix upstream has already made: after the pin,
# Background.qml shows finalPath, not path, when nothing is on screen yet.
# It is deleted at the next bump.
#
# All three must apply with no fuzz and no offset, and the two guards after them are
# what makes that true. `--fuzz=0` was carrying the whole claim until
# 2026-09-13 and it never could: it bounds FUZZ -- how many context lines may
# mismatch -- and says nothing about OFFSET. A hunk that lands 48 lines from
Expand All @@ -166,6 +178,7 @@ prepare() {
cd "omarchy-$_ref"
patch -p1 --fuzz=0 < "$srcdir/port-4x.patch"
patch -p1 --fuzz=0 < "$srcdir/notification-popups-bar-opt-out.patch"
patch -p1 --fuzz=0 < "$srcdir/first-background.patch"

# A1/A3. GNU patch's --backup-if-mismatch is on by default and writes a
# .orig for exactly the files that did not apply cleanly, so the signal for
Expand Down
12 changes: 12 additions & 0 deletions pkgbuilds/omarchy-config/first-background.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
diff --git a/shell/plugins/background/Background.qml b/shell/plugins/background/Background.qml
--- a/shell/plugins/background/Background.qml
+++ b/shell/plugins/background/Background.qml
@@ -53,7 +53,7 @@
if (instant || !displayedBackground) {
oldBackground = ""
incomingBackground = ""
- displayedBackground = path
+ displayedBackground = finalPath
revealProgress = 1
return
}