diff options
| -rw-r--r-- | meta-oe/recipes-gnome/libpeas/libpeas/0001-Do-not-build-tests-when-introspection-is-disabled-mi.patch | 36 | ||||
| -rw-r--r-- | meta-oe/recipes-gnome/libpeas/libpeas/add_missing_locale_include.patch | 21 | ||||
| -rw-r--r-- | meta-oe/recipes-gnome/libpeas/libpeas_1.30.0.bb (renamed from meta-oe/recipes-gnome/libpeas/libpeas_1.26.0.bb) | 8 |
3 files changed, 1 insertions, 64 deletions
diff --git a/meta-oe/recipes-gnome/libpeas/libpeas/0001-Do-not-build-tests-when-introspection-is-disabled-mi.patch b/meta-oe/recipes-gnome/libpeas/libpeas/0001-Do-not-build-tests-when-introspection-is-disabled-mi.patch deleted file mode 100644 index 86586fe710..0000000000 --- a/meta-oe/recipes-gnome/libpeas/libpeas/0001-Do-not-build-tests-when-introspection-is-disabled-mi.patch +++ /dev/null | |||
| @@ -1,36 +0,0 @@ | |||
| 1 | From 53a4f19887d9ae4e77f32dd6d71c8a7b516b4d5d Mon Sep 17 00:00:00 2001 | ||
| 2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> | ||
| 3 | Date: Mon, 10 Aug 2020 21:53:33 +0200 | ||
| 4 | Subject: [PATCH] Do not build tests when introspection is disabled/missing | ||
| 5 | MIME-Version: 1.0 | ||
| 6 | Content-Type: text/plain; charset=UTF-8 | ||
| 7 | Content-Transfer-Encoding: 8bit | ||
| 8 | |||
| 9 | Fixes: | ||
| 10 | | ../libpeas-1.26.0/tests/libpeas/introspection/meson.build:47:0: ERROR: Unknown variable "libpeas_gir". | ||
| 11 | |||
| 12 | Upstrem-Status: Submitted[https://gitlab.gnome.org/GNOME/libpeas/-/merge_requests/28] | ||
| 13 | |||
| 14 | Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> | ||
| 15 | --- | ||
| 16 | meson.build | 4 +++- | ||
| 17 | 1 file changed, 3 insertions(+), 1 deletion(-) | ||
| 18 | |||
| 19 | diff --git a/meson.build b/meson.build | ||
| 20 | index 8322fea..43fb062 100644 | ||
| 21 | --- a/meson.build | ||
| 22 | +++ b/meson.build | ||
| 23 | @@ -254,7 +254,9 @@ subdir('loaders') | ||
| 24 | if build_demos == true | ||
| 25 | subdir('peas-demo') | ||
| 26 | endif | ||
| 27 | -subdir('tests') | ||
| 28 | +if generate_gir == true | ||
| 29 | + subdir('tests') | ||
| 30 | +endif | ||
| 31 | |||
| 32 | summary = [ | ||
| 33 | '', | ||
| 34 | -- | ||
| 35 | 2.26.2 | ||
| 36 | |||
diff --git a/meta-oe/recipes-gnome/libpeas/libpeas/add_missing_locale_include.patch b/meta-oe/recipes-gnome/libpeas/libpeas/add_missing_locale_include.patch deleted file mode 100644 index 6646931283..0000000000 --- a/meta-oe/recipes-gnome/libpeas/libpeas/add_missing_locale_include.patch +++ /dev/null | |||
| @@ -1,21 +0,0 @@ | |||
| 1 | From 3cc69f1eaa86163c3816265fa64cb660f4def364 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Christian Hergert <chergert@redhat.com> | ||
| 3 | Date: Fri, 13 Mar 2020 10:32:21 -0700 | ||
| 4 | Subject: [PATCH] demo: add missing locale.h include | ||
| 5 | |||
| 6 | Fixes #39 | ||
| 7 | |||
| 8 | Upstream-Status: backport | ||
| 9 | |||
| 10 | diff --git a/peas-demo/peas-demo.c b/peas-demo/peas-demo.c | ||
| 11 | index 47ac005..466a392 100644 | ||
| 12 | --- a/peas-demo/peas-demo.c | ||
| 13 | +++ b/peas-demo/peas-demo.c | ||
| 14 | @@ -26,6 +26,7 @@ | ||
| 15 | #include <girepository.h> | ||
| 16 | #include <glib/gi18n.h> | ||
| 17 | #include <gtk/gtk.h> | ||
| 18 | +#include <locale.h> | ||
| 19 | |||
| 20 | #include <libpeas/peas.h> | ||
| 21 | #include <libpeas-gtk/peas-gtk.h> | ||
diff --git a/meta-oe/recipes-gnome/libpeas/libpeas_1.26.0.bb b/meta-oe/recipes-gnome/libpeas/libpeas_1.30.0.bb index fd4ce7de5e..316a927846 100644 --- a/meta-oe/recipes-gnome/libpeas/libpeas_1.26.0.bb +++ b/meta-oe/recipes-gnome/libpeas/libpeas_1.30.0.bb | |||
| @@ -12,13 +12,7 @@ inherit gnomebase gobject-introspection gtk-doc gtk-icon-cache features_check | |||
| 12 | 12 | ||
| 13 | ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" | 13 | ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" |
| 14 | 14 | ||
| 15 | SRC_URI += " \ | 15 | SRC_URI[archive.sha256sum] = "0bf5562e9bfc0382a9dcb81f64340787542568762a3a367d9d90f6185898b9a3" |
| 16 | file://add_missing_locale_include.patch \ | ||
| 17 | file://0001-Do-not-build-tests-when-introspection-is-disabled-mi.patch \ | ||
| 18 | " | ||
| 19 | |||
| 20 | SRC_URI[archive.md5sum] = "f7723bf8433b7984121157e1e9a629b5" | ||
| 21 | SRC_URI[archive.sha256sum] = "a976d77e20496479a8e955e6a38fb0e5c5de89cf64d9f44e75c2213ee14f7376" | ||
| 22 | 16 | ||
| 23 | PACKAGECONFIG[python3] = "-Dpython3=true,-Dpython3=false,python3-pygobject" | 17 | PACKAGECONFIG[python3] = "-Dpython3=true,-Dpython3=false,python3-pygobject" |
| 24 | 18 | ||
