[PATCH] aisleriot: pick up the specified guile version
- From: Omar Polo <op omarpolo com>
- To: games-list gnome org
- Subject: [PATCH] aisleriot: pick up the specified guile version
- Date: Sun, 31 Jul 2022 12:56:36 +0200
Hello,
aisleriot' meson.build has a -D flag to specify the guile version, for
example -Dguile=2.2. The problem is that it always ends up chosing the
newer one available, even when -Dguile=X.Y was specified.
So, if i want it to build with guile2.2 while having guile3 installed
-Dguile=2.2 would still end up linking to guile3, which is unexpected.
diff below fixes it for me, tested on OpenBSD-CURRENT.
I hope it's fine to send patches here. looking at the archive this
mailing list was empty for some time; i'm making an attempt to avoid
having to mess with gitlab :)
Cheers,
Omar Polo
Index: meson.build
--- meson.build.orig
+++ meson.build
@@ -44,9 +44,6 @@ gconf_req_version = '2.0'
gio_req_version = '2.32.0'
glib_req_version = '2.32.0'
gtk_req_version = '3.18.0'
-guile_2_0_req_version = '2.0.0'
-guile_2_2_req_version = '2.2.0'
-guile_3_0_req_version = '3.0.0'
libcanberra_gtk_req_version = '0.26'
qt5svg_req_version = '5.0.0'
rsvg_req_version = '2.32.0'
@@ -331,16 +328,6 @@ endif
guile_req = 'guile-' + guile_version
-if guile_version == '3.0'
- guile_req_version = guile_3_0_req_version
-elif guile_version == '2.2'
- guile_req_version = guile_2_2_req_version
-elif guile_version == '2.0'
- guile_req_version = guile_2_0_req_version
-else
- assert(false, 'unsupported guile version')
-endif
-
ar_pkgguiledir = ar_pkglibdir / 'guile' / guile_version
# Dependencies
@@ -349,7 +336,7 @@ cairo_dep = dependency('cairo', version: '>=' + ca
gio_dep = dependency('gio-2.0', version: '>=' + gio_req_version,)
glib_dep = dependency('glib-2.0', version: '>=' + glib_req_version,)
gtk_dep = dependency('gtk+-3.0', version: '>=' + gtk_req_version,)
-guile_dep = dependency(guile_req, version: '>=' + guile_req_version,)
+guile_dep = dependency(guile_req,)
if get_option('gconf')
gconf_dep = dependency('gconf-2.0', version: '>=' + gconf_req_version, required: true,)
[Date Prev][
Date Next] [Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]