background: Fix CI build breaking on gnome-desktop API change
The change was added in feeee1c
. For now we will handle the old and the new API
until this can be built.
This commit is contained in:
parent
70f8f74765
commit
baed38e31c
3 changed files with 9 additions and 1 deletions
|
@ -121,7 +121,7 @@ colord_dep = dependency('colord', version: '>= 0.1.34')
|
|||
gdk_pixbuf_dep = dependency('gdk-pixbuf-2.0', version: '>= 2.23.0')
|
||||
gio_dep = dependency('gio-2.0')
|
||||
glib_dep = dependency('glib-2.0', version: '>= 2.56.0')
|
||||
gnome_desktop_dep = dependency('gnome-desktop-3.0', version: '>= 3.35.4')
|
||||
gnome_desktop_dep = dependency('gnome-desktop-3.0', version: '>= 3.27.90')
|
||||
gnome_settings_dep = dependency('gnome-settings-daemon', version: '>= 3.27.90')
|
||||
goa_dep = dependency('goa-1.0', version: goa_req_version)
|
||||
gsettings_desktop_dep = dependency('gsettings-desktop-schemas', version: '>= 3.31.0')
|
||||
|
|
|
@ -156,7 +156,11 @@ render_at_size (GnomeBG *bg,
|
|||
GdkPixbuf *pixbuf;
|
||||
|
||||
pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, width, height);
|
||||
#ifdef GNOME_DESKTOP_BG_API_BREAK
|
||||
gnome_bg_draw (bg, pixbuf);
|
||||
#else
|
||||
gnome_bg_draw (bg, pixbuf, gdk_screen_get_default (), FALSE);
|
||||
#endif
|
||||
|
||||
return pixbuf;
|
||||
}
|
||||
|
|
|
@ -102,6 +102,10 @@ cflags += [
|
|||
'-DGNOME_DESKTOP_USE_UNSTABLE_API'
|
||||
]
|
||||
|
||||
if gnome_desktop_dep.version().version_compare('>=3.35.4')
|
||||
cflags += '-DGNOME_DESKTOP_BG_API_BREAK'
|
||||
endif
|
||||
|
||||
panels_libs += static_library(
|
||||
cappletname,
|
||||
sources: sources,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue