From 9afdda8e250f6d4c5bb400c72dbc6a5b5609b20b Mon Sep 17 00:00:00 2001 From: Joshua Strobl Date: Sun, 27 Aug 2023 15:00:10 +0300 Subject: [PATCH 1/7] Drop background setting as we will do that via Fedora's desktop-backgrounds package --- gnome/meson.build | 2 -- gnome/org.gnome.desktop.background.gschema.override | 3 --- gnome/org.gnome.desktop.screensaver.gschema.override | 2 -- 3 files changed, 7 deletions(-) delete mode 100644 gnome/org.gnome.desktop.background.gschema.override delete mode 100644 gnome/org.gnome.desktop.screensaver.gschema.override diff --git a/gnome/meson.build b/gnome/meson.build index f3772ad..64d0090 100644 --- a/gnome/meson.build +++ b/gnome/meson.build @@ -1,7 +1,5 @@ schemas = [ - 'org.gnome.desktop.background.gschema.override', 'org.gnome.desktop.interface.gschema.override', - 'org.gnome.desktop.screensaver.gschema.override', 'org.gnome.gedit.preferences.editor.gschema.override', ] diff --git a/gnome/org.gnome.desktop.background.gschema.override b/gnome/org.gnome.desktop.background.gschema.override deleted file mode 100644 index 9bc3c90..0000000 --- a/gnome/org.gnome.desktop.background.gschema.override +++ /dev/null @@ -1,3 +0,0 @@ -[org.gnome.desktop.background:Budgie] -picture-uri='file:///usr/share/backgrounds/budgie/valley-midnight.jpg' -picture-uri-dark='file:///usr/share/backgrounds/budgie/valley-midnight.jpg' diff --git a/gnome/org.gnome.desktop.screensaver.gschema.override b/gnome/org.gnome.desktop.screensaver.gschema.override deleted file mode 100644 index fb4eb8e..0000000 --- a/gnome/org.gnome.desktop.screensaver.gschema.override +++ /dev/null @@ -1,2 +0,0 @@ -[org.gnome.desktop.screensaver:Budgie] -picture-uri='file:///usr/share/backgrounds/budgie/valley-midnight.jpg' From e9d53d9d5d23ec10263ff882cd2f318a1bd1cceb Mon Sep 17 00:00:00 2001 From: Joshua Strobl Date: Sun, 27 Aug 2023 15:02:44 +0300 Subject: [PATCH 2/7] Rename schemas, make it easier to override in other packages --- budgie/meson.build | 4 ++-- gnome/meson.build | 4 ++-- lightdm/meson.build | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/budgie/meson.build b/budgie/meson.build index 6e893a0..1e79a2f 100644 --- a/budgie/meson.build +++ b/budgie/meson.build @@ -4,11 +4,11 @@ schemas = [ 'org.buddiesofbudgie.budgie-desktop-view.gschema.override', ] -custom_target('90_budgie_settings.gschema.override', +custom_target('10_budgie_org_settings.gschema.override', capture: true, command: ['cat', '@INPUT@'], input: schemas, install_dir: path_schema, install: true, - output: '90_budgie_settings.gschema.override', + output: '10_budgie_org_settings.gschema.override', ) \ No newline at end of file diff --git a/gnome/meson.build b/gnome/meson.build index 64d0090..c5d3c84 100644 --- a/gnome/meson.build +++ b/gnome/meson.build @@ -3,11 +3,11 @@ schemas = [ 'org.gnome.gedit.preferences.editor.gschema.override', ] -custom_target('90_budgie_gnome_settings.gschema.override', +custom_target('10_budgie_org_gnome_settings.gschema.override', capture: true, command: ['cat', '@INPUT@'], input: schemas, install_dir: path_schema, install: true, - output: '90_budgie_gnome_settings.gschema.override', + output: '10_budgie_org_gnome_settings.gschema.override', ) \ No newline at end of file diff --git a/lightdm/meson.build b/lightdm/meson.build index d238c0a..c7b5d50 100644 --- a/lightdm/meson.build +++ b/lightdm/meson.build @@ -2,11 +2,11 @@ schemas = [ 'x.dm.slick-greeter.gschema.override', ] -custom_target('90_budgie_lightdm.gschema.override', +custom_target('10_budgie_org_lightdm.gschema.override', capture: true, command: ['cat', '@INPUT@'], input: schemas, install_dir: path_schema, install: true, - output: '90_budgie_lightdm.gschema.override', + output: '10_budgie_org_lightdm.gschema.override', ) \ No newline at end of file From a11287eaa75a43ec311c19cc3bcef98db8142fa7 Mon Sep 17 00:00:00 2001 From: Joshua Strobl Date: Wed, 6 Sep 2023 10:24:34 +0300 Subject: [PATCH 3/7] Bump to 0.5 --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 8f3062b..b4a87b5 100644 --- a/meson.build +++ b/meson.build @@ -1,7 +1,7 @@ project( 'budgie-desktop-defaults', 'c', - version: '0.4', + version: '0.5', license: [ 'CC-BY-SA-4.0' ], From ee3a2f50ae147924d6dcdbce18b16c43dbd8fecb Mon Sep 17 00:00:00 2001 From: Joshua Strobl Date: Wed, 6 Sep 2023 13:56:49 +0300 Subject: [PATCH 4/7] Remove slick-greeter configuration as well. Bump to 0.5.1. --- lightdm/meson.build | 12 ------------ lightdm/x.dm.slick-greeter.gschema.override | 2 -- meson.build | 3 +-- 3 files changed, 1 insertion(+), 16 deletions(-) delete mode 100644 lightdm/meson.build delete mode 100644 lightdm/x.dm.slick-greeter.gschema.override diff --git a/lightdm/meson.build b/lightdm/meson.build deleted file mode 100644 index c7b5d50..0000000 --- a/lightdm/meson.build +++ /dev/null @@ -1,12 +0,0 @@ -schemas = [ - 'x.dm.slick-greeter.gschema.override', -] - -custom_target('10_budgie_org_lightdm.gschema.override', - capture: true, - command: ['cat', '@INPUT@'], - input: schemas, - install_dir: path_schema, - install: true, - output: '10_budgie_org_lightdm.gschema.override', -) \ No newline at end of file diff --git a/lightdm/x.dm.slick-greeter.gschema.override b/lightdm/x.dm.slick-greeter.gschema.override deleted file mode 100644 index 54181ae..0000000 --- a/lightdm/x.dm.slick-greeter.gschema.override +++ /dev/null @@ -1,2 +0,0 @@ -[x.dm.slick-greeter] -background='file:///usr/share/backgrounds/budgie/valley-midnight.jpg' diff --git a/meson.build b/meson.build index b4a87b5..522322b 100644 --- a/meson.build +++ b/meson.build @@ -1,7 +1,7 @@ project( 'budgie-desktop-defaults', 'c', - version: '0.5', + version: '0.5.1', license: [ 'CC-BY-SA-4.0' ], @@ -16,7 +16,6 @@ path_schema = join_paths(path_data, 'glib-2.0', 'schemas') subdir('budgie') subdir('gnome') -subdir('lightdm') report = [ ' Build configuration:', From fee3b2bcb27aeff120567013f48498ded86c24c7 Mon Sep 17 00:00:00 2001 From: Joshua Strobl Date: Sun, 17 Sep 2023 18:17:25 +0300 Subject: [PATCH 5/7] Add CODEOWNERS --- CODEOWNERS | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 CODEOWNERS diff --git a/CODEOWNERS b/CODEOWNERS new file mode 100644 index 0000000..83c971e --- /dev/null +++ b/CODEOWNERS @@ -0,0 +1,2 @@ +# Global rule, if anything matches after this then that rule takes precedent +* @JoshStrobl \ No newline at end of file From 0ce84a918ba480adb98a1badd7dea55dd7db9520 Mon Sep 17 00:00:00 2001 From: Joshua Strobl Date: Tue, 2 Apr 2024 17:33:24 +0300 Subject: [PATCH 6/7] fix: renamed firefox desktop file in Fedora 40 --- budgie/com.solus-project.icon-tasklist.gschema.override | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/budgie/com.solus-project.icon-tasklist.gschema.override b/budgie/com.solus-project.icon-tasklist.gschema.override index 8745299..7e02d06 100644 --- a/budgie/com.solus-project.icon-tasklist.gschema.override +++ b/budgie/com.solus-project.icon-tasklist.gschema.override @@ -1,2 +1,2 @@ [com.solus-project.icon-tasklist] -pinned-launchers=['nemo.desktop', 'firefox.desktop', 'org.gnome.Rhythmbox3.desktop', 'org.gnome.Software.desktop', 'org.xfce.Parole.desktop'] +pinned-launchers=['nemo.desktop', 'org.mozilla.firefox.desktop', 'org.gnome.Rhythmbox3.desktop', 'org.gnome.Software.desktop', 'org.xfce.Parole.desktop'] From 917e4e638b5f6bff81ea2f26ac00c7f684a94631 Mon Sep 17 00:00:00 2001 From: Joshua Strobl Date: Sun, 1 Jun 2025 12:17:04 +0300 Subject: [PATCH 7/7] feat: move from Materia to Pocillo Material was orphaned between Fedora 42 and Fedora 43. Switch to Pocillo by Ubuntu Budgie. --- gnome/org.gnome.desktop.interface.gschema.override | 2 +- meson.build | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gnome/org.gnome.desktop.interface.gschema.override b/gnome/org.gnome.desktop.interface.gschema.override index 00ae2ce..b8ecd6b 100644 --- a/gnome/org.gnome.desktop.interface.gschema.override +++ b/gnome/org.gnome.desktop.interface.gschema.override @@ -1,4 +1,4 @@ [org.gnome.desktop.interface:Budgie] color-scheme='prefer-dark' -gtk-theme='Materia-dark' +gtk-theme='Pocillo-dark' icon-theme='Papirus' diff --git a/meson.build b/meson.build index 522322b..d2b8690 100644 --- a/meson.build +++ b/meson.build @@ -1,7 +1,7 @@ project( 'budgie-desktop-defaults', 'c', - version: '0.5.1', + version: '0.5.2', license: [ 'CC-BY-SA-4.0' ], @@ -26,4 +26,4 @@ report = [ ' schema dir: @0@'.format(path_schema), ] -message('\n\n\n' + '\n'.join(report) + '\n\n') \ No newline at end of file +message('\n\n\n' + '\n'.join(report) + '\n\n')