scim: create .inc and add 1.4.6 recipe

2 files changed, 75 insertions, 74 deletions

diff --git a/recipes/scim/scim.inc b/recipes/scim/scim.inc
new file mode 100644
index 0000000000..5b1690a54a
--- /dev/null
+++ b/recipes/scim/scim.inc
@@ -0,0 +1,74 @@
+DESCRIPTION = "Smart Common Input Method (SCIM) platform"
+HOMEPAGE = "http://www.scim-im.org"
+SECTION = "libs/inputmethod"
+LICENSE = "LGPL"
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.gz \
+           file://configure.patch;patch=1 \
+#           file://composemacron.patch;patch=1 \
+	"
+DEPENDS = "gtk+"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = " --without-doxygen "
+LEAD_SONAME = "libscim-1.0.so"
+
+PDIR = "${PN}-1.0"
+
+do_configure_append () {
+	# Fix unset @ALL_LINGUAS@
+	#   Replace with a list of available translations in ${S}/po
+
+	cd ${S}/po
+	SEDR=`ls *.gmo -1 --color=none | sed 's/.gmo//' | tr '\n' ' '`
+	SEDL='@ALL_LINGUAS@'
+	sed "s/${SEDL}.*/${SEDR}/" Makefile.in.in > Mii.tmp
+	sed "s/${SEDL}.*/${SEDR}/" Makefile.in > Mi.tmp
+	sed "s/${SEDL}.*/${SEDR}/" Makefile > M.tmp
+	mv Mii.tmp Makefile.in.in
+	mv Mi.tmp Makefile.in
+	mv M.tmp Makefile
+
+	# Fix unset @INTLTOOL_LIBDIR@
+	#   Only needed for a check to see if charmap.alias is present,
+	#   not really needed, so we fail that test by having it look
+	#   in ${S}
+
+	cd ${S}
+	sed 's/@INTLTOOL_LIBDIR@/./' intltool-merge.in > Ii.tmp
+	sed 's/@INTLTOOL_LIBDIR@/./' intltool-merge > I.tmp
+	mv Ii.tmp intltool-merge.in
+	mv I.tmp intltool-merge
+
+	# Fix unset @GTK_LIBDIR@
+	#   This is the same as ${libdir} so we use that
+
+	cd ${S}/extras/gtk2_immodule
+	sed 's/@GTK_LIBDIR@/$(libdir)/g' Makefile.in > Mi.tmp
+	sed 's/@GTK_LIBDIR@/$(libdir)/g' Makefile.am > Ma.tmp
+	mv Mi.tmp Makefile.in
+	mv Ma.tmp Makefile.am
+}
+
+pkg_postinst_${PN} () {
+	# Update gtk2 immodules
+	#   Adds SCIM to the list
+	/usr/bin/gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
+}
+
+pkg_postrm_${PN} () {
+	# Update gtk2 immodules
+	#   Removes SCIM from the list
+	/usr/bin/gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
+}
+
+FILES_${PN}-dbg +=   "${libdir}/${PDIR}/.debug \
+                      ${libdir}/${PDIR}/1.4.0/*/.debug \
+		      ${libdir}/gtk-2.0/immodules/.debug"
+FILES_${PN} +=       "${libdir}/${PDIR}/scim-panel-gtk \
+                      ${libdir}/${PDIR}/scim-helper* \
+                      ${libdir}/${PDIR}/scim-launcher \
+		      ${libdir}/${PDIR}/1.4.0 \
+                      ${libdir}/gtk-2.0/immodules"
diff --git a/recipes/scim/scim_1.4.9.bb b/recipes/scim/scim_1.4.9.bb
index 5b1690a54a..5e4abe694a 100644
--- a/recipes/scim/scim_1.4.9.bb
+++ b/recipes/scim/scim_1.4.9.bb
@@ -1,74 +1 @@
-DESCRIPTION = "Smart Common Input Method (SCIM) platform"
-HOMEPAGE = "http://www.scim-im.org"
-SECTION = "libs/inputmethod"
-LICENSE = "LGPL"
-PR = "r0"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.gz \
-           file://configure.patch;patch=1 \
-#           file://composemacron.patch;patch=1 \
-	"
-DEPENDS = "gtk+"
-
-inherit autotools pkgconfig
-
-EXTRA_OECONF = " --without-doxygen "
-LEAD_SONAME = "libscim-1.0.so"
-
-PDIR = "${PN}-1.0"
-
-do_configure_append () {
-	# Fix unset @ALL_LINGUAS@
-	#   Replace with a list of available translations in ${S}/po
-
-	cd ${S}/po
-	SEDR=`ls *.gmo -1 --color=none | sed 's/.gmo//' | tr '\n' ' '`
-	SEDL='@ALL_LINGUAS@'
-	sed "s/${SEDL}.*/${SEDR}/" Makefile.in.in > Mii.tmp
-	sed "s/${SEDL}.*/${SEDR}/" Makefile.in > Mi.tmp
-	sed "s/${SEDL}.*/${SEDR}/" Makefile > M.tmp
-	mv Mii.tmp Makefile.in.in
-	mv Mi.tmp Makefile.in
-	mv M.tmp Makefile
-
-	# Fix unset @INTLTOOL_LIBDIR@
-	#   Only needed for a check to see if charmap.alias is present,
-	#   not really needed, so we fail that test by having it look
-	#   in ${S}
-
-	cd ${S}
-	sed 's/@INTLTOOL_LIBDIR@/./' intltool-merge.in > Ii.tmp
-	sed 's/@INTLTOOL_LIBDIR@/./' intltool-merge > I.tmp
-	mv Ii.tmp intltool-merge.in
-	mv I.tmp intltool-merge
-
-	# Fix unset @GTK_LIBDIR@
-	#   This is the same as ${libdir} so we use that
-
-	cd ${S}/extras/gtk2_immodule
-	sed 's/@GTK_LIBDIR@/$(libdir)/g' Makefile.in > Mi.tmp
-	sed 's/@GTK_LIBDIR@/$(libdir)/g' Makefile.am > Ma.tmp
-	mv Mi.tmp Makefile.in
-	mv Ma.tmp Makefile.am
-}
-
-pkg_postinst_${PN} () {
-	# Update gtk2 immodules
-	#   Adds SCIM to the list
-	/usr/bin/gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
-}
-
-pkg_postrm_${PN} () {
-	# Update gtk2 immodules
-	#   Removes SCIM from the list
-	/usr/bin/gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
-}
-
-FILES_${PN}-dbg +=   "${libdir}/${PDIR}/.debug \
-                      ${libdir}/${PDIR}/1.4.0/*/.debug \
-		      ${libdir}/gtk-2.0/immodules/.debug"
-FILES_${PN} +=       "${libdir}/${PDIR}/scim-panel-gtk \
-                      ${libdir}/${PDIR}/scim-helper* \
-                      ${libdir}/${PDIR}/scim-launcher \
-		      ${libdir}/${PDIR}/1.4.0 \
-                      ${libdir}/gtk-2.0/immodules"
+require scim.inc