mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2026-06-17 14:33:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

[fixup] make xpm optional at build time (default disabled)

Browse source
This commit is contained in:
Johan Malm 2024-09-29 15:09:05 +01:00
parent 7366bdcef9
commit 24cbd2fc5c
4 changed files with 18 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
meson.build
View file

@ -106,6 +106,12 @@ else
endif endif
conf_data.set10('HAVE_RSVG', have_rsvg) conf_data.set10('HAVE_RSVG', have_rsvg)
have_xpm = false
if get_option('xpm').enabled()
have_xpm = true
endif
conf_data.set10('HAVE_XPM', have_xpm)
have_libsfdo = sfdo_basedir.found() and sfdo_desktop.found() and sfdo_icon.found() have_libsfdo = sfdo_basedir.found() and sfdo_desktop.found() and sfdo_icon.found()
conf_data.set10('HAVE_LIBSFDO', have_libsfdo) conf_data.set10('HAVE_LIBSFDO', have_libsfdo)

1
meson_options.txt
View file

@ -1,6 +1,7 @@
option('man-pages', type: 'feature', value: 'auto', description: 'Generate and install man pages') option('man-pages', type: 'feature', value: 'auto', description: 'Generate and install man pages')
option('xwayland', type: 'feature', value: 'auto', description: 'Enable support for X11 applications') option('xwayland', type: 'feature', value: 'auto', description: 'Enable support for X11 applications')
option('svg', type: 'feature', value: 'enabled', description: 'Enable svg window buttons') option('svg', type: 'feature', value: 'enabled', description: 'Enable svg window buttons')
option('xpm', type: 'feature', value: 'disabled', description: 'Enable xpm window buttons')
option('icon', type: 'feature', value: 'enabled', description: 'Enable window icons') option('icon', type: 'feature', value: 'enabled', description: 'Enable window icons')
option('nls', type: 'feature', value: 'auto', description: 'Enable native language support') option('nls', type: 'feature', value: 'auto', description: 'Enable native language support')
option('static_analyzer', type: 'feature', value: 'disabled', description: 'Run gcc static analyzer') option('static_analyzer', type: 'feature', value: 'disabled', description: 'Run gcc static analyzer')

5
src/icon-loader.c
View file

@ -8,7 +8,10 @@
#include "config.h" #include "config.h"
#include "icon-loader.h" #include "icon-loader.h"
#include "img/img-png.h" #include "img/img-png.h"
#if HAVE_XPM
#include "img/img-xpm.h" #include "img/img-xpm.h"
#endif
#if HAVE_RSVG #if HAVE_RSVG
#include "img/img-svg.h" #include "img/img-svg.h"
@ -180,7 +183,9 @@ icon_loader_lookup(struct server *server, const char *app_id, int size, int scal
#endif #endif
break; break;
case SFDO_ICON_FILE_FORMAT_XPM: case SFDO_ICON_FILE_FORMAT_XPM:
#if HAVE_XPM
img_xpm_load(ctx.path, &icon_buffer); img_xpm_load(ctx.path, &icon_buffer);
#endif
break; break;
} }

7
src/img/meson.build
View file

@ -1,9 +1,14 @@
labwc_sources += files( labwc_sources += files(
'img-png.c', 'img-png.c',
'img-xbm.c', 'img-xbm.c',
'img-xpm.c',
) )
if have_xpm
labwc_sources += files(
'img-xpm.c',
)
endif
if have_rsvg if have_rsvg
labwc_sources += files( labwc_sources += files(
'img-svg.c', 'img-svg.c',