osb-nrcore: unified recipes, added missing libxt dependency

4 files changed, 38 insertions, 95 deletions

diff --git a/packages/gtk-webcore/osb-nrcore.inc b/packages/gtk-webcore/osb-nrcore.inc
new file mode 100644
index 0000000000..3b71c9685d
--- /dev/null
+++ b/packages/gtk-webcore/osb-nrcore.inc
@@ -0,0 +1,32 @@
+DESCRIPTION = "Gtk+ WebCore - rendering engine"
+HOMEPAGE = "http://gtk-webcore.sourceforge.net/"
+PRIORITY = "optional"
+SECTION = "gpe"
+LICENSE = "GPL"
+DEPENDS = "glib-2.0 gtk+ pango osb-jscore libxt"
+
+LEAD_SONAME = "libnrcore.so"
+
+inherit autotools pkgconfig
+
+do_configure () {
+	autotools_do_configure
+	cd ${S}
+
+	# prevent libtool from linking libs against libstdc++, libgcc, ...
+	cat ${TARGET_PREFIX}libtool | sed -e 's/postdeps=".*"/postdeps=""/' > ${TARGET_PREFIX}libtool.tmp
+	mv ${TARGET_PREFIX}libtool.tmp ${TARGET_PREFIX}libtool
+}
+
+do_stage () {
+	oe_libinstall -so libnrcore ${STAGING_LIBDIR}
+	oe_libinstall -so -C kwiq libnrcore_kwiq_gtk ${STAGING_LIBDIR}
+
+	autotools_stage_includes
+	
+	install -d ${STAGING_INCDIR}/osb/NRCore
+	for i in ${S}/kwiq/WebCore*.h ${S}/kwiq/KWIQ*.h; do
+		install -m 0644 $i ${STAGING_INCDIR}/osb/NRCore
+	done
+}
+
diff --git a/packages/gtk-webcore/osb-nrcore_0.5.0.bb b/packages/gtk-webcore/osb-nrcore_0.5.0.bb
index 34bafd659b..37800f3f78 100644
--- a/packages/gtk-webcore/osb-nrcore_0.5.0.bb
+++ b/packages/gtk-webcore/osb-nrcore_0.5.0.bb
@@ -1,35 +1,6 @@
-LICENSE = "GPL"
-DESCRIPTION = "Gtk+ WebCore - rendering engine"
-HOMEPAGE = "http://gtk-webcore.sourceforge.net/"
-PRIORITY = "optional"
-DEPENDS = "glib-2.0 gtk+ pango osb-jscore"
-SECTION = "gpe"
+require osb-nrcore.inc
+
 PR = "r2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/gtk-webcore/osb-nrcore-${PV}.tar.gz \
            file://KWQDictImpl.patch;patch=1"
-
-LEAD_SONAME = "libnrcore.so"
-
-inherit autotools pkgconfig
-
-do_configure () {
-	autotools_do_configure
-	cd ${S}
-
-	# prevent libtool from linking libs against libstdc++, libgcc, ...
-	cat ${TARGET_PREFIX}libtool | sed -e 's/postdeps=".*"/postdeps=""/' > ${TARGET_PREFIX}libtool.tmp
-	mv ${TARGET_PREFIX}libtool.tmp ${TARGET_PREFIX}libtool
-}
-
-do_stage () {
-	oe_libinstall -so libnrcore ${STAGING_LIBDIR}
-	oe_libinstall -so -C kwiq libnrcore_kwiq_gtk ${STAGING_LIBDIR}
-
-	autotools_stage_includes
-	
-	install -d ${STAGING_INCDIR}/osb/NRCore
-	for i in ${S}/kwiq/WebCore*.h ${S}/kwiq/KWIQ*.h; do
-		install -m 0644 $i ${STAGING_INCDIR}/osb/NRCore
-	done
-}
diff --git a/packages/gtk-webcore/osb-nrcore_20050430.bb b/packages/gtk-webcore/osb-nrcore_20050430.bb
index bc4ca5c435..c79f2b9fbd 100644
--- a/packages/gtk-webcore/osb-nrcore_20050430.bb
+++ b/packages/gtk-webcore/osb-nrcore_20050430.bb
@@ -1,41 +1,11 @@
-DESCRIPTION = "Gtk+ WebCore - rendering engine"
-HOMEPAGE = "http://gtk-webcore.sourceforge.net/"
-LICENSE = "GPL"
-PRIORITY = "optional"
-SECTION = "gpe"
+require osb-nrcore.inc
 
 FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}"
 PV = "0.5.0+cvs${FIXEDSRCDATE}"
 PR = "r1"
 
-DEPENDS = "glib-2.0 gtk+ pango osb-jscore"
-
 SRC_URI = "cvs://anonymous@gtk-webcore.cvs.sourceforge.net/cvsroot/gtk-webcore;module=NRCore;date=${FIXEDSRCDATE} \
 	   file://KWIQ-mimetype-segfault.patch;patch=1 \
 	   file://setHandle_segfault-fix.patch;patch=1"
-S = "${WORKDIR}/NRCore"
-
-LEAD_SONAME = "libnrcore.so"
-
-inherit autotools pkgconfig
 
-do_configure () {
-	autotools_do_configure
-	cd ${S}
-
-	# prevent libtool from linking libs against libstdc++, libgcc, ...
-	cat ${TARGET_PREFIX}libtool | sed -e 's/postdeps=".*"/postdeps=""/' > ${TARGET_PREFIX}libtool.tmp
-	mv ${TARGET_PREFIX}libtool.tmp ${TARGET_PREFIX}libtool
-}
-
-do_stage () {
-	oe_libinstall -so libnrcore ${STAGING_LIBDIR}
-	oe_libinstall -so -C kwiq libnrcore_kwiq_gtk ${STAGING_LIBDIR}
-
-	autotools_stage_includes
-	
-	install -d ${STAGING_INCDIR}/osb/NRCore
-	for i in ${S}/kwiq/WebCore*.h ${S}/kwiq/KWIQ*.h; do
-		install -m 0644 $i ${STAGING_INCDIR}/osb/NRCore
-	done
-}
+S = "${WORKDIR}/NRCore"
diff --git a/packages/gtk-webcore/osb-nrcore_20060212.bb b/packages/gtk-webcore/osb-nrcore_20060212.bb
index bdcbda0877..991af8d24d 100644
--- a/packages/gtk-webcore/osb-nrcore_20060212.bb
+++ b/packages/gtk-webcore/osb-nrcore_20060212.bb
@@ -1,44 +1,14 @@
-DESCRIPTION = "Gtk+ WebCore - rendering engine"
-HOMEPAGE = "http://gtk-webcore.sourceforge.net/"
-LICENSE = "GPL"
-PRIORITY = "optional"
-SECTION = "gpe"
+require osb-nrcore.inc
 
 FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}"
 PV = "0.5.0+cvs${FIXEDSRCDATE}"
 PR = "r0"
 
-DEPENDS = "glib-2.0 gtk+ pango osb-jscore"
-
 SRC_URI = "cvs://anonymous@gtk-webcore.cvs.sourceforge.net/cvsroot/gtk-webcore;module=NRCore;date=${FIXEDSRCDATE} \
            file://KWIQ-mimetype-segfault.patch;patch=1 \
 	   file://KWQKURL-urlcmp.patch;patch=1 \
            file://gcc4-fno-threadsafe-statics-NRCore.patch;patch=1"
+
 S = "${WORKDIR}/NRCore"
 
 DEFAULT_PREFERENCE = "${@['-1', '1'][not bb.data.getVar('PREFERRED_VERSION_gcc-cross', d, 1) or bb.data.getVar('PREFERRED_VERSION_gcc-cross', d, 1).split('.')[0] == '4']}"
-
-LEAD_SONAME = "libnrcore.so"
-
-inherit autotools pkgconfig
-
-do_configure () {
-	autotools_do_configure
-	cd ${S}
-
-	# prevent libtool from linking libs against libstdc++, libgcc, ...
-	cat ${TARGET_PREFIX}libtool | sed -e 's/postdeps=".*"/postdeps=""/' > ${TARGET_PREFIX}libtool.tmp
-	mv ${TARGET_PREFIX}libtool.tmp ${TARGET_PREFIX}libtool
-}
-
-do_stage () {
-	oe_libinstall -so libnrcore ${STAGING_LIBDIR}
-	oe_libinstall -so -C kwiq libnrcore_kwiq_gtk ${STAGING_LIBDIR}
-
-	autotools_stage_includes
-	
-	install -d ${STAGING_INCDIR}/osb/NRCore
-	for i in ${S}/kwiq/WebCore*.h ${S}/kwiq/KWIQ*.h; do
-		install -m 0644 $i ${STAGING_INCDIR}/osb/NRCore
-	done
-}