0001-defaulttheme.patch 1.5 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647
  1. [PATCH] fix mbtheme build issue when png support is disabled
  2. DEFAULTTHEME{,NAME} is not defined when png support is disabled, leading
  3. to compile errors in mbtheme.c:
  4. mbtheme.c: In function 'show_parse_error':
  5. mbtheme.c:2422:28: error: 'DEFAULTTHEME' undeclared (first use in this function)
  6. mbtheme.c:2422:28: note: each undeclared identifier is reported only once for each function it appears in
  7. mbtheme.c: In function 'mbtheme_init':
  8. mbtheme.c:2448:30: error: 'DEFAULTTHEME' undeclared (first use in this function)
  9. mbtheme.c:2470:25: error: 'DEFAULTTHEMENAME' undeclared (first use in this function)
  10. Fix it by unconditionally defining them as the values used are the same
  11. in png / !png cases anyway.
  12. Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
  13. ---
  14. src/structs.h | 9 ---------
  15. 1 file changed, 9 deletions(-)
  16. Index: matchbox-window-manager-1.2/src/structs.h
  17. ===================================================================
  18. --- matchbox-window-manager-1.2.orig/src/structs.h
  19. +++ matchbox-window-manager-1.2/src/structs.h
  20. @@ -81,8 +81,6 @@
  21. #define GENERIC_ICON PKGDATADIR "/mbnoapp.xpm"
  22. -#ifdef MB_HAVE_PNG
  23. -
  24. #define DEFAULT_THEME DATADIR "/themes/Default/matchbox/theme.xml"
  25. #define DEFAULTTHEME DATADIR "/themes/Default/matchbox/theme.xml"
  26. @@ -91,13 +89,6 @@
  27. #define DEFAULTTHEMENAME "Default"
  28. -#else
  29. -
  30. -#define DEFAULT_THEME DATADIR "/themes/Default/matchbox/theme.xml"
  31. -#define DEFAULT_THEME_NAME "Default"
  32. -
  33. -#endif
  34. -
  35. #define CONFDEFAULTS PKGDATADIR "/defaults"
  36. /* Simple Macros */