From 4dac178dc48fcac4e735047271ef4688ae518343 Mon Sep 17 00:00:00 2001 From: wiiznokes <78230769+wiiznokes@users.noreply.github.com> Date: Jul 05 2025 13:45:40 +0000 Subject: [PATCH 1/2] add doc for patches --- diff --git a/.gitignore b/.gitignore index 2f58121..ae64fae 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ /dev/* !dev/.keep target/ -venv/ \ No newline at end of file +venv/ +/upstream/ \ No newline at end of file diff --git a/docs/nightly.md b/docs/nightly.md index 303e0b6..c7d7daa 100644 --- a/docs/nightly.md +++ b/docs/nightly.md @@ -2,7 +2,11 @@ The nightly Fedora COSMIC builds are hosted on the [ryanabx/cosmic-epoch COPR](https://copr.fedorainfracloud.org/coprs/ryanabx/cosmic-epoch) - ## How are the nightly packages built -Each package in the copr runs the `bootstrap.sh` script, which in turn calls the `cosmic-packaging-bootstrap.py` script, which prepares the sources for the srpm. From there, copr takes over and builds the resulting srpm. \ No newline at end of file +Each package in the copr runs the `bootstrap.sh` script, which in turn calls the `cosmic-packaging-bootstrap.py` script, which prepares the sources for the srpm. From there, copr takes over and builds the resulting srpm. + +## How to patch nightly packages + +Nightly packages now use the upsteam https://src.fedoraproject.org/group/cosmic-sig repos. The patches are hosted in this repo, in [patches](./../patches). +You can use the justfile to help you. Just change the NAME variable, call `just clone-upstream`, make your change, and call `just create-patch "commit msg" patch_name`. diff --git a/justfile b/justfile index d1bf576..0239ba4 100644 --- a/justfile +++ b/justfile @@ -1,7 +1,6 @@ -set working-directory := 'dev' set export -NAME := 'cosmic-files' +NAME := 'cosmic-applets' TAG := 'nightly' all *FLAGS: clean (init FLAGS) sources spec build @@ -38,4 +37,14 @@ clean: clean-rpmbuild-dir: rm -rf ~/rpmbuild - rpmdev-setuptree \ No newline at end of file + rpmdev-setuptree + + +clone-upstream: + rm -rf upstream/{{NAME}} + git clone https://src.fedoraproject.org/rpms/{{NAME}}.git upstream/{{NAME}} + +create-patch commit_msg patch_name: + git -C upstream/{{NAME}} add . + git -C upstream/{{NAME}} commit -m "{{commit_msg}}" + git -C upstream/{{NAME}} format-patch -1 --stdout > patches/{{NAME}}/{{patch_name}}.patch \ No newline at end of file From 91bcbfde843e5559d643af37c077508e75d9a292 Mon Sep 17 00:00:00 2001 From: wiiznokes <78230769+wiiznokes@users.noreply.github.com> Date: Jul 05 2025 13:56:33 +0000 Subject: [PATCH 2/2] add open ssl patch --- diff --git a/patches/cosmic-settings-daemon/0001-Require-openssl.patch b/patches/cosmic-settings-daemon/0001-Require-openssl.patch new file mode 100644 index 0000000..2e1ac7f --- /dev/null +++ b/patches/cosmic-settings-daemon/0001-Require-openssl.patch @@ -0,0 +1,24 @@ +From 621798a15fa0fd03de7ceb002a55f3494f3391bf Mon Sep 17 00:00:00 2001 +From: wiiznokes <78230769+wiiznokes@users.noreply.github.com> +Date: Sat, 5 Jul 2025 15:53:24 +0200 +Subject: [PATCH] add openssl dep + +--- + cosmic-settings-daemon.spec | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/cosmic-settings-daemon.spec b/cosmic-settings-daemon.spec +index edd0707..290d10a 100644 +--- a/cosmic-settings-daemon.spec ++++ b/cosmic-settings-daemon.spec +@@ -45,6 +45,7 @@ BuildRequires: libxkbcommon-devel + BuildRequires: pam-devel + BuildRequires: pulseaudio-utils + BuildRequires: just ++BuildRequires: openssl-devel + + Requires: acpid + Requires: adw-gtk3-theme +-- +2.50.0 +