File gitg-Various-meson-build-fixes.patch of Package gitg

Overview Repositories Revisions Requests Users Attributes Meta

File gitg-Various-meson-build-fixes.patch of Package gitg (Revision f6e094acbafa6b3f6314ff42e53b6051)

Currently displaying revision f6e094acbafa6b3f6314ff42e53b6051 , Show latest

From 046945a021c056dc64aebfcba9721c4395bf8d39 Mon Sep 17 00:00:00 2001
From: Alberto Fanjul <albertofanjul@gmail.com>
Date: Sun, 28 Oct 2018 00:05:56 +0200
Subject: [PATCH] meson: install generated files

---
 libgitg-ext/meson.build | 8 +++++++-
 libgitg/meson.build     | 8 +++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/libgitg-ext/meson.build b/libgitg-ext/meson.build
index 2750c6cd..784f36d3 100644
--- a/libgitg-ext/meson.build
+++ b/libgitg-ext/meson.build
@@ -49,7 +49,13 @@ libgitg_ext = shared_library(
   vala_gir: libgitg_ext_gir_name,
   link_args: common_ldflags,
   link_depends: symbol_map,
-  install: true
+  install: true,
+  install_dir: [
+    true,
+    true,
+    true,
+    true
+  ]
 )
 
 deps = [
diff --git a/libgitg/meson.build b/libgitg/meson.build
index 8837199c..1214f3fb 100644
--- a/libgitg/meson.build
+++ b/libgitg/meson.build
@@ -136,7 +136,13 @@ libgitg = shared_library(
   vala_gir: libgitg_gir_name,
   link_args: ldflags,
   link_depends: symbol_map,
-  install: true
+  install: true,
+  install_dir: [
+    true,
+    true,
+    true,
+    true
+  ]
 )
 
 libgitg_dep = declare_dependency(
-- 
2.18.1

From 849f95c33658e9a5d7d97c55e56ba9625a86a00b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?I=C3=B1igo=20Mart=C3=ADnez?= <inigomartinez@gmail.com>
Date: Sat, 27 Oct 2018 15:32:23 +0200
Subject: [PATCH] build: Fix shared library paths in typelib files

The GObject Introspection metadata generation by meson uses a custom
target command[0]. This command also needs to specify the shared
library where the symbols in the typelib file can be found.

However, the values used are wrong because the path to the built
shared libraries are specified instead of the name of the
shared libraries themselves.

This has been fixed by specifying the name of the shared libraries.

Fixes #157

[0] http://mesonbuild.com/Vala.html#gobject-introspection
---
 libgitg-ext/meson.build | 2 +-
 libgitg/meson.build     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libgitg-ext/meson.build b/libgitg-ext/meson.build
index 784f36d3..5e347e01 100644
--- a/libgitg-ext/meson.build
+++ b/libgitg-ext/meson.build
@@ -114,7 +114,7 @@ endif
 custom_target(
   libgitg_ext_typelib_name,
   output: libgitg_ext_typelib_name,
-  command: [g_ir_compiler, '--shared-library', libgitg_ext.full_path(), '--includedir', libgitg_build_dir, '--output', '@OUTPUT@', join_paths(meson.current_build_dir(), libgitg_ext_gir_name)],
+  command: [g_ir_compiler, '--shared-library', libgitg_ext_api_name, '--includedir', libgitg_build_dir, '--output', '@OUTPUT@', join_paths(meson.current_build_dir(), libgitg_ext_gir_name)],
   depends: [
     libgitg,
     libgitg_ext,
diff --git a/libgitg/meson.build b/libgitg/meson.build
index 1214f3fb..a3a78a0b 100644
--- a/libgitg/meson.build
+++ b/libgitg/meson.build
@@ -167,7 +167,7 @@ pkg.generate(
 custom_target(
   libgitg_typelib_name,
   output: libgitg_typelib_name,
-  command: [g_ir_compiler, '--shared-library', libgitg.full_path(), '--output', '@OUTPUT@', join_paths(libgitg_build_dir, libgitg_gir_name)],
+  command: [g_ir_compiler, '--shared-library', libgitg_api_name, '--output', '@OUTPUT@', join_paths(libgitg_build_dir, libgitg_gir_name)],
   depends: libgitg,
   install: true,
   install_dir: gitg_girepositorydir,
-- 
2.18.1

From f0cd2c8cfacdf6906dfb1d2a42e77163cd776e3b Mon Sep 17 00:00:00 2001
From: Alberto Fanjul <albertofanjul@gmail.com>
Date: Sun, 4 Nov 2018 03:15:30 +0100
Subject: [PATCH] meson: Install vala header into correct location

---
 libgitg-ext/meson.build | 2 +-
 libgitg/meson.build     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libgitg-ext/meson.build b/libgitg-ext/meson.build
index 5e347e01..f116ba01 100644
--- a/libgitg-ext/meson.build
+++ b/libgitg-ext/meson.build
@@ -52,7 +52,7 @@ libgitg_ext = shared_library(
   install: true,
   install_dir: [
     true,
-    true,
+    join_paths(gitg_includedir, libgitg_ext_api_name, 'libgitg-ext'),
     true,
     true
   ]
diff --git a/libgitg/meson.build b/libgitg/meson.build
index a3a78a0b..b3ff67a6 100644
--- a/libgitg/meson.build
+++ b/libgitg/meson.build
@@ -139,7 +139,7 @@ libgitg = shared_library(
   install: true,
   install_dir: [
     true,
-    true,
+    join_paths(gitg_includedir, libgitg_api_name, 'libgitg'),
     true,
     true
   ]
-- 
2.18.1

From c83122140a998b3026a56cb2688f5675d5180b18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?I=C3=B1igo=20Mart=C3=ADnez?= <inigomartinez@gmail.com>
Date: Mon, 24 Dec 2018 10:30:58 +0100
Subject: [PATCH] meson: Add libdir on gitg's rpath

If `libdir` is set in a custom directory, `gitg` will not be able to
find `libgitg` and `libgitg-ext`.

`libdir` has been set as the `rpath` in `gitg` so when a custom
`libdir` directory is used `libgitg` and `libgitg-ext` will be
found.

Fixes #174
---
 gitg/meson.build | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gitg/meson.build b/gitg/meson.build
index 53b1fa72..930f8013 100644
--- a/gitg/meson.build
+++ b/gitg/meson.build
@@ -134,4 +134,5 @@ executable(
   c_args: cflags,
   vala_args: vala_flags,
   install: true,
+  install_rpath: gitg_libdir,
 )
-- 
2.18.1

Places

File gitg-Various-meson-build-fixes.patch of Package gitg (Revision f6e094acbafa6b3f6314ff42e53b6051)

Places