[oe-commits] Bian Naimeng : imsettings: add recipe

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master-next
Commit: fb9b39ed87bb810d8f750d7e6100dbf6cd4dfe7f
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=fb9b39ed87bb810d8f750d7e6100dbf6cd4dfe7f

Author: Bian Naimeng <biannm at cn.fujitsu.com>
Date:   Tue Dec 30 11:49:36 2014 +0800

imsettings: add recipe

Delivery framework for general Input Method configuration

Signed-off-by: Bian Naimeng <biannm at cn.fujitsu.com>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 .../imsettings/gtk-is-required-by-notify.patch     | 18 ++++++++++++++
 ...CAL_AMFLAGS-isnot-supported-by-autoreconf.patch | 20 ++++++++++++++++
 .../imsettings/imsettings_1.6.7.bb                 | 28 ++++++++++++++++++++++
 3 files changed, 66 insertions(+)

diff --git a/meta-oe/recipes-extended/imsettings/imsettings/gtk-is-required-by-notify.patch b/meta-oe/recipes-extended/imsettings/imsettings/gtk-is-required-by-notify.patch
new file mode 100644
index 0000000..d42358d
--- /dev/null
+++ b/meta-oe/recipes-extended/imsettings/imsettings/gtk-is-required-by-notify.patch
@@ -0,0 +1,18 @@
+gtk+ is required by linnotify. So make sure gtk be linked before libnotify
+
+Signed-off-by: Bian Naimeng <biannm at cn.fujitsu.com>
+
+diff -Nurp imsettings-1.6.7.orig/configure.ac imsettings-1.6.7/configure.ac
+--- imsettings-1.6.7.orig/configure.ac	2013-11-26 16:09:09.000000000 +0800
++++ imsettings-1.6.7/configure.ac	2014-12-30 11:27:44.370003209 +0800
+@@ -93,8 +93,8 @@ PKG_CHECK_MODULES(LIBNOTIFY, libnotify,
+ 		has_old_libnotify=yes
+ 		PKG_CHECK_MODULES(GTK, gtk+-2.0 >= $GTK_REQUIRED)
+ 		AC_DEFINE(HAS_OLD_LIBNOTIFY,, [Using older libnotify])
+-		IMDAEMON_CFLAGS="$GTK_CFLAGS $LIBNOTIFY_OLD_CFLAGS"
+-		IMDAEMON_LIBS="$GTK_LIBS $LIBNOTIFY_OLD_LIBS"],[
++		IMDAEMON_CFLAGS="$LIBNOTIFY_OLD_CFLAGS $GTK_CFLAGS"
++		IMDAEMON_LIBS="$LIBNOTIFY_OLD_LIBS $GTK_LIBS"],[
+ 		has_old_libnotify=no
+ 		IMDAEMON_CFLAGS="$LIBNOTIFY_CFLAGS"
+ 		IMDAEMON_LIBS="$LIBNOTIFY_LIBS"])
diff --git a/meta-oe/recipes-extended/imsettings/imsettings/multi-line-ACLOCAL_AMFLAGS-isnot-supported-by-autoreconf.patch b/meta-oe/recipes-extended/imsettings/imsettings/multi-line-ACLOCAL_AMFLAGS-isnot-supported-by-autoreconf.patch
new file mode 100644
index 0000000..1327c85
--- /dev/null
+++ b/meta-oe/recipes-extended/imsettings/imsettings/multi-line-ACLOCAL_AMFLAGS-isnot-supported-by-autoreconf.patch
@@ -0,0 +1,20 @@
+multi-line ACLOCAL_AMFLAGS isn't supported by autoreconf.
+It will cause configure error as follow.
+
+  aclocal: error: non-option arguments are not accepted: '\'.
+
+Signed-off-by: Bian Naimeng <biannm at cn.fujitsu.com>
+
+--- imsettings-1.6.7.orig/Makefile.am	2013-02-08 10:33:59.000000000 +0800
++++ imsettings-1.6.7/Makefile.am	2014-12-25 11:48:27.078022744 +0800
+@@ -1,9 +1,7 @@
+ NULL =
+ SUBDIRS = data imsettings imsettings-daemon backends utils po tests docs
+ 
+-ACLOCAL_AMFLAGS =			\
+-	-I m4macros			\
+-	$(NULL)
++ACLOCAL_AMFLAGS = -I m4macros $(NULL)
+ 
+ CONFIGURE_DEPENDENCIES =		\
+ 	requires			\
diff --git a/meta-oe/recipes-extended/imsettings/imsettings_1.6.7.bb b/meta-oe/recipes-extended/imsettings/imsettings_1.6.7.bb
new file mode 100644
index 0000000..d5d9ffc
--- /dev/null
+++ b/meta-oe/recipes-extended/imsettings/imsettings_1.6.7.bb
@@ -0,0 +1,28 @@
+SUMMARY = "Delivery framework for general Input Method configuration"
+DESCRIPTION = "IMSettings is a framework that delivers Input Method \
+settings and applies the changes so they take effect \
+immediately without any need to restart applications \
+or the desktop. \
+This package contains the core DBus services and some utilities."
+HOMEPAGE = "http://code.google.com/p/imsettings/"
+SECTION = "Applications/System"
+
+inherit autotools gtk-doc
+
+SRC_URI = "https://bitbucket.org/tagoh/imsettings/downloads/${BPN}-${PV}.tar.bz2 \
+           file://multi-line-ACLOCAL_AMFLAGS-isnot-supported-by-autoreconf.patch \
+           file://gtk-is-required-by-notify.patch"
+
+SRC_URI[md5sum] = "81ceddbbb443c101d7993a60c5ce6223"
+SRC_URI[sha256sum] = "0d40099e93eb82bd35c29322df374297ae3286b5879b21f5056c8d4b5b7577dd"
+
+LICENSE = "LGPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1"
+
+EXTRA_OECONF = "--with-xinputsh=50-xinput.sh \
+                --disable-static \
+               "
+
+DEPENDS = "gtk+ gconf libnotify dbus-glib libgxim"
+
+FILES_${PN} += "/usr/share/dbus-1/*"