[oe-commits] org.oe.dev osb-nrcore: unified recipes, added missing libxt dependency
hrw commit
openembedded-commits at lists.openembedded.org
Wed Dec 13 22:56:59 UTC 2006
osb-nrcore: unified recipes, added missing libxt dependency
Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: 3b92a7d1b004b4e1e41e5db9ad722db069da03ce
ViewMTN: http://monotone.openembedded.org/revision.psp?id=3b92a7d1b004b4e1e41e5db9ad722db069da03ce
Files:
1
packages/gtk-webcore/osb-nrcore.inc
packages/gtk-webcore/osb-nrcore_0.5.0.bb
packages/gtk-webcore/osb-nrcore_20050430.bb
packages/gtk-webcore/osb-nrcore_20060212.bb
Diffs:
#
# mt diff -r0a20426c396ae9550c552c5e030a01fd51d45154 -r3b92a7d1b004b4e1e41e5db9ad722db069da03ce
#
#
#
# add_file "packages/gtk-webcore/osb-nrcore.inc"
# content [bb74045e42a69c1b0faaf1a4656e7051d34ceec9]
#
# patch "packages/gtk-webcore/osb-nrcore_0.5.0.bb"
# from [4c8f7f0ed6548da1cc4dac1a1fb2681c883fb795]
# to [0fece35a6b84dc361353d33a9fede31ce779a1f0]
#
# patch "packages/gtk-webcore/osb-nrcore_20050430.bb"
# from [ceca1ad21c1fb38aa9512c2fba5ee9260b21836c]
# to [d0992f1bed330eb050103333b4fba78a2796beed]
#
# patch "packages/gtk-webcore/osb-nrcore_20060212.bb"
# from [98da1b588732152679b6f04ee864e5d9065613b2]
# to [6e579f3f6ac84177795301fcc33ff6537085db24]
#
============================================================
--- packages/gtk-webcore/osb-nrcore.inc bb74045e42a69c1b0faaf1a4656e7051d34ceec9
+++ packages/gtk-webcore/osb-nrcore.inc bb74045e42a69c1b0faaf1a4656e7051d34ceec9
@@ -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
+}
+
============================================================
--- packages/gtk-webcore/osb-nrcore_0.5.0.bb 4c8f7f0ed6548da1cc4dac1a1fb2681c883fb795
+++ packages/gtk-webcore/osb-nrcore_0.5.0.bb 0fece35a6b84dc361353d33a9fede31ce779a1f0
@@ -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
-}
============================================================
--- packages/gtk-webcore/osb-nrcore_20050430.bb ceca1ad21c1fb38aa9512c2fba5ee9260b21836c
+++ packages/gtk-webcore/osb-nrcore_20050430.bb d0992f1bed330eb050103333b4fba78a2796beed
@@ -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"
+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
-}
============================================================
--- packages/gtk-webcore/osb-nrcore_20060212.bb 98da1b588732152679b6f04ee864e5d9065613b2
+++ packages/gtk-webcore/osb-nrcore_20060212.bb 6e579f3f6ac84177795301fcc33ff6537085db24
@@ -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
-}
More information about the Openembedded-commits
mailing list