Balló György pushed to branch main at Arch Linux / Packaging / Packages /
forge-sparks
Commits:
ff50f8ec by Balló György at 2024-11-08T18:20:38+01:00
Apply merged commit instead of patch
- - - - -
3 changed files:
- .SRCINFO
- PKGBUILD
- − forge-sparks-background-status.patch
Changes:
=====================================
.SRCINFO
=====================================
@@ -21,9 +21,7 @@ pkgbase = forge-sparks
depends = libsoup3
source =
git+https://github.com/rafaelmardojai/forge-sparks.git#tag=0.4.0
source = git+https://github.com/sonnyp/troll.git
- source = forge-sparks-background-status.patch
b2sums =
7854c572ecea01c35a374f42126cf178b3de24029a03653b4f6e5a8483e3c81f055d0b649ce06644c4822c8e846a355efca6a5af63f43f6393c95ff88184c67e
b2sums = SKIP
- b2sums =
c4d7dd1a4ec9a9381fa312670366d3f44ccb6f133c4957b0eccdcbce0b2b614a91beac6182809e0da9c34dd9895c95cb07627d42eab0f316f10868f5cbc96961
pkgname = forge-sparks
=====================================
PKGBUILD
=====================================
@@ -28,12 +28,10 @@ makedepends=(
source=(
"git+https://github.com/rafaelmardojai/forge-sparks.git#tag=$pkgver";
git+https://github.com/sonnyp/troll.git
- forge-sparks-background-status.patch
)
b2sums=(
7854c572ecea01c35a374f42126cf178b3de24029a03653b4f6e5a8483e3c81f055d0b649ce06644c4822c8e846a355efca6a5af63f43f6393c95ff88184c67e
SKIP
-
c4d7dd1a4ec9a9381fa312670366d3f44ccb6f133c4957b0eccdcbce0b2b614a91beac6182809e0da9c34dd9895c95cb07627d42eab0f316f10868f5cbc96961
)
prepare() {
@@ -44,7 +42,7 @@ prepare() {
git -c protocol.file.allow=always submodule update
# https://github.com/rafaelmardojai/forge-sparks/pull/45
- git apply -3 ../forge-sparks-background-status.patch
+ git cherry-pick -n baf3cf8bf083c647072ed8f7844f6c9556dba1b5
}
build() {
=====================================
forge-sparks-background-status.patch deleted
=====================================
@@ -1,28 +0,0 @@
-From 86955b404c12744d6ca08c3daec66149d0d1fbbc Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <[email protected]>
-Date: Thu, 7 Nov 2024 17:45:54 +0100
-Subject: [PATCH] util: Set background status only if sandboxed
-
----
- src/util.js | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/src/util.js b/src/util.js
-index d0b3fa4..39ff246 100644
---- a/src/util.js
-+++ b/src/util.js
-@@ -80,9 +80,11 @@ export function requestBackground(window, autostart=false,
hidden=false) {
- * @param {String} message
- */
- export function setBackgroundStatus(message=_('Monitoring new
notifications')) {
-- portal.set_background_status(message, null, (portal, result) => {
-- portal.set_background_status_finish(result);
-- });
-+ if (Xdp.Portal.running_under_sandbox()) {
-+ portal.set_background_status(message, null, (portal, result) => {
-+ portal.set_background_status_finish(result);
-+ });
-+ }
- }
-
- /**
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/forge-sparks/-/commit/ff50f8ecbe6293de620e842a3fb79d514226f9da
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/forge-sparks/-/commit/ff50f8ecbe6293de620e842a3fb79d514226f9da
You're receiving this email because of your account on gitlab.archlinux.org.
