[polari] flatpak: Fix idle build issue
- From: Florian Müllner <fmuellner src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [polari] flatpak: Fix idle build issue
- Date: Sat, 24 Jul 2021 03:43:48 +0000 (UTC)
commit 4383af2f49e1d000aa2697740d35b5eea9a5a305
Author: Florian Müllner <fmuellner gnome org>
Date: Sat Jul 24 05:18:02 2021 +0200
flatpak: Fix idle build issue
The executable is missing its internal libraries when built with meson, see
https://gitlab.freedesktop.org/telepathy/telepathy-idle/-/merge_requests/5
https://gitlab.gnome.org/GNOME/polari/-/merge_requests/205
flatpak/idle-build-fix.patch | 38 ++++++++++++++++++++++++++++++++++++++
flatpak/org.gnome.Polari.json | 4 ++++
2 files changed, 42 insertions(+)
---
diff --git a/flatpak/idle-build-fix.patch b/flatpak/idle-build-fix.patch
new file mode 100644
index 00000000..062e602b
--- /dev/null
+++ b/flatpak/idle-build-fix.patch
@@ -0,0 +1,38 @@
+From 99704fb9214cbc1319f7faea129ea4b97fda1c97 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner gnome org>
+Date: Sat, 24 Jul 2021 04:43:28 +0200
+Subject: [PATCH] meson: Built helper libraries statically
+
+They aren't installed, so the dynamic linker has no chance of
+locating them if they are built as shared libraries.
+---
+ extensions/meson.build | 2 +-
+ src/meson.build | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/extensions/meson.build b/extensions/meson.build
+index 388820d..78f11a5 100644
+--- a/extensions/meson.build
++++ b/extensions/meson.build
+@@ -5,7 +5,7 @@ xmls = files(
+
+ subdir('_gen')
+
+-libidle_extensions = library(
++libidle_extensions = static_library(
+ 'idle-extensions',
+ sources: [
+ 'extensions.h',
+diff --git a/src/meson.build b/src/meson.build
+index 0cfcc3a..25a599c 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -1,4 +1,4 @@
+-libidle_convenience = library(
++libidle_convenience = static_library(
+ 'idle-convenience',
+ sources: [
+ 'idle-connection.c',
+--
+2.31.1
+
diff --git a/flatpak/org.gnome.Polari.json b/flatpak/org.gnome.Polari.json
index 83e35b51..e714e3ff 100644
--- a/flatpak/org.gnome.Polari.json
+++ b/flatpak/org.gnome.Polari.json
@@ -130,6 +130,10 @@
"type": "git",
"tag-pattern": "^telepathy-idle-(\\d+.[^(99)].[\\d.]+)$"
}
+ },
+ {
+ "type": "patch",
+ "path": "idle-build-fix.patch"
}
],
"cleanup": [
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]