From af602920594a9cc2e9b397fe311fda7f531be7f3 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 10 Dec 2015 20:01:13 +0100 Subject: 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 --- ...CAL_AMFLAGS-isnot-supported-by-autoreconf.patch | 21 ++++++++++++++++++ meta-oe/recipes-extended/libgxim/libgxim_0.5.0.bb | 25 ++++++++++++++++++++++ ...CAL_AMFLAGS-isnot-supported-by-autoreconf.patch | 21 ------------------ .../recipes-extended/libgxim/libgxim_0.5.0.bb | 25 ---------------------- 4 files changed, 46 insertions(+), 46 deletions(-) create mode 100644 meta-oe/recipes-extended/libgxim/libgxim/multi-line-ACLOCAL_AMFLAGS-isnot-supported-by-autoreconf.patch create mode 100644 meta-oe/recipes-extended/libgxim/libgxim_0.5.0.bb delete mode 100644 meta-ruby/recipes-extended/libgxim/libgxim/multi-line-ACLOCAL_AMFLAGS-isnot-supported-by-autoreconf.patch delete mode 100644 meta-ruby/recipes-extended/libgxim/libgxim_0.5.0.bb diff --git a/meta-oe/recipes-extended/libgxim/libgxim/multi-line-ACLOCAL_AMFLAGS-isnot-supported-by-autoreconf.patch b/meta-oe/recipes-extended/libgxim/libgxim/multi-line-ACLOCAL_AMFLAGS-isnot-supported-by-autoreconf.patch new file mode 100644 index 0000000000..3d293b473e --- /dev/null +++ b/meta-oe/recipes-extended/libgxim/libgxim/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 + +diff -Nurp libgxim-0.5.0.orig/Makefile.am libgxim-0.5.0/Makefile.am +--- libgxim-0.5.0.orig/Makefile.am 2012-12-13 15:48:09.000000000 +0800 ++++ libgxim-0.5.0/Makefile.am 2014-12-19 11:05:50.727209821 +0800 +@@ -2,9 +2,7 @@ NULL = + AUTOMAKE_OPTIONS = dist-bzip2 + SUBDIRS = libgxim m4macros po tests docs + +-ACLOCAL_AMFLAGS = \ +- -I m4macros \ +- $(NULL) ++ACLOCAL_AMFLAGS = -I m4macros $(NULL) + + CONFIGURE_DEPENDENCIES = \ + requires \ diff --git a/meta-oe/recipes-extended/libgxim/libgxim_0.5.0.bb b/meta-oe/recipes-extended/libgxim/libgxim_0.5.0.bb new file mode 100644 index 0000000000..768bdaa694 --- /dev/null +++ b/meta-oe/recipes-extended/libgxim/libgxim_0.5.0.bb @@ -0,0 +1,25 @@ +SUMMARY = "GObject-based XIM protocol library" +DESCRIPTION = "libgxim is a X Input Method protocol library that is implemented by GObject.\ +this library helps you to implement XIM servers or client applications to\ +communicate through XIM protocol without using Xlib API directly, particularly\ +if your application uses GObject-based main loop.\ +\ +This package contains the shared library." + +HOMEPAGE = "http://code.google.com/p/libgxim/" +SECTION = "System Environment/Libraries" + +SRC_URI = "https://bitbucket.org/tagoh/libgxim/downloads/${BPN}-${PV}.tar.bz2 \ + file://multi-line-ACLOCAL_AMFLAGS-isnot-supported-by-autoreconf.patch" + +SRC_URI[md5sum] = "4bb1fa63d00eb224439d413591c29a6a" +SRC_URI[sha256sum] = "75e20d1744139644f9951b78ea3910b162d3380302315cb4b3d0640f23694c79" + +LICENSE = "LGPLv2+" +LIC_FILES_CHKSUM = "\ +file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" + +EXTRA_OECONF = " --disable-static --disable-rebuilds" +DEPENDS += "gtk+ glib-2.0 ruby-native" + +inherit autotools pkgconfig gettext 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 3d293b473e..0000000000 --- a/meta-ruby/recipes-extended/libgxim/libgxim/multi-line-ACLOCAL_AMFLAGS-isnot-supported-by-autoreconf.patch +++ /dev/null @@ -1,21 +0,0 @@ -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 - -diff -Nurp libgxim-0.5.0.orig/Makefile.am libgxim-0.5.0/Makefile.am ---- libgxim-0.5.0.orig/Makefile.am 2012-12-13 15:48:09.000000000 +0800 -+++ libgxim-0.5.0/Makefile.am 2014-12-19 11:05:50.727209821 +0800 -@@ -2,9 +2,7 @@ NULL = - AUTOMAKE_OPTIONS = dist-bzip2 - SUBDIRS = libgxim m4macros po tests docs - --ACLOCAL_AMFLAGS = \ -- -I m4macros \ -- $(NULL) -+ACLOCAL_AMFLAGS = -I m4macros $(NULL) - - CONFIGURE_DEPENDENCIES = \ - 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 768bdaa694..0000000000 --- a/meta-ruby/recipes-extended/libgxim/libgxim_0.5.0.bb +++ /dev/null @@ -1,25 +0,0 @@ -SUMMARY = "GObject-based XIM protocol library" -DESCRIPTION = "libgxim is a X Input Method protocol library that is implemented by GObject.\ -this library helps you to implement XIM servers or client applications to\ -communicate through XIM protocol without using Xlib API directly, particularly\ -if your application uses GObject-based main loop.\ -\ -This package contains the shared library." - -HOMEPAGE = "http://code.google.com/p/libgxim/" -SECTION = "System Environment/Libraries" - -SRC_URI = "https://bitbucket.org/tagoh/libgxim/downloads/${BPN}-${PV}.tar.bz2 \ - file://multi-line-ACLOCAL_AMFLAGS-isnot-supported-by-autoreconf.patch" - -SRC_URI[md5sum] = "4bb1fa63d00eb224439d413591c29a6a" -SRC_URI[sha256sum] = "75e20d1744139644f9951b78ea3910b162d3380302315cb4b3d0640f23694c79" - -LICENSE = "LGPLv2+" -LIC_FILES_CHKSUM = "\ -file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" - -EXTRA_OECONF = " --disable-static --disable-rebuilds" -DEPENDS += "gtk+ glib-2.0 ruby-native" - -inherit autotools pkgconfig gettext -- cgit 1.2.3-korg