summaryrefslogtreecommitdiffstats
path: root/meta-ruby
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2015-12-10 20:01:13 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2015-12-18 12:39:50 +0100
commitaf602920594a9cc2e9b397fe311fda7f531be7f3 (patch)
tree48ac01c301740f1655c499e5834977b0ab4455e3 /meta-ruby
parentb5341db1c245e581b25e2b7d5766ed2c1bbd17f7 (diff)
downloadmeta-openembedded-af602920594a9cc2e9b397fe311fda7f531be7f3.tar.gz
libgxim: move from meta-ruby back to meta-oe
* it was moved to meta-ruby (totherer with imsettings which depends on libgxim) because of ruby-native dependency, now when ruby was moved from meta-ruby to oe-core we can move libgxim back to meta-oe (which also allows imsettings in meta-xfce to depend only on meta-oe as well) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-ruby')
-rw-r--r--meta-ruby/recipes-extended/libgxim/libgxim/multi-line-ACLOCAL_AMFLAGS-isnot-supported-by-autoreconf.patch21
-rw-r--r--meta-ruby/recipes-extended/libgxim/libgxim_0.5.0.bb25
2 files changed, 0 insertions, 46 deletions
diff --git a/meta-ruby/recipes-extended/libgxim/libgxim/multi-line-ACLOCAL_AMFLAGS-isnot-supported-by-autoreconf.patch b/meta-ruby/recipes-extended/libgxim/libgxim/multi-line-ACLOCAL_AMFLAGS-isnot-supported-by-autoreconf.patch
deleted file mode 100644
index 3d293b473..000000000
--- a/meta-ruby/recipes-extended/libgxim/libgxim/multi-line-ACLOCAL_AMFLAGS-isnot-supported-by-autoreconf.patch
+++ /dev/null
@@ -1,21 +0,0 @@
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 libgxim-0.5.0.orig/Makefile.am libgxim-0.5.0/Makefile.am
9--- libgxim-0.5.0.orig/Makefile.am 2012-12-13 15:48:09.000000000 +0800
10+++ libgxim-0.5.0/Makefile.am 2014-12-19 11:05:50.727209821 +0800
11@@ -2,9 +2,7 @@ NULL =
12 AUTOMAKE_OPTIONS = dist-bzip2
13 SUBDIRS = libgxim m4macros 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-ruby/recipes-extended/libgxim/libgxim_0.5.0.bb b/meta-ruby/recipes-extended/libgxim/libgxim_0.5.0.bb
deleted file mode 100644
index 768bdaa69..000000000
--- a/meta-ruby/recipes-extended/libgxim/libgxim_0.5.0.bb
+++ /dev/null
@@ -1,25 +0,0 @@
1SUMMARY = "GObject-based XIM protocol library"
2DESCRIPTION = "libgxim is a X Input Method protocol library that is implemented by GObject.\
3this library helps you to implement XIM servers or client applications to\
4communicate through XIM protocol without using Xlib API directly, particularly\
5if your application uses GObject-based main loop.\
6\
7This package contains the shared library."
8
9HOMEPAGE = "http://code.google.com/p/libgxim/"
10SECTION = "System Environment/Libraries"
11
12SRC_URI = "https://bitbucket.org/tagoh/libgxim/downloads/${BPN}-${PV}.tar.bz2 \
13 file://multi-line-ACLOCAL_AMFLAGS-isnot-supported-by-autoreconf.patch"
14
15SRC_URI[md5sum] = "4bb1fa63d00eb224439d413591c29a6a"
16SRC_URI[sha256sum] = "75e20d1744139644f9951b78ea3910b162d3380302315cb4b3d0640f23694c79"
17
18LICENSE = "LGPLv2+"
19LIC_FILES_CHKSUM = "\
20file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1"
21
22EXTRA_OECONF = " --disable-static --disable-rebuilds"
23DEPENDS += "gtk+ glib-2.0 ruby-native"
24
25inherit autotools pkgconfig gettext