summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRico Tzschichholz <ricotz@ubuntu.com>2019-04-29 13:57:21 +0200
committerRico Tzschichholz <ricotz@ubuntu.com>2019-04-29 13:57:21 +0200
commitf43f963415533dde89aea9a2231a1ebb2192d327 (patch)
treeffe9c4a648f8aee411aa137fab44721271a70f38
parent4b0c7c912a544f404debed275b8d0af4fab7dd58 (diff)
downloadrygel-f43f963415533dde89aea9a2231a1ebb2192d327.tar.gz
build: Add additional GIR tweak for references to RygelCore.IconInfo
-rw-r--r--src/librygel-server/Makefile.am1
-rw-r--r--src/librygel-server/meson.build3
2 files changed, 3 insertions, 1 deletions
diff --git a/src/librygel-server/Makefile.am b/src/librygel-server/Makefile.am
index c24c5691..8b96e0a3 100644
--- a/src/librygel-server/Makefile.am
+++ b/src/librygel-server/Makefile.am
@@ -47,6 +47,7 @@ $(builddir)/RygelServer-2.6.gir: $(srcdir)/Rygel-2.6.gir
-e 's,namespace name="Rygel",namespace name="RygelServer",g' \
-e 's,RygelServer\.Plugin,RygelCore.Plugin,g' \
-e 's,RygelServer\.MediaDevice,RygelCore.MediaDevice,g' \
+ -e 's,RygelServer\.IconInfo,RygelCore.IconInfo,g' \
-e 's,<package name="rygel-server-2.6"/>,<include name="RygelCore" version="2.6"/>\n<package name="rygel-server-2.6"/>,' \
$< >$@
GIRS = RygelServer-2.6.gir
diff --git a/src/librygel-server/meson.build b/src/librygel-server/meson.build
index 35910283..8b5327fb 100644
--- a/src/librygel-server/meson.build
+++ b/src/librygel-server/meson.build
@@ -107,6 +107,7 @@ server_gir = custom_target('RygelServer-2.6.gir',
'-e', 's,namespace name="Rygel",namespace name="RygelServer",g',
'-e', 's,RygelServer[.]Plugin,RygelCore.Plugin,g',
'-e', 's,RygelServer[.]MediaDevice,RygelCore.MediaDevice,g',
+ '-e', 's,RygelServer[.]IconInfo,RygelCore.IconInfo,g',
'-e', 's|<package name="rygel-server-2.6"/>|<include name="RygelCore" version="2.6"/><package name="rygel-server-2.6"/>|',
join_paths(meson.current_build_dir(), 'Rygel-2.6.gir')],
output: 'RygelServer-2.6.gir',
@@ -131,4 +132,4 @@ rygel_server = declare_dependency(include_directories: include_directories('.'),
link_with: server_lib)
# necessary to be able to pass it to g-ir-compiler in other libs
-server_girdir = meson.current_build_dir() \ No newline at end of file
+server_girdir = meson.current_build_dir()