budgie-desktop: update to 10.5.3.
Now depends on budgie-screensaver
This commit is contained in:
parent
c28aa39886
commit
0df4e8d080
3 changed files with 6 additions and 12663 deletions
|
@ -1,65 +0,0 @@
|
|||
From: Joshua Strobl <joshua@streambits.io>
|
||||
Date: Mon, 12 Apr 2021 06:14:04 +0300
|
||||
Subject: [PATCH] Support moved font anti-aliasing and hinting in GSD 40. Fixes
|
||||
#2121.
|
||||
|
||||
---
|
||||
src/panel/meson.build | 4 ++++
|
||||
src/panel/settings/settings_fonts.vala | 11 ++++++++++-
|
||||
2 files changed, 14 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git src/panel/meson.build src/panel/meson.build
|
||||
index ee610868..5451c278 100644
|
||||
--- src/panel/meson.build
|
||||
+++ src/panel/meson.build
|
||||
@@ -72,6 +72,10 @@ budgie_panel_vala_args = [
|
||||
'--gresources=' + gresource,
|
||||
]
|
||||
|
||||
+if dep_gsd.version().version_compare('>=40.0')
|
||||
+ budgie_panel_vala_args += ['-D', 'HAVE_GSD_40']
|
||||
+endif
|
||||
+
|
||||
budgie_panel_c_args = [
|
||||
'-DWNCK_I_KNOW_THIS_IS_UNSTABLE'
|
||||
]
|
||||
diff --git src/panel/settings/settings_fonts.vala src/panel/settings/settings_fonts.vala
|
||||
index fc17622f..f750b926 100644
|
||||
--- src/panel/settings/settings_fonts.vala
|
||||
+++ src/panel/settings/settings_fonts.vala
|
||||
@@ -24,7 +24,10 @@ namespace Budgie {
|
||||
|
||||
private Settings ui_settings;
|
||||
private Settings wm_settings;
|
||||
+
|
||||
+#if !HAVE_GSD_40
|
||||
private Settings x_settings;
|
||||
+#endif
|
||||
|
||||
public FontPage() {
|
||||
Object(group: SETTINGS_GROUP_APPEARANCE,
|
||||
@@ -135,14 +138,20 @@ namespace Budgie {
|
||||
/* Hook up settings */
|
||||
ui_settings = new Settings("org.gnome.desktop.interface");
|
||||
wm_settings = new Settings("org.gnome.desktop.wm.preferences");
|
||||
- x_settings = new Settings("org.gnome.settings-daemon.plugins.xsettings");
|
||||
ui_settings.bind("document-font-name", fontbutton_document, "font-name", SettingsBindFlags.DEFAULT);
|
||||
ui_settings.bind("font-name", fontbutton_interface, "font-name", SettingsBindFlags.DEFAULT);
|
||||
ui_settings.bind("monospace-font-name", fontbutton_monospace, "font-name", SettingsBindFlags.DEFAULT);
|
||||
wm_settings.bind("titlebar-font", fontbutton_title, "font-name", SettingsBindFlags.DEFAULT);
|
||||
ui_settings.bind("text-scaling-factor", spinbutton_scaling, "value", SettingsBindFlags.DEFAULT);
|
||||
+
|
||||
+#if HAVE_GSD_40
|
||||
+ ui_settings.bind("font-antialiasing", combobox_antialias, "active-id", SettingsBindFlags.DEFAULT);
|
||||
+ ui_settings.bind("font-hinting", combobox_hinting, "active-id", SettingsBindFlags.DEFAULT);
|
||||
+#else
|
||||
+ x_settings = new Settings("org.gnome.settings-daemon.plugins.xsettings");
|
||||
x_settings.bind("hinting", combobox_hinting, "active-id", SettingsBindFlags.DEFAULT);
|
||||
x_settings.bind("antialiasing", combobox_antialias, "active-id", SettingsBindFlags.DEFAULT);
|
||||
+#endif
|
||||
}
|
||||
}
|
||||
}
|
||||
--
|
||||
2.31.1
|
||||
|
File diff suppressed because it is too large
Load diff
|
@ -1,23 +1,24 @@
|
|||
# Template file for 'budgie-desktop'
|
||||
pkgname=budgie-desktop
|
||||
version=10.5.2
|
||||
revision=3
|
||||
version=10.5.3
|
||||
revision=1
|
||||
build_style=meson
|
||||
build_helper=gir
|
||||
configure_args="-Dwith-gtk-doc=false"
|
||||
hostmakedepends="pkg-config intltool vala glib-devel gobject-introspection sassc"
|
||||
hostmakedepends="pkg-config intltool vala glib-devel gobject-introspection sassc
|
||||
budgie-screensaver"
|
||||
makedepends="alsa-lib-devel libnotify-devel accountsservice-devel libpeas-devel
|
||||
libwnck-devel mutter-devel ibus-devel gnome-desktop-devel pulseaudio-devel
|
||||
upower-devel gtk+3-devel polkit-devel gnome-bluetooth-devel gnome-menus-devel
|
||||
gnome-settings-daemon-devel vala libuuid-devel libupower-glib3"
|
||||
depends="gnome-session gnome-settings-daemon gnome-control-center elogind
|
||||
gnome-themes-extra"
|
||||
gnome-themes-extra budgie-screensaver"
|
||||
short_desc="Modern desktop environment from the Solus Project"
|
||||
maintainer="Lorem <notloremipsum@protonmail.com>"
|
||||
license="GPL-2.0-only, LGPL-2.1-only"
|
||||
homepage="https://github.com/solus-project/budgie-desktop"
|
||||
distfiles="${homepage}/releases/download/v${version}/budgie-desktop-v${version}.tar.xz"
|
||||
checksum=d7219c1dc6d0e3fe54ac33062bfd420ab94158bcfe9409d09c85d7e7a21c67fa
|
||||
checksum=878f4e6460c29740bf633c3b11ba97bcb788068c1460f82569938af2f1633b25
|
||||
|
||||
budgie-desktop-devel_package() {
|
||||
short_desc+=" - development files"
|
||||
|
|
Loading…
Reference in a new issue