summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-devtools/python/python3-pygobject/0001-configure.ac-Don-t-use-gnome-common-macros.patch33
-rw-r--r--meta/recipes-devtools/python/python3-pygobject/0001-configure.ac-add-sysroot-path-to-GI_DATADIR-don-t-se.patch41
2 files changed, 0 insertions, 74 deletions
diff --git a/meta/recipes-devtools/python/python3-pygobject/0001-configure.ac-Don-t-use-gnome-common-macros.patch b/meta/recipes-devtools/python/python3-pygobject/0001-configure.ac-Don-t-use-gnome-common-macros.patch
deleted file mode 100644
index aaedb58fec..0000000000
--- a/meta/recipes-devtools/python/python3-pygobject/0001-configure.ac-Don-t-use-gnome-common-macros.patch
+++ /dev/null
@@ -1,33 +0,0 @@
1From 206360744cedff20eae3c8fcfde9938fdae99592 Mon Sep 17 00:00:00 2001
2From: Jussi Kukkonen <jussi.kukkonen@intel.com>
3Date: Thu, 6 Jul 2017 11:47:21 +0300
4Subject: [PATCH] configure.ac: Don't use gnome-common macros
5
6remove GNOME_COMPILE_WARNINGS() call: it's from gnome-common which
7is deprecated.
8
9This patch can be removed when upgrading to 3.25.1: at that point
10pygobject needs autoconf-archive instead.
11
12Upstream-Status: Inappropriate [Already handled upstream]
13Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
14---
15 configure.ac | 2 --
16 1 file changed, 2 deletions(-)
17
18diff --git a/configure.ac b/configure.ac
19index 1f15b3c..5cb170f 100644
20--- a/configure.ac
21+++ b/configure.ac
22@@ -221,8 +221,6 @@ AC_ARG_WITH(common,
23 with_common=yes)
24 AM_CONDITIONAL(WITH_COMMON, test "$with_common" = "yes")
25
26-# compiler warnings, errors, required cflags, and code coverage support
27-GNOME_COMPILE_WARNINGS([maximum], [-Wno-error=missing-prototypes])
28 AC_MSG_CHECKING(for Gnome code coverage support)
29 m4_ifdef([GNOME_CODE_COVERAGE],
30 [AC_MSG_RESULT(yes)
31--
322.1.4
33
diff --git a/meta/recipes-devtools/python/python3-pygobject/0001-configure.ac-add-sysroot-path-to-GI_DATADIR-don-t-se.patch b/meta/recipes-devtools/python/python3-pygobject/0001-configure.ac-add-sysroot-path-to-GI_DATADIR-don-t-se.patch
deleted file mode 100644
index a391f7e74e..0000000000
--- a/meta/recipes-devtools/python/python3-pygobject/0001-configure.ac-add-sysroot-path-to-GI_DATADIR-don-t-se.patch
+++ /dev/null
@@ -1,41 +0,0 @@
1From 5e5350d730f85957a42c6d846d347d080e7dd996 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Fri, 23 Oct 2015 12:40:34 +0300
4Subject: [PATCH] configure.ac: add sysroot path to GI_DATADIR; don't set
5 introspection scanner and compiler paths
6
7Upstream-Status: Pending [review on oe-core maillist]
8Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
9---
10 configure.ac | 8 +-------
11 1 file changed, 1 insertion(+), 7 deletions(-)
12
13diff --git a/configure.ac b/configure.ac
14index 2c0cfbd..cfcb3bf 100644
15--- a/configure.ac
16+++ b/configure.ac
17@@ -194,7 +194,7 @@ PKG_CHECK_MODULES(GI,
18 gobject-introspection-1.0 >= introspection_required_version
19 )
20
21-GI_DATADIR=$($PKG_CONFIG --variable=gidatadir gobject-introspection-1.0)
22+GI_DATADIR=$PKG_CONFIG_SYSROOT_DIR$($PKG_CONFIG --variable=gidatadir gobject-introspection-1.0)
23 AC_SUBST(GI_DATADIR)
24
25 if test "$enable_cairo" != no; then
26@@ -219,12 +219,6 @@ AC_ARG_WITH(common,
27 with_common=yes)
28 AM_CONDITIONAL(WITH_COMMON, test "$with_common" = "yes")
29
30-INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
31-INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
32-
33-AC_SUBST(INTROSPECTION_SCANNER)
34-AC_SUBST(INTROSPECTION_COMPILER)
35-
36 # compiler warnings, errors, required cflags, and code coverage support
37 GNOME_COMPILE_WARNINGS([maximum])
38 AC_MSG_CHECKING(for Gnome code coverage support)
39--
402.1.4
41