summaryrefslogtreecommitdiffstats
path: root/meta-xfce
diff options
context:
space:
mode:
Diffstat (limited to 'meta-xfce')
-rw-r--r--meta-xfce/recipes-extended/imsettings/gtk-is-required-by-notify.patch18
-rw-r--r--meta-xfce/recipes-extended/imsettings/multi-line-ACLOCAL_AMFLAGS-isnot-supported-by-autoreconf.patch21
-rw-r--r--meta-xfce/recipes-extended/imsettings_1.6.8.bb30
3 files changed, 69 insertions, 0 deletions
diff --git a/meta-xfce/recipes-extended/imsettings/gtk-is-required-by-notify.patch b/meta-xfce/recipes-extended/imsettings/gtk-is-required-by-notify.patch
new file mode 100644
index 000000000..d42358d69
--- /dev/null
+++ b/meta-xfce/recipes-extended/imsettings/gtk-is-required-by-notify.patch
@@ -0,0 +1,18 @@
1gtk+ is required by linnotify. So make sure gtk be linked before libnotify
2
3Signed-off-by: Bian Naimeng <biannm@cn.fujitsu.com>
4
5diff -Nurp imsettings-1.6.7.orig/configure.ac imsettings-1.6.7/configure.ac
6--- imsettings-1.6.7.orig/configure.ac 2013-11-26 16:09:09.000000000 +0800
7+++ imsettings-1.6.7/configure.ac 2014-12-30 11:27:44.370003209 +0800
8@@ -93,8 +93,8 @@ PKG_CHECK_MODULES(LIBNOTIFY, libnotify,
9 has_old_libnotify=yes
10 PKG_CHECK_MODULES(GTK, gtk+-2.0 >= $GTK_REQUIRED)
11 AC_DEFINE(HAS_OLD_LIBNOTIFY,, [Using older libnotify])
12- IMDAEMON_CFLAGS="$GTK_CFLAGS $LIBNOTIFY_OLD_CFLAGS"
13- IMDAEMON_LIBS="$GTK_LIBS $LIBNOTIFY_OLD_LIBS"],[
14+ IMDAEMON_CFLAGS="$LIBNOTIFY_OLD_CFLAGS $GTK_CFLAGS"
15+ IMDAEMON_LIBS="$LIBNOTIFY_OLD_LIBS $GTK_LIBS"],[
16 has_old_libnotify=no
17 IMDAEMON_CFLAGS="$LIBNOTIFY_CFLAGS"
18 IMDAEMON_LIBS="$LIBNOTIFY_LIBS"])
diff --git a/meta-xfce/recipes-extended/imsettings/multi-line-ACLOCAL_AMFLAGS-isnot-supported-by-autoreconf.patch b/meta-xfce/recipes-extended/imsettings/multi-line-ACLOCAL_AMFLAGS-isnot-supported-by-autoreconf.patch
new file mode 100644
index 000000000..9e318474e
--- /dev/null
+++ b/meta-xfce/recipes-extended/imsettings/multi-line-ACLOCAL_AMFLAGS-isnot-supported-by-autoreconf.patch
@@ -0,0 +1,21 @@
1multi-line ACLOCAL_AMFLAGS isn't supported by autoreconf.
2It will cause configure error as follow.
3
4 aclocal: error: non-option arguments are not accepted: '\'.
5
6Signed-off-by: Bian Naimeng <biannm@cn.fujitsu.com>
7
8diff -Nurp imsettings-1.6.8.orig/Makefile.am imsettings-1.6.8/Makefile.am
9--- imsettings-1.6.8.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
11@@ -1,9 +1,7 @@
12 NULL =
13 SUBDIRS = data imsettings imsettings-daemon backends utils po tests docs
14
15-ACLOCAL_AMFLAGS = \
16- -I m4macros \
17- $(NULL)
18+ACLOCAL_AMFLAGS = -I m4macros $(NULL)
19
20 CONFIGURE_DEPENDENCIES = \
21 requires \
diff --git a/meta-xfce/recipes-extended/imsettings_1.6.8.bb b/meta-xfce/recipes-extended/imsettings_1.6.8.bb
new file mode 100644
index 000000000..699547dec
--- /dev/null
+++ b/meta-xfce/recipes-extended/imsettings_1.6.8.bb
@@ -0,0 +1,30 @@
1SUMMARY = "Delivery framework for general Input Method configuration"
2DESCRIPTION = "IMSettings is a framework that delivers Input Method \
3settings and applies the changes so they take effect \
4immediately without any need to restart applications \
5or the desktop. \
6This package contains the core DBus services and some utilities."
7HOMEPAGE = "http://code.google.com/p/imsettings/"
8SECTION = "Applications/System"
9
10inherit autotools gtk-doc
11
12SRC_URI = "https://bitbucket.org/tagoh/imsettings/downloads/${BPN}-${PV}.tar.bz2 \
13 file://gtk-is-required-by-notify.patch \
14 file://multi-line-ACLOCAL_AMFLAGS-isnot-supported-by-autoreconf.patch"
15
16SRC_URI[md5sum] = "c31429f1d60e36d7f811f871c75b6c41"
17SRC_URI[sha256sum] = "2620ffbf9a6dc842dbf994b4773d4fe355eb77076ccf33f726ba63f16c0d08ba"
18
19LICENSE = "LGPLv2+"
20LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1"
21
22EXTRA_OECONF = "--with-xinputsh=50-xinput.sh \
23 --disable-static \
24 "
25
26DEPENDS = "gtk+ gconf libnotify dbus-glib libgxim xfconf"
27
28RDEPENDS_${PN} += "bash"
29
30FILES_${PN} += "${datadir}/dbus-1/*"