diff options
author | Huang Qiyu <huangqy.fnst@cn.fujitsu.com> | 2018-03-21 11:36:08 +0800 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2018-03-29 16:51:20 -0700 |
commit | 2aa496eb66045667df00136c6ddf25c9b297ebc7 (patch) | |
tree | bb60dda945cdf208470954bc7a4898113af4bcf3 /meta-oe/recipes-devtools/python | |
parent | fafb973ec06eb238457c0cd1f999e58978ea4a85 (diff) | |
download | meta-openembedded-2aa496eb66045667df00136c6ddf25c9b297ebc7.tar.gz |
python-pygobject: 3.22.0 -> 3.28.0
1.Upgrad python-pygobject from 3.22.0 to 3.28.0.
2.Modify 0001-configure.ac-add-sysroot-path-to-GI_DATADIR-don-t-se.patch, since the data has been changed.
Signed-off-by: Huang Qiyu <huangqy.fnst@cn.fujitsu.com>
Diffstat (limited to 'meta-oe/recipes-devtools/python')
-rw-r--r-- | meta-oe/recipes-devtools/python/python-pygobject/0001-configure.ac-add-sysroot-path-to-GI_DATADIR-don-t-se.patch | 19 | ||||
-rw-r--r-- | meta-oe/recipes-devtools/python/python-pygobject_3.28.0.bb (renamed from meta-oe/recipes-devtools/python/python-pygobject_3.22.0.bb) | 4 |
2 files changed, 5 insertions, 18 deletions
diff --git a/meta-oe/recipes-devtools/python/python-pygobject/0001-configure.ac-add-sysroot-path-to-GI_DATADIR-don-t-se.patch b/meta-oe/recipes-devtools/python/python-pygobject/0001-configure.ac-add-sysroot-path-to-GI_DATADIR-don-t-se.patch index a391f7e74..9a11442f1 100644 --- a/meta-oe/recipes-devtools/python/python-pygobject/0001-configure.ac-add-sysroot-path-to-GI_DATADIR-don-t-se.patch +++ b/meta-oe/recipes-devtools/python/python-pygobject/0001-configure.ac-add-sysroot-path-to-GI_DATADIR-don-t-se.patch | |||
@@ -14,28 +14,15 @@ diff --git a/configure.ac b/configure.ac | |||
14 | index 2c0cfbd..cfcb3bf 100644 | 14 | index 2c0cfbd..cfcb3bf 100644 |
15 | --- a/configure.ac | 15 | --- a/configure.ac |
16 | +++ b/configure.ac | 16 | +++ b/configure.ac |
17 | @@ -194,7 +194,7 @@ PKG_CHECK_MODULES(GI, | 17 | @@ -155,7 +155,7 @@ PKG_CHECK_MODULES(GI, |
18 | gobject-introspection-1.0 >= introspection_required_version | 18 | |
19 | ) | 19 | GOBJECT_INTROSPECTION_CHECK(introspection_required_version) |
20 | 20 | ||
21 | -GI_DATADIR=$($PKG_CONFIG --variable=gidatadir gobject-introspection-1.0) | 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) | 22 | +GI_DATADIR=$PKG_CONFIG_SYSROOT_DIR$($PKG_CONFIG --variable=gidatadir gobject-introspection-1.0) |
23 | AC_SUBST(GI_DATADIR) | 23 | AC_SUBST(GI_DATADIR) |
24 | 24 | ||
25 | if test "$enable_cairo" != no; then | 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 | -- | 26 | -- |
40 | 2.1.4 | 27 | 2.1.4 |
41 | 28 | ||
diff --git a/meta-oe/recipes-devtools/python/python-pygobject_3.22.0.bb b/meta-oe/recipes-devtools/python/python-pygobject_3.28.0.bb index 7ddf4e552..ab65ba1dc 100644 --- a/meta-oe/recipes-devtools/python/python-pygobject_3.22.0.bb +++ b/meta-oe/recipes-devtools/python/python-pygobject_3.28.0.bb | |||
@@ -17,8 +17,8 @@ SRC_URI = " \ | |||
17 | file://0001-configure.ac-add-sysroot-path-to-GI_DATADIR-don-t-se.patch \ | 17 | file://0001-configure.ac-add-sysroot-path-to-GI_DATADIR-don-t-se.patch \ |
18 | " | 18 | " |
19 | 19 | ||
20 | SRC_URI[md5sum] = "ed4117ed5d554d25fd7718807fbf819f" | 20 | SRC_URI[md5sum] = "b29d69edb63ae1f555afeb19f90b9996" |
21 | SRC_URI[sha256sum] = "08b29cfb08efc80f7a8630a2734dec65a99c1b59f1e5771c671d2e4ed8a5cbe7" | 21 | SRC_URI[sha256sum] = "42b47b261b45aedfc77e02e3c90a01cd74d6f86c3273c1860a054d531d606e5a" |
22 | 22 | ||
23 | S = "${WORKDIR}/${SRCNAME}-${PV}" | 23 | S = "${WORKDIR}/${SRCNAME}-${PV}" |
24 | 24 | ||