diff options
author | Khem Raj <raj.khem@gmail.com> | 2015-11-17 11:13:16 -0800 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-12-18 12:39:50 +0100 |
commit | b5341db1c245e581b25e2b7d5766ed2c1bbd17f7 (patch) | |
tree | a13eb6c215e0317504574d8869302813651374c3 /meta-xfce/recipes-extended/imsettings | |
parent | 00264bf4b3adad0cc2b083acbe23fdb3235c5874 (diff) | |
download | meta-openembedded-contrib-b5341db1c245e581b25e2b7d5766ed2c1bbd17f7.tar.gz |
imsettings: Move from meta-ruby to meta-xfce
It depends on xfconf which is XFCE component, no one
depends on imsettings in meta-ruby so move it close
to its dependencies.
Ideally, xfconf should be turned into PACKAGECONFIG
and this recipe then moved to meta-oe since all kind
of DE's can use it then.
For now it frees meta-ruby from unnecessary dependency on xfce layer
Change-Id: I6b5896b0db504fad49a9da5967d3493e27c627b0
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-xfce/recipes-extended/imsettings')
-rw-r--r-- | meta-xfce/recipes-extended/imsettings/gtk-is-required-by-notify.patch | 18 | ||||
-rw-r--r-- | meta-xfce/recipes-extended/imsettings/multi-line-ACLOCAL_AMFLAGS-isnot-supported-by-autoreconf.patch | 21 |
2 files changed, 39 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 0000000000..d42358d690 --- /dev/null +++ b/meta-xfce/recipes-extended/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@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-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 0000000000..9e318474e4 --- /dev/null +++ b/meta-xfce/recipes-extended/imsettings/multi-line-ACLOCAL_AMFLAGS-isnot-supported-by-autoreconf.patch @@ -0,0 +1,21 @@ +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@cn.fujitsu.com> + +diff -Nurp imsettings-1.6.8.orig/Makefile.am imsettings-1.6.8/Makefile.am +--- imsettings-1.6.8.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 +@@ -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 \ |