mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-07-27 20:07:25 +00:00
Code Issues Projects Releases Wiki Activity

imsettings: 1.6.8 -> 1.7.1

Browse Source 
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>
This commit is contained in:
Wang Xin
2016-09-14 00:57:06 -04:00
committed by Martin Jansa
parent a3cdf02a39
commit 14a532d783
3 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-xfce/recipes-extended/imsettings/gtk-is-required-by-notify.patch → meta-xfce/recipes-extended/imsettings/imsettings/gtk-is-required-by-notify.patch
View File
meta-xfce/recipes-extended/imsettings/multi-line-ACLOCAL_AMFLAGS-isnot-supported-by-autoreconf.patch → meta-xfce/recipes-extended/imsettings/imsettings/multi-line-ACLOCAL_AMFLAGS-isnot-supported-by-autoreconf.patch
+5 -7
View File
@@ -5,16 +5,14 @@ It will cause configure error as follow.
Signed-off-by: Bian Naimeng <biannm@cn.fujitsu.com> Signed-off-by: Bian Naimeng <biannm@cn.fujitsu.com>
diff -Nurp imsettings-1.6.8.orig/Makefile.am imsettings-1.6.8/Makefile.am diff -Nurp imsettings-1.7.1.orig/Makefile.am imsettings-1.7.1/Makefile.am
--- imsettings-1.6.8.orig/Makefile.am 2013-02-08 11:33:59.000000000 +0900 --- imsettings-1.7.1.orig/Makefile.am 2013-02-08 11:33:59.000000000 +0900
+++ imsettings-1.6.8/Makefile.am 2015-06-24 14:15:32.070000007 +0900 +++ imsettings-1.7.1/Makefile.am 2015-06-24 14:15:32.070000007 +0900
@@ -1,9 +1,7 @@ @@ -1,7 +1,7 @@
NULL = NULL =
SUBDIRS = data imsettings imsettings-daemon backends utils po tests docs SUBDIRS = data imsettings imsettings-daemon backends utils po tests docs
-ACLOCAL_AMFLAGS = \ -ACLOCAL_AMFLAGS = -Im4macros
- -I m4macros \
- $(NULL)
+ACLOCAL_AMFLAGS = -I m4macros $(NULL) +ACLOCAL_AMFLAGS = -I m4macros $(NULL)
CONFIGURE_DEPENDENCIES = \ CONFIGURE_DEPENDENCIES = \
meta-xfce/recipes-extended/imsettings_1.6.8.bb → meta-xfce/recipes-extended/imsettings/imsettings_1.7.1.bb
+4 -4
View File
@@ -13,8 +13,8 @@ SRC_URI = "https://bitbucket.org/tagoh/imsettings/downloads/${BPN}-${PV}.tar.bz2
file://gtk-is-required-by-notify.patch \ file://gtk-is-required-by-notify.patch \
file://multi-line-ACLOCAL_AMFLAGS-isnot-supported-by-autoreconf.patch" file://multi-line-ACLOCAL_AMFLAGS-isnot-supported-by-autoreconf.patch"
SRC_URI[md5sum] = "c31429f1d60e36d7f811f871c75b6c41" SRC_URI[md5sum] = "ab439e21a7d86fa99fbc04586c755349"
SRC_URI[sha256sum] = "2620ffbf9a6dc842dbf994b4773d4fe355eb77076ccf33f726ba63f16c0d08ba" SRC_URI[sha256sum] = "12c35352386057ba68d69a0b7d9a1d0d01ebbd893aafe0a094c3158c8079ac9a"
LICENSE = "LGPLv2+" LICENSE = "LGPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1"
@@ -23,8 +23,8 @@ EXTRA_OECONF = "--with-xinputsh=50-xinput.sh \
--disable-static \ --disable-static \
" "
DEPENDS = "gtk+ gconf libnotify dbus-glib libgxim xfconf" DEPENDS = "gtk+ gconf libnotify dbus-glib libgxim xfconf intltool-native"
RDEPENDS_${PN} += "bash" RDEPENDS_${PN} += "bash"
FILES_${PN} += "${datadir}/dbus-1/*" FILES_${PN} += "${datadir}/dbus-1/* ${datadir}/gir-1.0/* ${libdir}/girepository-1.0/*"