diff options
author | Wang Xin <wangxin2015.fnst@cn.fujitsu.com> | 2016-09-14 00:57:06 -0400 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2016-09-19 16:24:03 +0200 |
commit | 14a532d78309768756403efb3491f514af7dcdf7 (patch) | |
tree | c8d740bf3edd015bd8d9b227e1776e2b82749b26 /meta-xfce/recipes-extended | |
parent | a3cdf02a3980746d9a29fd5d0e485e0ec4b8a8a3 (diff) | |
download | meta-openembedded-14a532d78309768756403efb3491f514af7dcdf7.tar.gz |
imsettings: 1.6.8 -> 1.7.1
1) Upgrade imsettings from 1.6.8 to 1.7.1.
2) Fix the directory structure.
3) Modify one patch, since the data has been changed.
multi-line-ACLOCAL_AMFLAGS-isnot-supported-by-autoreconf.patch
4) Modify DEPENDS, fix warning.
WARNING: imsettings-1.7.1-r0 do_configure: Missing DEPENDS on intltool-native
Signed-off-by: Wang Xin <wangxin2015.fnst@cn.fujitsu.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-xfce/recipes-extended')
-rw-r--r-- | meta-xfce/recipes-extended/imsettings/imsettings/gtk-is-required-by-notify.patch (renamed from meta-xfce/recipes-extended/imsettings/gtk-is-required-by-notify.patch) | 0 | ||||
-rw-r--r-- | meta-xfce/recipes-extended/imsettings/imsettings/multi-line-ACLOCAL_AMFLAGS-isnot-supported-by-autoreconf.patch (renamed from meta-xfce/recipes-extended/imsettings/multi-line-ACLOCAL_AMFLAGS-isnot-supported-by-autoreconf.patch) | 12 | ||||
-rw-r--r-- | meta-xfce/recipes-extended/imsettings/imsettings_1.7.1.bb (renamed from meta-xfce/recipes-extended/imsettings_1.6.8.bb) | 8 |
3 files changed, 9 insertions, 11 deletions
diff --git a/meta-xfce/recipes-extended/imsettings/gtk-is-required-by-notify.patch b/meta-xfce/recipes-extended/imsettings/imsettings/gtk-is-required-by-notify.patch index d42358d69..d42358d69 100644 --- a/meta-xfce/recipes-extended/imsettings/gtk-is-required-by-notify.patch +++ b/meta-xfce/recipes-extended/imsettings/imsettings/gtk-is-required-by-notify.patch | |||
diff --git a/meta-xfce/recipes-extended/imsettings/multi-line-ACLOCAL_AMFLAGS-isnot-supported-by-autoreconf.patch b/meta-xfce/recipes-extended/imsettings/imsettings/multi-line-ACLOCAL_AMFLAGS-isnot-supported-by-autoreconf.patch index 9e318474e..d5ac87dc0 100644 --- a/meta-xfce/recipes-extended/imsettings/multi-line-ACLOCAL_AMFLAGS-isnot-supported-by-autoreconf.patch +++ b/meta-xfce/recipes-extended/imsettings/imsettings/multi-line-ACLOCAL_AMFLAGS-isnot-supported-by-autoreconf.patch | |||
@@ -5,16 +5,14 @@ It will cause configure error as follow. | |||
5 | 5 | ||
6 | Signed-off-by: Bian Naimeng <biannm@cn.fujitsu.com> | 6 | Signed-off-by: Bian Naimeng <biannm@cn.fujitsu.com> |
7 | 7 | ||
8 | diff -Nurp imsettings-1.6.8.orig/Makefile.am imsettings-1.6.8/Makefile.am | 8 | diff -Nurp imsettings-1.7.1.orig/Makefile.am imsettings-1.7.1/Makefile.am |
9 | --- imsettings-1.6.8.orig/Makefile.am 2013-02-08 11:33:59.000000000 +0900 | 9 | --- imsettings-1.7.1.orig/Makefile.am 2013-02-08 11:33:59.000000000 +0900 |
10 | +++ imsettings-1.6.8/Makefile.am 2015-06-24 14:15:32.070000007 +0900 | 10 | +++ imsettings-1.7.1/Makefile.am 2015-06-24 14:15:32.070000007 +0900 |
11 | @@ -1,9 +1,7 @@ | 11 | @@ -1,7 +1,7 @@ |
12 | NULL = | 12 | NULL = |
13 | SUBDIRS = data imsettings imsettings-daemon backends utils po tests docs | 13 | SUBDIRS = data imsettings imsettings-daemon backends utils po tests docs |
14 | 14 | ||
15 | -ACLOCAL_AMFLAGS = \ | 15 | -ACLOCAL_AMFLAGS = -Im4macros |
16 | - -I m4macros \ | ||
17 | - $(NULL) | ||
18 | +ACLOCAL_AMFLAGS = -I m4macros $(NULL) | 16 | +ACLOCAL_AMFLAGS = -I m4macros $(NULL) |
19 | 17 | ||
20 | CONFIGURE_DEPENDENCIES = \ | 18 | CONFIGURE_DEPENDENCIES = \ |
diff --git a/meta-xfce/recipes-extended/imsettings_1.6.8.bb b/meta-xfce/recipes-extended/imsettings/imsettings_1.7.1.bb index 699547dec..8c04db6c0 100644 --- a/meta-xfce/recipes-extended/imsettings_1.6.8.bb +++ b/meta-xfce/recipes-extended/imsettings/imsettings_1.7.1.bb | |||
@@ -13,8 +13,8 @@ SRC_URI = "https://bitbucket.org/tagoh/imsettings/downloads/${BPN}-${PV}.tar.bz2 | |||
13 | file://gtk-is-required-by-notify.patch \ | 13 | file://gtk-is-required-by-notify.patch \ |
14 | file://multi-line-ACLOCAL_AMFLAGS-isnot-supported-by-autoreconf.patch" | 14 | file://multi-line-ACLOCAL_AMFLAGS-isnot-supported-by-autoreconf.patch" |
15 | 15 | ||
16 | SRC_URI[md5sum] = "c31429f1d60e36d7f811f871c75b6c41" | 16 | SRC_URI[md5sum] = "ab439e21a7d86fa99fbc04586c755349" |
17 | SRC_URI[sha256sum] = "2620ffbf9a6dc842dbf994b4773d4fe355eb77076ccf33f726ba63f16c0d08ba" | 17 | SRC_URI[sha256sum] = "12c35352386057ba68d69a0b7d9a1d0d01ebbd893aafe0a094c3158c8079ac9a" |
18 | 18 | ||
19 | LICENSE = "LGPLv2+" | 19 | LICENSE = "LGPLv2+" |
20 | LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" | 20 | LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" |
@@ -23,8 +23,8 @@ EXTRA_OECONF = "--with-xinputsh=50-xinput.sh \ | |||
23 | --disable-static \ | 23 | --disable-static \ |
24 | " | 24 | " |
25 | 25 | ||
26 | DEPENDS = "gtk+ gconf libnotify dbus-glib libgxim xfconf" | 26 | DEPENDS = "gtk+ gconf libnotify dbus-glib libgxim xfconf intltool-native" |
27 | 27 | ||
28 | RDEPENDS_${PN} += "bash" | 28 | RDEPENDS_${PN} += "bash" |
29 | 29 | ||
30 | FILES_${PN} += "${datadir}/dbus-1/*" | 30 | FILES_${PN} += "${datadir}/dbus-1/* ${datadir}/gir-1.0/* ${libdir}/girepository-1.0/*" |