Christian Persch · Sergej A · Christian Persch · Jeremy Bicha · Christian Persch · Yuri Chornoivan
--- a/ChangeLog
+++ b/ChangeLog
--- a/games/meson.build
+++ b/games/meson.build
@@ -122,9 +122,13 @@ guile_warnings = [
  '-W1',
 ]

-guile_flags = [
-  '-Ono-letrectify',
-]
+guile_flags = []
+
+if guile_version.version_compare('>= 3.0')
+  guile_flags += [
+    '-Ono-letrectify',
+  ]
+endif

 # FIXME: this should use files('...') (allowed as per docs),
 # but that crashes meson, see https://gitlab.gnome.org/chpe/meson/issues/2

--- a/help/ru/ru.po
+++ b/help/ru/ru.po
--- a/help/uk/uk.po
+++ b/help/uk/uk.po
--- a/meson.build
+++ b/meson.build
@@ -30,7 +30,7 @@ project(
    'GFDL-1.3-only',
  ],
  meson_version: '>= 0.49.0',
-  version: '3.22.21',
+  version: '3.22.22',
 )

 # Naming

--- a/po/ja.po
+++ b/po/ja.po
--- a/src/lib/ar-card-theme-private.h
+++ b/src/lib/ar-card-theme-private.h
@@ -115,6 +115,10 @@ gboolean _ar_card_theme_class_foreach_env (ArCardThemeClass *klass,
                                              const char *env,
                                              ArCardThemeForeachFunc callback,
                                              gpointer data);
+gboolean _ar_card_theme_class_foreach_user_dir (ArCardThemeClass *klass,
+						const char *name,
+						ArCardThemeForeachFunc callback,
+						gpointer data);

 void _ar_card_theme_emit_changed (ArCardTheme *theme);


--- a/src/lib/ar-card-theme-svg.c
+++ b/src/lib/ar-card-theme-svg.c
@@ -138,8 +138,14 @@ ar_card_theme_svg_class_foreach_theme_dir (ArCardThemeClass *klass,
  /* If we're installed in a non-system prefix, also load the card themes
   * from the system prefix.
   */
-  if (!ar_runtime_is_system_prefix ())
-    return callback (klass, "/usr/share/aisleriot/cards", data);
+  if (!ar_runtime_is_system_prefix ()) {
+    if (!callback (klass, "/usr/share/aisleriot/cards", data))
+      return FALSE;
+  }
+
+  /* Load user-installed themes */
+  if (!_ar_card_theme_class_foreach_user_dir (klass, "cards", callback, data))
+    return FALSE;

  return TRUE;
 }

--- a/src/lib/ar-card-theme.c
+++ b/src/lib/ar-card-theme.c
@@ -324,6 +324,23 @@ _ar_card_theme_class_foreach_env (ArCardThemeClass *klass,
  return retval;
 }

+gboolean
+_ar_card_theme_class_foreach_user_dir (ArCardThemeClass *klass,
+				       const char *name,
+				       ArCardThemeForeachFunc callback,
+				       gpointer data)
+{
+  const char *udd = g_get_user_data_dir();
+  if (!udd)
+    return TRUE;
+
+  char *path = g_build_filename(udd, "aisleriot", name, NULL);
+  gboolean rv = callback(klass, path, data);
+  g_free(path);
+
+  return rv;
+}
+
 /* public API */

 /**