Accepting request 1205431 from GNOME:Factory

SCripted push of GNOME 47

OBS-URL: https://build.opensuse.org/request/show/1205431
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/glib2-branding?expand=0&rev=22
This commit is contained in:
Ana Guerrero 2024-10-24 13:40:31 +00:00 committed by Git OBS Bridge
commit 02ccfb2db0
3 changed files with 28 additions and 7 deletions

View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Tue Oct 1 19:32:14 UTC 2024 - Lubos Kocman <lubos.kocman@suse.com>
- Align default wallpaper and screensaver urls with new light and dark
theme wallpaper for Tumbleweed gh#openSUSE/branding#154
and gh#openSUSE/branding#160
- openSUSE no longer uses static/dynamic xml.
See issue gh#openSUSE/branding#161
- Use zoom instead of streched with 4096x4096 unified wallpaper
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Mar 14 10:38:22 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org> Thu Mar 14 10:38:22 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>

View File

@ -11,19 +11,20 @@ toolkit-accessibility = false
[org.gnome.desktop.background] [org.gnome.desktop.background]
## Default wallpaper ## Default wallpaper
picture-uri = "@@WALLPAPER_URI@@" picture-uri = "@@WALLPAPER_URI@@"
picture-uri-dark = "@@WALLPAPER_URI@@" picture-uri-dark = "@@WALLPAPER_URI_DARK@@"
picture-options = "stretched" picture-options = "zoom"
@@IF_openSUSE@@primary-color = "#258c06" @@IF_openSUSE@@primary-color = "#63bbb2ff"
@@IF_openSUSE@@secondary-color = "#258c06" @@IF_openSUSE@@secondary-color = "#0c2a27ff"
@@IF_SLE@@primary-color = "#0C322C" @@IF_SLE@@primary-color = "#0C322C"
@@IF_SLE@@secondary-color = "#0C322C" @@IF_SLE@@secondary-color = "#0C322C"
[org.gnome.desktop.screensaver] [org.gnome.desktop.screensaver]
@@IF_openSUSE@@picture-uri = "@@WALLPAPER_URI@@" @@IF_openSUSE@@picture-uri = "@@WALLPAPER_URI@@"
@@IF_openSUSE@@picture-uri-dark = "@@WALLPAPER_URI_DARK@@"
@@IF_SLE@@picture-uri = "@@LOCKSCREEN_URI@@" @@IF_SLE@@picture-uri = "@@LOCKSCREEN_URI@@"
picture-options = "stretched" picture-options = "zoom"
@@IF_openSUSE@@primary-color = "#258c06" @@IF_openSUSE@@primary-color = "#63bbb2ff"
@@IF_openSUSE@@secondary-color = "#258c06" @@IF_openSUSE@@secondary-color = "#0c2a27ff"
@@IF_SLE@@primary-color = "#0C322C" @@IF_SLE@@primary-color = "#0C322C"
@@IF_SLE@@secondary-color = "#0C322C" @@IF_SLE@@secondary-color = "#0C322C"
@@IF_SLE@@lock-delay = 300 @@IF_SLE@@lock-delay = 300

View File

@ -90,8 +90,18 @@ cp -a %{SOURCE1} COPYING
cp -a %{SOURCE2} glib2-branding.gschema.override.in cp -a %{SOURCE2} glib2-branding.gschema.override.in
%build %build
# Legacy XML compatability with SLES15 branding.
# We no longer use xml and have dark/light bg variants.
# Can be removed if SLES adopts gh#openSUSE/branding#161
%if 0%{?build_SLE}
test -f %{_datadir}/wallpapers/%{branding_name}-default.xml test -f %{_datadir}/wallpapers/%{branding_name}-default.xml
sed "s,@@WALLPAPER_URI@@,file://%{_datadir}/wallpapers/%{branding_name}-default.xml,;s,@@LOCKSCREEN_URI@@,file://%{_datadir}/wallpapers/%{branding_name}-default-static-lockscreen.xml," glib2-branding.gschema.override.in > glib2-branding.gschema.override sed "s,@@WALLPAPER_URI@@,file://%{_datadir}/wallpapers/%{branding_name}-default.xml,;s,@@LOCKSCREEN_URI@@,file://%{_datadir}/wallpapers/%{branding_name}-default-static-lockscreen.xml," glib2-branding.gschema.override.in > glib2-branding.gschema.override
%else
sed -e "s,@@WALLPAPER_URI@@,file://%{_datadir}/wallpapers/%{branding_name}default/contents/images/default.png," \
-e "s,@@WALLPAPER_URI_DARK@@,file://%{_datadir}/wallpapers/%{branding_name}default/contents/images/default-dark.png," \
glib2-branding.gschema.override.in > glib2-branding.gschema.override
%endif
#for sound theme #for sound theme
%if 0%{?build_openSUSE} %if 0%{?build_openSUSE}
sed "s:@@IF_openSUSE@@::g" < glib2-branding.gschema.override | \ sed "s:@@IF_openSUSE@@::g" < glib2-branding.gschema.override | \