From 59e42d83328cce9d33dd79aa7d84e316a873dc21 Mon Sep 17 00:00:00 2001 From: Chris Vogel Date: Thu, 15 Dec 2022 10:54:28 +0100 Subject: [PATCH 1/3] run: Export GI_TYPELIB_PATH as well This is needed for programs needing GObject introspection data --- run.in | 1 + 1 file changed, 1 insertion(+) diff --git a/run.in b/run.in index cfe574c..118ed95 100755 --- a/run.in +++ b/run.in @@ -7,6 +7,7 @@ FEEDBACK_THEME=${FEEDBACK_THEME:-"${ABS_SRCDIR}/data/default.json"} export FEEDBACK_THEME export GSETTINGS_SCHEMA_DIR="${ABS_BUILDDIR}/data" +export GI_TYPELIB_PATH="${ABS_BUILDDIR}/libfeedback:$GI_TYPELIB_PATH" if [ "${FBD_GDB}" = 1 ]; then echo "Running feedbackd under gdb" From d4197ed7a4d401cbe71d8279e8f9a6f05335de2e Mon Sep 17 00:00:00 2001 From: Chris Vogel Date: Thu, 15 Dec 2022 10:55:01 +0100 Subject: [PATCH 2/3] run: Don't hardcode feedbackd This allows arbitrary executables from the source tree with a well defined environment. --- README.md | 4 ++-- run.in | 2 +- tests/services/org.sigxcpu.Feedback.service.in | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index db28c03..6b915e8 100644 --- a/README.md +++ b/README.md @@ -46,13 +46,13 @@ way to get going is to do the following: To run the daemon use ```sh -_build/run +_build/run _build/src/feedbackd ``` To run under gdb use ``` sh -FBD_GDB=1 _build/run +FBD_GDB=1 _build/run _build/src/feedbackd ``` You can introspect and get the current theme with diff --git a/run.in b/run.in index 118ed95..33b3933 100755 --- a/run.in +++ b/run.in @@ -15,4 +15,4 @@ if [ "${FBD_GDB}" = 1 ]; then fi set -x -exec ${WRAPPER} "${ABS_BUILDDIR}/src/feedbackd" "$@" +exec ${WRAPPER} "$@" diff --git a/tests/services/org.sigxcpu.Feedback.service.in b/tests/services/org.sigxcpu.Feedback.service.in index 43577c3..ed8e451 100644 --- a/tests/services/org.sigxcpu.Feedback.service.in +++ b/tests/services/org.sigxcpu.Feedback.service.in @@ -1,4 +1,4 @@ [D-BUS Service] Name=org.sigxcpu.Feedback -Exec=@ABS_BUILDDIR@/run +Exec=@ABS_BUILDDIR@/run @ABS_BUILDDIR@/src/feedbackd From 312f0697cbce6af4ffbb4dcc88ac1213ea0e6d16 Mon Sep 17 00:00:00 2001 From: Chris Vogel Date: Thu, 15 Dec 2022 10:55:58 +0100 Subject: [PATCH 3/3] example: Document usage --- examples/example.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/examples/example.py b/examples/example.py index 6068fc1..dead56a 100755 --- a/examples/example.py +++ b/examples/example.py @@ -1,6 +1,11 @@ #!/usr/bin/python3 # -# export GI_TYPELIB_PATH=/usr/local/lib/x86_64-linux-gnu/girepository-1.0/ +# depends on GObject introspection data for libfeedback +# +# After building from source you can start this example like this: +# _build/run examples/example.py +# Otherwise like this: +# GI_TYPELIB_PATH= example.py import gi import time