summaryrefslogtreecommitdiff
path: root/meta-openembedded/meta-oe/recipes-gnome
diff options
context:
space:
mode:
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-gnome')
-rw-r--r--meta-openembedded/meta-oe/recipes-gnome/libjcat/libjcat_0.1.3.bb (renamed from meta-openembedded/meta-oe/recipes-gnome/libjcat/libjcat_0.1.2.bb)2
-rw-r--r--meta-openembedded/meta-oe/recipes-gnome/libpeas/libpeas/0001-Do-not-build-tests-when-introspection-is-disabled-mi.patch36
-rw-r--r--meta-openembedded/meta-oe/recipes-gnome/libpeas/libpeas/add_missing_locale_include.patch21
-rw-r--r--meta-openembedded/meta-oe/recipes-gnome/libpeas/libpeas_1.26.0.bb (renamed from meta-openembedded/meta-oe/recipes-gnome/libpeas/libpeas_1.25.3.bb)13
4 files changed, 68 insertions, 4 deletions
diff --git a/meta-openembedded/meta-oe/recipes-gnome/libjcat/libjcat_0.1.2.bb b/meta-openembedded/meta-oe/recipes-gnome/libjcat/libjcat_0.1.3.bb
index 10f5a800b..7ef2e5305 100644
--- a/meta-openembedded/meta-oe/recipes-gnome/libjcat/libjcat_0.1.2.bb
+++ b/meta-openembedded/meta-oe/recipes-gnome/libjcat/libjcat_0.1.3.bb
@@ -11,7 +11,7 @@ SRC_URI = "\
git://github.com/hughsie/libjcat.git \
file://run-ptest \
"
-SRCREV = "1a509ac60b7446254c3bd1f45ea53e6cffba30ac"
+SRCREV = "3c120a9132a36b100366cfe3d658ae31e6f4b7e9"
S = "${WORKDIR}/git"
inherit gobject-introspection gtk-doc meson ptest-gnome vala
diff --git a/meta-openembedded/meta-oe/recipes-gnome/libpeas/libpeas/0001-Do-not-build-tests-when-introspection-is-disabled-mi.patch b/meta-openembedded/meta-oe/recipes-gnome/libpeas/libpeas/0001-Do-not-build-tests-when-introspection-is-disabled-mi.patch
new file mode 100644
index 000000000..86586fe71
--- /dev/null
+++ b/meta-openembedded/meta-oe/recipes-gnome/libpeas/libpeas/0001-Do-not-build-tests-when-introspection-is-disabled-mi.patch
@@ -0,0 +1,36 @@
+From 53a4f19887d9ae4e77f32dd6d71c8a7b516b4d5d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Mon, 10 Aug 2020 21:53:33 +0200
+Subject: [PATCH] Do not build tests when introspection is disabled/missing
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Fixes:
+| ../libpeas-1.26.0/tests/libpeas/introspection/meson.build:47:0: ERROR: Unknown variable "libpeas_gir".
+
+Upstrem-Status: Submitted[https://gitlab.gnome.org/GNOME/libpeas/-/merge_requests/28]
+
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+---
+ meson.build | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 8322fea..43fb062 100644
+--- a/meson.build
++++ b/meson.build
+@@ -254,7 +254,9 @@ subdir('loaders')
+ if build_demos == true
+ subdir('peas-demo')
+ endif
+-subdir('tests')
++if generate_gir == true
++ subdir('tests')
++endif
+
+ summary = [
+ '',
+--
+2.26.2
+
diff --git a/meta-openembedded/meta-oe/recipes-gnome/libpeas/libpeas/add_missing_locale_include.patch b/meta-openembedded/meta-oe/recipes-gnome/libpeas/libpeas/add_missing_locale_include.patch
new file mode 100644
index 000000000..664693128
--- /dev/null
+++ b/meta-openembedded/meta-oe/recipes-gnome/libpeas/libpeas/add_missing_locale_include.patch
@@ -0,0 +1,21 @@
+From 3cc69f1eaa86163c3816265fa64cb660f4def364 Mon Sep 17 00:00:00 2001
+From: Christian Hergert <chergert@redhat.com>
+Date: Fri, 13 Mar 2020 10:32:21 -0700
+Subject: [PATCH] demo: add missing locale.h include
+
+Fixes #39
+
+Upstream-Status: backport
+
+diff --git a/peas-demo/peas-demo.c b/peas-demo/peas-demo.c
+index 47ac005..466a392 100644
+--- a/peas-demo/peas-demo.c
++++ b/peas-demo/peas-demo.c
+@@ -26,6 +26,7 @@
+ #include <girepository.h>
+ #include <glib/gi18n.h>
+ #include <gtk/gtk.h>
++#include <locale.h>
+
+ #include <libpeas/peas.h>
+ #include <libpeas-gtk/peas-gtk.h>
diff --git a/meta-openembedded/meta-oe/recipes-gnome/libpeas/libpeas_1.25.3.bb b/meta-openembedded/meta-oe/recipes-gnome/libpeas/libpeas_1.26.0.bb
index 57419a427..fd4ce7de5 100644
--- a/meta-openembedded/meta-oe/recipes-gnome/libpeas/libpeas_1.25.3.bb
+++ b/meta-openembedded/meta-oe/recipes-gnome/libpeas/libpeas_1.26.0.bb
@@ -8,10 +8,17 @@ DEPENDS = "gtk+3"
GNOMEBASEBUILDCLASS = "meson"
GTKDOC_MESON_OPTION = "gtk_doc"
-inherit gnomebase gobject-introspection gtk-doc gtk-icon-cache
+inherit gnomebase gobject-introspection gtk-doc gtk-icon-cache features_check
-SRC_URI[archive.md5sum] = "08bfff8f9688cf630dcb0f950617661f"
-SRC_URI[archive.sha256sum] = "1c9bbb29740c29cd6e1dd0c9964722ff08cd5e6f68f1b5c135bc391a6ce97639"
+ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
+
+SRC_URI += " \
+ file://add_missing_locale_include.patch \
+ file://0001-Do-not-build-tests-when-introspection-is-disabled-mi.patch \
+"
+
+SRC_URI[archive.md5sum] = "f7723bf8433b7984121157e1e9a629b5"
+SRC_URI[archive.sha256sum] = "a976d77e20496479a8e955e6a38fb0e5c5de89cf64d9f44e75c2213ee14f7376"
PACKAGECONFIG[python3] = "-Dpython3=true,-Dpython3=false,python3-pygobject"