libpeas: upgrade 1.26.0 -> 1.30.0

(Identical) patches have been applied upstream

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Andreas Müller
2021-05-22 03:35:13 +02:00
committed by Khem Raj
parent 8848f59f56
commit a4f52d928b
3 changed files with 1 additions and 64 deletions
@@ -1,36 +0,0 @@
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
@@ -1,21 +0,0 @@
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>
@@ -12,13 +12,7 @@ inherit gnomebase gobject-introspection gtk-doc gtk-icon-cache features_check
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"
SRC_URI[archive.sha256sum] = "0bf5562e9bfc0382a9dcb81f64340787542568762a3a367d9d90f6185898b9a3"
PACKAGECONFIG[python3] = "-Dpython3=true,-Dpython3=false,python3-pygobject"