Merge branch 'gmobile-0.0.1' into 'main'
Update to gmobile 0.0.1 See merge request Librem5/feedbackd!104
This commit is contained in:
@@ -2,6 +2,10 @@ include:
|
|||||||
- remote: 'https://source.puri.sm/Librem5/librem5-ci/raw/master/librem5-pipeline-definitions.yml'
|
- remote: 'https://source.puri.sm/Librem5/librem5-ci/raw/master/librem5-pipeline-definitions.yml'
|
||||||
- remote: 'https://gitlab.freedesktop.org/freedesktop/ci-templates/-/raw/34039cd573a2df832d465bc9e4c5f543571f5241/templates/ci-fairy.yml'
|
- remote: 'https://gitlab.freedesktop.org/freedesktop/ci-templates/-/raw/34039cd573a2df832d465bc9e4c5f543571f5241/templates/ci-fairy.yml'
|
||||||
|
|
||||||
|
variables:
|
||||||
|
GIT_SUBMODULE_STRATEGY: normal
|
||||||
|
GIT_SUBMODULE_DEPTH: 1
|
||||||
|
|
||||||
stages:
|
stages:
|
||||||
- build
|
- build
|
||||||
- test
|
- test
|
||||||
|
|||||||
+1
-1
@@ -20,7 +20,7 @@ if get_option('daemon')
|
|||||||
'gtk_doc=false',
|
'gtk_doc=false',
|
||||||
'tests=false',
|
'tests=false',
|
||||||
])
|
])
|
||||||
gmobile = gmobile_subp.get_variable('libgmobile_dep')
|
gmobile = gmobile_subp.get_variable('gmobile_dep')
|
||||||
gsound = dependency('gsound')
|
gsound = dependency('gsound')
|
||||||
gudev = dependency('gudev-1.0', version: '>=232')
|
gudev = dependency('gudev-1.0', version: '>=232')
|
||||||
json_glib = dependency('json-glib-1.0')
|
json_glib = dependency('json-glib-1.0')
|
||||||
|
|||||||
@@ -557,7 +557,7 @@ fbd_feedback_manager_load_theme (FbdFeedbackManager *self)
|
|||||||
g_autofree char *theme_name = NULL;
|
g_autofree char *theme_name = NULL;
|
||||||
const char *theme_file = g_getenv (FEEDBACKD_THEME_VAR);
|
const char *theme_file = g_getenv (FEEDBACKD_THEME_VAR);
|
||||||
|
|
||||||
compatibles = gm_devicetree_get_compatibles (NULL, &err);
|
compatibles = gm_device_tree_get_compatibles (NULL, &err);
|
||||||
if (compatibles == NULL && err) {
|
if (compatibles == NULL && err) {
|
||||||
g_debug ("Failed to get compatibles: %s", err->message);
|
g_debug ("Failed to get compatibles: %s", err->message);
|
||||||
g_clear_error (&err);
|
g_clear_error (&err);
|
||||||
|
|||||||
+1
-1
Submodule subprojects/gmobile updated: 1039e78081...d483537aee
Reference in New Issue
Block a user