File plymouth-adapts-xkbommon.patch of Package plymouth

Overview Repositories Revisions Requests Users Attributes Meta

File plymouth-adapts-xkbommon.patch of Package plymouth (Revision 92fedf4416a8a652055a79e139b7f8c8)

Currently displaying revision 92fedf4416a8a652055a79e139b7f8c8 , Show latest

Index: plymouth-24.004.60/meson.build
===================================================================
--- plymouth-24.004.60.orig/meson.build
+++ plymouth-24.004.60/meson.build
@@ -90,6 +90,9 @@ config_file = configure_file(
 )
 config_h_inc = include_directories('.')
 
+# xkbcommmon header files install position changed in openSUSE
+xkbcommon_h_inc = xkbcommon_dep.get_pkgconfig_variable('includedir')
+
 # Subdirectories
 subdir('images')
 subdir('po')
Index: plymouth-24.004.60/src/libply-splash-core/meson.build
===================================================================
--- plymouth-24.004.60.orig/src/libply-splash-core/meson.build
+++ plymouth-24.004.60/src/libply-splash-core/meson.build
@@ -41,7 +41,7 @@ libply_splash_core = library('ply-splash
   libply_splash_core_sources,
   dependencies: libply_splash_core_public_deps + libply_splash_core_private_deps,
   c_args: libply_splash_core_cflags,
-  include_directories: config_h_inc,
+  include_directories: [config_h_inc, xkbcommon_h_inc],
   version: plymouth_soversion,
   install: true,
 )
Index: plymouth-24.004.60/src/libply-splash-graphics/meson.build
===================================================================
--- plymouth-24.004.60.orig/src/libply-splash-graphics/meson.build
+++ plymouth-24.004.60/src/libply-splash-graphics/meson.build
@@ -28,7 +28,7 @@ libply_splash_graphics = library('ply-sp
   libply_splash_graphics_sources,
   dependencies: libply_splash_graphics_deps,
   c_args: libply_splash_graphics_cflags,
-  include_directories: config_h_inc,
+  include_directories: [config_h_inc, xkbcommon_h_inc],
   version: plymouth_soversion,
   install: true,
 )
Index: plymouth-24.004.60/src/meson.build
===================================================================
--- plymouth-24.004.60.orig/src/meson.build
+++ plymouth-24.004.60/src/meson.build
@@ -33,7 +33,7 @@ plymouthd = executable('plymouthd',
   dependencies: plymouthd_deps,
   c_args: plymouthd_cflags,
   export_dynamic: true,
-  include_directories: config_h_inc,
+  include_directories: [config_h_inc, xkbcommon_h_inc],
   install: true,
   install_dir: get_option('sbindir'),
 )
Index: plymouth-24.004.60/src/plugins/controls/label-freetype/meson.build
===================================================================
--- plymouth-24.004.60.orig/src/plugins/controls/label-freetype/meson.build
+++ plymouth-24.004.60/src/plugins/controls/label-freetype/meson.build
@@ -6,7 +6,7 @@ label_plugin = shared_module('label-free
     libply_splash_core_dep,
     libply_splash_graphics_dep,
   ],
-  include_directories: config_h_inc,
+  include_directories: [config_h_inc, xkbcommon_h_inc],
   name_prefix: '',
   install: true,
   install_dir: plymouth_plugin_path,
Index: plymouth-24.004.60/src/plugins/controls/label-pango/meson.build
===================================================================
--- plymouth-24.004.60.orig/src/plugins/controls/label-pango/meson.build
+++ plymouth-24.004.60/src/plugins/controls/label-pango/meson.build
@@ -8,7 +8,7 @@ label_plugin = shared_module('label-pang
     libply_splash_core_dep,
     libply_splash_graphics_dep,
   ],
-  include_directories: config_h_inc,
+  include_directories: [config_h_inc, xkbcommon_h_inc],
   name_prefix: '',
   install: true,
   install_dir: plymouth_plugin_path,
Index: plymouth-24.004.60/src/plugins/renderers/drm/meson.build
===================================================================
--- plymouth-24.004.60.orig/src/plugins/renderers/drm/meson.build
+++ plymouth-24.004.60/src/plugins/renderers/drm/meson.build
@@ -5,7 +5,7 @@ drm_plugin = shared_module('drm',
     libply_splash_core_dep,
     libdrm_dep,
   ],
-  include_directories: config_h_inc,
+  include_directories: [config_h_inc, xkbcommon_h_inc],
   name_prefix: '',
   install: true,
   install_dir: plymouth_plugin_path / 'renderers',
Index: plymouth-24.004.60/src/plugins/renderers/frame-buffer/meson.build
===================================================================
--- plymouth-24.004.60.orig/src/plugins/renderers/frame-buffer/meson.build
+++ plymouth-24.004.60/src/plugins/renderers/frame-buffer/meson.build
@@ -4,7 +4,7 @@ frame_buffer_plugin = shared_module('fra
     libply_dep,
     libply_splash_core_dep,
   ],
-  include_directories: config_h_inc,
+  include_directories: [config_h_inc, xkbcommon_h_inc],
   name_prefix: '',
   install: true,
   install_dir: plymouth_plugin_path / 'renderers',
Index: plymouth-24.004.60/src/plugins/splash/details/meson.build
===================================================================
--- plymouth-24.004.60.orig/src/plugins/splash/details/meson.build
+++ plymouth-24.004.60/src/plugins/splash/details/meson.build
@@ -4,7 +4,7 @@ details_plugin = shared_module('details'
     libply_splash_core_dep,
     libply_splash_graphics_dep,
   ],
-  include_directories: config_h_inc,
+  include_directories: [config_h_inc, xkbcommon_h_inc],
   name_prefix: '',
   install: true,
   install_dir: plymouth_plugin_path,
Index: plymouth-24.004.60/src/plugins/splash/fade-throbber/meson.build
===================================================================
--- plymouth-24.004.60.orig/src/plugins/splash/fade-throbber/meson.build
+++ plymouth-24.004.60/src/plugins/splash/fade-throbber/meson.build
@@ -10,7 +10,7 @@ fade_throbber_plugin = shared_module('fa
     '-DPLYMOUTH_BACKGROUND_START_COLOR=@0@'.format(get_option('background-start-color-stop')),
     '-DPLYMOUTH_BACKGROUND_END_COLOR=@0@'.format(get_option('background-end-color-stop')),
   ],
-  include_directories: config_h_inc,
+  include_directories: [config_h_inc, xkbcommon_h_inc],
   name_prefix: '',
   install: true,
   install_dir: plymouth_plugin_path,
Index: plymouth-24.004.60/src/plugins/splash/script/meson.build
===================================================================
--- plymouth-24.004.60.orig/src/plugins/splash/script/meson.build
+++ plymouth-24.004.60/src/plugins/splash/script/meson.build
@@ -49,7 +49,7 @@ script_plugin = shared_module('script',
   c_args: [
     '-DPLYMOUTH_LOGO_FILE="@0@"'.format(plymouth_logo_file),
   ],
-  include_directories: config_h_inc,
+  include_directories: [config_h_inc, xkbcommon_h_inc],
   name_prefix: '',
   install: true,
   install_dir: plymouth_plugin_path,
Index: plymouth-24.004.60/src/plugins/splash/space-flares/meson.build
===================================================================
--- plymouth-24.004.60.orig/src/plugins/splash/space-flares/meson.build
+++ plymouth-24.004.60/src/plugins/splash/space-flares/meson.build
@@ -7,7 +7,7 @@ space_flares_plugin = shared_module('spa
   c_args: [
     '-DPLYMOUTH_LOGO_FILE="@0@"'.format(plymouth_logo_file),
   ],
-  include_directories: config_h_inc,
+  include_directories: [config_h_inc, xkbcommon_h_inc],
   name_prefix: '',
   install: true,
   install_dir: plymouth_plugin_path,
Index: plymouth-24.004.60/src/plugins/splash/text/meson.build
===================================================================
--- plymouth-24.004.60.orig/src/plugins/splash/text/meson.build
+++ plymouth-24.004.60/src/plugins/splash/text/meson.build
@@ -4,7 +4,7 @@ text_plugin = shared_module('text',
     libply_splash_core_dep,
     libply_splash_graphics_dep,
   ],
-  include_directories: config_h_inc,
+  include_directories: [config_h_inc, xkbcommon_h_inc],
   name_prefix: '',
   install: true,
   install_dir: plymouth_plugin_path,
Index: plymouth-24.004.60/src/plugins/splash/tribar/meson.build
===================================================================
--- plymouth-24.004.60.orig/src/plugins/splash/tribar/meson.build
+++ plymouth-24.004.60/src/plugins/splash/tribar/meson.build
@@ -3,7 +3,7 @@ tribar_plugin = shared_module('tribar',
   dependencies: [
     libply_splash_core_dep,
   ],
-  include_directories: config_h_inc,
+  include_directories: [config_h_inc, xkbcommon_h_inc],
   name_prefix: '',
   install: true,
   install_dir: plymouth_plugin_path,
Index: plymouth-24.004.60/src/plugins/splash/two-step/meson.build
===================================================================
--- plymouth-24.004.60.orig/src/plugins/splash/two-step/meson.build
+++ plymouth-24.004.60/src/plugins/splash/two-step/meson.build
@@ -8,7 +8,7 @@ two_step_plugin = shared_module('two-ste
     '-DPLYMOUTH_BACKGROUND_START_COLOR=@0@'.format(get_option('background-start-color-stop')),
     '-DPLYMOUTH_BACKGROUND_END_COLOR=@0@'.format(get_option('background-end-color-stop')),
   ],
-  include_directories: config_h_inc,
+  include_directories: [config_h_inc, xkbcommon_h_inc],
   name_prefix: '',
   install: true,
   install_dir: plymouth_plugin_path,

Places

File plymouth-adapts-xkbommon.patch of Package plymouth (Revision 92fedf4416a8a652055a79e139b7f8c8)

Places