[nautilus/wip/antoniof/gnome-42: 67/72] Revert "build: Drop libgd dependency and submodule"
- From: António Fernandes <antoniof src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus/wip/antoniof/gnome-42: 67/72] Revert "build: Drop libgd dependency and submodule"
- Date: Fri, 11 Feb 2022 19:28:02 +0000 (UTC)
commit 3103d048603f7968530b0ad2f2940b85d3f45cd7
Author: Ondrej Holy <oholy redhat com>
Date: Fri Feb 11 14:37:21 2022 +0100
Revert "build: Drop libgd dependency and submodule"
This reverts commit b4f70a8872ca2b243a4b44ed4396e7bb6bbd0c05.
.gitmodules | 4 ++++
meson.build | 11 +++++++++++
src/meson.build | 1 +
subprojects/libgd | 1 +
4 files changed, 17 insertions(+)
---
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 000000000..16ee54864
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,4 @@
+[submodule "subprojects/libgd"]
+ path = subprojects/libgd
+ url = https://gitlab.gnome.org/GNOME/libgd.git
+ branch = master
diff --git a/meson.build b/meson.build
index e8a6ed8d9..b324bc74a 100644
--- a/meson.build
+++ b/meson.build
@@ -95,6 +95,17 @@ pkgconfig = import('pkgconfig')
################
glib_ver = '>= 2.67.1'
+libgd = subproject(
+ 'libgd',
+ default_options: [
+ 'static=true',
+ 'with-gtk-hacks=true',
+ 'with-main-view=true',
+ 'with-tagged-entry=true'
+ ]
+)
+libgd_dep = libgd.get_variable('libgd_dep')
+
libm = cc.find_library('m')
if get_option('extensions')
diff --git a/src/meson.build b/src/meson.build
index dac467d54..cfd56eeed 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -279,6 +279,7 @@ nautilus_deps = [
gmodule,
gnome_autoar,
gnome_desktop,
+ libgd_dep,
libhandy,
libportal,
libportal_gtk3,
diff --git a/subprojects/libgd b/subprojects/libgd
new file mode 160000
index 000000000..8a68efc5b
--- /dev/null
+++ b/subprojects/libgd
@@ -0,0 +1 @@
+Subproject commit 8a68efc5bc2b4c3f24ad4a41b1656f8557bb8b44
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]